ruby · yui-knk · Apr 29, 2024 · Apr 28, 2024 · Apr 28, 2024 · Apr 28, 2024
diff --git a/...eterizing_rules/invalid_argument_number.y → ...ing_rules/error/invalid_argument_number.y b/...eterizing_rules/invalid_argument_number.y → ...ing_rules/error/invalid_argument_number.y
diff --git a/.../parameterizing_rules/invalid_rule_name.y → ...eterizing_rules/error/invalid_rule_name.y b/.../parameterizing_rules/invalid_rule_name.y → ...eterizing_rules/error/invalid_rule_name.y
diff --git a/...fixtures/parameterizing_rules/delimited.y → ...s/parameterizing_rules/stdlib/delimited.y b/...fixtures/parameterizing_rules/delimited.y → ...s/parameterizing_rules/stdlib/delimited.y
diff --git a/spec/fixtures/parameterizing_rules/list.y → ...xtures/parameterizing_rules/stdlib/list.y b/spec/fixtures/parameterizing_rules/list.y → ...xtures/parameterizing_rules/stdlib/list.y
diff --git a/...ures/parameterizing_rules/nonempty_list.y → ...rameterizing_rules/stdlib/nonempty_list.y b/...ures/parameterizing_rules/nonempty_list.y → ...rameterizing_rules/stdlib/nonempty_list.y
diff --git a/spec/fixtures/parameterizing_rules/option.y → ...ures/parameterizing_rules/stdlib/option.y b/spec/fixtures/parameterizing_rules/option.y → ...ures/parameterizing_rules/stdlib/option.y
diff --git a/...xtures/parameterizing_rules/between_rhs.y → ...erizing_rules/stdlib/option_between_rhs.y b/...xtures/parameterizing_rules/between_rhs.y → ...erizing_rules/stdlib/option_between_rhs.y
diff --git a/...es/parameterizing_rules/option_with_tag.y → ...meterizing_rules/stdlib/option_with_tag.y b/...es/parameterizing_rules/option_with_tag.y → ...meterizing_rules/stdlib/option_with_tag.y
diff --git a/.../fixtures/parameterizing_rules/preceded.y → ...es/parameterizing_rules/stdlib/preceded.y b/.../fixtures/parameterizing_rules/preceded.y → ...es/parameterizing_rules/stdlib/preceded.y
diff --git a/...res/parameterizing_rules/separated_list.y → ...ameterizing_rules/stdlib/separated_list.y b/...res/parameterizing_rules/separated_list.y → ...ameterizing_rules/stdlib/separated_list.y
diff --git a/...eterizing_rules/separated_nonempty_list.y → ...ng_rules/stdlib/separated_nonempty_list.y b/...eterizing_rules/separated_nonempty_list.y → ...ng_rules/stdlib/separated_nonempty_list.y
diff --git a/...ixtures/parameterizing_rules/terminated.y → .../parameterizing_rules/stdlib/terminated.y b/...ixtures/parameterizing_rules/terminated.y → .../parameterizing_rules/stdlib/terminated.y
diff --git a/...tures/parameterizing_rules/user_defined.y → ...parameterizing_rules/user_defined/basic.y b/...tures/parameterizing_rules/user_defined.y → ...parameterizing_rules/user_defined/basic.y
@@ -6,37 +6,21 @@
 // Prologue
 static int yylex(YYSTYPE *val, YYLTYPE *loc);
 static int yyerror(YYLTYPE *loc, const char *str);
-
 %}
+
 %union {
     int i;
-    char *s;
 }
 
 %token <i> number
-%token <s> string
 
 %rule defined_option(X): /* empty */
                        | X
                        ;
 
-%rule multi_args(X, Y): X
-                      | Y
-                      ;
-
-%rule unused_define(X): /* empty */
-                      | X
-                      ;
-
-%rule pair(X, Y): X ',' Y { printf("(%d, %d)\n", $1, $2); }
-                ;
-
 %%
 
 program         : defined_option(number) <i>
-                | multi_args(number, string)
-                | multi_args(number, number)
-                | pair(number, string) { printf("pair odd even\n"); }
                 ;
 
 %%

diff --git a/spec/fixtures/parameterizing_rules/user_defined/multi_arguments.y b/spec/fixtures/parameterizing_rules/user_defined/multi_arguments.y
@@ -0,0 +1,43 @@
+/*
+ * This is comment for this file.
+ */
+
+%{
+// Prologue
+static int yylex(YYSTYPE *val, YYLTYPE *loc);
+static int yyerror(YYLTYPE *loc, const char *str);
+%}
+
+%union {
+    int i;
+    char *s;
+}
+
+%token <i> number
+%token <s> string
+
+%rule pair(X, Y): X
+                | Y
+                ;
+
+%%
+
+program         : pair(number, string)
+                | pair(number, number)
+                ;
+
+%%
+
+static int yylex(YYSTYPE *yylval, YYLTYPE *loc)
+{
+  return 0;
+}
+
+static int yyerror(YYLTYPE *loc, const char *str)
+{
+  return 0;
+}
+
+int main(int argc, char *argv[])
+{
+}
diff --git a/...meterizing_rules/user_defined_with_nest.y → ...erizing_rules/user_defined/nested_rules.y b/...meterizing_rules/user_defined_with_nest.y → ...erizing_rules/user_defined/nested_rules.y
@@ -10,11 +10,9 @@ static int yyerror(YYLTYPE *loc, const char *str);
 
 %union {
     int i;
-    char* s;
 }
 
 %token <i> number
-%token <s> string
 
 %rule nested_nested_option(X): /* empty */
                               | X
@@ -28,24 +26,9 @@ static int yyerror(YYLTYPE *loc, const char *str);
                | nested_option(Y)
                ;
 
-%rule nested_multi_option(X): /* empty */
-                              | X
-                              ;
-
-%rule multi_option(X, Y): /* empty */
-                        | nested_multi_option(X)
-                        | nested_multi_option(Y) X
-                        ;
-
-%rule with_word_seps(X): /* empty */
-                   | X ' '+
-                   ;
-
 %%
 
 program         : option(number)
-                | multi_option(number, string)
-                | with_word_seps(string)
                 ;
 
 %%

diff --git a/spec/fixtures/parameterizing_rules/nested.y → ..._rules/user_defined/nested_rules_in_rhs.y b/spec/fixtures/parameterizing_rules/nested.y → ..._rules/user_defined/nested_rules_in_rhs.y
diff --git a/spec/fixtures/parameterizing_rules/user_defined/nested_rules_multi_arguments.y b/spec/fixtures/parameterizing_rules/user_defined/nested_rules_multi_arguments.y
@@ -0,0 +1,47 @@
+/*
+ * This is comment for this file.
+ */
+
+%{
+// Prologue
+static int yylex(YYSTYPE *val, YYLTYPE *loc);
+static int yyerror(YYLTYPE *loc, const char *str);
+%}
+
+%union {
+    int i;
+    char* s;
+}
+
+%token <i> number
+%token <s> string
+
+%rule nested_multi_option(X): /* empty */
+                              | X
+                              ;
+
+%rule multi_option(X, Y): /* empty */
+                        | nested_multi_option(X)
+                        | nested_multi_option(Y) X
+                        ;
+
+%%
+
+program         : multi_option(number, string)
+                ;
+
+%%
+
+static int yylex(YYSTYPE *yylval, YYLTYPE *loc)
+{
+  return 0;
+}
+
+static int yyerror(YYLTYPE *loc, const char *str)
+{
+  return 0;
+}
+
+int main(int argc, char *argv[])
+{
+}
diff --git a/spec/fixtures/parameterizing_rules/user_defined/nested_rules_symbols.y b/spec/fixtures/parameterizing_rules/user_defined/nested_rules_symbols.y
@@ -0,0 +1,40 @@
+/*
+ * This is comment for this file.
+ */
+
+%{
+// Prologue
+static int yylex(YYSTYPE *val, YYLTYPE *loc);
+static int yyerror(YYLTYPE *loc, const char *str);
+%}
+
+%union {
+    char* s;
+}
+
+%token <s> string
+
+%rule with_word_seps(X): /* empty */
+                   | X ' '+
+                   ;
+
+%%
+
+program         : with_word_seps(string)
+                ;
+
+%%
+
+static int yylex(YYSTYPE *yylval, YYLTYPE *loc)
+{
+  return 0;
+}
+
+static int yyerror(YYLTYPE *loc, const char *str)
+{
+  return 0;
+}
+
+int main(int argc, char *argv[])
+{
+}
diff --git a/...izing_rules/user_defined_with_recursive.y → ...meterizing_rules/user_defined/recursive.y b/...izing_rules/user_defined_with_recursive.y → ...meterizing_rules/user_defined/recursive.y
diff --git a/spec/fixtures/parameterizing_rules/user_defined/with_action.y b/spec/fixtures/parameterizing_rules/user_defined/with_action.y
@@ -0,0 +1,41 @@
+/*
+ * This is comment for this file.
+ */
+
+%{
+// Prologue
+static int yylex(YYSTYPE *val, YYLTYPE *loc);
+static int yyerror(YYLTYPE *loc, const char *str);
+%}
+
+%union {
+    int i;
+    char *s;
+}
+
+%token <i> number
+%token <s> string
+
+%rule pair(X, Y): X ',' Y { printf("(%d, %d)\n", $1, $2); }
+                ;
+
+%%
+
+program         : pair(number, string) { printf("pair odd even\n"); }
+                ;
+
+%%
+
+static int yylex(YYSTYPE *yylval, YYLTYPE *loc)
+{
+  return 0;
+}
+
+static int yyerror(YYLTYPE *loc, const char *str)
+{
+  return 0;
+}
+
+int main(int argc, char *argv[])
+{
+}