lrama 0.5.8 → 0.5.9

data/lib/lrama/lexer.rb

@@ -3,6 +3,7 @@ require "lrama/lexer/token"
 
 module Lrama
   class Lexer
+    attr_reader :head_line, :head_column
     attr_accessor :status
     attr_accessor :end_symbol
 
@@ -24,6 +25,8 @@ module Lrama
       %precedence
       %prec
       %error-token
+      %empty
+      %code
     )
 
     def initialize(text)
@@ -63,8 +66,6 @@ module Lrama
         when @scanner.scan(/\/\//)
           @scanner.scan_until(/\n/)
           newline
-        when @scanner.scan(/%empty/)
-          # noop
         else
           break
         end
@@ -80,18 +81,20 @@ module Lrama
         return [@scanner.matched, @scanner.matched]
       when @scanner.scan(/#{PERCENT_TOKENS.join('|')}/)
         return [@scanner.matched, @scanner.matched]
+      when @scanner.scan(/[\?\+\*]/)
+        return [@scanner.matched, @scanner.matched]
       when @scanner.scan(/<\w+>/)
-        return [:TAG, build_token(type: Token::Tag, s_value: @scanner.matched)]
+        return [:TAG, setup_token(Lrama::Lexer::Token::Tag.new(s_value: @scanner.matched))]
       when @scanner.scan(/'.'/)
-        return [:CHARACTER, build_token(type: Token::Char, s_value: @scanner.matched)]
+        return [:CHARACTER, setup_token(Lrama::Lexer::Token::Char.new(s_value: @scanner.matched))]
       when @scanner.scan(/'\\\\'|'\\b'|'\\t'|'\\f'|'\\r'|'\\n'|'\\v'|'\\13'/)
-        return [:CHARACTER, build_token(type: Token::Char, s_value: @scanner.matched)]
+        return [:CHARACTER, setup_token(Lrama::Lexer::Token::Char.new(s_value: @scanner.matched))]
       when @scanner.scan(/"/)
         return [:STRING, %Q("#{@scanner.scan_until(/"/)})]
       when @scanner.scan(/\d+/)
         return [:INTEGER, Integer(@scanner.matched)]
       when @scanner.scan(/([a-zA-Z_.][-a-zA-Z0-9_.]*)/)
-        token = build_token(type: Token::Ident, s_value: @scanner.matched)
+        token = setup_token(Lrama::Lexer::Token::Ident.new(s_value: @scanner.matched))
         type =
           if @scanner.check(/\s*(\[\s*[a-zA-Z_.][-a-zA-Z0-9_.]*\s*\])?\s*:/)
             :IDENT_COLON
@@ -100,7 +103,7 @@ module Lrama
           end
         return [type, token]
       else
-        raise
+        raise ParseError, "Unexpected token: #{@scanner.peek(10).chomp}."
       end
     end
 
@@ -115,13 +118,13 @@ module Lrama
         when @scanner.scan(/}/)
           if nested == 0 && @end_symbol == '}'
             @scanner.unscan
-            return [:C_DECLARATION, build_token(type: Token::User_code, s_value: code, references: [])]
+            return [:C_DECLARATION, setup_token(Lrama::Lexer::Token::UserCode.new(s_value: code))]
           else
             code += @scanner.matched
             nested -= 1
           end
         when @scanner.check(/#{@end_symbol}/)
-          return [:C_DECLARATION, build_token(type: Token::User_code, s_value: code, references: [])]
+          return [:C_DECLARATION, setup_token(Lrama::Lexer::Token::UserCode.new(s_value: code))]
         when @scanner.scan(/\n/)
           code += @scanner.matched
           newline
@@ -136,7 +139,7 @@ module Lrama
           code += @scanner.getch
         end
       end
-      raise
+      raise ParseError, "Unexpected code: #{code}."
     end
 
     private
@@ -155,13 +158,9 @@ module Lrama
       end
     end
 
-    def build_token(type:, s_value:, **options)
-      token = Token.new(type: type, s_value: s_value)
+    def setup_token(token)
       token.line = @head_line
       token.column = @head_column
-      options.each do |attr, value|
-        token.public_send("#{attr}=", value)
-      end
 
       token
     end

data/lib/lrama/option_parser.rb

@@ -58,6 +58,7 @@ module Lrama
         o.separator 'Tuning the Parser:'
         o.on('-S', '--skeleton=FILE', 'specify the skeleton to use') {|v| @options.skeleton = v }
         o.on('-t', 'reserved, do nothing') { }
+        o.on('--debug', 'display debugging outputs of internal parser') {|v| @options.debug = true }
         o.separator ''
         o.separator 'Output:'
         o.on('-H', '--header=[FILE]', 'also produce a header file named FILE') {|v| @options.header = true; @options.header_file = v }
@@ -108,7 +109,7 @@ module Lrama
     def validate_trace(trace)
       list = %w[
         none locations scan parse automaton bitsets
-        closure grammar resource sets muscles tools
+        closure grammar rules resource sets muscles tools
         m4-early m4 skeleton time ielr cex all
       ]
       h = {}

data/lib/lrama/options.rb

@@ -4,7 +4,8 @@ module Lrama
     attr_accessor :skeleton, :header, :header_file,
                   :report_file, :outfile,
                   :error_recovery, :grammar_file,
-                  :report_file, :trace_opts, :report_opts, :y
+                  :report_file, :trace_opts, :report_opts, :y,
+                  :debug
 
     def initialize
       @skeleton = "bison/yacc.c"

data/lib/lrama/output.rb

@@ -349,6 +349,15 @@ module Lrama
       end
     end
 
+    # b4_percent_code_get
+    def percent_code(name)
+      @grammar.percent_codes.select do |percent_code|
+        percent_code.id.s_value == name
+      end.map do |percent_code|
+        percent_code.code.s_value
+      end.join
+    end
+
     private
 
     def eval_template(file, path)