schala-lang/src/parsing/combinator.rs

@@ -197,7 +197,7 @@ fn import(input: Span) -> ParseResult<ImportSpecifier> {
             map(
                 preceded(
                     tag("::"),
-                    delimited(char('{'), cut(separated_list1(tok(char(',')), identifier)), char('}')),
+                    delimited(char('{'), separated_list0(tok(char(',')), identifier), char('}')),
                 ),
                 |names| ImportedNames::List(names.into_iter().map(|n| rc_string(n.fragment())).collect()),
             ),

schala-lang/src/parsing/peg_parser.rs

@@ -37,7 +37,7 @@ peg::parser! {
         //Note - this is a hack, ideally the rule `rule block() -> Block = "{" _ items:(statement() **
         //delimiter()) _ "}" { items.into() }` would've worked, but it doesn't.
         pub rule block(parser: &mut Parser) -> Block =
-            "{" __ items:(statement(parser) ** delimiter()) delimiter()? __ "}" { items.into() } /
+            "{" __ items:block_item(parser)* __ "}" { items.into() } /
             "{" __ stmt:statement(parser) __ "}" { vec![stmt].into() }
 
         rule block_item(parser: &mut Parser) -> Statement =
@@ -78,13 +78,7 @@ peg::parser! {
 
         rule import_suffix() -> ImportedNames =
             "::*" { ImportedNames::All } /
-            "::{" __ names:(identifier() ** (_ "," _)) __ "}" {?
+            "::{" __ names:(identifier() ** (_ "," _)) __ "}" { ImportedNames::List(names.into_iter().map(rc_string).collect()) }
-                if names.is_empty() {
-                    Err("import groups must have at least one item")
-                } else {
-                    Ok(ImportedNames::List(names.into_iter().map(rc_string).collect()))
-                }
-            }
 
         rule declaration(parser: &mut Parser) -> Declaration =
             binding(parser) / type_decl(parser) / annotation(parser) / func(parser) / interface(parser) /
@@ -103,7 +97,7 @@ peg::parser! {
             }
 
         rule decl_block(parser: &mut Parser) -> Vec<Declaration> =
-            "{" __ decls:(func_declaration(parser) ** (delimiter()+)) delimiter()? __ "}" { decls }
+            "{" __ decls:(func_declaration(parser) ** (delimiter()+)) __ "}" { decls }
 
         rule interface(parser: &mut Parser) -> Declaration =
             "interface" _ name:identifier() _ signatures:signature_block(parser) { Declaration::Interface { name: rc_string(name), signatures } }

schala-lang/src/parsing/test.rs

@@ -519,8 +519,9 @@ fn single_param_lambda() {
 fn complex_lambdas() {
     use ExpressionKind::*;
 
+    //TODO support this without the semicolon after the lambda
     assert_ast! {
-    r#"fn wahoo() { let a = 10; \(x) { x + a } }
+    r#"fn wahoo() { let a = 10; \(x) { x + a }; }
     wahoo()(3) "#,
     vec![
         fn_decl(Signature { name: rc("wahoo"), operator: false, type_anno: None, params: vec![] },
@@ -990,8 +991,9 @@ fn impls() {
         vec![decl(Impl { type_name: ty_simple("Heh"), interface_name: None, block: block.clone() })]
     );
 
+    //TODO `"impl Heh<X> { fn yolo() { }; fn swagg() { }; }"` ought to work
     assert_ast!(
-        "impl Heh<X> { fn yolo() { }; fn swagg() { }; }",
+        "impl Heh<X> { fn yolo() { }; fn swagg() { } }",
         vec![decl(Impl {
             type_name: TypeIdentifier::Singleton(TypeSingletonName {
                 name: rc("Heh"),
@@ -1106,7 +1108,15 @@ fn imports() {
         }))]
     };
 
-    assert_fail!("import bespouri::{}");
+    //TODO this shouldn't be legal
+    assert_ast! {
+        "import bespouri::{}",
+        vec![stmt(StatementKind::Import(ImportSpecifier {
+            id: Default::default(),
+            path_components: vec![rc("bespouri")],
+            imported_names: ImportedNames::List(vec![]),
+        }))]
+    };
 
     assert_ast! {
         "import bespouri::*",