Revert RHS order to original order

ruby · Jan 23, 2024 · 7ac1f17 · 7ac1f17
1 parent 849f679
commit 7ac1f17
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/lib/lrama/grammar/stdlib.y b/lib/lrama/grammar/stdlib.y
@@ -28,10 +28,10 @@
  *
  * program: list_number
  * list_number: ε
- * list_number: number list_number
+ * list_number: list_number number
  */
 %rule list(X): /* empty */
-             | X list(X)
+             | list(X) X
              ;
 
 /*
@@ -41,10 +41,10 @@
  *
  * program: nonempty_list_number
  * nonempty_list_number: number
- * nonempty_list_number: number nonempty_list_number
+ * nonempty_list_number: nonempty_list_number number
  */
 %rule nonempty_list(X): X
-                      | X nonempty_list(X)
+                      | nonempty_list(X) X
                       ;
 
 /*
@@ -54,10 +54,10 @@
  *
  * program: separated_nonempty_list_comma_number
  * separated_nonempty_list_comma_number: number
- * separated_nonempty_list_comma_number: number comma separated_nonempty_list_comma_number
+ * separated_nonempty_list_comma_number: separated_nonempty_list_comma_number comma number
  */
 %rule separated_nonempty_list(separator, X): X
-                                           | X separator separated_nonempty_list(separator, X)
+                                           | separated_nonempty_list(separator, X) separator X
                                            ;
 
 /*
@@ -70,7 +70,7 @@
  * option_separated_nonempty_list_comma_number: ε
  * option_separated_nonempty_list_comma_number: separated_nonempty_list_comma_number
  * separated_nonempty_list_comma_number: number
- * separated_nonempty_list_comma_number: number comma separated_nonempty_list_comma_number
+ * separated_nonempty_list_comma_number: comma separated_nonempty_list_comma_number number
  */
 %rule separated_list(separator, X): option(separated_nonempty_list(separator, X))
                                   ;

diff --git a/spec/lrama/parser_spec.rb b/spec/lrama/parser_spec.rb
@@ -961,8 +961,8 @@
               id: 2,
               lhs: grammar.find_symbol_by_s_value!("nonempty_list_number"),
               rhs: [
-                grammar.find_symbol_by_s_value!("number"),
                 grammar.find_symbol_by_s_value!("nonempty_list_number"),
+                grammar.find_symbol_by_s_value!("number"),
               ],
               token_code: nil,
               nullable: false,
@@ -996,8 +996,8 @@
               id: 5,
               lhs: grammar.find_symbol_by_s_value!("nonempty_list_number_alias"),
               rhs: [
-                grammar.find_symbol_by_s_value!("number_alias"),
                 grammar.find_symbol_by_s_value!("nonempty_list_number_alias"),
+                grammar.find_symbol_by_s_value!("number_alias"),
               ],
               nullable: false,
               precedence_sym: grammar.find_symbol_by_s_value!("number_alias"),
@@ -1057,8 +1057,8 @@
               id: 2,
               lhs: grammar.find_symbol_by_s_value!("list_number"),
               rhs: [
-                grammar.find_symbol_by_s_value!("number"),
                 grammar.find_symbol_by_s_value!("list_number"),
+                grammar.find_symbol_by_s_value!("number"),
               ],
               token_code: nil,
               nullable: false,
@@ -1090,8 +1090,8 @@
               id: 5,
               lhs: grammar.find_symbol_by_s_value!("list_number_alias"),
               rhs: [
-                grammar.find_symbol_by_s_value!("number_alias"),
                 grammar.find_symbol_by_s_value!("list_number_alias"),
+                grammar.find_symbol_by_s_value!("number_alias"),
               ],
               nullable: false,
               precedence_sym: grammar.find_symbol_by_s_value!("number_alias"),
@@ -1151,13 +1151,13 @@
               id: 2,
               lhs: grammar.find_symbol_by_s_value!("separated_nonempty_list_','_number"),
               rhs: [
-                grammar.find_symbol_by_s_value!("number"),
-                grammar.find_symbol_by_number!(4),
                 grammar.find_symbol_by_s_value!("separated_nonempty_list_','_number"),
+                grammar.find_symbol_by_number!(4),
+                grammar.find_symbol_by_s_value!("number"),
               ],
               token_code: nil,
               nullable: false,
-              precedence_sym: grammar.find_symbol_by_number!(4),
+              precedence_sym: grammar.find_symbol_by_s_value!("number"),
               position_in_original_rule_rhs: 0,
               lineno: 19,
             ),
@@ -1227,13 +1227,13 @@
               id: 3,
               lhs: grammar.find_symbol_by_s_value!("separated_nonempty_list_','_number"),
               rhs: [
-                grammar.find_symbol_by_s_value!("number"),
-                grammar.find_symbol_by_number!(4),
                 grammar.find_symbol_by_s_value!("separated_nonempty_list_','_number"),
+                grammar.find_symbol_by_number!(4),
+                grammar.find_symbol_by_s_value!("number"),
               ],
               token_code: nil,
               nullable: false,
-              precedence_sym: grammar.find_symbol_by_number!(4),
+              precedence_sym: grammar.find_symbol_by_s_value!("number"),
               position_in_original_rule_rhs: 0,
               lineno: 19,
             ),