opal 0.9.4 → 0.10.0.beta1

data/lib/opal/parser/grammar.y

@@ -137,10 +137,7 @@ rule
                       result = new_rescue_mod(val[1], val[0], val[2])
                     }
                 | klEND tLCURLY compstmt tRCURLY
-                | lhs tEQL command_call
-                    {
-                      result = new_assign(val[0], val[1], val[2])
-                    }
+                | command_asgn
                 | mlhs tEQL command_call
                     {
                       result = s(:masgn, val[0], s(:to_ary, val[2]))
@@ -172,6 +169,15 @@ rule
                     }
                 | expr
 
+    command_asgn: lhs tEQL command_call
+                    {
+                      result = new_assign(val[0], val[1], val[2])
+                    }
+                | lhs tEQL command_asgn
+                    {
+                      result = new_assign(val[0], val[1], val[2])
+                    }
+
             expr: command_call
                 | expr kAND expr
                     {
@@ -195,18 +201,6 @@ rule
 
     command_call: command
                 | block_command
-                | kRETURN call_args
-                    {
-                      result = new_return(val[0], val[1])
-                    }
-                | kBREAK call_args
-                    {
-                      result = new_break(val[0], val[1])
-                    }
-                | kNEXT call_args
-                    {
-                      result = new_next(val[0], val[1])
-                    }
 
    block_command: block_call
                 | block_call tJSDOT operation2 command_args
@@ -214,12 +208,18 @@ rule
                 | block_call tCOLON2 operation2 command_args
 
  cmd_brace_block: tLBRACE_ARG opt_block_var compstmt tRCURLY
+                    {
+                      result = new_iter(val[1], val[2])
+                    }
 
          command: operation command_args =tLOWEST
                     {
                       result = new_call(nil, val[0], val[1])
                     }
                 | operation command_args cmd_brace_block
+                    {
+                      result = new_call(nil, val[0], val[1]) << val[2]
+                    }
                 | primary_value tJSDOT operation2 command_args =tLOWEST
                     {
                       result = new_js_call(val[0], val[2], val[3])
@@ -243,6 +243,18 @@ rule
                     {
                       result = new_yield val[1]
                     }
+                | kRETURN call_args
+                    {
+                      result = new_return(val[0], val[1])
+                    }
+                | kBREAK call_args
+                    {
+                      result = new_break(val[0], val[1])
+                    }
+                | kNEXT call_args
+                    {
+                      result = new_next(val[0], val[1])
+                    }
 
             mlhs: mlhs_basic
                     {
@@ -956,7 +968,6 @@ rule
                 | kDEF fname
                     {
                       push_scope
-                      lexer.lex_state = :expr_endfn
                     }
                     f_arglist bodystmt kEND
                     {
@@ -1002,6 +1013,31 @@ rule
                 | tCOLON
                 | kDO_COND
 
+
+     opt_bv_decl: opt_nl
+                    {
+                      result = []
+                    }
+                | opt_nl tSEMI bv_decls opt_nl
+                    {
+                      result = val[2]
+                    }
+
+        bv_decls: bvar
+                    {
+                      result = [ val[0] ]
+                    }
+                | bv_decls tCOMMA bvar
+                    {
+                      result = val[0] << val[2]
+                    }
+
+            bvar: tIDENTIFIER
+                    {
+                      result = new_shadowarg(val[0])
+                    }
+                | f_bad_arg
+
           lambda: f_larglist lambda_body
                     {
                       result = new_call nil, [:lambda, []], []
@@ -1010,13 +1046,16 @@ rule
 
       f_larglist: tLPAREN2 block_param tRPAREN
                     {
-                      result = val[1]
+                      result = new_block_args(*val[1])
                     }
                 | tLPAREN2 tRPAREN
                     {
                       result = nil
                     }
                 | block_param
+                    {
+                      result = new_block_args(*val[0])
+                    }
                 | none
 
      lambda_body: tLAMBEG compstmt tRCURLY
@@ -1060,22 +1099,35 @@ rule
                     }
 
    opt_block_var: none
-                | tPIPE tPIPE
+                | tPIPE opt_bv_decl tPIPE
                     {
-                      result = nil
+                      result = new_block_args(nil, [val[1]])
                     }
                 | tOROP
                     {
                       result = nil
                     }
-                | tPIPE block_param tPIPE
+                | tPIPE block_param opt_bv_decl tPIPE
                     {
-                      result = val[1]
+                      val[1] << val[2]
+                      result = new_block_args(*val[1])
                     }
 
- block_args_tail: f_block_arg
+ block_args_tail: f_block_kwarg tCOMMA f_kwrest opt_f_block_arg
                     {
-                      result = val[0]
+                      result = [val[0], val[2], val[3]]
+                    }
+                | f_block_kwarg opt_f_block_arg
+                    {
+                      result = [val[0], nil, val[1]]
+                    }
+                | f_kwrest opt_f_block_arg
+                    {
+                      result = [nil, val[0], val[1]]
+                    }
+                | f_block_arg
+                    {
+                      result = [nil, nil, val[0]]
                     }
 
 opt_block_args_tail: tCOMMA block_args_tail
@@ -1089,39 +1141,79 @@ opt_block_args_tail: tCOMMA block_args_tail
 
      block_param: f_arg tCOMMA f_block_optarg tCOMMA f_rest_arg opt_block_args_tail
                     {
-                      result = new_block_args(val[0], val[2], val[4], val[5])
+                      optarg = new_optarg(val[2])
+                      restarg = new_restarg(val[4])
+                      result = [val[0] + optarg + restarg, val[5]]
+                    }
+                | f_arg tCOMMA f_block_optarg tCOMMA f_rest_arg tCOMMA f_arg opt_block_args_tail
+                    {
+                      optarg = new_optarg(val[2])
+                      restarg = new_restarg(val[4])
+                      result = [val[0] + optarg + restarg + val[6], val[7]]
                     }
                 | f_arg tCOMMA f_block_optarg opt_block_args_tail
                     {
-                      result = new_block_args(val[0], val[2], nil, val[3])
+                      optarg = new_optarg(val[2])
+                      result = [val[0] + optarg, val[3]]
+                    }
+                | f_arg tCOMMA f_block_optarg tCOMMA f_arg opt_block_args_tail
+                    {
+                      optarg = new_optarg(val[2])
+                      result = [val[0] + optarg + val[4], val[5]]
                     }
                 | f_arg tCOMMA f_rest_arg opt_block_args_tail
                     {
-                      result = new_block_args(val[0], nil, val[2], val[3])
+                      restarg = new_restarg(val[2])
+                      result = [val[0] + restarg, val[3]]
                     }
                 | f_arg tCOMMA
                     {
-                      result = new_block_args(val[0], nil, nil, nil)
+                      result = [val[0], nil]
+                    }
+                | f_arg tCOMMA f_rest_arg tCOMMA f_arg opt_block_args_tail
+                    {
+                      restarg = new_restarg(val[2])
+                      result = [val[0] + restarg + val[4], val[5]]
                     }
                 | f_arg opt_block_args_tail
                     {
-                      result = new_block_args(val[0], nil, nil, val[1])
+                      result = [val[0], val[1]]
                     }
                 | f_block_optarg tCOMMA f_rest_arg opt_block_args_tail
                     {
-                      result = new_block_args(nil, val[0], val[2], val[3])
+                      optarg = new_optarg(val[0])
+                      restarg = new_restarg(val[2])
+                      result = [optarg + restarg, val[3]]
+                    }
+                | f_block_optarg tCOMMA f_rest_arg tCOMMA f_arg opt_block_args_tail
+                    {
+                      optarg = new_optarg(val[0])
+                      restarg = new_restarg(val[2])
+                      result = [optarg + restarg + val[4], val[5]]
                     }
                 | f_block_optarg opt_block_args_tail
                     {
-                      result = new_block_args(nil, val[0], nil, val[1])
+                      optarg= new_optarg(val[0])
+                      result = [optarg, val[1]]
+                    }
+                | f_block_optarg tCOMMA f_arg opt_block_args_tail
+                    {
+                      optarg = new_optarg(val[0])
+                      result = [optarg + val[2], val[3]]
                     }
                 | f_rest_arg opt_block_args_tail
                     {
-                      result = new_block_args(nil, nil, val[0], val[1])
+                      restarg = new_restarg(val[0])
+                      result = [restarg, val[1]]
+                    }
+                | f_rest_arg tCOMMA f_arg opt_block_args_tail
+                    {
+                      restarg = new_restarg(val[0])
+                      result = [restarg + val[2], val[3]]
                     }
                 | block_args_tail
                     {
-                      result = new_block_args(nil, nil, nil, val[0])
+                      result = [nil, val[0]]
                     }
 
         do_block: kDO_BLOCK
@@ -1512,7 +1604,7 @@ xstring_contents: none
                       result = nil
                     }
 
-       f_arglist: tLPAREN2 f_args opt_nl tRPAREN
+       f_arglist: tLPAREN2 f_args opt_bv_decl tRPAREN
                     {
                       result = val[1]
                       lexer.lex_state = :expr_beg
@@ -1549,6 +1641,25 @@ xstring_contents: none
                       result = new_kwarg(val[0])
                     }
 
+      f_block_kw: f_label primary_value
+                    {
+                      result = new_kwoptarg(val[0], val[1])
+                    }
+                | f_label
+                    {
+                      result = new_kwarg(val[0])
+                    }
+
+   f_block_kwarg: f_block_kw
+                    {
+                      result = [val[0]]
+                    }
+                | f_block_kwarg tCOMMA f_block_kw
+                    {
+                      result = val[0]
+                      result << val[2]
+                    }
+
          f_kwarg: f_kw
                     {
                       result = [val[0]]
@@ -1587,39 +1698,79 @@ xstring_contents: none
 
           f_args: f_arg tCOMMA f_optarg tCOMMA f_rest_arg opt_args_tail
                     {
-                      result = new_args(val[0], val[2], val[4], val[5])
+                      optarg = new_optarg(val[2])
+                      restarg = new_restarg(val[4])
+                      result = new_args(val[0] + optarg + restarg, val[5])
+                    }
+                | f_arg tCOMMA f_optarg tCOMMA f_rest_arg tCOMMA f_arg opt_args_tail
+                    {
+                      optarg = new_optarg(val[2])
+                      restarg = new_restarg(val[4])
+                      result = new_args(val[0] + optarg + restarg + val[6], val[7])
                     }
                 | f_arg tCOMMA f_optarg opt_args_tail
                     {
-                      result = new_args(val[0], val[2], nil, val[3])
+                      optarg = new_optarg(val[2])
+                      result = new_args(val[0] + optarg, val[3])
+                    }
+                | f_arg tCOMMA f_optarg tCOMMA f_arg opt_args_tail
+                    {
+                      optarg = new_optarg(val[2])
+                      result = new_args(val[0] + optarg + val[4], val[5])
                     }
                 | f_arg tCOMMA f_rest_arg opt_args_tail
                     {
-                      result = new_args(val[0], nil, val[2], val[3])
+                      restarg = new_restarg(val[2])
+                      result = new_args(val[0] + restarg, val[3])
+                    }
+                | f_arg tCOMMA f_rest_arg tCOMMA f_arg opt_args_tail
+                    {
+                      restarg = new_restarg(val[2])
+                      result = new_args(val[0] + restarg + val[4], val[5])
                     }
                 | f_arg opt_args_tail
                     {
-                      result = new_args(val[0], nil, nil, val[1])
+                      result = new_args(val[0], val[1])
                     }
                 | f_optarg tCOMMA f_rest_arg opt_args_tail
                     {
-                      result = new_args(nil, val[0], val[2], val[3])
+                      optarg = new_optarg(val[0])
+                      restarg = new_restarg(val[2])
+                      result = new_args(optarg + restarg, val[3])
+                    }
+                | f_optarg tCOMMA f_rest_arg tCOMMA f_arg opt_args_tail
+                    {
+                      optarg = new_optarg(val[0])
+                      restarg = new_restarg(val[2])
+                      result = new_args(optarg + restarg + val[4], val[5])
                     }
                 | f_optarg opt_args_tail
                     {
-                      result = new_args(nil, val[0], nil, val[1])
+                      optarg = new_optarg(val[0])
+                      result = new_args(optarg, val[1])
+                    }
+                | f_optarg tCOMMA f_arg opt_args_tail
+                    {
+                      optarg = new_optarg(val[0])
+                      result = new_args(optarg + val[2], val[3])
                     }
                 | f_rest_arg opt_args_tail
                     {
-                      result = new_args(nil, nil, val[0], val[1])
+                      optarg = new_restarg(val[0])
+                      result = new_args(optarg, val[1])
+                    }
+                | f_rest_arg tCOMMA f_arg opt_args_tail
+                    {
+                      restarg = new_restarg(val[0])
+                      result = new_args(restarg + val[2], val[3])
                     }
                 | args_tail
                     {
-                      result = new_args(nil, nil, nil, val[0])
+                      result = new_args(nil, val[0])
                     }
                 | # none
                     {
-                      result = new_args(nil, nil, nil, nil)
+                      result = new_args(nil, nil)
                     }
 
       f_norm_arg: f_bad_arg
@@ -1660,13 +1811,16 @@ xstring_contents: none
 
           f_marg: f_norm_arg
                     {
-                      result = s(:lasgn, val[0])
+                      result = s(:arg, val[0])
                     }
                 | tLPAREN f_margs tRPAREN
+                    {
+                      result = val[1]
+                    }
 
      f_marg_list: f_marg
                     {
-                      result = s(:array, val[0])
+                      result = s(:mlhs, val[0])
                     }
                 | f_marg_list tCOMMA f_marg
                     {
@@ -1676,9 +1830,39 @@ xstring_contents: none
 
          f_margs: f_marg_list
                 | f_marg_list tCOMMA tSTAR f_norm_arg
+                    {
+                      result = val[0].push(s(:restarg, val[3]))
+                    }
+                | f_marg_list tCOMMA tSTAR f_norm_arg tCOMMA f_marg_list
+                    {
+                      result = val[0].push(s(:restarg, val[3])).concat(val[5][1..-1])
+                    }
                 | f_marg_list tCOMMA tSTAR
+                    {
+                      result = val[0].push(s(:restarg))
+                    }
+                | f_marg_list tCOMMA tSTAR tCOMMA f_marg_list
+                    {
+                      result = val[0].push(s(:restarg)).concat(val[4][1..-1])
+                    }
                 | tSTAR f_norm_arg
+                    {
+                      result = s(:mlhs, s(:restarg, val[1]))
+                    }
+                | tSTAR f_norm_arg tCOMMA f_marg_list
+                    {
+                      val[3].insert(1, s(:restarg, val[1]))
+                      result = val[3]
+                    }
                 | tSTAR
+                    {
+                      result = s(:mlhs, s(:restarg))
+                    }
+                | tSTAR tCOMMA f_marg_list
+                    {
+                      val[2].insert(1, s(:restarg))
+                      result = val[2]
+                    }
 
            f_arg: f_arg_item
                     {
@@ -1758,7 +1942,7 @@ xstring_contents: none
                     }
                 | assocs tCOMMA assoc
                     {
-                      result = val[0].push(*val[2])
+                      result = val[0].concat(val[2])
                     }
 
            assoc: arg_value tASSOC arg_value
@@ -1773,6 +1957,10 @@ xstring_contents: none
                     {
                       result = [s(:sym, source(val[1]).to_sym), val[3]]
                     }
+                | tDSTAR arg_value
+                    {
+                      result = [new_kwsplat(val[1])]
+                    }
 
        operation: tIDENTIFIER
                 | tCONSTANT