parser 0.9.1 → 0.9.2

data/lib/parser/ruby18.y

@@ -69,7 +69,7 @@ rule
                       result = @builder.compstmt(val[0])
                     }
 
-           stmts: none
+           stmts: # nothing
                     {
                       result = []
                     }
@@ -140,19 +140,13 @@ rule
 
                       result = @builder.begin_body(val[0], [ rescue_body ])
                     }
-                | klBEGIN
+                | klBEGIN tLCURLY compstmt tRCURLY
                     {
                       if in_def?
                         diagnostic(:error, :begin_in_method, val[0])
                       end
 
-                      @static_env.extend_static
-                    }
-                    tLCURLY 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])
                     }
                 | klEND tLCURLY compstmt tRCURLY
                     {
@@ -797,7 +791,7 @@ rule
                       result = [ val[0], val[1] << val[3], val[5] ]
                     }
 
-  opt_paren_args: none
+  opt_paren_args: # nothing
                     {
                       result = [ nil, [], nil ]
                     }
@@ -1015,9 +1009,6 @@ rule
                     }
                     opt_nl tRPAREN
                     {
-                      # TODO better location info here
-                      diagnostic :warning, :grouped_expression, val[0]
-
                       result = @builder.parenthesize(val[0], val[1], val[3])
                     }
                 | tLPAREN compstmt tRPAREN
@@ -1346,7 +1337,7 @@ rule
                     }
                 ;
 
-   opt_block_var: none
+   opt_block_var: # nothing
                     {
                       result = @builder.args(nil, [], nil)
                     }
@@ -1483,7 +1474,7 @@ rule
                                       val[3], val[4]),
                                  *val[5] ]
                     }
-                |
+                | # nothing
                     {
                       result = []
                     }
@@ -1545,11 +1536,7 @@ 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])
                     }
@@ -1560,20 +1547,19 @@ rule
                     }
                 | 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])
                     }
@@ -1596,7 +1582,7 @@ rule
                       result = val[0] << val[1]
                     }
 
-xstring_contents: # nothing # TODO: replace with string_contents?
+xstring_contents: # nothing
                     {
                       result = []
                     }
@@ -1895,7 +1881,7 @@ xstring_contents: # nothing # TODO: replace with string_contents?
                       result = val[1]
                     }
 
-      assoc_list: none
+      assoc_list: # nothing
                     {
                       result = []
                     }