ruby-ll 1.1.3-java → 2.0.0-java

data/lib/ll/driver.rb

@@ -30,6 +30,10 @@ module LL
         message  = "Unexpected #{token_type}, expected #{expected} instead"
       when :eof
         message = "Received #{token_type} but there's nothing left to parse"
+      when :star
+        message = %Q{Unexpected #{token_type} for a "*" operator}
+      when :plus
+        message = %Q{Unexpected #{token_type} for a "+" operator}
       end
 
       return message

data/lib/ll/grammar_compiler.rb

@@ -179,7 +179,7 @@ module LL
     ##
     # Processes the assignment of terminals.
     #
-    # @see #process
+    # @see [#process]
     #
     def on_terminals(node, compiled_grammar)
       node.children.each do |child|
@@ -199,7 +199,7 @@ module LL
     ##
     # Processes an %inner directive.
     #
-    # @see #process
+    # @see [#process]
     #
     def on_inner(node, compiled_grammar)
       compiled_grammar.inner = process(node.children[0], compiled_grammar)
@@ -208,7 +208,7 @@ module LL
     ##
     # Processes a %header directive.
     #
-    # @see #process
+    # @see [#process]
     #
     def on_header(node, compiled_grammar)
       compiled_grammar.header = process(node.children[0], compiled_grammar)
@@ -217,7 +217,7 @@ module LL
     ##
     # Processes a node containing Ruby source code.
     #
-    # @see #process
+    # @see [#process]
     # @return [String]
     #
     def on_ruby(node, compiled_grammar)
@@ -227,7 +227,7 @@ module LL
     ##
     # Extracts the name from an identifier.
     #
-    # @see #process
+    # @see [#process]
     # @return [String]
     #
     def on_ident(node, compiled_grammar)
@@ -237,7 +237,7 @@ module LL
     ##
     # Processes an epsilon.
     #
-    # @see #process
+    # @see [#process]
     # @return [LL::Epsilon]
     #
     def on_epsilon(node, compiled_grammar)
@@ -247,7 +247,7 @@ module LL
     ##
     # Processes the assignment of a rule.
     #
-    # @see #process
+    # @see [#process]
     #
     def on_rule(node, compiled_grammar)
       name = process(node.children[0], compiled_grammar)
@@ -280,7 +280,7 @@ module LL
     ##
     # Creates a basic prototype for a rule.
     #
-    # @see #process
+    # @see [#process]
     #
     def on_rule_prototype(node, compiled_grammar)
       name = process(node.children[0], compiled_grammar)
@@ -295,7 +295,7 @@ module LL
     ##
     # Processes a single rule branch.
     #
-    # @see #process
+    # @see [#process]
     # @return [LL::Branch]
     #
     def on_branch(node, compiled_grammar)
@@ -313,33 +313,53 @@ module LL
     ##
     # Processes the steps of a branch.
     #
-    # @see #process
+    # @see [#process]
     # @return [Array]
     #
     def on_steps(node, compiled_grammar)
-      steps = []
+      return lookup_identifiers(node, compiled_grammar)
+    end
 
-      node.children.each do |step_node|
-        retval = process(step_node, compiled_grammar)
+    ##
+    # Processes the "*" operator.
+    #
+    # @param [LL::AST::Node] node
+    # @param [LL::CompiledGrammar] compiled_grammar
+    # @return [LL::Operator]
+    #
+    def on_star(node, compiled_grammar)
+      steps = lookup_identifiers(node, compiled_grammar)
+      name  = "_ll_star#{node.source_line.line}#{node.source_line.column}"
+      rule  = Rule.new(name, node.source_line)
 
-        # Literal rule/terminal names.
-        if retval.is_a?(String)
-          step = compiled_grammar.lookup_identifier(retval)
+      rule.add_branch(steps, node.source_line)
 
-          undefined_identifier!(retval, step_node, compiled_grammar) unless step
-        # Epsilon
-        else
-          step = retval
-        end
+      rule.increment_references
 
-        if step
-          step.increment_references if step.respond_to?(:increment_references)
+      compiled_grammar.add_rule(rule)
 
-          steps << step
-        end
-      end
+      return Operator.new(:star, rule, node.source_line)
+    end
+
+    ##
+    # Processes the "+" operator.
+    #
+    # @param [LL::AST::Node] node
+    # @param [LL::CompiledGrammar] compiled_grammar
+    # @return [LL::Operator]
+    #
+    def on_plus(node, compiled_grammar)
+      steps = lookup_identifiers(node, compiled_grammar)
+      name  = "_ll_plus#{node.source_line.line}#{node.source_line.column}"
+      rule  = Rule.new(name, node.source_line)
+
+      rule.add_branch(steps, node.source_line)
 
-      return steps
+      rule.increment_references
+
+      compiled_grammar.add_rule(rule)
+
+      return Operator.new(:plus, rule, node.source_line)
     end
 
     private
@@ -355,5 +375,35 @@ module LL
         node.source_line
       )
     end
+
+    ##
+    # @see [#process]
+    # @return [Array]
+    #
+    def lookup_identifiers(node, compiled_grammar)
+      idents = []
+
+      node.children.each do |ident_node|
+        retval = process(ident_node, compiled_grammar)
+
+        # Literal rule/terminal names.
+        if retval.is_a?(String)
+          ident = compiled_grammar.lookup_identifier(retval)
+
+          undefined_identifier!(retval, ident_node, compiled_grammar) if !ident
+        # Epsilon
+        else
+          ident = retval
+        end
+
+        if ident
+          ident.increment_references if ident.respond_to?(:increment_references)
+
+          idents << ident
+        end
+      end
+
+      return idents
+    end
   end # Compiler
 end # LL

data/lib/ll/lexer.rb

@@ -64,49 +64,49 @@ self._ll_lexer_indicies = [
 	27, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 26, 1, 
-	1, 28, 1, 29, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 25, 25, 
+	1, 28, 1, 29, 1, 1, 30, 31, 
+	32, 33, 1, 1, 1, 1, 25, 25, 
 	25, 25, 25, 25, 25, 25, 25, 25, 
-	30, 31, 1, 32, 1, 1, 1, 25, 
+	34, 35, 1, 36, 1, 1, 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, 33, 1, 25, 
+	25, 1, 1, 1, 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, 34, 35, 1, 1, 1, 25, 36, 
-	36, 36, 36, 36, 36, 36, 36, 36, 
-	36, 36, 36, 36, 36, 36, 36, 36, 
-	36, 36, 36, 36, 36, 36, 36, 36, 
-	36, 36, 36, 36, 36, 36, 36, 36, 
-	36, 36, 36, 36, 36, 36, 36, 36, 
-	36, 36, 36, 36, 36, 36, 36, 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, 25, 25, 25, 25, 25, 25, 25, 
-	25, 36, 36, 36, 36, 36, 36, 36, 
+	25, 40, 40, 40, 40, 40, 40, 40, 
 	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, 36, 36, 36, 36, 25, 36, 
+	25, 25, 40, 40, 40, 40, 25, 40, 
 	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, 36, 36, 36, 36, 36, 25, 
-	37, 28, 39, 38, 38, 38, 38, 38, 
-	38, 38, 38, 38, 38, 38, 38, 38, 
-	38, 38, 38, 38, 38, 38, 38, 38, 
-	38, 38, 38, 38, 38, 38, 38, 38, 
-	38, 38, 38, 38, 38, 38, 38, 38, 
-	38, 38, 38, 38, 38, 38, 38, 38, 
-	38, 38, 38, 38, 38, 38, 38, 38, 
-	38, 38, 38, 38, 38, 38, 38, 38, 
-	38, 38, 38, 38, 38, 38, 38, 38, 
-	38, 38, 38, 38, 38, 38, 38, 38, 
-	38, 38, 38, 38, 38, 38, 38, 38, 
-	38, 38, 38, 38, 38, 38, 38, 38, 
-	38, 38, 38, 38, 38, 38, 38, 38, 
-	38, 38, 38, 38, 38, 38, 38, 38, 
-	38, 38, 38, 40, 38, 41, 38, 0
+	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
 ]
 
 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, 23, 22, 22, 22, 22, 25, 25, 
-	25, 25
+	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
+	20, 21, 22, 23, 24, 25
 ]
 
 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, 37, 
-	38, 0
+	0, 0, 0, 0, 0, 0, 0, 41, 
+	42, 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 20 then
+	when 24 then
 # line 188 "lib/ll/lexer.rl"
 		begin
 te = p+1
  begin  brace_count += 1  end
 		end
-	when 21 then
+	when 25 then
 # line 190 "lib/ll/lexer.rl"
 		begin
 te = p+1
@@ -338,7 +338,7 @@ te = p+1
           end
          end
 		end
-	when 18 then
+	when 22 then
 # line 206 "lib/ll/lexer.rl"
 		begin
 te = p+1
@@ -367,33 +367,57 @@ te = p+1
 te = p+1
  begin  emit(:T_HEADER, ts, te)  end
 		end
-	when 12 then
+	when 16 then
 # line 220 "lib/ll/lexer.rl"
 		begin
 te = p+1
  begin  emit(:T_EQUALS, ts, te)  end
 		end
-	when 10 then
+	when 14 then
 # line 221 "lib/ll/lexer.rl"
 		begin
 te = p+1
  begin  emit(:T_COLON, ts, te)  end
 		end
-	when 11 then
+	when 15 then
 # line 222 "lib/ll/lexer.rl"
 		begin
 te = p+1
  begin  emit(:T_SEMICOLON, ts, te)  end
 		end
-	when 15 then
+	when 19 then
 # line 223 "lib/ll/lexer.rl"
 		begin
 te = p+1
  begin  emit(:T_PIPE, ts, te)  end
 		end
-	when 14 then
+	when 13 then
+# line 225 "lib/ll/lexer.rl"
+		begin
+te = p+1
+ begin  emit(:T_PLUS, ts, te)  end
+		end
+	when 12 then
 # line 226 "lib/ll/lexer.rl"
 		begin
+te = p+1
+ begin  emit(:T_STAR, ts, te)  end
+		end
+	when 10 then
+# line 227 "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"
+		begin
+te = p+1
+ begin  emit(:T_RPAREN, ts, te)  end
+		end
+	when 18 then
+# line 230 "lib/ll/lexer.rl"
+		begin
 te = p+1
  begin 
           mark        = ts + 1
@@ -405,26 +429,26 @@ te = p+1
           cs = 25;
          end
 		end
-	when 17 then
+	when 21 then
 # line 213 "lib/ll/lexer.rl"
 		begin
 te = p
 p = p - 1;		end
-	when 16 then
+	when 20 then
 # line 1 "NONE"
 		begin
 	case act
 	when 16 then
 	begin begin p = ((te))-1; end
  emit(:T_EPSILON, ts, te) end
-	when 18 then
+	when 22 then
 	begin begin p = ((te))-1; end
 
         emit(:T_IDENT, ts, te)
       end
 end 
 			end
-	when 19 then
+	when 23 then
 # line 148 "lib/ll/lexer.rl"
 		begin
 
@@ -458,7 +482,7 @@ te = p+1
 		begin
 te = p+1
 		end
-	when 13 then
+	when 17 then
 # line 1 "NONE"
 		begin
 te = p+1
@@ -473,8 +497,8 @@ te = p+1
 		end
 # line 168 "lib/ll/lexer.rl"
 		begin
-act = 18;		end
-# line 477 "lib/ll/lexer.rb"
+act = 22;		end
+# line 501 "lib/ll/lexer.rb"
 	end
 	end
 	end
@@ -484,7 +508,7 @@ act = 18;		end
 # line 1 "NONE"
 		begin
 ts = nil;		end
-# line 487 "lib/ll/lexer.rb"
+# line 511 "lib/ll/lexer.rb"
 	end
 
 	if cs == 0
@@ -576,7 +600,7 @@ end
     end
 
     
-# line 238 "lib/ll/lexer.rl"
+# line 242 "lib/ll/lexer.rl"
 
   end # Lexer
 end # Oga