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

FEATURE: Better error reporting using must!.

Browse Source 
Some errors around punctuation were less than helpful. This should
improve that situation somewhat.
This commit is contained in:
Jeremy Wall 2019-01-13 14:31:04 -06:00
parent c4505ac2ab
commit 3cfed0d0e1
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/parse/mod.rs
View File

@ -214,8 +214,8 @@ make_fn!(
do_each!(
field => wrap_err!(either!(match_type!(BOOLEAN), match_type!(BAREWORD), match_type!(STR)),
"Field names must be a bareword or a string."),
_ => punct!("="),
value => expression,
_ => must!(punct!("=")),
value => must!(expression),
(field, value)
)
);
@ -381,14 +381,14 @@ fn module_expression(input: SliceIter<Token>) -> Result<SliceIter<Token>, Expres
let parsed = do_each!(input,
pos => pos,
_ => word!("module"),
_ => punct!("{"),
_ => must!(punct!("{")),
arglist => trace_parse!(optional!(field_list)),
_ => optional!(punct!(",")),
_ => punct!("}"),
_ => punct!("=>"),
_ => punct!("{"),
_ => must!(punct!("}")),
_ => must!(punct!("=>")),
_ => must!(punct!("{")),
stmt_list => trace_parse!(repeat!(statement)),
_ => punct!("}"),
_ => must!(punct!("}")),
(pos, arglist, stmt_list)
);
match parsed {
@ -412,10 +412,10 @@ fn macro_expression(input: SliceIter<Token>) -> Result<SliceIter<Token>, Express
let parsed = do_each!(input,
pos => pos,
_ => word!("macro"),
_ => punct!("("),
_ => must!(punct!("(")),
arglist => trace_parse!(optional!(arglist)),
_ => punct!(")"),
_ => punct!("=>"),
_ => must!(punct!(")")),
_ => must!(punct!("=>")),
map => trace_parse!(tuple),
(pos, arglist, map)
);
@ -502,9 +502,9 @@ make_fn!(
do_each!(
tmpl => match_type!(STR),
_ => punct!("%"),
_ => punct!("("),
_ => must!(punct!("(")),
args => separated!(punct!(","), trace_parse!(expression)),
_ => punct!(")"),
_ => must!(punct!(")")),
(tuple_to_format(tmpl, args))
)
);
@ -514,8 +514,8 @@ make_fn!(
do_each!(
pos => pos,
_ => word!("include"),
typ => match_type!(BAREWORD),
path => match_type!(STR),
typ => must!(match_type!(BAREWORD)),
path => must!(match_type!(STR)),
(Expression::Include(IncludeDef{
pos: pos,
typ: typ,