Skip to content
This repository was archived by the owner on May 15, 2018. It is now read-only.

Don't panic on empty input. #7

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,14 @@ mod test {
}
}

#[test]
fn serialize_empty() {
let input = "";
let expected = "";

serialize_test(input, expected);
}

#[test]
fn serialize_simple() {
let input = " user_pref /* block comment */ ( 'example.pref.string', 'value' ) ;\n pref(\"example.pref.int\", -123); sticky_pref('example.pref.bool',false)";
Expand Down
6 changes: 3 additions & 3 deletions src/prefreader.rs
Original file line number Diff line number Diff line change
Expand Up @@ -257,21 +257,21 @@ impl<'a> PrefTokenizer<'a> {
}

fn get_char(&mut self) -> Option<char> {
if self.pos >= self.data.len() - 1 {
if self.pos as i64 >= self.data.len() as i64 - 1 {
self.cur = None;
return None
};
if self.cur.is_some() {
self.pos += 1;
}
let c = self.data[self.pos] as char;
if self.cur == Some('\n') {
self.position.line += 1;
self.position.column = 0;
} else if self.cur.is_some() {
self.position.column += 1;
};
self.cur = Some(c);
self.cur = self.data.get(self.pos)
.map(|c| *c as char);
self.cur
}

Expand Down