Skip to content

Clean up some logic/formatting in JSON module #19246

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 24, 2014
Merged

Clean up some logic/formatting in JSON module #19246

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
134 changes: 63 additions & 71 deletions src/libserialize/json.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1166,7 +1166,7 @@ impl Stack {
/// at the top.
pub fn get<'l>(&'l self, idx: uint) -> StackElement<'l> {
match self.stack[idx] {
InternalIndex(i) => { Index(i) }
InternalIndex(i) => Index(i),
InternalKey(start, size) => {
Key(str::from_utf8(
self.str_buffer[start as uint .. start as uint + size as uint]).unwrap())
Expand Down Expand Up @@ -1643,69 +1643,65 @@ impl<T: Iterator<char>> Parser<T> {
fn parse_start(&mut self) -> JsonEvent {
let val = self.parse_value();
self.state = match val {
Error(_) => { ParseFinished }
ArrayStart => { ParseArray(true) }
ObjectStart => { ParseObject(true) }
_ => { ParseBeforeFinish }
Error(_) => ParseFinished,
ArrayStart => ParseArray(true),
ObjectStart => ParseObject(true),
_ => ParseBeforeFinish,
};
return val;
}

fn parse_array(&mut self, first: bool) -> JsonEvent {
if self.ch_is(']') {
if !first {
return self.error_event(InvalidSyntax);
}
if self.stack.is_empty() {
self.state = ParseBeforeFinish;
self.error_event(InvalidSyntax)
} else {
self.state = if self.stack.last_is_index() {
self.state = if self.stack.is_empty() {
ParseBeforeFinish
} else if self.stack.last_is_index() {
ParseArrayComma
} else {
ParseObjectComma
}
};
self.bump();
ArrayEnd
}
self.bump();
return ArrayEnd;
}
if first {
self.stack.push_index(0);
} else {
if first {
self.stack.push_index(0);
}
let val = self.parse_value();
self.state = match val {
Error(_) => ParseFinished,
ArrayStart => ParseArray(true),
ObjectStart => ParseObject(true),
_ => ParseArrayComma,
};
val
}

let val = self.parse_value();

self.state = match val {
Error(_) => { ParseFinished }
ArrayStart => { ParseArray(true) }
ObjectStart => { ParseObject(true) }
_ => { ParseArrayComma }
};
return val;
}

fn parse_array_comma_or_end(&mut self) -> Option<JsonEvent> {
if self.ch_is(',') {
self.stack.bump_index();
self.state = ParseArray(false);
self.bump();
return None;
None
} else if self.ch_is(']') {
self.stack.pop();
if self.stack.is_empty() {
self.state = ParseBeforeFinish;
self.state = if self.stack.is_empty() {
ParseBeforeFinish
} else if self.stack.last_is_index() {
ParseArrayComma
} else {
self.state = if self.stack.last_is_index() {
ParseArrayComma
} else {
ParseObjectComma
}
}
ParseObjectComma
};
self.bump();
return Some(ArrayEnd);
Some(ArrayEnd)
} else if self.eof() {
return Some(self.error_event(EOFWhileParsingArray));
Some(self.error_event(EOFWhileParsingArray))
} else {
return Some(self.error_event(InvalidSyntax));
Some(self.error_event(InvalidSyntax))
}
}

Expand All @@ -1718,15 +1714,13 @@ impl<T: Iterator<char>> Parser<T> {
self.stack.pop();
}
}
if self.stack.is_empty() {
self.state = ParseBeforeFinish;
self.state = if self.stack.is_empty() {
ParseBeforeFinish
} else if self.stack.last_is_index() {
ParseArrayComma
} else {
self.state = if self.stack.last_is_index() {
ParseArrayComma
} else {
ParseObjectComma
}
}
ParseObjectComma
};
self.bump();
return ObjectEnd;
}
Expand All @@ -1737,7 +1731,7 @@ impl<T: Iterator<char>> Parser<T> {
return self.error_event(KeyMustBeAString);
}
let s = match self.parse_str() {
Ok(s) => { s }
Ok(s) => s,
Err(e) => {
self.state = ParseFinished;
return Error(e);
Expand All @@ -1756,25 +1750,23 @@ impl<T: Iterator<char>> Parser<T> {
let val = self.parse_value();

self.state = match val {
Error(_) => { ParseFinished }
ArrayStart => { ParseArray(true) }
ObjectStart => { ParseObject(true) }
_ => { ParseObjectComma }
Error(_) => ParseFinished,
ArrayStart => ParseArray(true),
ObjectStart => ParseObject(true),
_ => ParseObjectComma,
};
return val;
}

fn parse_object_end(&mut self) -> JsonEvent {
if self.ch_is('}') {
if self.stack.is_empty() {
self.state = ParseBeforeFinish;
self.state = if self.stack.is_empty() {
ParseBeforeFinish
} else if self.stack.last_is_index() {
ParseArrayComma
} else {
self.state = if self.stack.last_is_index() {
ParseArrayComma
} else {
ParseObjectComma
}
}
ParseObjectComma
};
self.bump();
ObjectEnd
} else if self.eof() {
Expand Down Expand Up @@ -1852,23 +1844,23 @@ impl<T: Iterator<char>> Builder<T> {
}

fn build_value(&mut self) -> Result<Json, BuilderError> {
return match self.token {
Some(NullValue) => { Ok(Null) }
Some(I64Value(n)) => { Ok(I64(n)) }
Some(U64Value(n)) => { Ok(U64(n)) }
Some(F64Value(n)) => { Ok(F64(n)) }
Some(BooleanValue(b)) => { Ok(Boolean(b)) }
match self.token {
Some(NullValue) => Ok(Null),
Some(I64Value(n)) => Ok(I64(n)),
Some(U64Value(n)) => Ok(U64(n)),
Some(F64Value(n)) => Ok(F64(n)),
Some(BooleanValue(b)) => Ok(Boolean(b)),
Some(StringValue(ref mut s)) => {
let mut temp = string::String::new();
swap(s, &mut temp);
Ok(String(temp))
}
Some(Error(e)) => { Err(e) }
Some(ArrayStart) => { self.build_array() }
Some(ObjectStart) => { self.build_object() }
Some(ObjectEnd) => { self.parser.error(InvalidSyntax) }
Some(ArrayEnd) => { self.parser.error(InvalidSyntax) }
None => { self.parser.error(EOFWhileParsingValue) }
Some(Error(e)) => Err(e),
Some(ArrayStart) => self.build_array(),
Some(ObjectStart) => self.build_object(),
Some(ObjectEnd) => self.parser.error(InvalidSyntax),
Some(ArrayEnd) => self.parser.error(InvalidSyntax),
None => self.parser.error(EOFWhileParsingValue),
}
}

Expand Down