parser 0.9.1 → 0.9.2

data/lib/parser/ruby19.y

@@ -44,14 +44,14 @@ preclow
 
 rule
 
-         program:   top_compstmt
+         program: top_compstmt
 
     top_compstmt: top_stmts opt_terms
                     {
                       result = @builder.compstmt(val[0])
                     }
 
-       top_stmts: none
+       top_stmts: # nothing
                     {
                       result = []
                     }
@@ -69,15 +69,9 @@ rule
                     }
 
         top_stmt: stmt
-                | klBEGIN
+                | klBEGIN tLCURLY top_compstmt tRCURLY
                     {
-                      @static_env.extend_static
-                    }
-                    tLCURLY top_compstmt tRCURLY
-                    {
-                      @static_env.unextend
-
-                      result = @builder.preexe(val[0], val[2], val[3], val[4])
+                      result = @builder.preexe(val[0], val[1], val[2], val[3])
                     }
 
         bodystmt: compstmt opt_rescue opt_else opt_ensure
@@ -101,7 +95,7 @@ rule
                       result = @builder.compstmt(val[0])
                     }
 
-           stmts: none
+           stmts: # nothing
                     {
                       result = []
                     }
@@ -846,13 +840,13 @@ rule
                       result = val
                     }
 
-  opt_paren_args: none
+  opt_paren_args: # nothing
                     {
                       result = [ nil, [], nil ]
                     }
                 | paren_args
 
-   opt_call_args: none
+   opt_call_args: # nothing
                     {
                       result = []
                     }
@@ -895,7 +889,7 @@ rule
                       result = @lexer.cmdarg.dup
                       @lexer.cmdarg.push(true)
                     }
-                  call_args
+                    call_args
                     {
                       @lexer.cmdarg = val[0]
 
@@ -911,7 +905,7 @@ rule
                     {
                       result = [ val[1] ]
                     }
-                | none
+                | # nothing
                     {
                       result = []
                     }
@@ -968,10 +962,7 @@ rule
                     }
                     opt_nl tRPAREN
                     {
-                      # TODO better location info here
-                      diagnostic :warning, :grouped_expression, val[0]
-
-                      result = @builder.parenthesize(val[0], val[1], val[3])
+                      result = @builder.parenthesize(val[0], val[1], val[4])
                     }
                 | tLPAREN compstmt tRPAREN
                     {
@@ -1399,11 +1390,14 @@ rule
                       result = [ val[0] ]
                     }
 
- opt_block_param: none
+ opt_block_param: # nothing
                     {
                       result = @builder.args(nil, [], nil)
                     }
                 | block_param_def
+                    {
+                      @lexer.state = :expr_value
+                    }
 
  block_param_def: tPIPE opt_bv_decl tPIPE
                     {
@@ -1418,7 +1412,7 @@ rule
                       result = @builder.args(val[0], val[1].concat(val[2]), val[3])
                     }
 
-     opt_bv_decl: none
+     opt_bv_decl: # nothing
                     {
                       result = []
                     }
@@ -1558,7 +1552,7 @@ rule
                     {
                       @static_env.extend_dynamic
                     }
-                 opt_block_param compstmt kEND
+                    opt_block_param compstmt kEND
                     {
                       result = [ val[0], val[2], val[3], val[4] ]
 
@@ -1653,40 +1647,35 @@ rule
                       result = @builder.regexp_compose(val[0], val[1], val[2], opts)
                     }
 
-           words: tWORDS_BEG tSPACE tSTRING_END
-                    { # :nocov: TODO: unused with Ragel lexer; remove?
-                      result = @builder.words_compose(val[0], [], val[2])
-                    }
-                | tWORDS_BEG word_list tSTRING_END
+           words: tWORDS_BEG word_list tSTRING_END
                     {
                       result = @builder.words_compose(val[0], val[1], val[2])
                     }
 
-       word_list: none
+       word_list: # nothing
                     {
                       result = []
                     }
                 | word_list word tSPACE
                     {
-                      result = val[0] << val[1]
+                      result = val[0] << @builder.word(val[1])
                     }
 
             word: string_content
+                    {
+                      result = [ val[0] ]
+                    }
                 | word string_content
-                    { # :nocov: TODO: test this rule, remove if unused
-                      raise "unused 'word string_content'"
+                    {
+                      result = val[0] << val[1]
                     }
 
-          qwords: tQWORDS_BEG tSPACE tSTRING_END
-                    { # :nocov: TODO: unused with Ragel lexer; remove?
-                      result = @builder.words_compose(val[0], [], val[2])
-                    }
-                | tQWORDS_BEG qword_list tSTRING_END
+          qwords: tQWORDS_BEG qword_list tSTRING_END
                     {
                       result = @builder.words_compose(val[0], val[1], val[2])
                     }
 
-      qword_list: none
+      qword_list: # nothing
                     {
                       result = []
                     }
@@ -1695,7 +1684,7 @@ rule
                       result = val[0] << @builder.string(val[1])
                     }
 
- string_contents: none
+ string_contents: # nothing
                     {
                       result = []
                     }
@@ -1704,7 +1693,7 @@ rule
                       result = val[0] << val[1]
                     }
 
-xstring_contents: none # TODO: replace with string_contents?
+xstring_contents: # nothing
                     {
                       result = []
                     }
@@ -1713,7 +1702,7 @@ xstring_contents: none # TODO: replace with string_contents?
                       result = val[0] << val[1]
                     }
 
-regexp_contents: none
+regexp_contents: # nothing
                     {
                       result = []
                     }
@@ -1758,17 +1747,11 @@ regexp_contents: none
                 | backref
 
 
-          symbol: tSYMBEG sym
-                    { # :nocov: TODO: not used, delete.
-                      result = nil
-                    }
-                | tSYMBOL
+          symbol: tSYMBOL
                     {
                       result = @builder.symbol(val[0])
                     }
 
-             sym: fname | tIVAR | tGVAR | tCVAR
-
             dsym: tSYMBEG xstring_contents tSTRING_END
                     {
                       result = @builder.symbol_compose(val[0], val[1], val[2])
@@ -1886,11 +1869,13 @@ keyword_variable: kNIL
                     {
                       result = @builder.args(val[0], val[1], val[2])
 
-                      @lexer.state = :expr_beg
+                      @lexer.state = :expr_value
                     }
                 | f_args term
                     {
                       result = @builder.args(nil, val[0], nil)
+
+                      @lexer.state = :expr_value
                     }
 
           f_args: f_arg tCOMMA f_optarg tCOMMA f_rest_arg              opt_f_block_arg
@@ -2081,7 +2066,7 @@ keyword_variable: kNIL
                     {
                       result = [ val[1] ]
                     }
-                |
+                | # nothing
                     {
                       result = []
                     }
@@ -2092,7 +2077,7 @@ keyword_variable: kNIL
                       result = val[1]
                     }
 
-      assoc_list: none
+      assoc_list: # nothing
                     {
                       result = []
                     }