zaphar/ucg
1
0
Fork 0
mirror of https://github.com/zaphar/ucg.git synced 2025-07-25 18:49:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

MAINT: Parsing peformance boosts.

Browse Source
This commit is contained in:
Jeremy Wall 2018-12-12 18:41:08 -06:00
parent 8009c6a8a5
commit e15573d316
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/parse/mod.rs
View File

@ -365,13 +365,13 @@ make_fn!(
make_fn!( make_fn!(
value<SliceIter<Token>, Value>, value<SliceIter<Token>, Value>,
alt_peek!( either!(
symbol_or_expression => trace_nom!(selector_value) trace_nom!(selector_value),
| either!(punct!("["), punct!("{")) => trace_nom!(compound_value) trace_nom!(compound_value),
| match_type!(BOOLEAN) => trace_nom!(boolean_value) trace_nom!(boolean_value),
| match_type!(EMPTY) => trace_nom!(empty_value) trace_nom!(empty_value),
| either!(match_type!(DIGIT), punct!(".")) => trace_nom!(number) trace_nom!(number),
| trace_nom!(quoted_value) trace_nom!(quoted_value)
) )
); );
@ -383,6 +383,7 @@ make_fn!(
simple_expression<SliceIter<Token>, Expression>, simple_expression<SliceIter<Token>, Expression>,
do_each!( do_each!(
val => trace_nom!(value), val => trace_nom!(value),
_ => not!(either!(punct!("."), punct!("{"), punct!("["), punct!("("))),
(value_to_expression(val)) (value_to_expression(val))
) )
); );
@ -819,18 +820,13 @@ make_fn!(
fn unprefixed_expression(input: SliceIter<Token>) -> NomResult<Expression> { fn unprefixed_expression(input: SliceIter<Token>) -> NomResult<Expression> {
let _input = input.clone(); let _input = input.clone();
let attempt = either!( either!(
input, input,
trace_nom!(format_expression),
trace_nom!(simple_expression),
trace_nom!(call_expression), trace_nom!(call_expression),
trace_nom!(copy_expression), trace_nom!(copy_expression)
trace_nom!(format_expression) )
);
match attempt {
Result::Incomplete(i) => Result::Incomplete(i),
Result::Complete(rest, expr) => Result::Complete(rest, expr),
Result::Fail(_) => trace_nom!(_input, simple_expression),
Result::Abort(e) => Result::Abort(e),
}
} }
make_fn!( make_fn!(