ruby-ll 2.0.0-java → 2.1.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f307cb5b874f4f151092083942884b5077e5fab
-  data.tar.gz: 1a9dbbcd10bd6898a709aa5759d5f91030272e8f
+  metadata.gz: 4f3c66d4523120a5e1f5ef8c6c32f45915c072d8
+  data.tar.gz: 49d49c6a297f2e2f5a0ac1514b232e7cfa4253ea
 SHA512:
-  metadata.gz: d397ac3dac1792bb4310508aaec7ee448cfe0f09f9fa1072daa5c53f1b8ea290c2ff342897e8edfcced314d5b9fa0715970dccadea8ac0c9f0b23be1dced959b
-  data.tar.gz: 76771a39c8fdebf2e64f5b0535a019c22ac5aff0907b96f2a8d91ec5d5f054f742aa3fc75dd847cb1c050c1e1a60c79269308a2eb6aa596cd9923479a21b3665
+  metadata.gz: f910a5007ee6a672b5b5ac517ed70c82843ace40f44d241a22c039d984b33fea351488eae1af64bfc88d8d41236ad81fc01dae55afb58d2ae0e3fb8371dcc12b
+  data.tar.gz: 7f20ee290e31e4c16a08bd1c438c80cadccb722b6096a37154092eff0420e250ca2238aa5f405b4dcd412242993c13d46e15ab3f701fbe802c375e34eb120835

data/README.md

@@ -20,9 +20,10 @@ For more information on LL parsing, see
 
 ## Features
 
-* Support for detecting first/first and first/follow conflicts
-* clang-like error/warning messages to ease debugging parsers
-* High performance and a low memory footprint
+* Support for detecting first/first and first/follow conflicts.
+* clang-like error/warning messages to ease debugging parsers.
+* High performance and a low memory footprint.
+* Support for the `*`, `+` and `?` operators.
 
 ## Requirements
 
@@ -326,7 +327,8 @@ It's also an error to re-define an existing rule.
 ### Operators
 
 Grammars can use two operators to define a sequence of terminals/non-terminals:
-the star (`*`) and plus (`+`) operators.
+the star (`*`) and plus (`+`) operators. There's also the `?` (question)
+operator which can be used to indicate something as being optional.
 
 The star operator indicates that something should occur 0 or more times. Here
 the "B" identifier could occur 0 times, once, twice or many more times:
@@ -339,6 +341,17 @@ should occur at least once but can also occur, say, 10 times:
 
     A = B+;
 
+The question operator can be used as an alternative to the following pattern:
+
+    # "A" or "A C"
+    A = B A_follow;
+
+    A_follow = C | _;
+
+Using this operator you can simply write the following:
+
+    A = B C?;
+
 Operators can be applied either to a single terminal/rule or a series of
 terminals/rules grouped together using parenthesis. For example, both are
 perfectly valid:

data/ext/c/driver.c

@@ -9,6 +9,7 @@
 #define T_PLUS 5
 #define T_ADD_VALUE_STACK 6
 #define T_APPEND_VALUE_STACK 7
+#define T_QUESTION 8
 
 ID id_config_const;
 ID id_each_token;
@@ -184,6 +185,27 @@ VALUE ll_driver_each_token(VALUE token, VALUE self)
                 }
             }
         }
+        /* "?" operator */
+        else if ( stack_type == T_QUESTION )
+        {
+            production_i = state->config->table[stack_value][token_id];
+
+            if ( production_i == T_EOF )
+            {
+                kv_push(VALUE, state->value_stack, Qnil);
+            }
+            else
+            {
+                FOR(rule_i, state->config->rule_lengths[production_i])
+                {
+                    kv_push(
+                        long,
+                        state->stack,
+                        state->config->rules[production_i][rule_i]
+                    );
+                }
+            }
+        }
         /*
         Adds a new array to the value stack that can be used to group operator
         values together

data/ext/java/org/libll/Driver.java

@@ -36,6 +36,7 @@ public class Driver extends RubyObject
     private static long T_PLUS               = 5;
     private static long T_ADD_VALUE_STACK    = 6;
     private static long T_APPEND_VALUE_STACK = 7;
+    private static long T_QUESTION           = 8;
 
     /**
      * The current Ruby runtime.
@@ -200,6 +201,28 @@ public class Driver extends RubyObject
                             }
                         }
                     }
+                    // "?" operator
+                    else if ( stack_type == self.T_QUESTION )
+                    {
+                        Long production_i = self.config.table
+                            .get(stack_value.intValue())
+                            .get(token_id.intValue());
+
+                        if ( production_i == self.T_EOF )
+                        {
+                            value_stack.push(context.nil);
+                        }
+                        else
+                        {
+                            ArrayList<Long> row = self.config.rules
+                                .get(production_i.intValue());
+
+                            for ( int index = 0; index < row.size(); index++ )
+                            {
+                                stack.push(row.get(index));
+                            }
+                        }
+                    }
                     // Adds a new array to the value stack that can be used to
                     // group operator values together
                     else if ( stack_type == self.T_ADD_VALUE_STACK )

data/lib/ll/configuration_compiler.rb

@@ -16,9 +16,17 @@ module LL
       :star               => 4,
       :plus               => 5,
       :add_value_stack    => 6,
-      :append_value_stack => 7
+      :append_value_stack => 7,
+      :question           => 8
     }.freeze
 
+    ##
+    # Operators which don't require a value stack.
+    #
+    # @return [Array]
+    #
+    SKIP_VALUE_STACK = [:question]
+
     ##
     # @return [String]
     #
@@ -167,8 +175,10 @@ module LL
               row << TYPES[step.type]
               row << rule_indices[step.receiver]
 
-              row << TYPES[:add_value_stack]
-              row << 0
+              unless SKIP_VALUE_STACK.include?(step.type)
+                row << TYPES[:add_value_stack]
+                row << 0
+              end
             end
           end
 

data/lib/ll/driver.rb

@@ -34,6 +34,8 @@ module LL
         message = %Q{Unexpected #{token_type} for a "*" operator}
       when :plus
         message = %Q{Unexpected #{token_type} for a "+" operator}
+      when :question
+        message = %Q{Unexpected #{token_type} for a "?" operator}
       end
 
       return message

data/lib/ll/grammar_compiler.rb

@@ -362,6 +362,27 @@ module LL
       return Operator.new(:plus, rule, node.source_line)
     end
 
+    ##
+    # Processes the "?" operator.
+    #
+    # @param [LL::AST::Node] node
+    # @param [LL::CompiledGrammar] compiled_grammar
+    # @return [LL::Operator]
+    #
+    def on_question(node, compiled_grammar)
+      steps = lookup_identifiers(node, compiled_grammar)
+      name  = "_ll_question#{node.source_line.line}#{node.source_line.column}"
+      rule  = Rule.new(name, node.source_line)
+
+      rule.add_branch(steps, node.source_line)
+
+      rule.increment_references
+
+      compiled_grammar.add_rule(rule)
+
+      return Operator.new(:question, rule, node.source_line)
+    end
+
     private
 
     ##

data/lib/ll/lexer.rb

@@ -67,46 +67,46 @@ self._ll_lexer_indicies = [
 	1, 28, 1, 29, 1, 1, 30, 31, 
 	32, 33, 1, 1, 1, 1, 25, 25, 
 	25, 25, 25, 25, 25, 25, 25, 25, 
-	34, 35, 1, 36, 1, 1, 1, 25, 
+	34, 35, 1, 36, 1, 37, 1, 25, 
 	25, 25, 25, 25, 25, 25, 25, 25, 
 	25, 25, 25, 25, 25, 25, 25, 25, 
 	25, 25, 25, 25, 25, 25, 25, 25, 
-	25, 1, 1, 1, 1, 37, 1, 25, 
+	25, 1, 1, 1, 1, 38, 1, 25, 
 	25, 25, 25, 25, 25, 25, 25, 25, 
 	25, 25, 25, 25, 25, 25, 25, 25, 
 	25, 25, 25, 25, 25, 25, 25, 25, 
-	25, 38, 39, 1, 1, 1, 25, 40, 
-	40, 40, 40, 40, 40, 40, 40, 40, 
-	40, 40, 40, 40, 40, 40, 40, 40, 
-	40, 40, 40, 40, 40, 40, 40, 40, 
-	40, 40, 40, 40, 40, 40, 40, 40, 
-	40, 40, 40, 40, 40, 40, 40, 40, 
-	40, 40, 40, 40, 40, 40, 40, 25, 
+	25, 39, 40, 1, 1, 1, 25, 41, 
+	41, 41, 41, 41, 41, 41, 41, 41, 
+	41, 41, 41, 41, 41, 41, 41, 41, 
+	41, 41, 41, 41, 41, 41, 41, 41, 
+	41, 41, 41, 41, 41, 41, 41, 41, 
+	41, 41, 41, 41, 41, 41, 41, 41, 
+	41, 41, 41, 41, 41, 41, 41, 25, 
 	25, 25, 25, 25, 25, 25, 25, 25, 
-	25, 40, 40, 40, 40, 40, 40, 40, 
+	25, 41, 41, 41, 41, 41, 41, 41, 
 	25, 25, 25, 25, 25, 25, 25, 25, 
 	25, 25, 25, 25, 25, 25, 25, 25, 
 	25, 25, 25, 25, 25, 25, 25, 25, 
-	25, 25, 40, 40, 40, 40, 25, 40, 
+	25, 25, 41, 41, 41, 41, 25, 41, 
 	25, 25, 25, 25, 25, 25, 25, 25, 
 	25, 25, 25, 25, 25, 25, 25, 25, 
 	25, 25, 25, 25, 25, 25, 25, 25, 
-	25, 25, 40, 40, 40, 40, 40, 25, 
-	41, 28, 43, 42, 42, 42, 42, 42, 
-	42, 42, 42, 42, 42, 42, 42, 42, 
-	42, 42, 42, 42, 42, 42, 42, 42, 
-	42, 42, 42, 42, 42, 42, 42, 42, 
-	42, 42, 42, 42, 42, 42, 42, 42, 
-	42, 42, 42, 42, 42, 42, 42, 42, 
-	42, 42, 42, 42, 42, 42, 42, 42, 
-	42, 42, 42, 42, 42, 42, 42, 42, 
-	42, 42, 42, 42, 42, 42, 42, 42, 
-	42, 42, 42, 42, 42, 42, 42, 42, 
-	42, 42, 42, 42, 42, 42, 42, 42, 
-	42, 42, 42, 42, 42, 42, 42, 42, 
-	42, 42, 42, 42, 42, 42, 42, 42, 
-	42, 42, 42, 42, 42, 42, 42, 42, 
-	42, 42, 42, 44, 42, 45, 42, 0
+	25, 25, 41, 41, 41, 41, 41, 25, 
+	42, 28, 44, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 45, 43, 46, 43, 0
 ]
 
 class << self
@@ -118,8 +118,8 @@ self._ll_lexer_trans_targs = [
 	6, 22, 8, 9, 10, 22, 12, 13, 
 	22, 15, 16, 17, 18, 19, 20, 21, 
 	22, 23, 22, 22, 24, 1, 22, 22, 
-	22, 22, 22, 22, 22, 23, 22, 22, 
-	22, 22, 25, 25, 25, 25
+	22, 22, 22, 22, 22, 22, 23, 22, 
+	22, 22, 22, 25, 25, 25, 25
 ]
 
 class << self
@@ -132,7 +132,7 @@ self._ll_lexer_trans_actions = [
 	3, 0, 0, 0, 0, 0, 0, 0, 
 	4, 7, 8, 9, 0, 0, 10, 11, 
 	12, 13, 14, 15, 16, 17, 18, 19, 
-	20, 21, 22, 23, 24, 25
+	20, 21, 22, 23, 24, 25, 26
 ]
 
 class << self
@@ -164,8 +164,8 @@ end
 self._ll_lexer_eof_trans = [
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 41, 
-	42, 0
+	0, 0, 0, 0, 0, 0, 0, 42, 
+	43, 0
 ]
 
 class << self
@@ -312,13 +312,13 @@ ts = p
 	cs = _ll_lexer_trans_targs[_trans]
 	if _ll_lexer_trans_actions[_trans] != 0
 	case _ll_lexer_trans_actions[_trans]
-	when 24 then
+	when 25 then
 # line 188 "lib/ll/lexer.rl"
 		begin
 te = p+1
  begin  brace_count += 1  end
 		end
-	when 25 then
+	when 26 then
 # line 190 "lib/ll/lexer.rl"
 		begin
 te = p+1
@@ -338,7 +338,7 @@ te = p+1
           end
          end
 		end
-	when 22 then
+	when 23 then
 # line 206 "lib/ll/lexer.rl"
 		begin
 te = p+1
@@ -385,7 +385,7 @@ te = p+1
 te = p+1
  begin  emit(:T_SEMICOLON, ts, te)  end
 		end
-	when 19 then
+	when 20 then
 # line 223 "lib/ll/lexer.rl"
 		begin
 te = p+1
@@ -403,20 +403,26 @@ te = p+1
 te = p+1
  begin  emit(:T_STAR, ts, te)  end
 		end
-	when 10 then
+	when 17 then
 # line 227 "lib/ll/lexer.rl"
 		begin
+te = p+1
+ begin  emit(:T_QUESTION, ts, te)  end
+		end
+	when 10 then
+# line 228 "lib/ll/lexer.rl"
+		begin
 te = p+1
  begin  emit(:T_LPAREN, ts, te)  end
 		end
 	when 11 then
-# line 228 "lib/ll/lexer.rl"
+# line 229 "lib/ll/lexer.rl"
 		begin
 te = p+1
  begin  emit(:T_RPAREN, ts, te)  end
 		end
-	when 18 then
-# line 230 "lib/ll/lexer.rl"
+	when 19 then
+# line 231 "lib/ll/lexer.rl"
 		begin
 te = p+1
  begin 
@@ -429,26 +435,26 @@ te = p+1
           cs = 25;
          end
 		end
-	when 21 then
+	when 22 then
 # line 213 "lib/ll/lexer.rl"
 		begin
 te = p
 p = p - 1;		end
-	when 20 then
+	when 21 then
 # line 1 "NONE"
 		begin
 	case act
 	when 16 then
 	begin begin p = ((te))-1; end
  emit(:T_EPSILON, ts, te) end
-	when 22 then
+	when 23 then
 	begin begin p = ((te))-1; end
 
         emit(:T_IDENT, ts, te)
       end
 end 
 			end
-	when 23 then
+	when 24 then
 # line 148 "lib/ll/lexer.rl"
 		begin
 
@@ -482,7 +488,7 @@ te = p+1
 		begin
 te = p+1
 		end
-	when 17 then
+	when 18 then
 # line 1 "NONE"
 		begin
 te = p+1
@@ -497,8 +503,8 @@ te = p+1
 		end
 # line 168 "lib/ll/lexer.rl"
 		begin
-act = 22;		end
-# line 501 "lib/ll/lexer.rb"
+act = 23;		end
+# line 507 "lib/ll/lexer.rb"
 	end
 	end
 	end
@@ -508,7 +514,7 @@ act = 22;		end
 # line 1 "NONE"
 		begin
 ts = nil;		end
-# line 511 "lib/ll/lexer.rb"
+# line 517 "lib/ll/lexer.rb"
 	end
 
 	if cs == 0
@@ -600,7 +606,7 @@ end
     end
 
     
-# line 242 "lib/ll/lexer.rl"
+# line 243 "lib/ll/lexer.rl"
 
   end # Lexer
 end # Oga

data/lib/ll/parser.rb

@@ -21,119 +21,112 @@ class Parser < LL::Driver
     :T_SEMICOLON, # 11
     :T_STAR, # 12
     :T_PLUS, # 13
-    :T_LPAREN, # 14
-    :T_RPAREN, # 15
+    :T_QUESTION, # 14
+    :T_LPAREN, # 15
+    :T_RPAREN, # 16
   ].freeze
 
   CONFIG.rules = [
     [3, 0, 0, 1], # 0
-    [3, 1, 2, 0], # 1
-    [3, 2, 0, 1, 0, 2], # 2
-    [3, 3, 2, 0], # 3
-    [3, 4, 0, 23], # 4
-    [3, 5, 0, 3], # 5
-    [3, 6, 0, 5], # 6
-    [3, 7, 0, 6], # 7
-    [3, 8, 0, 7], # 8
-    [3, 9, 1, 11, 0, 4, 0, 10, 1, 2], # 9
-    [3, 10, 0, 4, 0, 10, 1, 8, 1, 8], # 10
-    [3, 11, 2, 0], # 11
-    [3, 12, 1, 11, 0, 8, 1, 3], # 12
-    [3, 13, 0, 20, 1, 4], # 13
-    [3, 14, 0, 20, 1, 5], # 14
-    [3, 15, 0, 9, 0, 10], # 15
-    [3, 16, 0, 8], # 16
-    [3, 17, 2, 0], # 17
-    [3, 18, 1, 6], # 18
-    [3, 19, 0, 12, 0, 13], # 19
-    [3, 20, 0, 15, 1, 15, 0, 8, 1, 14], # 20
-    [3, 21, 0, 11], # 21
-    [3, 22, 2, 0], # 22
-    [3, 23, 0, 14, 0, 10], # 23
-    [3, 24, 0, 15], # 24
-    [3, 25, 2, 0], # 25
-    [3, 26, 1, 13], # 26
-    [3, 27, 1, 12], # 27
-    [3, 28, 0, 11], # 28
-    [3, 29, 0, 17], # 29
-    [3, 30, 1, 10], # 30
-    [3, 31, 0, 19, 0, 16], # 31
-    [3, 32, 0, 20], # 32
-    [3, 33, 2, 0], # 33
-    [3, 34, 1, 1], # 34
-    [3, 35, 0, 22, 0, 18], # 35
-    [3, 36, 0, 21, 1, 9], # 36
-    [3, 37, 2, 0], # 37
-    [3, 38, 1, 11, 0, 21, 1, 7, 0, 10], # 38
+    [3, 1, 4, 19, 6, 0], # 1
+    [3, 2, 0, 18], # 2
+    [3, 3, 0, 3], # 3
+    [3, 4, 0, 5], # 4
+    [3, 5, 0, 6], # 5
+    [3, 6, 0, 7], # 6
+    [3, 7, 1, 11, 4, 20, 6, 0, 0, 9, 1, 2], # 7
+    [3, 8, 0, 9, 1, 8, 1, 8], # 8
+    [3, 9, 1, 11, 0, 8, 1, 3], # 9
+    [3, 10, 0, 15, 1, 4], # 10
+    [3, 11, 0, 15, 1, 5], # 11
+    [3, 12, 5, 21, 6, 0], # 12
+    [3, 13, 1, 6], # 13
+    [3, 14, 8, 22, 0, 9], # 14
+    [3, 15, 0, 11, 1, 16, 0, 8, 1, 15], # 15
+    [3, 16, 1, 13], # 16
+    [3, 17, 1, 12], # 17
+    [3, 18, 1, 14], # 18
+    [3, 19, 5, 23, 6, 0], # 19
+    [3, 20, 0, 13], # 20
+    [3, 21, 1, 10], # 21
+    [3, 22, 8, 24, 0, 12], # 22
+    [3, 23, 1, 1], # 23
+    [3, 24, 4, 25, 6, 0, 0, 14], # 24
+    [3, 25, 0, 14, 1, 9], # 25
+    [3, 26, 1, 11, 0, 16, 1, 7, 0, 9], # 26
+    [3, 27, 0, 2], # 27
+    [3, 28, 0, 4], # 28
+    [3, 29, 0, 9], # 29
+    [3, 30, 0, 11], # 30
+    [3, 31, 0, 10], # 31
+    [3, 32, 0, 15], # 32
+    [3, 33, 0, 17], # 33
   ].freeze
 
   CONFIG.table = [
-    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], # 0
-    [3, 3, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3], # 1
-    [-1, -1, 5, 6, 7, 8, 4, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 2
-    [-1, -1, 9, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 3
-    [11, 11, 11, 11, 11, 11, 11, 11, 10, 11, 11, 11, 11, 11, 11, 11], # 4
-    [-1, -1, -1, 12, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 5
-    [-1, -1, -1, -1, 13, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 6
-    [-1, -1, -1, -1, -1, 14, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 7
-    [-1, -1, -1, -1, -1, -1, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 8
-    [17, 17, 17, 17, 17, 17, 16, 17, 17, 17, 17, 17, 17, 17, 17, 17], # 9
-    [-1, -1, -1, -1, -1, -1, 18, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 10
-    [-1, -1, -1, -1, -1, -1, 19, -1, -1, -1, -1, -1, -1, -1, 20, -1], # 11
-    [22, 22, 22, 22, 22, 22, 21, 22, 22, 22, 22, 22, 22, 22, 21, 22], # 12
-    [-1, -1, -1, -1, -1, -1, 23, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 13
-    [25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 24, 24, 25, 25], # 14
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 27, 26, -1, -1], # 15
-    [-1, -1, -1, -1, -1, -1, 28, -1, -1, -1, 29, -1, -1, -1, 28, -1], # 16
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 30, -1, -1, -1, -1, -1], # 17
-    [-1, -1, -1, -1, -1, -1, 31, -1, -1, -1, 31, -1, -1, -1, 31, -1], # 18
-    [33, 32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33], # 19
-    [-1, 34, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 20
-    [-1, -1, -1, -1, -1, -1, 35, -1, -1, -1, 35, -1, -1, -1, 35, -1], # 21
-    [37, 37, 37, 37, 37, 37, 37, 37, 37, 36, 37, 37, 37, 37, 37, 37], # 22
-    [-1, -1, -1, -1, -1, -1, 38, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 23
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], # 0
+    [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], # 1
+    [-1, -1, 3, 4, 5, 6, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 2
+    [-1, -1, 7, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 3
+    [-1, -1, -1, -1, -1, -1, -1, -1, 8, -1, -1, -1, -1, -1, -1, -1, -1], # 4
+    [-1, -1, -1, 9, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 5
+    [-1, -1, -1, -1, 10, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 6
+    [-1, -1, -1, -1, -1, 11, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 7
+    [12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12], # 8
+    [-1, -1, -1, -1, -1, -1, 13, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 9
+    [-1, -1, -1, -1, -1, -1, 14, -1, -1, -1, -1, -1, -1, -1, -1, 15, -1], # 10
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 17, 16, 18, -1, -1], # 11
+    [19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 20, 19, 19, 19, 19, 19, 19], # 12
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 21, -1, -1, -1, -1, -1, -1], # 13
+    [22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22], # 14
+    [-1, 23, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 15
+    [24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24], # 16
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, 25, -1, -1, -1, -1, -1, -1, -1], # 17
+    [-1, -1, -1, -1, -1, -1, 26, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 18
+    [-1, -1, 27, 27, 27, 27, 27, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 19
+    [-1, -1, -1, -1, -1, -1, -1, -1, 28, -1, -1, -1, -1, -1, -1, -1, -1], # 20
+    [-1, -1, -1, -1, -1, -1, 29, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 21
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 30, 30, 30, -1, -1], # 22
+    [-1, -1, -1, -1, -1, -1, 31, -1, -1, -1, -1, -1, -1, -1, -1, 31, -1], # 23
+    [-1, 32, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 24
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, 33, -1, -1, -1, -1, -1, -1, -1], # 25
   ].freeze
 
   CONFIG.actions = [
     [:_rule_0, 1], # 0
-    [:_rule_1, 0], # 1
-    [:_rule_2, 2], # 2
-    [:_rule_3, 0], # 3
+    [:_rule_1, 1], # 1
+    [:_rule_2, 1], # 2
+    [:_rule_3, 1], # 3
     [:_rule_4, 1], # 4
     [:_rule_5, 1], # 5
     [:_rule_6, 1], # 6
-    [:_rule_7, 1], # 7
-    [:_rule_8, 1], # 8
-    [:_rule_9, 4], # 9
-    [:_rule_10, 4], # 10
-    [:_rule_11, 0], # 11
-    [:_rule_12, 3], # 12
-    [:_rule_13, 2], # 13
+    [:_rule_7, 4], # 7
+    [:_rule_8, 3], # 8
+    [:_rule_9, 3], # 9
+    [:_rule_10, 2], # 10
+    [:_rule_11, 2], # 11
+    [:_rule_12, 1], # 12
+    [:_rule_13, 1], # 13
     [:_rule_14, 2], # 14
-    [:_rule_15, 2], # 15
+    [:_rule_15, 4], # 15
     [:_rule_16, 1], # 16
-    [:_rule_17, 0], # 17
+    [:_rule_17, 1], # 17
     [:_rule_18, 1], # 18
-    [:_rule_19, 2], # 19
-    [:_rule_20, 4], # 20
+    [:_rule_19, 1], # 19
+    [:_rule_20, 1], # 20
     [:_rule_21, 1], # 21
-    [:_rule_22, 0], # 22
-    [:_rule_23, 2], # 23
-    [:_rule_24, 1], # 24
-    [:_rule_25, 0], # 25
-    [:_rule_26, 1], # 26
+    [:_rule_22, 2], # 22
+    [:_rule_23, 1], # 23
+    [:_rule_24, 2], # 24
+    [:_rule_25, 2], # 25
+    [:_rule_26, 4], # 26
     [:_rule_27, 1], # 27
     [:_rule_28, 1], # 28
     [:_rule_29, 1], # 29
     [:_rule_30, 1], # 30
-    [:_rule_31, 2], # 31
+    [:_rule_31, 1], # 31
     [:_rule_32, 1], # 32
-    [:_rule_33, 0], # 33
-    [:_rule_34, 1], # 34
-    [:_rule_35, 2], # 35
-    [:_rule_36, 2], # 36
-    [:_rule_37, 0], # 37
-    [:_rule_38, 4], # 38
+    [:_rule_33, 1], # 33
   ].freeze
 
   ##
@@ -181,15 +174,15 @@ class Parser < LL::Driver
   end
 
   def _rule_1(val)
-     s(:grammar) 
+    val[0]
   end
 
   def _rule_2(val)
-     [val[0], *val[1]] 
+    val[0]
   end
 
   def _rule_3(val)
-    val
+    val[0]
   end
 
   def _rule_4(val)
@@ -205,157 +198,137 @@ class Parser < LL::Driver
   end
 
   def _rule_7(val)
-    val[0]
+    
+      s(:name, [val[1], *val[2]], :source_line => val[0].source_line)
+    
   end
 
   def _rule_8(val)
-    val[0]
+     val[2] 
   end
 
   def _rule_9(val)
     
-      s(:name, [val[1], *val[2]], :source_line => val[0].source_line)
+      s(:terminals, val[1], :source_line => val[0].source_line)
     
   end
 
   def _rule_10(val)
-     [val[2], *val[3]] 
+    
+      s(:inner, [val[1]], :source_line => val[0].source_line)
+    
   end
 
   def _rule_11(val)
-    val
+    
+      s(:header, [val[1]], :source_line => val[0].source_line)
+    
   end
 
   def _rule_12(val)
-    
-      s(:terminals, val[1], :source_line => val[0].source_line)
-    
+    val[0]
   end
 
   def _rule_13(val)
     
-      s(:inner, [val[1]], :source_line => val[0].source_line)
+      s(:ident, [val[0].value], :source_line => val[0].source_line)
     
   end
 
   def _rule_14(val)
     
-      s(:header, [val[1]], :source_line => val[0].source_line)
+      val[1] ? s(val[1][0], [val[0]], :source_line => val[1][1]) : val[0]
     
   end
 
   def _rule_15(val)
-     [val[0], *val[1]] 
+    
+      s(val[3][0], val[1], :source_line => val[0].source_line)
+    
   end
 
   def _rule_16(val)
-     val[0] 
+     [:plus, val[0].source_line] 
   end
 
   def _rule_17(val)
-    val
+     [:star, val[0].source_line] 
   end
 
   def _rule_18(val)
-    
-      s(:ident, [val[0].value], :source_line => val[0].source_line)
-    
+     [:question, val[0].source_line] 
   end
 
   def _rule_19(val)
-     [val[0], *val[1]] 
+    
+      s(:steps, val[0], :source_line => val[0][0].source_line)
+    
   end
 
   def _rule_20(val)
     
-      [s(val[3][0], val[1], :source_line => val[0].source_line)]
+      s(:steps, [val[0]], :source_line => val[0].source_line)
     
   end
 
   def _rule_21(val)
-     val[0] 
+     s(:epsilon, [], :source_line => val[0].source_line) 
   end
 
   def _rule_22(val)
-    val
+    
+      steps = [val[0]]
+
+      steps << val[1] if val[1]
+
+      s(:branch, steps, :source_line => val[0].source_line)
+    
   end
 
   def _rule_23(val)
-    
-      val[1] ? s(val[1][0], [val[0]], :source_line => val[1][1]) : val[0]
-    
+     s(:ruby, [val[0].value], :source_line => val[0].source_line) 
   end
 
   def _rule_24(val)
-     val[0] 
+     [val[0], *val[1]] 
   end
 
   def _rule_25(val)
-     nil 
+     val[1] 
   end
 
   def _rule_26(val)
-     [:plus, val[0].source_line] 
+    
+      s(:rule, [val[0], *val[2]], :source_line => val[0].source_line)
+    
   end
 
   def _rule_27(val)
-     [:star, val[0].source_line] 
+    val[0]
   end
 
   def _rule_28(val)
-    
-      s(:steps, val[0], :source_line => val[0][0].source_line)
-    
+    val[0]
   end
 
   def _rule_29(val)
-    
-      s(:steps, [val[0]], :source_line => val[0].source_line)
-    
+    val[0]
   end
 
   def _rule_30(val)
-     s(:epsilon, [], :source_line => val[0].source_line) 
+    val[0]
   end
 
   def _rule_31(val)
-    
-      steps = [val[0]]
-
-      steps << val[1] if val[1]
-
-      s(:branch, steps, :source_line => val[0].source_line)
-    
+    val[0]
   end
 
   def _rule_32(val)
-     val[0] 
+    val[0]
   end
 
   def _rule_33(val)
-     nil 
-  end
-
-  def _rule_34(val)
-     s(:ruby, [val[0].value], :source_line => val[0].source_line) 
-  end
-
-  def _rule_35(val)
-     [val[0], *val[1]] 
-  end
-
-  def _rule_36(val)
-     val[1] 
-  end
-
-  def _rule_37(val)
-    val
-  end
-
-  def _rule_38(val)
-    
-      s(:rule, [val[0], *val[2]], :source_line => val[0].source_line)
-    
+    val[0]
   end
 end
 end

data/lib/ll/version.rb

@@ -1,3 +1,3 @@
 module LL
-  VERSION = '2.0.0'
+  VERSION = '2.1.0'
 end # LL

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-ll
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: java
 authors:
 - Yorick Peterse
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-03-18 00:00:00.000000000 Z
+date: 2015-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast