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

BUGFIX: Allow empty lists in parsing.

Browse Source
This commit is contained in:
Jeremy Wall 2018-11-21 20:41:54 -06:00
parent 0ff3472011
commit a9b374bf33
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
integration_tests/list_test.ucg Normal file
View File

@ -0,0 +1 @@
let empty_list = [];

5
src/build/compile_test.rs
View File

@ -33,6 +33,11 @@ fn test_tuples() {
assert_build(include_str!("../../integration_tests/tuple_test.ucg"));
}
#[test]
fn test_lists() {
assert_build(include_str!("../../integration_tests/list_test.ucg"));
}
#[test]
fn test_comparisons() {
assert_build(include_str!("../../integration_tests/comparisons_test.ucg"));

6
src/parse/mod.rs
View File

@ -331,9 +331,9 @@ make_fn!(
)
);
fn tuple_to_list<Sp: Into<Position>>(pos: Sp, elems: Vec<Expression>) -> Value {
fn tuple_to_list<Sp: Into<Position>>(pos: Sp, elems: Option<Vec<Expression>>) -> Value {
Value::List(ListDef {
elems: elems,
elems: elems.unwrap_or_else(|| Vec::new()),
pos: pos.into(),
})
}
@ -342,7 +342,7 @@ make_fn!(
list_value<SliceIter<Token>, Value>,
do_each!(
start => punct!("["),
elements => separated!(punct!(","), expression),
elements => optional!(separated!(punct!(","), expression)),
_ => optional!(punct!(",")), // nom's opt! macro doesn't preserve error types properly but this one does.
_ => punct!("]"),
(tuple_to_list(start.pos, elements))