parser-lr 0.7.0 → 0.8.1

package/grammars/grammar.grammar

@@ -236,193 +236,72 @@ grammar
 
 ast
     grammar_file =
-        name_decl
-        { section }
-        start_decl
-        grammar_section
-        [ ast_section ]
-        [ transform_section ]
-    ;
-
-    name_decl =
-        name_kw grammar_name semicolon
-    ;
-
-    grammar_name =
-        identifier
-      | string_literal
-    ;
-
-    section =
-        token_section
-      | skip_section
-      | states_section
+        #sections { section }
     ;
 
     token_section =
-        tokens_kw token_def { token_def }
+        #definitions { token_def }
     ;
 
     skip_section =
-        skip_kw token_def { token_def }
-    ;
-
-    states_section =
-        states_kw state_name { comma state_name } semicolon
-    ;
-
-    token_def =
-        identifier equal regex_literal semicolon
-    ;
-
-    state_name =
-        identifier
-    ;
-
-    start_decl =
-        start_kw identifier semicolon
+        #definitions { token_def }
     ;
 
     grammar_section =
-        grammar_kw production { production }
+        #productions { production }
     ;
 
     ast_section =
-        ast_kw ast_type { ast_type }
+        #types { ast_type }
     ;
 
     transform_section =
-        transform_kw transform_rule { transform_rule }
-    ;
-
-    production =
-        identifier equal expression semicolon
-    ;
-
-    ast_type =
-        identifier equal expression semicolon
+        #rules { transform_rule }
     ;
 
     transform_rule =
-        identifier arrow labeled_transform { bar labeled_transform } semicolon
-    ;
-
-    labeled_transform =
-        hash identifier transform_expr
-    ;
-
-    transform_expr =
-        drop_kw
-      | pass_expr
-      | fold_left_expr
-      | fold_right_expr
-      | flatten_expr
-      | build_expr
-    ;
-
-    pass_expr =
-        pass_kw lpar reference rpar
-    ;
-
-    fold_left_expr =
-        fold_left_kw lpar build_target comma reference_list rpar
-    ;
-
-    fold_right_expr =
-        fold_right_kw lpar build_target comma reference_list rpar
-    ;
-
-    flatten_expr =
-        flatten_kw lpar build_target comma reference comma reference rpar
-    ;
-
-    build_expr =
-        build_target [ lpar reference_list rpar ]
-    ;
-
-    build_target =
-        identifier dot hash identifier
+        #alternatives { labeled_transform }
     ;
 
     reference_list =
-        reference { comma reference }
-    ;
-
-    reference =
-        identifier
-    ;
-
-    expression =
-        choice
+        #references { reference }
     ;
 
     choice =
-        alternative { bar alternative }
-    ;
-
-    alternative =
-        labeled_alternative
-    ;
-
-    labeled_alternative =
-        [ hash identifier ] sequence
+        #alternatives { alternative }
     ;
 
     sequence =
-        factor { factor }
-    ;
-
-    factor =
-        bracketed
-      | repeat
-      | group
-      | primary
-    ;
-
-    bracketed =
-        lbracket expression rbracket [ colon identifier ]
-    ;
-
-    repeat =
-        lbrace expression rbrace
-    ;
-
-    group =
-        lpar expression rpar
-    ;
-
-    primary =
-        string_literal
-      | identifier
+        #factors { factor }
     ;
 
 transform
     grammar_file$repeat_0 ->
         #main flatten(grammar_file.#sections, section, grammar_file$repeat_0) ;
 
-    token_section$repeat_1 ->
+    token_section ->
         #main flatten(token_section.#definitions, token_def, token_section$repeat_1) ;
 
-    skip_section$repeat_2 ->
+    skip_section ->
         #main flatten(skip_section.#definitions, token_def, skip_section$repeat_2) ;
 
-    grammar_section$repeat_4 ->
+    grammar_section ->
         #main flatten(grammar_section.#productions, production, grammar_section$repeat_4) ;
 
-    ast_section$repeat_5 ->
+    ast_section ->
         #main flatten(ast_section.#types, ast_type, ast_section$repeat_5) ;
 
-    transform_section$repeat_6 ->
+    transform_section ->
         #main flatten(transform_section.#rules, transform_rule, transform_section$repeat_6) ;
 
-    transform_rule$repeat_7 ->
+    transform_rule ->
         #main flatten(transform_rule.#alternatives, labeled_transform, transform_rule$repeat_7) ;
 
-    reference_list$repeat_8 ->
+    reference_list ->
         #main flatten(reference_list.#references, reference, reference_list$repeat_8) ;
 
-    choice$repeat_9 ->
+    choice ->
         #main flatten(choice.#alternatives, alternative, choice$repeat_9) ;
 
-    sequence$repeat_10 ->
+    sequence ->
         #main flatten(sequence.#factors, factor, sequence$repeat_10) ;

package/grammars/lisp.grammar

@@ -51,16 +51,17 @@ grammar
 
 ast
     program =
-        { form }
+        #program { form }
     ;
 
     form =
         #list list
       | #atom atom
+      | #elements { form }
     ;
 
     list =
-        [open]:lpar
+        #list [open]:lpar
         { [element]:form }
         [close]:rpar
     ;

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "parser-lr",
     "author": "Adam R Moss <adamrmoss@gmail.com>",
-    "version": "0.7.0",
+    "version": "0.8.1",
     "description": "Shift-reduce parser library for EBNF grammars with LR table generation, lexing, and CST-to-AST transforms",
     "keywords": [
         "ast",