opal 0.4.4 → 0.5.0

data/lib/opal/{grammar.y → parser/grammar.y}

@@ -1,4 +1,4 @@
-class Opal::Grammar
+class Opal::Parser
 
 token CLASS MODULE DEF UNDEF BEGIN RESCUE ENSURE END IF UNLESS
       THEN ELSIF ELSE CASE WHEN WHILE UNTIL FOR BREAK NEXT
@@ -59,7 +59,7 @@ compstmt:
     stmts opt_terms
     {
       comp = new_compstmt val[0]
-      if comp and comp[0] == :begin and comp.size == 2
+      if comp and comp.type == :begin and comp.size == 2
         result = comp[1]
         result.line = comp.line
       else
@@ -85,7 +85,7 @@ stmts:
 stmt:
     ALIAS fitem
     {
-      @lex_state = :expr_fname
+      lexer.lex_state = :expr_fname
     }
     fitem
     {
@@ -121,6 +121,9 @@ stmt:
       result = s(:until, val[2], val[0], true)
     }
   | stmt RESCUE_MOD stmt
+    {
+      result = s(:rescue_mod, val[0], val[2])
+    }
   | klBEGIN LCURLY compstmt '}'
   | klEND LCURLY compstmt '}'
   | lhs '=' command_call
@@ -229,7 +232,7 @@ command:
   | primary_value '.' operation2 command_args cmd_brace_block
   | primary_value '::' operation2 command_args =LOWEST
     {
-      result = "result = ['call', val[0], val[2], val[3]];"
+      result = new_call val[0], val[2].intern, val[3]
     }
   | primary_value '::' operation2 command_args cmd_brace_block
   | SUPER command_args
@@ -274,10 +277,12 @@ mlhs_basic:
     {
       result = val[0] << s(:splat, val[2])
     }
+  | mlhs_head SPLAT mlhs_node ',' mlhs_post
   | mlhs_head SPLAT
     {
       result = val[0] << s(:splat)
     }
+  | mlhs_head SPLAT ',' mlhs_post
   | SPLAT mlhs_node
     {
       result = s(:array, s(:splat, val[1]))
@@ -286,6 +291,7 @@ mlhs_basic:
     {
       result = s(:array, s(:splat))
     }
+  | SPLAT ',' mlhs_post
 
 mlhs_item:
     mlhs_node
@@ -307,6 +313,10 @@ mlhs_head:
       result = val[0] << val[1]
     }
 
+mlhs_post:
+    mlhs_item
+  | mlhs_post ',' mlhs_item
+
 mlhs_node:
     variable
     {
@@ -315,7 +325,7 @@ mlhs_node:
   | primary_value '[@' aref_args ']'
     {
       args = val[2]
-      args[0] = :arglist if args[0] == :array
+      args.type = :arglist if args.type == :array
       result = s(:attrasgn, val[0], :[]=, args)
     }
   | primary_value '.' IDENTIFIER
@@ -336,7 +346,7 @@ lhs:
   | primary_value '[@' aref_args ']'
     {
       args = val[2]
-      args[0] = :arglist if args[0] == :array
+      args.type = :arglist if args.type == :array
       result = s(:attrasgn, val[0], :[]=, args)
     }
   | primary_value '.' IDENTIFIER
@@ -356,6 +366,9 @@ lhs:
       result = s(:colon2, val[0], val[2].intern)
     }
   | '::@' CONSTANT
+    {
+      result = s(:colon3, val[1].intern)
+    }
   | backref
 
 cname:
@@ -381,12 +394,12 @@ fname:
   | FID
   | op
     {
-      @lex_state = :expr_end
+      lexer.lex_state = :expr_end
       result = val[0]
     }
   | reswords
     {
-      @lex_state = :expr_end
+      lexer.lex_state = :expr_end
       result = val[0]
     }
 
@@ -422,6 +435,7 @@ reswords:
   | OR       | REDO       | RESCUE    | RETRY    | RETURN | SELF
   | SUPER    | THEN       | TRUE      | UNDEF    | WHEN   | YIELD
   | IF_MOD   | UNLESS_MOD | WHILE_MOD | UNTIL_MOD | RESCUE_MOD 
+  | IF       | WHILE      | UNTIL | UNLESS
 
 arg:
     lhs '=' arg
@@ -429,6 +443,9 @@ arg:
       result = new_assign val[0], val[2]
     }
   | lhs '=' arg RESCUE_MOD arg
+    {
+      result = new_assign val[0], s(:rescue_mod, val[2], val[4])
+    }
   | var_lhs OP_ASGN arg
     {
       result = new_op_asgn val[1].intern, val[0], val[2]
@@ -436,7 +453,7 @@ arg:
   | primary_value '[@' aref_args ']' OP_ASGN arg
     {
       args = val[2]
-      args[0] = :arglist if args[0] == :array
+      args.type = :arglist if args.type == :array
       result = s(:op_asgn1, val[0], val[2], val[4].intern, val[5])
       result.line = val[0].line
     }
@@ -488,15 +505,15 @@ arg:
   | '+@' arg
     {
       result = new_call val[1], :"+@", s(:arglist)
-      result = val[1] if [:int, :float].include? val[1][0]
+      result = val[1] if [:int, :float].include? val[1].type
     }
   | '-@' arg
     {
       result = new_call val[1], :"-@", s(:arglist)
-      if val[1][0] == :int
+      if val[1].type == :int
         val[1][1] = -val[1][1]
         result = val[1]
-      elsif val[1][0] == :float
+      elsif val[1].type == :float
         val[1][1] = -val[1][1].to_f
         result = val[1]
       end
@@ -598,6 +615,10 @@ aref_args:
     {
       result = nil
     }
+  | command opt_nl
+    {
+      result = s(:array, val[0])
+    }
   | args trailer
     {
       result = val[0]
@@ -660,11 +681,11 @@ call_args2:
 
 command_args:
     {
-      cmdarg_push 1
+      lexer.cmdarg_push 1
     }
     open_args
     {
-      cmdarg_pop
+      lexer.cmdarg_pop
       result = val[1]
     }
 
@@ -737,7 +758,7 @@ primary:
   | FID
   | BEGIN
     {
-      result = @line
+      result = lexer.line
     }
     bodystmt END
     {
@@ -750,7 +771,7 @@ primary:
     }
   | PAREN_BEG compstmt ')'
     {
-      result = val[1] || s(:nil)
+      result = s(:paren, val[1] || s(:nil))
     }
   | primary_value '::' CONSTANT
     {
@@ -803,14 +824,14 @@ primary:
     }
   | operation brace_block
     {
-      result = val[1]
-      result[1] = new_call(nil, val[0].intern, s(:arglist))
+      result = new_call nil, val[0].intern, s(:arglist)
+      result << val[1]
     }
   | method_call
   | method_call brace_block
     {
-      result = val[1]
-      result[1] = val[0]
+      val[0] << val[1]
+      result = val[0]
     }
   | LAMBDA lambda
     {
@@ -826,12 +847,12 @@ primary:
     }
   | WHILE
     {
-      cond_push 1
-      result = @line
+      lexer.cond_push 1
+      result = lexer.line
     }
     expr_value do
     {
-      cond_pop
+      lexer.cond_pop
     }
     compstmt END
     {
@@ -840,12 +861,12 @@ primary:
     }
   | UNTIL
     {
-      cond_push 1
-      result = @line
+      lexer.cond_push 1
+      result = lexer.line
     }
     expr_value do
     {
-      cond_pop
+      lexer.cond_pop
     }
     compstmt END
     {
@@ -860,14 +881,14 @@ primary:
   | CASE opt_terms case_body END
     {
       result = s(:case, nil, *val[2])
-      result.line = val[2].line
+      # result.line = val[2].line
     }
   | CASE opt_terms ELSE compstmt END
     {
       result = s(:case, nil, val[3])
-      result.line = val[3].line
+      # result.line = val[3].line
     }
-  | FOR block_var IN
+  | FOR mlhs IN
     {
       result = "this.cond_push(1);"
     }
@@ -878,7 +899,7 @@ primary:
     compstmt END
   | CLASS
     {
-      result = @line
+      result = lexer.line
     }
     cpath superclass
     {
@@ -888,11 +909,11 @@ primary:
     {
       result = new_class val[2], val[3], val[5]
       result.line = val[1]
-      result.end_line = @line
+      result.end_line = lexer.line
     }
   | CLASS '<<'
     {
-      result = @line
+      result = lexer.line
     }
     expr term
     {
@@ -905,7 +926,7 @@ primary:
     }
   | MODULE
     {
-      result = @line
+      result = lexer.line
     }
     cpath
     {
@@ -915,30 +936,30 @@ primary:
     {
       result = new_module val[2], val[4]
       result.line = val[1]
-      result.end_line = @line
+      result.end_line = lexer.line
     }
   | DEF fname
     {
-      result = @scope_line
+      result = lexer.scope_line
       push_scope
     }
     f_arglist bodystmt END
     {
-      result = new_defn val[2], val[1], val[3], val[4]
+      result = new_def val[2], nil, val[1], val[3], val[4]
       pop_scope
     }
   | DEF singleton dot_or_colon
     {
-       # ..
+       lexer.lex_state = :expr_fname
     }
     fname
     {
-      result = @scope_line
+      result = lexer.scope_line
       push_scope
     }
     f_arglist bodystmt END
     {
-      result = new_defs val[5], val[1], val[4], val[6], val[7]
+      result = new_def val[5], val[1], val[4], val[6], val[7]
       pop_scope
     }
   | BREAK
@@ -972,12 +993,12 @@ do:
 lambda:
     f_larglist lambda_body
     {
-      call = new_call nil, :lambda, s(:arglist)
-      result = new_iter call, val[0], val[1]
+      result = new_call nil, :lambda, s(:arglist)
+      result << new_iter(val[0], val[1])
     }
 
 f_larglist:
-    '(' block_var_args ')'
+    '(' block_param ')'
     {
       result = val[1]
     }
@@ -985,7 +1006,7 @@ f_larglist:
     {
       result = nil
     }
-  | block_var_args
+  | block_param
   | none
 
 lambda_body:
@@ -1005,7 +1026,7 @@ if_tail:
     }
   | ELSIF
     {
-      result = @line
+      result = lexer.line
     }
     expr_value then compstmt if_tail
     {
@@ -1020,91 +1041,101 @@ opt_else:
       result = val[1]
     }
 
-block_var:
-    block_var_args
+f_block_optarg:
+    f_block_opt
     {
+      result = s(:block, val[0])
+    }
+  | f_block_optarg ',' f_block_opt
+    {
+      val[0] << val[2]
       result = val[0]
     }
 
-block_var_args:
-    f_arg ',' f_block_optarg ',' f_rest_arg opt_f_block_arg
+f_block_opt:
+    IDENTIFIER '=' primary_value
     {
-      result = new_block_args val[0], val[2], val[4], val[5]
+      result = new_assign new_assignable(s(:identifier, val[0].intern)), val[2]
     }
-  | f_arg ',' f_block_optarg opt_f_block_arg
+
+opt_block_var:
+    none
+  | '|' '|'
     {
-      result = new_block_args val[0], val[2], nil, val[3]
+      result = 0
     }
-  | f_arg ',' f_rest_arg opt_f_block_arg
+  | '||'
     {
-      result = new_block_args val[0], nil, val[2], val[3]
+      result = 0
     }
-  | f_arg ','
+  | '|' block_param '|'
     {
-      result = new_block_args val[0], nil, nil, nil
+      result = val[1]
     }
-  | f_arg opt_f_block_arg
+
+block_args_tail: 
+  f_block_arg
+     {
+       result = val[0]
+     }
+
+opt_block_args_tail:
+    ',' block_args_tail
     {
-      result = new_block_args val[0], nil, nil, val[1]
+      result = val[1]
     }
-  | f_block_optarg ',' f_rest_arg opt_f_block_arg
+  | none
     {
-      result = new_block_args nil, val[0], val[2], val[3]
+      nil
     }
-  | f_block_optarg opt_f_block_arg
+
+block_param:
+    f_arg ',' f_block_optarg ',' f_rest_arg opt_block_args_tail
     {
-      result = new_block_args nil, val[0], nil, val[1]
+      result = new_block_args val[0], val[2], val[4], val[5]
     }
-  | f_rest_arg opt_f_block_arg
+  | f_arg ',' f_block_optarg opt_block_args_tail
     {
-      result = new_block_args nil, nil, val[0], val[1]
+      result = new_block_args val[0], val[2], nil, val[3]
     }
-  | f_block_arg
+  | f_arg ',' f_rest_arg opt_block_args_tail
     {
-      result = new_block_args nil, nil, nil, val[0]
+      result = new_block_args val[0], nil, val[2], val[3]
     }
-
-f_block_optarg:
-    f_block_opt
+  | f_arg ','
     {
-      result = s(:block, val[0])
+      result = new_block_args val[0], nil, nil, nil
     }
-  | f_block_optarg ',' f_block_opt
+  | f_arg opt_block_args_tail
     {
-      val[0] << val[2]
-      result = val[0]
+      result = new_block_args val[0], nil, nil, val[1]
     }
-
-f_block_opt:
-    IDENTIFIER '=' primary_value
+  | f_block_optarg ',' f_rest_arg opt_block_args_tail
     {
-      result = new_assign new_assignable(s(:identifier, val[0].intern)), val[2]
+      result = new_block_args nil, val[0], val[2], val[3]
     }
-
-opt_block_var:
-    none
-  | '|' '|'
+  | f_block_optarg opt_block_args_tail
     {
-      result = 0
+      result = new_block_args nil, val[0], nil, val[1]
     }
-  | '||'
+  | f_rest_arg opt_block_args_tail
     {
-      result = 0
+      result = new_block_args nil, nil, val[0], val[1]
     }
-  | '|' block_var '|'
+  | block_args_tail
     {
-      result = val[1]
+      result = new_block_args nil, nil, nil, val[0]
     }
 
 do_block:
     DO_BLOCK
     {
       push_scope :block
-      result = @line
+      result = lexer.line
     }
     opt_block_var compstmt END
     {
-      result = new_iter nil, val[2], val[3]
+      result = new_iter val[2], val[3]
       result.line = val[1]
       pop_scope
     }
@@ -1112,8 +1143,8 @@ do_block:
 block_call:
     command do_block
     {
-      result = val[1]
-      result[1] = val[0]
+      val[0] << val[1]
+      result = val[0]
     }
   | block_call '.' operation2 opt_paren_args
   | block_call '::' operation2 opt_paren_args
@@ -1145,29 +1176,29 @@ method_call:
     }
   | SUPER
     {
-      result = s(:zsuper)
+      result = s(:super, nil)
     }
 
 brace_block:
     LCURLY
     {
       push_scope :block
-      result = @line
+      result = lexer.line
     }
     opt_block_var compstmt '}'
     {
-      result = new_iter nil, val[2], val[3]
+      result = new_iter val[2], val[3]
       result.line = val[1]
       pop_scope
     }
   | DO
     {
       push_scope :block
-      result = @line
+      result = lexer.line
     }
     opt_block_var compstmt END
     {
-      result = new_iter nil, val[2], val[3]
+      result = new_iter val[2], val[3]
       result.line = val[1]
       pop_scope
     }
@@ -1175,7 +1206,7 @@ brace_block:
 case_body:
     WHEN
     {
-      result = @line
+      result = lexer.line
     }
     args then compstmt cases
     {
@@ -1285,7 +1316,7 @@ word_list:
   | word_list word SPACE
     {
       part = val[1]
-      part = s(:dstr, "", val[1]) if part[0] == :evstr
+      part = s(:dstr, "", val[1]) if part.type == :evstr
       result = val[0] << part
     }
 
@@ -1346,27 +1377,27 @@ string_content:
     }
   | STRING_DVAR
     {
-      result = @string_parse
-      @string_parse = nil
+      result = lexer.strterm
+      lexer.strterm = nil
     }
     string_dvar
     {
-      @string_parse = val[1]
+      lexer.strterm = val[1]
       result = s(:evstr, val[2])
     }
   | STRING_DBEG
     {
-      cond_push 0
-      cmdarg_push 0
-      result = @string_parse
-      @string_parse = nil
-      @lex_state = :expr_beg
+      lexer.cond_push 0
+      lexer.cmdarg_push 0
+      result = lexer.strterm
+      lexer.strterm = nil
+      lexer.lex_state = :expr_beg
     }
     compstmt '}'
     {
-      @string_parse = val[1]
-      cond_lexpop
-      cmdarg_lexpop
+      lexer.strterm = val[1]
+      lexer.cond_lexpop
+      lexer.cmdarg_lexpop
       result = s(:evstr, val[2])
     }
 
@@ -1390,7 +1421,7 @@ symbol:
     SYMBOL_BEG sym
     {
       result = s(:sym, val[1].intern)
-      @lex_state = :expr_end
+      lexer.lex_state = :expr_end
     }
   | SYMBOL
     {
@@ -1459,11 +1490,11 @@ variable:
     }
   | FILE
     {
-      result = s(:str, @file)
+      result = s(:str, self.file)
     }
   | LINE
     {
-      result = s(:int, @line)
+      result = s(:int, lexer.line)
     }
 
 var_ref:
@@ -1503,6 +1534,7 @@ f_arglist:
     '(' f_args opt_nl ')'
     {
       result = val[1]
+      lexer.lex_state = :expr_beg
     }
   | f_args term
     {
@@ -1567,15 +1599,50 @@ f_norm_arg:
   | IDENTIFIER
     {
       result = val[0].intern
-      @scope.add_local result
+      scope.add_local result
     }
 
-f_arg:
+f_arg_item:
     f_norm_arg
+    {
+      result = val[0]
+    }
+  | PAREN_BEG f_margs ')'
+    {
+      result = val[1]
+    }
+
+f_marg:
+    f_norm_arg
+    {
+      result = s(:lasgn, val[0])
+    }
+  | PAREN_BEG f_margs ')'
+
+f_marg_list:
+    f_marg
+    {
+      result = s(:array, val[0])
+    }
+  | f_marg_list ',' f_marg
+    {
+      val[0] << val[2]
+      result = val[0]
+    }
+
+f_margs:
+    f_marg_list
+  | f_marg_list ',' SPLAT f_norm_arg
+  | f_marg_list ',' SPLAT
+  | SPLAT f_norm_arg
+  | SPLAT
+
+f_arg:
+    f_arg_item
     {
       result = [val[0]]
     }
-  | f_arg ',' f_norm_arg
+  | f_arg ',' f_arg_item
     {
       val[0] << val[2]
       result = val[0]