parser 2.4.0.2 → 2.5.0.0

data/lib/parser/ruby25.y

@@ -283,9 +283,14 @@ rule
                                   nil, val[3], nil)
                     }
 
- cmd_brace_block: tLBRACE_ARG brace_body tRCURLY
+ cmd_brace_block: tLBRACE_ARG
                     {
-                      result = [ val[0], *val[1], val[2] ]
+                      @context.push(:block)
+                    }
+                  brace_body tRCURLY
+                    {
+                      result = [ val[0], *val[2], val[3] ]
+                      @context.pop
                     }
 
            fcall: operation
@@ -342,7 +347,7 @@ rule
                       result = @builder.keyword_cmd(:yield, val[0],
                                   nil, val[1], nil)
                     }
-                | kRETURN call_args
+                | k_return call_args
                     {
                       result = @builder.keyword_cmd(:return, val[0],
                                   nil, val[1], nil)
@@ -841,12 +846,11 @@ rule
                     }
 
     command_args:   {
-                      result = @lexer.cmdarg.dup
                       @lexer.cmdarg.push(true)
                     }
                   call_args
                     {
-                      @lexer.cmdarg = val[0]
+                      @lexer.cmdarg.pop
 
                       result = val[1]
                     }
@@ -969,7 +973,7 @@ rule
                     {
                       result = @builder.associate(val[0], val[1], val[2])
                     }
-                | kRETURN
+                | k_return
                     {
                       result = @builder.keyword_cmd(:return, val[0])
                     }
@@ -1095,10 +1099,11 @@ rule
                     {
                       @static_env.extend_static
                       @lexer.push_cmdarg
+                      @context.push(:class)
                     }
                     bodystmt kEND
                     {
-                      if in_def?
+                      if @context.indirectly_in_def?
                         diagnostic :error, :class_in_def, nil, val[0]
                       end
 
@@ -1109,14 +1114,13 @@ rule
 
                       @lexer.pop_cmdarg
                       @static_env.unextend
+                      @context.pop
                     }
                 | kCLASS tLSHFT expr term
                     {
-                      result = @def_level
-                      @def_level = 0
-
                       @static_env.extend_static
                       @lexer.push_cmdarg
+                      @context.push(:sclass)
                     }
                     bodystmt kEND
                     {
@@ -1125,8 +1129,7 @@ rule
 
                       @lexer.pop_cmdarg
                       @static_env.unextend
-
-                      @def_level = val[4]
+                      @context.pop
                     }
                 | kMODULE cpath
                     {
@@ -1135,7 +1138,7 @@ rule
                     }
                     bodystmt kEND
                     {
-                      if in_def?
+                      if @context.indirectly_in_def?
                         diagnostic :error, :module_in_def, nil, val[0]
                       end
 
@@ -1147,9 +1150,9 @@ rule
                     }
                 | kDEF fname
                     {
-                      @def_level += 1
                       @static_env.extend_static
                       @lexer.push_cmdarg
+                      @context.push(:def)
                     }
                     f_arglist bodystmt kEND
                     {
@@ -1158,7 +1161,7 @@ rule
 
                       @lexer.pop_cmdarg
                       @static_env.unextend
-                      @def_level -= 1
+                      @context.pop
                     }
                 | kDEF singleton dot_or_colon
                     {
@@ -1166,9 +1169,9 @@ rule
                     }
                     fname
                     {
-                      @def_level += 1
                       @static_env.extend_static
                       @lexer.push_cmdarg
+                      @context.push(:defs)
                     }
                     f_arglist bodystmt kEND
                     {
@@ -1177,7 +1180,7 @@ rule
 
                       @lexer.pop_cmdarg
                       @static_env.unextend
-                      @def_level -= 1
+                      @context.pop
                     }
                 | kBREAK
                     {
@@ -1198,6 +1201,13 @@ rule
 
    primary_value: primary
 
+        k_return: kRETURN
+                    {
+                      if @context.in_class?
+                        diagnostic :error, :invalid_return, nil, val[0]
+                      end
+                    }
+
             then: term
                 | kTHEN
                 | term kTHEN
@@ -1454,13 +1464,11 @@ opt_block_args_tail:
                     }
                   f_larglist
                     {
-                      result = @lexer.cmdarg.dup
-                      @lexer.cmdarg.clear
+                      @lexer.cmdarg.push(false)
                     }
                   lambda_body
                     {
-                      @lexer.cmdarg = val[2]
-                      @lexer.cmdarg.lexpop
+                      @lexer.cmdarg.pop
 
                       result = [ val[1], val[3] ]
 
@@ -1476,18 +1484,33 @@ opt_block_args_tail:
                       result = @builder.args(nil, val[0], nil)
                     }
 
-     lambda_body: tLAMBEG compstmt tRCURLY
+     lambda_body: tLAMBEG
+                    {
+                      @context.push(:lambda)
+                    }
+                  compstmt tRCURLY
+                    {
+                      result = [ val[0], val[2], val[3] ]
+                      @context.pop
+                    }
+                | kDO_LAMBDA
                     {
-                      result = [ val[0], val[1], val[2] ]
+                      @context.push(:lambda)
                     }
-                | kDO_LAMBDA compstmt kEND
+                  compstmt kEND
                     {
-                      result = [ val[0], val[1], val[2] ]
+                      result = [ val[0], val[2], val[3] ]
+                      @context.pop
                     }
 
-        do_block: kDO_BLOCK do_body kEND
+        do_block: kDO_BLOCK
+                    {
+                      @context.push(:block)
+                    }
+                  do_body kEND
                     {
-                      result = [ val[0], *val[1], val[2] ]
+                      result = [ val[0], *val[2], val[3] ]
+                      @context.pop
                     }
 
       block_call: command do_block
@@ -1571,29 +1594,33 @@ opt_block_args_tail:
                       result = @builder.index(val[0], val[1], val[2], val[3])
                     }
 
-     brace_block: tLCURLY brace_body tRCURLY
+     brace_block: tLCURLY
                     {
-                      result = [ val[0], *val[1], val[2] ]
+                      @context.push(:block)
                     }
-                | kDO do_body kEND
+                  brace_body tRCURLY
                     {
-                      result = [ val[0], *val[1], val[2] ]
+                      result = [ val[0], *val[2], val[3] ]
+                      @context.pop
+                    }
+                | kDO
+                    {
+                      @context.push(:block)
+                    }
+                  do_body kEND
+                    {
+                      result = [ val[0], *val[2], val[3] ]
+                      @context.pop
                     }
 
       brace_body:   {
                       @static_env.extend_dynamic
                     }
-                    {
-                      result = @lexer.cmdarg.dup
-                      @lexer.cmdarg.clear
-                    }
                     opt_block_param compstmt
                     {
-                      result = [ val[2], val[3] ]
+                      result = [ val[1], val[2] ]
 
                       @static_env.unextend
-                      @lexer.cmdarg = val[1]
-                      @lexer.cmdarg.pop
                     }
 
          do_body:   {
@@ -1609,7 +1636,6 @@ opt_block_args_tail:
 
                       @static_env.unextend
                       @lexer.cmdarg = val[1]
-                      @lexer.cmdarg.pop
                     }
 
        case_body: kWHEN args then compstmt cases
@@ -1814,7 +1840,7 @@ regexp_contents: # nothing
                     compstmt tSTRING_DEND
                     {
                       @lexer.cond.lexpop
-                      @lexer.cmdarg.lexpop
+                      @lexer.cmdarg.pop
 
                       result = @builder.begin(val[0], val[2], val[3])
                     }
@@ -1836,13 +1862,13 @@ regexp_contents: # nothing
 
           symbol: tSYMBOL
                     {
-                      @lexer.state = :expr_endarg
+                      @lexer.state = :expr_end
                       result = @builder.symbol(val[0])
                     }
 
             dsym: tSYMBEG xstring_contents tSTRING_END
                     {
-                      @lexer.state = :expr_endarg
+                      @lexer.state = :expr_end
                       result = @builder.symbol_compose(val[0], val[1], val[2])
                     }
 
@@ -1862,22 +1888,22 @@ regexp_contents: # nothing
 
   simple_numeric: tINTEGER
                     {
-                      @lexer.state = :expr_endarg
+                      @lexer.state = :expr_end
                       result = @builder.integer(val[0])
                     }
                 | tFLOAT
                     {
-                      @lexer.state = :expr_endarg
+                      @lexer.state = :expr_end
                       result = @builder.float(val[0])
                     }
                 | tRATIONAL
                     {
-                      @lexer.state = :expr_endarg
+                      @lexer.state = :expr_end
                       result = @builder.rational(val[0])
                     }
                 | tIMAGINARY
                     {
-                      @lexer.state = :expr_endarg
+                      @lexer.state = :expr_end
                       result = @builder.complex(val[0])
                     }
 
@@ -2349,8 +2375,6 @@ end
 
 require 'parser'
 
-Parser.check_for_encoding_support
-
 ---- inner
 
   def version

data/lib/parser/rubymotion.y

@@ -141,7 +141,7 @@ rule
                     }
                 | klBEGIN tLCURLY compstmt tRCURLY
                     {
-                      if in_def?
+                      if @context.indirectly_in_def?
                         diagnostic :error, :begin_in_method, nil, val[0]
                       end
 
@@ -265,12 +265,14 @@ rule
  cmd_brace_block: tLBRACE_ARG
                     {
                       @static_env.extend_dynamic
+                      @context.push(:block)
                     }
                     opt_block_param compstmt tRCURLY
                     {
                       result = [ val[0], val[2], val[3], val[4] ]
 
                       @static_env.unextend
+                      @context.pop
                     }
 
          command: operation command_args =tLOWEST
@@ -1098,10 +1100,11 @@ rule
                     {
                       @static_env.extend_static
                       @lexer.push_cmdarg
+                      @context.push(:class)
                     }
                     bodystmt kEND
                     {
-                      if in_def?
+                      if @context.indirectly_in_def?
                         diagnostic :error, :class_in_def, nil, val[0]
                       end
 
@@ -1112,14 +1115,13 @@ rule
 
                       @lexer.pop_cmdarg
                       @static_env.unextend
+                      @context.pop
                     }
                 | kCLASS tLSHFT expr term
                     {
-                      result = @def_level
-                      @def_level = 0
-
                       @static_env.extend_static
                       @lexer.push_cmdarg
+                      @context.push(:sclass)
                     }
                     bodystmt kEND
                     {
@@ -1128,8 +1130,7 @@ rule
 
                       @lexer.pop_cmdarg
                       @static_env.unextend
-
-                      @def_level = val[4]
+                      @context.pop
                     }
                 | kMODULE cpath
                     {
@@ -1138,7 +1139,7 @@ rule
                     }
                     bodystmt kEND
                     {
-                      if in_def?
+                      if @context.indirectly_in_def?
                         diagnostic :error, :module_in_def, nil, val[0]
                       end
 
@@ -1150,9 +1151,9 @@ rule
                     }
                 | kDEF fname
                     {
-                      @def_level += 1
                       @static_env.extend_static
                       @lexer.push_cmdarg
+                      @context.push(:def)
                     }
                     f_arglist bodystmt kEND
                     {
@@ -1161,7 +1162,7 @@ rule
 
                       @lexer.pop_cmdarg
                       @static_env.unextend
-                      @def_level -= 1
+                      @context.pop
                     }
                 | kDEF singleton dot_or_colon
                     {
@@ -1169,9 +1170,9 @@ rule
                     }
                     fname
                     {
-                      @def_level += 1
                       @static_env.extend_static
                       @lexer.push_cmdarg
+                      @context.push(:defs)
                     }
                     f_arglist bodystmt kEND
                     {
@@ -1180,7 +1181,7 @@ rule
 
                       @lexer.pop_cmdarg
                       @static_env.unextend
-                      @def_level -= 1
+                      @context.pop
                     }
                 | kBREAK
                     {
@@ -1444,24 +1445,36 @@ rule
                       result = @builder.args(nil, val[0].concat(val[1]), nil)
                     }
 
-     lambda_body: tLAMBEG compstmt tRCURLY
+     lambda_body: tLAMBEG
+                    {
+                      @context.push(:lambda)
+                    }
+                  compstmt tRCURLY
                     {
-                      result = [ val[0], val[1], val[2] ]
+                      result = [ val[0], val[2], val[3] ]
+                      @context.pop
                     }
-                | kDO_LAMBDA compstmt kEND
+                | kDO_LAMBDA
                     {
-                      result = [ val[0], val[1], val[2] ]
+                      @context.push(:lambda)
+                    }
+                  compstmt kEND
+                    {
+                      result = [ val[0], val[2], val[3] ]
+                      @context.pop
                     }
 
         do_block: kDO_BLOCK
                     {
                       @static_env.extend_dynamic
+                      @context.push(:block)
                     }
                     opt_block_param compstmt kEND
                     {
                       result = [ val[0], val[2], val[3], val[4] ]
 
                       @static_env.unextend
+                      @context.pop
                     }
 
       block_call: command do_block
@@ -1535,22 +1548,26 @@ rule
      brace_block: tLCURLY
                     {
                       @static_env.extend_dynamic
+                      @context.push(:block)
                     }
                     opt_block_param compstmt tRCURLY
                     {
                       result = [ val[0], val[2], val[3], val[4] ]
 
                       @static_env.unextend
+                      @context.pop
                     }
                 | kDO
                     {
                       @static_env.extend_dynamic
+                      @context.push(:block)
                     }
                     opt_block_param compstmt kEND
                     {
                       result = [ val[0], val[2], val[3], val[4] ]
 
                       @static_env.unextend
+                      @context.pop
                     }
 
        case_body: kWHEN args then compstmt cases
@@ -2154,8 +2171,6 @@ end
 
 require 'parser'
 
-Parser.check_for_encoding_support
-
 ---- inner
 
   def version