ruby-ll 1.1.3-java → 2.0.0-java

data/lib/ll/operator.rb

@@ -0,0 +1,26 @@
+module LL
+  ##
+  # Class for operators such as + and *.
+  #
+  class Operator
+    attr_reader :type, :receiver, :source_line
+
+    ##
+    # @param [Symbol] type
+    # @param [LL::Rule] receiver
+    # @param [LL::SourceLine] source_line
+    #
+    def initialize(type, receiver, source_line)
+      @type        = type
+      @receiver    = receiver
+      @source_line = source_line
+    end
+
+    ##
+    # @return [String]
+    #
+    def inspect
+      return "Operator(type: #{type.inspect}, receiver: #{receiver.inspect})"
+    end
+  end # Operator
+end # LL

data/lib/ll/parser.rb

@@ -19,6 +19,10 @@ class Parser < LL::Driver
     :T_PIPE, # 9
     :T_EPSILON, # 10
     :T_SEMICOLON, # 11
+    :T_STAR, # 12
+    :T_PLUS, # 13
+    :T_LPAREN, # 14
+    :T_RPAREN, # 15
   ].freeze
 
   CONFIG.rules = [
@@ -26,7 +30,7 @@ class Parser < LL::Driver
     [3, 1, 2, 0], # 1
     [3, 2, 0, 1, 0, 2], # 2
     [3, 3, 2, 0], # 3
-    [3, 4, 0, 18], # 4
+    [3, 4, 0, 23], # 4
     [3, 5, 0, 3], # 5
     [3, 6, 0, 5], # 6
     [3, 7, 0, 6], # 7
@@ -35,45 +39,59 @@ class Parser < LL::Driver
     [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, 15, 1, 4], # 13
-    [3, 14, 0, 15, 1, 5], # 14
+    [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, 8], # 19
-    [3, 20, 0, 12], # 20
-    [3, 21, 1, 10], # 21
-    [3, 22, 0, 14, 0, 11], # 22
-    [3, 23, 0, 15], # 23
-    [3, 24, 2, 0], # 24
-    [3, 25, 1, 1], # 25
-    [3, 26, 0, 17, 0, 13], # 26
-    [3, 27, 0, 16, 1, 9], # 27
-    [3, 28, 2, 0], # 28
-    [3, 29, 1, 11, 0, 16, 1, 7, 0, 10], # 29
+    [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
   ].freeze
 
   CONFIG.table = [
-    [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], # 1
-    [-1, -1, 5, 6, 7, 8, 4, -1, -1, -1, -1, -1], # 2
-    [-1, -1, 9, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 3
-    [11, 11, 11, 11, 11, 11, 11, 11, 10, 11, 11, 11], # 4
-    [-1, -1, -1, 12, -1, -1, -1, -1, -1, -1, -1, -1], # 5
-    [-1, -1, -1, -1, 13, -1, -1, -1, -1, -1, -1, -1], # 6
-    [-1, -1, -1, -1, -1, 14, -1, -1, -1, -1, -1, -1], # 7
-    [-1, -1, -1, -1, -1, -1, 15, -1, -1, -1, -1, -1], # 8
-    [17, 17, 17, 17, 17, 17, 16, 17, 17, 17, 17, 17], # 9
-    [-1, -1, -1, -1, -1, -1, 18, -1, -1, -1, -1, -1], # 10
-    [-1, -1, -1, -1, -1, -1, 19, -1, -1, -1, 20, -1], # 11
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 21, -1], # 12
-    [-1, -1, -1, -1, -1, -1, 22, -1, -1, -1, 22, -1], # 13
-    [24, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24], # 14
-    [-1, 25, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 15
-    [-1, -1, -1, -1, -1, -1, 26, -1, -1, -1, 26, -1], # 16
-    [28, 28, 28, 28, 28, 28, 28, 28, 28, 27, 28, 28], # 17
-    [-1, -1, -1, -1, -1, -1, 29, -1, -1, -1, -1, -1], # 18
+    [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
   ].freeze
 
   CONFIG.actions = [
@@ -96,17 +114,26 @@ class Parser < LL::Driver
     [:_rule_16, 1], # 16
     [:_rule_17, 0], # 17
     [:_rule_18, 1], # 18
-    [:_rule_19, 1], # 19
-    [:_rule_20, 1], # 20
+    [:_rule_19, 2], # 19
+    [:_rule_20, 4], # 20
     [:_rule_21, 1], # 21
-    [:_rule_22, 2], # 22
-    [:_rule_23, 1], # 23
-    [:_rule_24, 0], # 24
-    [:_rule_25, 1], # 25
-    [:_rule_26, 2], # 26
-    [:_rule_27, 2], # 27
-    [:_rule_28, 0], # 28
-    [:_rule_29, 4], # 29
+    [:_rule_22, 0], # 22
+    [:_rule_23, 2], # 23
+    [:_rule_24, 1], # 24
+    [:_rule_25, 0], # 25
+    [:_rule_26, 1], # 26
+    [:_rule_27, 1], # 27
+    [:_rule_28, 1], # 28
+    [:_rule_29, 1], # 29
+    [:_rule_30, 1], # 30
+    [:_rule_31, 2], # 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
   ].freeze
 
   ##
@@ -158,7 +185,7 @@ class Parser < LL::Driver
   end
 
   def _rule_2(val)
-     val[0] + val[1] 
+     [val[0], *val[1]] 
   end
 
   def _rule_3(val)
@@ -166,23 +193,23 @@ class Parser < LL::Driver
   end
 
   def _rule_4(val)
-    val
+    val[0]
   end
 
   def _rule_5(val)
-    val
+    val[0]
   end
 
   def _rule_6(val)
-    val
+    val[0]
   end
 
   def _rule_7(val)
-    val
+    val[0]
   end
 
   def _rule_8(val)
-    val
+    val[0]
   end
 
   def _rule_9(val)
@@ -192,7 +219,7 @@ class Parser < LL::Driver
   end
 
   def _rule_10(val)
-     [val[2]] + val[3] 
+     [val[2], *val[3]] 
   end
 
   def _rule_11(val)
@@ -218,7 +245,7 @@ class Parser < LL::Driver
   end
 
   def _rule_15(val)
-     [val[0]] + val[1] 
+     [val[0], *val[1]] 
   end
 
   def _rule_16(val)
@@ -236,22 +263,62 @@ class Parser < LL::Driver
   end
 
   def _rule_19(val)
+     [val[0], *val[1]] 
+  end
+
+  def _rule_20(val)
+    
+      [s(val[3][0], val[1], :source_line => val[0].source_line)]
+    
+  end
+
+  def _rule_21(val)
+     val[0] 
+  end
+
+  def _rule_22(val)
+    val
+  end
+
+  def _rule_23(val)
+    
+      val[1] ? s(val[1][0], [val[0]], :source_line => val[1][1]) : val[0]
+    
+  end
+
+  def _rule_24(val)
+     val[0] 
+  end
+
+  def _rule_25(val)
+     nil 
+  end
+
+  def _rule_26(val)
+     [:plus, val[0].source_line] 
+  end
+
+  def _rule_27(val)
+     [:star, val[0].source_line] 
+  end
+
+  def _rule_28(val)
     
       s(:steps, val[0], :source_line => val[0][0].source_line)
     
   end
 
-  def _rule_20(val)
+  def _rule_29(val)
     
       s(:steps, [val[0]], :source_line => val[0].source_line)
     
   end
 
-  def _rule_21(val)
+  def _rule_30(val)
      s(:epsilon, [], :source_line => val[0].source_line) 
   end
 
-  def _rule_22(val)
+  def _rule_31(val)
     
       steps = [val[0]]
 
@@ -261,31 +328,31 @@ class Parser < LL::Driver
     
   end
 
-  def _rule_23(val)
+  def _rule_32(val)
      val[0] 
   end
 
-  def _rule_24(val)
+  def _rule_33(val)
      nil 
   end
 
-  def _rule_25(val)
+  def _rule_34(val)
      s(:ruby, [val[0].value], :source_line => val[0].source_line) 
   end
 
-  def _rule_26(val)
-     [val[0]] + val[1] 
+  def _rule_35(val)
+     [val[0], *val[1]] 
   end
 
-  def _rule_27(val)
+  def _rule_36(val)
      val[1] 
   end
 
-  def _rule_28(val)
+  def _rule_37(val)
     val
   end
 
-  def _rule_29(val)
+  def _rule_38(val)
     
       s(:rule, [val[0], *val[2]], :source_line => val[0].source_line)
     

data/lib/ll/version.rb

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

metadata

@@ -1,25 +1,25 @@
 --- !ruby/object:Gem::Specification
 name: ruby-ll
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 2.0.0
 platform: java
 authors:
 - Yorick Peterse
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-02-17 00:00:00.000000000 Z
+date: 2015-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   prerelease: false
@@ -28,12 +28,12 @@ dependencies:
   name: ansi
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   prerelease: false
@@ -42,12 +42,12 @@ dependencies:
   name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   prerelease: false
@@ -56,12 +56,12 @@ dependencies:
   name: rspec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
   prerelease: false
@@ -70,12 +70,12 @@ dependencies:
   name: yard
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   prerelease: false
@@ -84,12 +84,12 @@ dependencies:
   name: simplecov
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   prerelease: false
@@ -98,12 +98,12 @@ dependencies:
   name: kramdown
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   prerelease: false
@@ -112,12 +112,12 @@ dependencies:
   name: benchmark-ips
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
   prerelease: false
@@ -126,12 +126,12 @@ dependencies:
   name: rake-compiler
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   prerelease: false
@@ -143,52 +143,54 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".yardopts"
-- LICENSE
-- README.md
-- bin/ruby-ll
+- doc/driver_architecture.md
 - doc/DCO.md
 - doc/css/common.css
-- ext/c/driver.c
-- ext/c/driver.h
-- ext/c/driver_config.c
-- ext/c/driver_config.h
-- ext/c/extconf.rb
-- ext/c/khash.h
-- ext/c/kvec.h
-- ext/c/libll.c
-- ext/c/libll.h
-- ext/c/macros.h
-- ext/java/Libll.java
-- ext/java/org/libll/Driver.java
-- ext/java/org/libll/DriverConfig.java
-- lib/libll.jar
 - lib/ll.rb
-- lib/ll/ast/node.rb
-- lib/ll/bootstrap/parser.rb
+- lib/ll/driver.rb
+- lib/ll/terminal.rb
+- lib/ll/driver_config.rb
+- lib/ll/compiled_grammar.rb
 - lib/ll/branch.rb
-- lib/ll/cli.rb
+- lib/ll/lexer.rb
 - lib/ll/code_generator.rb
+- lib/ll/cli.rb
+- lib/ll/parser.rb
 - lib/ll/compiled_configuration.rb
-- lib/ll/compiled_grammar.rb
+- lib/ll/source_line.rb
+- lib/ll/version.rb
+- lib/ll/rule.rb
 - lib/ll/configuration_compiler.rb
-- lib/ll/driver.rb
-- lib/ll/driver_config.rb
-- lib/ll/driver_template.erb
-- lib/ll/epsilon.rb
+- lib/ll/token.rb
 - lib/ll/erb_context.rb
 - lib/ll/grammar_compiler.rb
-- lib/ll/lexer.rb
-- lib/ll/message.rb
-- lib/ll/parser.rb
+- lib/ll/epsilon.rb
 - lib/ll/parser_error.rb
-- lib/ll/rule.rb
 - lib/ll/setup.rb
-- lib/ll/source_line.rb
-- lib/ll/terminal.rb
-- lib/ll/token.rb
-- lib/ll/version.rb
+- lib/ll/message.rb
+- lib/ll/operator.rb
+- lib/ll/ast/node.rb
+- lib/ll/bootstrap/parser.rb
+- lib/ll/driver_template.erb
+- ext/java/Libll.java
+- ext/java/org/libll/DriverConfig.java
+- ext/java/org/libll/Driver.java
+- ext/c/extconf.rb
+- ext/c/macros.h
+- ext/c/khash.h
+- ext/c/driver.c
+- ext/c/driver_config.h
+- ext/c/driver_config.c
+- ext/c/libll.h
+- ext/c/kvec.h
+- ext/c/libll.c
+- ext/c/driver.h
+- README.md
+- LICENSE
 - ruby-ll.gemspec
+- .yardopts
+- bin/ruby-ll
+- lib/libll.jar
 homepage: https://github.com/yorickpeterse/ruby-ll
 licenses:
 - MIT
@@ -199,17 +201,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.5
+rubygems_version: 2.1.9
 signing_key:
 specification_version: 4
 summary: An LL(1) parser generator for Ruby.