mkbison 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71a987a62e2d5a4ff59028f97bbb5d3f58d2c8f2
-  data.tar.gz: b5780f28d873a785a96dc0ad3b444158409bed52
+  metadata.gz: 775d49ffcf8f3320942f5d981dda023547aa9ec2
+  data.tar.gz: 968b178a6088323e13bd17bdd3391328c4e3430a
 SHA512:
-  metadata.gz: 909d99dfc14789d8ffbbf7a2396e82f085f85448cd87ca75b8efa6e3fb779a4c317e1928a9a499e5d9f191c494e3f99206afcf94bada2022f57d93840d883a87
-  data.tar.gz: 47033ca52ad47487545b17d405fa2615c86a9c9ebdc5cff36ef14d4e739518490ae6c0be7035ea73881c0295c425862bee7f94f397a1717f5ea7485c7d7da656
+  metadata.gz: ca6d1078b2cd885cf95ad022ecbb31e23764c188cbbce538a38bfe13c2d386d03210383133c51712da5d988dedede586a54f048855bf6114484edf521a7c1f66
+  data.tar.gz: c11e0370169c2052a032502dea255ff0581e97e64b72d18db3c430c7b7e47c20dd54889a51fb1ca8ba356732870d9a6b1e7b8b88468e92b67092e7d80319724f

data/README.md

@@ -16,9 +16,108 @@ Or install it yourself as:
 
     $ gem install mkbison
 
-## Usage
+You'll need to install [GNU Bison](https://www.gnu.org/software/bison/) as well, e.g.:
 
-TODO: Write usage instructions here
+    $ sudo apt-get install bison
+
+## Usage and Example
+
+The gem installs a command `mkbison` which translates `.rby` files into `.y` Bison grammar files, and generates a native ruby extension to expose the resulting parser.
+
+`.rby` files contain a grammar definition and ruby code. Their syntax mostly mirrors that of Bison grammar files, with the following differences:
+
+   * Actions are written in ruby, rather than C (as is the lex section).
+   * Positional references to semantic values are not allowed.
+   * [Named references](http://www.gnu.org/software/bison/manual/html_node/Named-References.html) should not use a dollar sign `$`.
+
+For example, here is a mkbison grammar for parsing very simple arithmetic expressions:
+
+**arithmetic.rby**
+```
+%token NUMBER
+
+%left OP_PLUS
+%left OP_MINUS
+
+%%
+
+arithmetic:
+  expression[x]
+  { self.result = x }
+;
+
+expression :
+  NUMBER
+| addition
+| subtraction
+;
+
+addition :
+  expression[left] OP_PLUS expression[right]
+  { left + right }
+;
+
+subtraction :
+  expression[left] OP_MINUS expression[right]
+  { left - right }
+;
+
+%%
+
+class Arithmetic
+  def lex
+    # skip space
+    while true
+      while (c = self.read) && c =~ /\s/
+      end
+
+      if c == '#'
+        while (char = self.read) && char != "\n"
+        end
+      else
+        break
+      end
+    end
+
+    case c
+    when '0'..'9'
+      number = c
+      while (c = self.peak) && ('0'..'9').include?(c)
+        number << self.read
+      end
+
+      self.lex_value = number.to_i
+      return Tokens::NUMBER
+
+    when '+'
+      return Tokens::OP_PLUS
+
+    when '-'
+      return Tokens::OP_MINUS
+    end
+
+    nil
+  end
+end
+```
+
+To translate it into a Bison grammar file, run
+
+    $ bundle exec mkbison -n Arithmetic -o . arithmetic.rby
+    $ rake compile
+
+This will generate and build a native extension named `arithmetic` in the current directory. A class named `Arithmetic` exposes the grammar parser. We can perform calculations now with `Arithmetic.new(expression).parse` which will return the result (or raise an exception if a syntax error is encountered).
+
+## TODO
+  * Automatically create Rakefile task
+  * Change the parsers initialize() behavior (don't assume argument is file path)
+
+  * Seems like you can hit EOF in the middle of action block and get wrong error msg
+  * Benchmark -- what takes so long on the koa grammar?
+  * Write to temp files, then move them into place
+  * Move base module into the c extension and document the lexing helpers
+
+Not all Bison features are supported yet.
 
 ## Contributing
 

data/bin/mkbison

@@ -3,12 +3,15 @@
 lib = File.expand_path('../../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
-require 'bison'
 require 'fileutils'
 require 'tempfile'
 require 'optparse'
 require 'ostruct'
 
+require 'cocaine'
+
+require 'bison'
+
 def underscore(name)
   name.gsub(/([a-z])([A-Z])/, '\1_\2').downcase
 end
@@ -66,6 +69,14 @@ bison.print_class(ruby_file)
 
 # Do a dry run
 Tempfile.new('bison-output.c').tap do |output|
-  bison = ENV['BISON_PATH'] || 'bison'
-  system(bison, '-o', output.path, bison_file.path)
+  bison = Cocaine::CommandLine.new(ENV['BISON_PATH'] || 'bison', '-o :out :in')
+  begin
+    bison.run(in: bison_file.path, out: output.path)
+  rescue Cocaine::CommandNotFoundError => e
+    warn("The bison command was not found on this system. " +
+         "Make sure to install it before attempting rake compile.")
+  rescue Cocaine::ExitStatusError => e
+    warn(e.message)
+    exit(1)
+  end
 end

data/bison_parser.rby

@@ -39,14 +39,20 @@ token_list :
 token:
   HASH KW_TOKEN IDENTIFIER[name]
   { Bison::Token.new(name) }
-|
+| assoc_token
+| token[token] NUMBER[num]
+  { token.tap{ |t| t.number = num } }
+;
+
+assoc_token:
   HASH KW_LEFT IDENTIFIER[name]
   { Bison::Token.new(name, :left) }
 |
   HASH KW_RIGHT IDENTIFIER[name]
   { Bison::Token.new(name, :right) }
-| token[token] NUMBER[num]
-  { token.tap{ |t| t.number = num } }
+|
+  assoc_token[token] IDENTIFIER[name]
+  { token.tap{ |t| t.names << name } }
 ;
 
 grammar_rules:

data/ext/bison_parser/bison_parser.c

@@ -396,16 +396,16 @@ union yyalloc
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  3
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   25
+#define YYLAST   26
 
 /* YYNTOKENS -- Number of terminals.  */
 #define YYNTOKENS  17
 /* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS  9
+#define YYNNTS  10
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  20
+#define YYNRULES  22
 /* YYNSTATES -- Number of states.  */
-#define YYNSTATES  31
+#define YYNSTATES  33
 
 /* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
    by yylex, with out-of-bounds checking.  */
@@ -453,9 +453,9 @@ static const yytype_uint8 yytranslate[] =
   /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
 static const yytype_uint8 yyrline[] =
 {
-       0,    37,    37,    50,    56,    67,    73,    84,    92,   100,
-     108,   120,   126,   137,   149,   155,   163,   175,   181,   190,
-     199
+       0,    37,    37,    50,    56,    67,    73,    84,    92,    96,
+     107,   115,   123,   135,   141,   152,   164,   170,   178,   190,
+     196,   205,   214
 };
 #endif
 
@@ -467,8 +467,8 @@ static const char *const yytname[] =
   "$end", "error", "$undefined", "IDENTIFIER", "NUMBER", "STRING",
   "COLON", "SEMICOLON", "LBRACK", "RBRACK", "PIPE", "HASH", "DOUBLE_HASH",
   "KW_TOKEN", "KW_LEFT", "KW_RIGHT", "ACTIONS", "$accept", "grammar_file",
-  "optional_code", "token_list", "token", "grammar_rules", "grammar_rule",
-  "components", "sequence", YY_NULLPTR
+  "optional_code", "token_list", "token", "assoc_token", "grammar_rules",
+  "grammar_rule", "components", "sequence", YY_NULLPTR
 };
 #endif
 
@@ -487,7 +487,7 @@ static const yytype_uint16 yytoknum[] =
 #define yypact_value_is_default(Yystate) \
   (!!((Yystate) == (-8)))
 
-#define YYTABLE_NINF -18
+#define YYTABLE_NINF -20
 
 #define yytable_value_is_error(Yytable_value) \
   0
@@ -497,9 +497,9 @@ static const yytype_uint16 yytoknum[] =
 static const yytype_int8 yypact[] =
 {
       -8,    10,    -7,    -8,    -6,    -8,     8,    12,    13,    14,
-      -1,    -8,    -8,    -8,    -8,    15,     2,    -8,    -8,    -3,
-      -8,    -4,    -2,    -8,    -8,    11,    -8,    -2,    17,    16,
-      -8
+      15,    -1,    -8,    -8,    -8,    -8,    -8,    16,     3,    -8,
+      -8,    -3,    -8,    -4,    -2,    -8,    -8,    17,    -8,    -2,
+      18,    11,    -8
 };
 
   /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
@@ -507,22 +507,22 @@ static const yytype_int8 yypact[] =
      means the default is an error.  */
 static const yytype_uint8 yydefact[] =
 {
-       5,     0,     0,     1,     0,    11,     6,     0,     0,     0,
-       3,    10,     7,     8,     9,     0,     0,     2,    12,    14,
-       4,     0,    15,    13,    17,    19,    18,    16,     0,     0,
-      20
+       5,     0,     0,     1,     0,    13,     6,     8,     0,     0,
+       0,     3,     9,    12,     7,    10,    11,     0,     0,     2,
+      14,    16,     4,     0,    17,    15,    19,    21,    20,    18,
+       0,     0,    22
 };
 
   /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int8 yypgoto[] =
 {
-      -8,    -8,    -8,    -8,    -8,    -8,    -8,    -8,     0
+      -8,    -8,    -8,    -8,    -8,    -8,    -8,    -8,    -8,     0
 };
 
   /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int8 yydefgoto[] =
 {
-      -1,     1,    17,     2,     6,    10,    18,    21,    22
+      -1,     1,    19,     2,     6,     7,    11,    20,    23,    24
 };
 
   /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
@@ -530,42 +530,42 @@ static const yytype_int8 yydefgoto[] =
      number is the opposite.  If YYTABLE_NINF, syntax error.  */
 static const yytype_int8 yytable[] =
 {
-     -17,    25,    15,    23,     4,     5,    24,     7,     8,     9,
-       3,    16,    11,   -17,    26,    12,    13,    14,    20,    28,
-      29,    19,     0,     0,    27,    30
+     -19,    27,    17,    25,     4,     5,    26,     8,     9,    10,
+       3,    18,    12,   -19,    28,    13,    14,    15,    16,    22,
+      32,    31,    21,     0,     0,    30,    29
 };
 
 static const yytype_int8 yycheck[] =
 {
        3,     3,     3,     7,    11,    12,    10,    13,    14,    15,
-       0,    12,     4,    16,    16,     3,     3,     3,    16,     8,
-       3,     6,    -1,    -1,    24,     9
+       0,    12,     4,    16,    16,     3,     3,     3,     3,    16,
+       9,     3,     6,    -1,    -1,     8,    26
 };
 
   /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
      symbol of state STATE-NUM.  */
 static const yytype_uint8 yystos[] =
 {
-       0,    18,    20,     0,    11,    12,    21,    13,    14,    15,
-      22,     4,     3,     3,     3,     3,    12,    19,    23,     6,
-      16,    24,    25,     7,    10,     3,    16,    25,     8,     3,
-       9
+       0,    18,    20,     0,    11,    12,    21,    22,    13,    14,
+      15,    23,     4,     3,     3,     3,     3,     3,    12,    19,
+      24,     6,    16,    25,    26,     7,    10,     3,    16,    26,
+       8,     3,     9
 };
 
   /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 static const yytype_uint8 yyr1[] =
 {
        0,    17,    18,    19,    19,    20,    20,    21,    21,    21,
-      21,    22,    22,    23,    24,    24,    24,    25,    25,    25,
-      25
+      22,    22,    22,    23,    23,    24,    25,    25,    25,    26,
+      26,    26,    26
 };
 
   /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
 static const yytype_uint8 yyr2[] =
 {
-       0,     2,     4,     0,     2,     0,     2,     3,     3,     3,
-       2,     0,     2,     4,     0,     1,     3,     0,     2,     2,
-       5
+       0,     2,     4,     0,     2,     0,     2,     3,     1,     2,
+       3,     3,     2,     0,     2,     4,     0,     1,     3,     0,
+       2,     2,     5
 };
 
 
@@ -1405,129 +1405,146 @@ yyreduce:
 
   case 8:
 #line 93 "../../../../ext/bison_parser/bison_parser.y" /* yacc.c:1661  */
+    { (yyval) = (yyvsp[0]); }
+#line 1410 "../../../../ext/bison_parser/bison_parser.c" /* yacc.c:1661  */
+    break;
+
+  case 9:
+#line 97 "../../../../ext/bison_parser/bison_parser.y" /* yacc.c:1661  */
+    {
+    rb_ivar_set(__actions, rb_intern("@_"), rb_ary_new3(2, INT2FIX((yyloc).first_line), INT2FIX((yyloc).first_column)));
+    rb_ivar_set(__actions, rb_intern("@token"), rb_ary_new3(2, INT2FIX((yylsp[-1]).first_line), INT2FIX((yylsp[-1]).first_column)));
+    rb_ivar_set(__actions, rb_intern("@num"), rb_ary_new3(2, INT2FIX((yylsp[0]).first_line), INT2FIX((yylsp[0]).first_column)));
+    (yyval) = rb_funcall(__actions, rb_intern("_2_token_445055bddb5840e621fa399faa56aefc"), 2, (yyvsp[-1]), (yyvsp[0]));
+  }
+#line 1421 "../../../../ext/bison_parser/bison_parser.c" /* yacc.c:1661  */
+    break;
+
+  case 10:
+#line 108 "../../../../ext/bison_parser/bison_parser.y" /* yacc.c:1661  */
     {
     rb_ivar_set(__actions, rb_intern("@_"), rb_ary_new3(2, INT2FIX((yyloc).first_line), INT2FIX((yyloc).first_column)));
     rb_ivar_set(__actions, rb_intern("@name"), rb_ary_new3(2, INT2FIX((yylsp[0]).first_line), INT2FIX((yylsp[0]).first_column)));
-    (yyval) = rb_funcall(__actions, rb_intern("_1_token_f014c38ad08ecac5d62c0e3fa23163b3"), 1, (yyvsp[0]));
+    (yyval) = rb_funcall(__actions, rb_intern("_0_assoc_token_f014c38ad08ecac5d62c0e3fa23163b3"), 1, (yyvsp[0]));
   }
-#line 1414 "../../../../ext/bison_parser/bison_parser.c" /* yacc.c:1661  */
+#line 1431 "../../../../ext/bison_parser/bison_parser.c" /* yacc.c:1661  */
     break;
 
-  case 9:
-#line 101 "../../../../ext/bison_parser/bison_parser.y" /* yacc.c:1661  */
+  case 11:
+#line 116 "../../../../ext/bison_parser/bison_parser.y" /* yacc.c:1661  */
     {
     rb_ivar_set(__actions, rb_intern("@_"), rb_ary_new3(2, INT2FIX((yyloc).first_line), INT2FIX((yyloc).first_column)));
     rb_ivar_set(__actions, rb_intern("@name"), rb_ary_new3(2, INT2FIX((yylsp[0]).first_line), INT2FIX((yylsp[0]).first_column)));
-    (yyval) = rb_funcall(__actions, rb_intern("_2_token_f014c38ad08ecac5d62c0e3fa23163b3"), 1, (yyvsp[0]));
+    (yyval) = rb_funcall(__actions, rb_intern("_1_assoc_token_f014c38ad08ecac5d62c0e3fa23163b3"), 1, (yyvsp[0]));
   }
-#line 1424 "../../../../ext/bison_parser/bison_parser.c" /* yacc.c:1661  */
+#line 1441 "../../../../ext/bison_parser/bison_parser.c" /* yacc.c:1661  */
     break;
 
-  case 10:
-#line 109 "../../../../ext/bison_parser/bison_parser.y" /* yacc.c:1661  */
+  case 12:
+#line 124 "../../../../ext/bison_parser/bison_parser.y" /* yacc.c:1661  */
     {
     rb_ivar_set(__actions, rb_intern("@_"), rb_ary_new3(2, INT2FIX((yyloc).first_line), INT2FIX((yyloc).first_column)));
     rb_ivar_set(__actions, rb_intern("@token"), rb_ary_new3(2, INT2FIX((yylsp[-1]).first_line), INT2FIX((yylsp[-1]).first_column)));
-    rb_ivar_set(__actions, rb_intern("@num"), rb_ary_new3(2, INT2FIX((yylsp[0]).first_line), INT2FIX((yylsp[0]).first_column)));
-    (yyval) = rb_funcall(__actions, rb_intern("_3_token_445055bddb5840e621fa399faa56aefc"), 2, (yyvsp[-1]), (yyvsp[0]));
+    rb_ivar_set(__actions, rb_intern("@name"), rb_ary_new3(2, INT2FIX((yylsp[0]).first_line), INT2FIX((yylsp[0]).first_column)));
+    (yyval) = rb_funcall(__actions, rb_intern("_2_assoc_token_1d82357deb6789321b86aa67cf1f1cf6"), 2, (yyvsp[-1]), (yyvsp[0]));
   }
-#line 1435 "../../../../ext/bison_parser/bison_parser.c" /* yacc.c:1661  */
+#line 1452 "../../../../ext/bison_parser/bison_parser.c" /* yacc.c:1661  */
     break;
 
-  case 11:
-#line 120 "../../../../ext/bison_parser/bison_parser.y" /* yacc.c:1661  */
+  case 13:
+#line 135 "../../../../ext/bison_parser/bison_parser.y" /* yacc.c:1661  */
     {
     rb_ivar_set(__actions, rb_intern("@_"), rb_ary_new3(2, INT2FIX((yyloc).first_line), INT2FIX((yyloc).first_column)));
     (yyval) = rb_funcall(__actions, rb_intern("_0_grammar_rules_99914b932bd37a50b983c5e7c90ae93b"), 0);
   }
-#line 1444 "../../../../ext/bison_parser/bison_parser.c" /* yacc.c:1661  */
+#line 1461 "../../../../ext/bison_parser/bison_parser.c" /* yacc.c:1661  */
     break;
 
-  case 12:
-#line 127 "../../../../ext/bison_parser/bison_parser.y" /* yacc.c:1661  */
+  case 14:
+#line 142 "../../../../ext/bison_parser/bison_parser.y" /* yacc.c:1661  */
     {
     rb_ivar_set(__actions, rb_intern("@_"), rb_ary_new3(2, INT2FIX((yyloc).first_line), INT2FIX((yyloc).first_column)));
     rb_ivar_set(__actions, rb_intern("@list"), rb_ary_new3(2, INT2FIX((yylsp[-1]).first_line), INT2FIX((yylsp[-1]).first_column)));
     rb_ivar_set(__actions, rb_intern("@rule"), rb_ary_new3(2, INT2FIX((yylsp[0]).first_line), INT2FIX((yylsp[0]).first_column)));
     (yyval) = rb_funcall(__actions, rb_intern("_1_grammar_rules_d4b402a4ddf06c5292ab917a96fe105c"), 2, (yyvsp[-1]), (yyvsp[0]));
   }
-#line 1455 "../../../../ext/bison_parser/bison_parser.c" /* yacc.c:1661  */
+#line 1472 "../../../../ext/bison_parser/bison_parser.c" /* yacc.c:1661  */
     break;
 
-  case 13:
-#line 138 "../../../../ext/bison_parser/bison_parser.y" /* yacc.c:1661  */
+  case 15:
+#line 153 "../../../../ext/bison_parser/bison_parser.y" /* yacc.c:1661  */
     {
     rb_ivar_set(__actions, rb_intern("@_"), rb_ary_new3(2, INT2FIX((yyloc).first_line), INT2FIX((yyloc).first_column)));
     rb_ivar_set(__actions, rb_intern("@name"), rb_ary_new3(2, INT2FIX((yylsp[-3]).first_line), INT2FIX((yylsp[-3]).first_column)));
     rb_ivar_set(__actions, rb_intern("@components"), rb_ary_new3(2, INT2FIX((yylsp[-1]).first_line), INT2FIX((yylsp[-1]).first_column)));
     (yyval) = rb_funcall(__actions, rb_intern("_0_grammar_rule_bce7f6337f3284ba4a3537cc1d642c28"), 2, (yyvsp[-3]), (yyvsp[-1]));
   }
-#line 1466 "../../../../ext/bison_parser/bison_parser.c" /* yacc.c:1661  */
+#line 1483 "../../../../ext/bison_parser/bison_parser.c" /* yacc.c:1661  */
     break;
 
-  case 14:
-#line 149 "../../../../ext/bison_parser/bison_parser.y" /* yacc.c:1661  */
+  case 16:
+#line 164 "../../../../ext/bison_parser/bison_parser.y" /* yacc.c:1661  */
     {
     rb_ivar_set(__actions, rb_intern("@_"), rb_ary_new3(2, INT2FIX((yyloc).first_line), INT2FIX((yyloc).first_column)));
     (yyval) = rb_funcall(__actions, rb_intern("_0_components_99914b932bd37a50b983c5e7c90ae93b"), 0);
   }
-#line 1475 "../../../../ext/bison_parser/bison_parser.c" /* yacc.c:1661  */
+#line 1492 "../../../../ext/bison_parser/bison_parser.c" /* yacc.c:1661  */
     break;
 
-  case 15:
-#line 156 "../../../../ext/bison_parser/bison_parser.y" /* yacc.c:1661  */
+  case 17:
+#line 171 "../../../../ext/bison_parser/bison_parser.y" /* yacc.c:1661  */
     {
     rb_ivar_set(__actions, rb_intern("@_"), rb_ary_new3(2, INT2FIX((yyloc).first_line), INT2FIX((yyloc).first_column)));
     rb_ivar_set(__actions, rb_intern("@sequence"), rb_ary_new3(2, INT2FIX((yylsp[0]).first_line), INT2FIX((yylsp[0]).first_column)));
     (yyval) = rb_funcall(__actions, rb_intern("_1_components_2403a823f1a9854a29da7cf64f191fbe"), 1, (yyvsp[0]));
   }
-#line 1485 "../../../../ext/bison_parser/bison_parser.c" /* yacc.c:1661  */
+#line 1502 "../../../../ext/bison_parser/bison_parser.c" /* yacc.c:1661  */
     break;
 
-  case 16:
-#line 164 "../../../../ext/bison_parser/bison_parser.y" /* yacc.c:1661  */
+  case 18:
+#line 179 "../../../../ext/bison_parser/bison_parser.y" /* yacc.c:1661  */
     {
     rb_ivar_set(__actions, rb_intern("@_"), rb_ary_new3(2, INT2FIX((yyloc).first_line), INT2FIX((yyloc).first_column)));
     rb_ivar_set(__actions, rb_intern("@sequences"), rb_ary_new3(2, INT2FIX((yylsp[-2]).first_line), INT2FIX((yylsp[-2]).first_column)));
     rb_ivar_set(__actions, rb_intern("@sequence"), rb_ary_new3(2, INT2FIX((yylsp[0]).first_line), INT2FIX((yylsp[0]).first_column)));
     (yyval) = rb_funcall(__actions, rb_intern("_2_components_62da044340939f02b6c0b52917617e17"), 2, (yyvsp[-2]), (yyvsp[0]));
   }
-#line 1496 "../../../../ext/bison_parser/bison_parser.c" /* yacc.c:1661  */
+#line 1513 "../../../../ext/bison_parser/bison_parser.c" /* yacc.c:1661  */
     break;
 
-  case 17:
-#line 175 "../../../../ext/bison_parser/bison_parser.y" /* yacc.c:1661  */
+  case 19:
+#line 190 "../../../../ext/bison_parser/bison_parser.y" /* yacc.c:1661  */
     {
     rb_ivar_set(__actions, rb_intern("@_"), rb_ary_new3(2, INT2FIX((yyloc).first_line), INT2FIX((yyloc).first_column)));
     (yyval) = rb_funcall(__actions, rb_intern("_0_sequence_99914b932bd37a50b983c5e7c90ae93b"), 0);
   }
-#line 1505 "../../../../ext/bison_parser/bison_parser.c" /* yacc.c:1661  */
+#line 1522 "../../../../ext/bison_parser/bison_parser.c" /* yacc.c:1661  */
     break;
 
-  case 18:
-#line 182 "../../../../ext/bison_parser/bison_parser.y" /* yacc.c:1661  */
+  case 20:
+#line 197 "../../../../ext/bison_parser/bison_parser.y" /* yacc.c:1661  */
     {
     rb_ivar_set(__actions, rb_intern("@_"), rb_ary_new3(2, INT2FIX((yyloc).first_line), INT2FIX((yyloc).first_column)));
     rb_ivar_set(__actions, rb_intern("@sequence"), rb_ary_new3(2, INT2FIX((yylsp[-1]).first_line), INT2FIX((yylsp[-1]).first_column)));
     rb_ivar_set(__actions, rb_intern("@code"), rb_ary_new3(2, INT2FIX((yylsp[0]).first_line), INT2FIX((yylsp[0]).first_column)));
     (yyval) = rb_funcall(__actions, rb_intern("_1_sequence_512ceffccf6bb7565046f90d6d7762ad"), 2, (yyvsp[-1]), (yyvsp[0]));
   }
-#line 1516 "../../../../ext/bison_parser/bison_parser.c" /* yacc.c:1661  */
+#line 1533 "../../../../ext/bison_parser/bison_parser.c" /* yacc.c:1661  */
     break;
 
-  case 19:
-#line 191 "../../../../ext/bison_parser/bison_parser.y" /* yacc.c:1661  */
+  case 21:
+#line 206 "../../../../ext/bison_parser/bison_parser.y" /* yacc.c:1661  */
     {
     rb_ivar_set(__actions, rb_intern("@_"), rb_ary_new3(2, INT2FIX((yyloc).first_line), INT2FIX((yyloc).first_column)));
     rb_ivar_set(__actions, rb_intern("@sequence"), rb_ary_new3(2, INT2FIX((yylsp[-1]).first_line), INT2FIX((yylsp[-1]).first_column)));
     rb_ivar_set(__actions, rb_intern("@follower"), rb_ary_new3(2, INT2FIX((yylsp[0]).first_line), INT2FIX((yylsp[0]).first_column)));
     (yyval) = rb_funcall(__actions, rb_intern("_2_sequence_4b2903c3aeb37d22d413a53653d0df28"), 2, (yyvsp[-1]), (yyvsp[0]));
   }
-#line 1527 "../../../../ext/bison_parser/bison_parser.c" /* yacc.c:1661  */
+#line 1544 "../../../../ext/bison_parser/bison_parser.c" /* yacc.c:1661  */
     break;
 
-  case 20:
-#line 200 "../../../../ext/bison_parser/bison_parser.y" /* yacc.c:1661  */
+  case 22:
+#line 215 "../../../../ext/bison_parser/bison_parser.y" /* yacc.c:1661  */
     {
     rb_ivar_set(__actions, rb_intern("@_"), rb_ary_new3(2, INT2FIX((yyloc).first_line), INT2FIX((yyloc).first_column)));
     rb_ivar_set(__actions, rb_intern("@sequence"), rb_ary_new3(2, INT2FIX((yylsp[-4]).first_line), INT2FIX((yylsp[-4]).first_column)));
@@ -1535,11 +1552,11 @@ yyreduce:
     rb_ivar_set(__actions, rb_intern("@tag"), rb_ary_new3(2, INT2FIX((yylsp[-1]).first_line), INT2FIX((yylsp[-1]).first_column)));
     (yyval) = rb_funcall(__actions, rb_intern("_3_sequence_68f2380aa0f3a7de0fb9b3482705a54c"), 3, (yyvsp[-4]), (yyvsp[-3]), (yyvsp[-1]));
   }
-#line 1539 "../../../../ext/bison_parser/bison_parser.c" /* yacc.c:1661  */
+#line 1556 "../../../../ext/bison_parser/bison_parser.c" /* yacc.c:1661  */
     break;
 
 
-#line 1543 "../../../../ext/bison_parser/bison_parser.c" /* yacc.c:1661  */
+#line 1560 "../../../../ext/bison_parser/bison_parser.c" /* yacc.c:1661  */
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
@@ -1774,7 +1791,7 @@ yyreturn:
 #endif
   return yyresult;
 }
-#line 211 "../../../../ext/bison_parser/bison_parser.y" /* yacc.c:1906  */
+#line 226 "../../../../ext/bison_parser/bison_parser.y" /* yacc.c:1906  */
 
 
 static VALUE cBisonParser;

data/ext/bison_parser/bison_parser.y

@@ -89,11 +89,26 @@ token:
   }
 
 |
+  assoc_token
+  { $$ = $1; }
+
+|
+  token NUMBER 
+  {
+    rb_ivar_set(__actions, rb_intern("@_"), rb_ary_new3(2, INT2FIX(@$.first_line), INT2FIX(@$.first_column)));
+    rb_ivar_set(__actions, rb_intern("@token"), rb_ary_new3(2, INT2FIX(@1.first_line), INT2FIX(@1.first_column)));
+    rb_ivar_set(__actions, rb_intern("@num"), rb_ary_new3(2, INT2FIX(@2.first_line), INT2FIX(@2.first_column)));
+    $$ = rb_funcall(__actions, rb_intern("_2_token_445055bddb5840e621fa399faa56aefc"), 2, $1, $2);
+  }
+
+;
+
+assoc_token:
   HASH KW_LEFT IDENTIFIER 
   {
     rb_ivar_set(__actions, rb_intern("@_"), rb_ary_new3(2, INT2FIX(@$.first_line), INT2FIX(@$.first_column)));
     rb_ivar_set(__actions, rb_intern("@name"), rb_ary_new3(2, INT2FIX(@3.first_line), INT2FIX(@3.first_column)));
-    $$ = rb_funcall(__actions, rb_intern("_1_token_f014c38ad08ecac5d62c0e3fa23163b3"), 1, $3);
+    $$ = rb_funcall(__actions, rb_intern("_0_assoc_token_f014c38ad08ecac5d62c0e3fa23163b3"), 1, $3);
   }
 
 |
@@ -101,16 +116,16 @@ token:
   {
     rb_ivar_set(__actions, rb_intern("@_"), rb_ary_new3(2, INT2FIX(@$.first_line), INT2FIX(@$.first_column)));
     rb_ivar_set(__actions, rb_intern("@name"), rb_ary_new3(2, INT2FIX(@3.first_line), INT2FIX(@3.first_column)));
-    $$ = rb_funcall(__actions, rb_intern("_2_token_f014c38ad08ecac5d62c0e3fa23163b3"), 1, $3);
+    $$ = rb_funcall(__actions, rb_intern("_1_assoc_token_f014c38ad08ecac5d62c0e3fa23163b3"), 1, $3);
   }
 
 |
-  token NUMBER 
+  assoc_token IDENTIFIER 
   {
     rb_ivar_set(__actions, rb_intern("@_"), rb_ary_new3(2, INT2FIX(@$.first_line), INT2FIX(@$.first_column)));
     rb_ivar_set(__actions, rb_intern("@token"), rb_ary_new3(2, INT2FIX(@1.first_line), INT2FIX(@1.first_column)));
-    rb_ivar_set(__actions, rb_intern("@num"), rb_ary_new3(2, INT2FIX(@2.first_line), INT2FIX(@2.first_column)));
-    $$ = rb_funcall(__actions, rb_intern("_3_token_445055bddb5840e621fa399faa56aefc"), 2, $1, $2);
+    rb_ivar_set(__actions, rb_intern("@name"), rb_ary_new3(2, INT2FIX(@2.first_line), INT2FIX(@2.first_column)));
+    $$ = rb_funcall(__actions, rb_intern("_2_assoc_token_1d82357deb6789321b86aa67cf1f1cf6"), 2, $1, $2);
   }
 
 ;

data/ext/bison_parser/extconf.rb

@@ -2,6 +2,8 @@ require 'mkmf'
 
 output = "#{File.dirname(__FILE__)}/bison_parser.c"
 bison_file = "#{File.dirname(__FILE__)}/bison_parser.y"
-system('bison', '-o', output, bison_file)
+
+bison = find_executable(ENV['BISON_PATH'] || 'bison')
+system(bison, '-o', output, bison_file) or abort("bison command failed")
 
 create_makefile 'bison_parser/bison_parser'

data/lib/bison/grammar_file.rb

@@ -12,7 +12,7 @@ module Bison
 
     def validate
       errors = []
-      symbols = tokens.map(&:name) + rules.map(&:name)
+      symbols = tokens.map(&:names).flatten + rules.map(&:name)
       rules.map(&:components).flatten.map(&:elements).flatten.each do |el|
         unless !(Bison::Nonterminal === el) || symbols.include?(el.name)
           errors << "#{el.location.join('.')}: #{el.name} is not defined"

data/lib/bison/token.rb

@@ -1,14 +1,18 @@
 module Bison
   class Token
-    attr_accessor :name
+    attr_accessor :names
     attr_accessor :number
     attr_accessor :associativity
     
     def initialize(name, assoc=nil)
-      self.name = name
+      self.names = Array(name)
       self.associativity = assoc
     end
 
+    def name
+      names.join(' ')
+    end
+
     def left?
       associativity == :left
     end

data/lib/bison/version.rb

@@ -1,3 +1,3 @@
 module Bison
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/bison_parser/actions.rb

@@ -26,16 +26,20 @@ class BisonParser
       Bison::Token.new(name)
     end
 
-    def _1_token_f014c38ad08ecac5d62c0e3fa23163b3(name)
+    def _2_token_445055bddb5840e621fa399faa56aefc(token, num)
+      token.tap{ |t| t.number = num }
+    end
+
+    def _0_assoc_token_f014c38ad08ecac5d62c0e3fa23163b3(name)
       Bison::Token.new(name, :left)
     end
 
-    def _2_token_f014c38ad08ecac5d62c0e3fa23163b3(name)
+    def _1_assoc_token_f014c38ad08ecac5d62c0e3fa23163b3(name)
       Bison::Token.new(name, :right)
     end
 
-    def _3_token_445055bddb5840e621fa399faa56aefc(token, num)
-      token.tap{ |t| t.number = num }
+    def _2_assoc_token_1d82357deb6789321b86aa67cf1f1cf6(token, name)
+      token.tap{ |t| t.names << name }
     end
 
     def _0_grammar_rules_99914b932bd37a50b983c5e7c90ae93b()

data/mkbison.gemspec

@@ -21,4 +21,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rake-compiler"
+  spec.add_development_dependency "cocaine"
 end

data/templates/extconf.rb.erb

@@ -3,7 +3,7 @@ require 'mkmf'
 output = "#{File.dirname(__FILE__)}/<%= uname %>.c"
 bison_file = "#{File.dirname(__FILE__)}/<%= uname %>.y"
 
-bison = ENV['BISON_PATH'] || 'bison'
-system(bison, '-o', output, bison_file)
+bison = find_executable(ENV['BISON_PATH'] || 'bison')
+system(bison, '-o', output, bison_file) or abort("bison command failed")
 
 create_makefile '<%= uname %>/<%= uname %>'

data/templates/parser.y.erb

@@ -59,8 +59,8 @@ void Init_<%= uname %>(void) {
   c<%= name %>Tokens = rb_define_module_under(c<%= name %>, "Tokens");
   c<%= name %>Actions = rb_define_class_under(c<%= name %>, "Actions", rb_cObject);
 
-<% tokens.each do |token| -%>
-  rb_define_const(c<%= name %>Tokens, "<%= token.name %>", INT2FIX(<%= token.name %>));
+<% tokens.map(&:names).flatten.each do |token| -%>
+  rb_define_const(c<%= name %>Tokens, "<%= token %>", INT2FIX(<%= token %>));
 <% end -%>
 
   rb_define_method(c<%= name %>, "parse", <%= uname %>_parse, 0);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mkbison
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Peter Woo
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: cocaine
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - peter@wioux.net
@@ -66,7 +80,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- TODO.txt
 - bin/mkbison
 - bison_parser.rby
 - ext/bison_parser/bison_parser.c

data/TODO.txt

@@ -1,5 +0,0 @@
-  * Seems like you can hit EOF in the middle of action block and get wrong error msg
-  * Benchmark -- what takes so long on koa?
-  * Support multiple tokens on %left/%right lines, for same precedence
-  * Write to temp file, then move into place
-  * Move base module into the c extension