opal 0.4.3 → 0.4.4

data/lib/opal/erb.rb

@@ -2,16 +2,49 @@ require 'opal/parser'
 
 module Opal
   module ERB
-    def self.parse(str, name='(erb)')
-      body = str.gsub('"', '\\"').gsub(/<%=([\s\S]+?)%>/) do
-        inner = $1.gsub(/\\'/, "'").gsub(/\\"/, '"')
-        "\")\nout.<<(#{ inner })\nout.<<(\""
-      end.gsub(/<%([\s\S]+?)%>/) do
-        "\")\n#{ $1 }\nout.<<(\""
+    def self.parse(source, file_name = '(erb)')
+      Compiler.new.compile source, file_name
+    end
+
+    class Compiler
+      def compile(source, file_name = '(erb)')
+        @source, @file_name, @result = source, file_name, source
+
+        self.fix_quotes
+        self.find_contents
+        self.find_code
+        self.wrap_compiled
+
+        Opal.parse @result
       end
 
-      code = "ERB.new('#{name}') do |out|\nout.<<(\"#{ body }\")\nout.join\nend\n"
-      Opal.parse code
+      def fix_quotes
+        @result = @result.gsub '"', '\\"'
+      end
+
+      BLOCK_EXPR = /\s+(do|\{)(\s*\|[^|]*\|)?\s*\Z/
+
+      def find_contents
+        @result = @result.gsub(/<%=([\s\S]+?)%>/) do
+          inner = $1.gsub(/\\'/, "'").gsub(/\\"/, '"')
+
+          if inner =~ BLOCK_EXPR
+            "\")\noutput_buffer.append= #{ inner }\noutput_buffer.append(\""
+          else
+            "\")\noutput_buffer.append=(#{ inner })\noutput_buffer.append(\""
+          end
+        end
+      end
+
+      def find_code
+        @result = @result.gsub(/<%([\s\S]+?)%>/) do
+          "\")\n#{ $1 }\noutput_buffer.append(\""
+        end
+      end
+
+      def wrap_compiled
+        @result = "Template.new('#@file_name') do |output_buffer|\noutput_buffer.append(\"#@result\")\noutput_buffer.join\nend\n"
+      end
     end
   end
 end

data/lib/opal/grammar.rb

@@ -1942,8 +1942,8 @@ racc_reduce_table = [
   2, 175, :_reduce_68,
   3, 175, :_reduce_69,
   1, 177, :_reduce_70,
-  4, 177, :_reduce_none,
-  3, 177, :_reduce_none,
+  4, 177, :_reduce_71,
+  3, 177, :_reduce_72,
   3, 177, :_reduce_none,
   3, 177, :_reduce_none,
   3, 177, :_reduce_none,
@@ -1954,7 +1954,7 @@ racc_reduce_table = [
   3, 152, :_reduce_80,
   3, 152, :_reduce_81,
   3, 152, :_reduce_82,
-  3, 152, :_reduce_none,
+  3, 152, :_reduce_83,
   2, 152, :_reduce_none,
   1, 152, :_reduce_none,
   1, 179, :_reduce_none,
@@ -3168,9 +3168,19 @@ def _reduce_70(val, _values, result)
     result
 end
 
-# reduce 71 omitted
+def _reduce_71(val, _values, result)
+      args = val[2]
+      args[0] = :arglist if args[0] == :array
+      result = s(:attrasgn, val[0], :[]=, args)
+    
+    result
+end
 
-# reduce 72 omitted
+def _reduce_72(val, _values, result)
+      result = new_call val[0], val[2].intern, s(:arglist)
+    
+    result
+end
 
 # reduce 73 omitted
 
@@ -3214,7 +3224,11 @@ def _reduce_82(val, _values, result)
     result
 end
 
-# reduce 83 omitted
+def _reduce_83(val, _values, result)
+      result = s(:colon2, val[0], val[2].intern)
+    
+    result
+end
 
 # reduce 84 omitted
 
@@ -3472,25 +3486,25 @@ def _reduce_179(val, _values, result)
 end
 
 def _reduce_180(val, _values, result)
-      result = s(:operator, :"+", val[0], val[2])
+      result = new_call val[0], :"+", s(:arglist, val[2])
     
     result
 end
 
 def _reduce_181(val, _values, result)
-      result = s(:operator, :"-", val[0], val[2])
+      result = new_call val[0], :"-", s(:arglist, val[2])
     
     result
 end
 
 def _reduce_182(val, _values, result)
-      result = s(:operator, :"*", val[0], val[2])
+      result = new_call val[0], :"*", s(:arglist, val[2])
     
     result
 end
 
 def _reduce_183(val, _values, result)
-      result = s(:operator, :"/", val[0], val[2])
+      result = new_call val[0], :"/", s(:arglist, val[2])
     
     result
 end

data/lib/opal/grammar.y

@@ -313,7 +313,15 @@ mlhs_node:
       result = new_assignable val[0]
     }
   | primary_value '[@' aref_args ']'
+    {
+      args = val[2]
+      args[0] = :arglist if args[0] == :array
+      result = s(:attrasgn, val[0], :[]=, args)
+    }
   | primary_value '.' IDENTIFIER
+    {
+      result = new_call val[0], val[2].intern, s(:arglist)
+    }
   | primary_value '::' IDENTIFIER
   | primary_value '.' CONSTANT
   | primary_value '::' CONSTANT
@@ -344,6 +352,9 @@ lhs:
       result = s(:attrasgn, val[0], "#{val[2]}=".intern, s(:arglist))
     }
   | primary_value '::' CONSTANT
+    {
+      result = s(:colon2, val[0], val[2].intern)
+    }
   | '::@' CONSTANT
   | backref
 
@@ -450,19 +461,19 @@ arg:
     }
   | arg '+' arg
     {
-      result = s(:operator, :"+", val[0], val[2])
+      result = new_call val[0], :"+", s(:arglist, val[2])
     }
   | arg '-' arg
     {
-      result = s(:operator, :"-", val[0], val[2])
+      result = new_call val[0], :"-", s(:arglist, val[2])
     }
   | arg '*' arg
     {
-      result = s(:operator, :"*", val[0], val[2])
+      result = new_call val[0], :"*", s(:arglist, val[2])
     }
   | arg '/' arg
     {
-      result = s(:operator, :"/", val[0], val[2])
+      result = new_call val[0], :"/", s(:arglist, val[2])
     }
   | arg '%' arg
     {

data/lib/opal/grammar_helpers.rb

@@ -208,6 +208,10 @@ module Opal
       when :call, :attrasgn
         lhs.last << rhs
         lhs
+      when :colon2
+        lhs << rhs
+        lhs[0] = :casgn
+        lhs
       else
         raise "Bad lhs for new_assign: #{lhs[0]}"
       end

data/lib/opal/lexer.rb

@@ -86,6 +86,30 @@ module Opal
       (@cmdarg & 1) != 0
     end
 
+    def arg?
+      [:expr_arg, :expr_cmdarg].include? @lex_state
+    end
+
+    def end?
+      [:expr_end, :expr_endarg, :expr_endfn].include? @lex_state
+    end
+
+    def beg?
+      [:expr_beg, :expr_value, :expr_mid, :expr_class].include? @lex_state
+    end
+
+    def after_operator?
+      [:expr_fname, :expr_dot].include? @lex_state
+    end
+
+    def spcarg?
+      arg? and @space_seen and !space?
+    end
+
+    def space?
+      @scanner.check(/\s/)
+    end
+
     def next_string_token
       # str_parse, scanner = current_string_parse, @scanner
       str_parse = @string_parse
@@ -269,15 +293,15 @@ module Opal
       # if we are trying to parse a string, then delegate to that
       return next_string_token if @string_parse
 
-      # scanner, space_seen, cmd_start, c = @scanner, false, false, ''
+      # scanner, @space_seen, cmd_start, c = @scanner, false, false, ''
       scanner = @scanner
-      space_seen = false
+      @space_seen = false
       cmd_start = false
       c = ''
 
       while true
         if scanner.scan(/\ |\t|\r/)
-          space_seen = true
+          @space_seen = true
           next
 
         elsif scanner.scan(/(\n|#)/)
@@ -289,6 +313,13 @@ module Opal
 
           next if [:expr_beg, :expr_dot].include? @lex_state
 
+          if scanner.scan(/([\ \t\r\f\v]*)\./)
+            @space_seen = true unless scanner[1].empty?
+            scanner.pos = scanner.pos - 1
+
+            next unless scanner.check(/\.\./)
+          end
+
           cmd_start = true
           @lex_state = :expr_beg
           return '\\n', '\\n'
@@ -297,6 +328,128 @@ module Opal
           @lex_state = :expr_beg
           return ';', ';'
 
+        elsif scanner.scan(/\*/)
+          if scanner.scan(/\*/)
+            if scanner.scan(/\=/)
+              @lex_state = :expr_beg
+              return :OP_ASGN, '**'
+            end
+
+            if @lex_state == :expr_fname or @lex_state == :expr_dot
+              @lex_state = :expr_arg
+            else
+              @lex_state = :expr_beg
+            end
+
+            return '**', '**'
+
+          else
+            if scanner.scan(/\=/)
+              @lex_state = :expr_beg
+              return :OP_ASGN, '*'
+            end
+          end
+
+          if scanner.scan(/\*\=/)
+            @lex_state = :expr_beg
+            return :OP_ASGN, '**'
+          end
+
+          if scanner.scan(/\*/)
+            if after_operator?
+              @lex_state = :expr_arg
+            else
+              @lex_state = :expr_beg
+            end
+
+            return '**', '**'
+          end
+
+          if scanner.scan(/\=/)
+            @lex_state = :expr_beg
+            return :OP_ASGN, '*'
+          else
+            result = '*'
+            if @lex_state == :expr_fname
+              @lex_state = :expr_end
+              return '*', result
+            elsif @space_seen && scanner.check(/\S/)
+              @lex_state = :expr_beg
+              return :SPLAT, result
+            elsif [:expr_beg, :expr_mid].include? @lex_state
+              @lex_state = :expr_beg
+              return :SPLAT, result
+            else
+              @lex_state = :expr_beg
+              return '*', result
+            end
+          end
+
+        elsif scanner.scan(/\!/)
+          c = scanner.scan(/./)
+          if after_operator?
+            @lex_state = :expr_arg
+            if c == "@"
+              return '!', '!'
+            end
+          else
+            @lex_state = :expr_beg
+          end
+
+          if c == '='
+            return '!=', '!='
+          elsif c == '~'
+            return '!~', '!~'
+          end
+
+          scanner.pos = scanner.pos - 1
+          return '!', '!'
+
+        elsif scanner.scan(/\=/)
+          if @lex_state == :expr_beg and !@space_seen
+            if scanner.scan(/begin/) and space?
+              scanner.scan(/(.*)/) # end of line
+
+              while true
+                if scanner.eos?
+                  raise "embedded document meets end of file"
+                end
+
+                if scanner.scan(/\=end/) and space?
+                  return next_token
+                end
+
+                if scanner.scan(/\n/)
+                  next
+                end
+
+                scanner.scan(/(.*)/)
+              end
+            end
+          end
+
+          @lex_state = if after_operator?
+                         :expr_arg
+                       else
+                         :expr_beg
+                       end
+
+          if scanner.scan(/\=/)
+            if scanner.scan(/\=/)
+              return '===', '==='
+            end
+
+            return '==', '=='
+          end
+
+          if scanner.scan(/\~/)
+            return '=~', '=~'
+          elsif scanner.scan(/\>/)
+            return '=>', '=>'
+          end
+
+          return '=', '='
+
         elsif scanner.scan(/\"/)
           @string_parse = { :beg => '"', :end => '"', :interpolate => true }
           return :STRING_BEG, scanner.matched
@@ -309,6 +462,50 @@ module Opal
           @string_parse = { :beg => "`", :end => "`", :interpolate => true }
           return :XSTRING_BEG, scanner.matched
 
+        elsif scanner.scan(/\&/)
+          if scanner.scan(/\&/)
+            @lex_state = :expr_beg
+
+            if scanner.scan(/\=/)
+              return :OP_ASGN, '&&'
+            end
+
+            return '&&', '&&'
+
+          elsif scanner.scan(/\=/)
+            @lex_state = :expr_beg
+            return :OP_ASGN, '&'
+          end
+
+          if spcarg?
+            #puts "warning: `&' interpreted as argument prefix"
+            result = '&@'
+          elsif beg?
+            result = '&@'
+          else
+            #puts "warn_balanced: & argument prefix"
+            result = '&'
+          end
+
+          @lex_state = after_operator? ? :expr_arg : :expr_beg
+          return result, '&'
+
+        elsif scanner.scan(/\|/)
+          if scanner.scan(/\|/)
+            @lex_state = :expr_beg
+            if scanner.scan(/\=/)
+              return :OP_ASGN, '||'
+            end
+
+            return '||', '||'
+
+          elsif scanner.scan(/\=/)
+            return :OP_ASGN, '|'
+          end
+
+          @lex_state = after_operator?() ? :expr_arg : :expr_beg
+          return '|', '|'
+
         elsif scanner.scan(/\%W/)
           start_word  = scanner.scan(/./)
           end_word    = { '(' => ')', '[' => ']', '{' => '}' }[start_word] || start_word
@@ -352,7 +549,7 @@ module Opal
           elsif @lex_state == :expr_fname
             @lex_state = :expr_end
           elsif @lex_state == :expr_cmdarg || @lex_state == :expr_arg
-            if !scanner.check(/\s/) && space_seen
+            if !scanner.check(/\s/) && @space_seen
               @string_parse = { :beg => '/', :end => '/', :interpolate => true, :regexp => true }
               return :REGEXP_BEG, scanner.matched
             end
@@ -367,7 +564,7 @@ module Opal
             @lex_state = :expr_beg
             return :OP_ASGN, '%'
           elsif scanner.check(/[^\s]/)
-            if @lex_state == :expr_beg or (@lex_state == :expr_arg && space_seen)
+            if @lex_state == :expr_beg or (@lex_state == :expr_arg && @space_seen)
               interpolate = true
               start_word  = scanner.scan(/./)
               end_word    = { '(' => ')', '[' => ']', '{' => '}' }[start_word] || start_word
@@ -380,7 +577,7 @@ module Opal
 
         elsif scanner.scan(/\\/)
           if scanner.scan(/\r?\n/)
-            space_seen = true
+            @space_seen = true
             next
           end
 
@@ -390,7 +587,7 @@ module Opal
           result = scanner.matched
           if [:expr_beg, :expr_mid].include? @lex_state
             result = :PAREN_BEG
-          elsif space_seen && [:expr_arg, :expr_cmdarg].include?(@lex_state)
+          elsif @space_seen && [:expr_arg, :expr_cmdarg].include?(@lex_state)
             result = :tLPAREN_ARG
           else
             result = '('
@@ -420,7 +617,7 @@ module Opal
             else
               raise "Unexpected '[' token"
             end
-          elsif [:expr_beg, :expr_mid].include?(@lex_state) || space_seen
+          elsif [:expr_beg, :expr_mid].include?(@lex_state) || @space_seen
             @lex_state = :expr_beg
             cond_push 0
             cmdarg_push 0
@@ -457,38 +654,11 @@ module Opal
           @lex_state = :expr_dot unless @lex_state == :expr_fname
           return '.', scanner.matched
 
-        elsif scanner.scan(/\*\*\=/)
-          @lex_state = :expr_beg
-          return :OP_ASGN, '**'
-
-        elsif scanner.scan(/\*\*/)
-          return '**', '**'
-
-        elsif scanner.scan(/\*\=/)
-          @lex_state = :expr_beg
-          return :OP_ASGN, '*'
-
-        elsif scanner.scan(/\*/)
-          result = scanner.matched
-          if @lex_state == :expr_fname
-            @lex_state = :expr_end
-            return '*', result
-          elsif space_seen && scanner.check(/\S/)
-            @lex_state = :expr_beg
-            return :SPLAT, result
-          elsif [:expr_beg, :expr_mid].include? @lex_state
-            @lex_state = :expr_beg
-            return :SPLAT, result
-          else
-            @lex_state = :expr_beg
-            return '*', result
-          end
-
         elsif scanner.scan(/\:\:/)
           if [:expr_beg, :expr_mid, :expr_class].include? @lex_state
             @lex_state = :expr_beg
             return '::@', scanner.matched
-          elsif space_seen && @lex_state == :expr_arg
+          elsif @space_seen && @lex_state == :expr_arg
             @lex_state = :expr_beg
             return '::@', scanner.matched
           end
@@ -516,26 +686,6 @@ module Opal
           @lex_state = :expr_fname
           return :SYMBOL_BEG, ':'
 
-        elsif scanner.check(/\|/)
-          if scanner.scan(/\|\|\=/)
-            @lex_state = :expr_beg
-            return :OP_ASGN, '||'
-          elsif scanner.scan(/\|\|/)
-            @lex_state = :expr_beg
-            return '||', '||'
-          elsif scanner.scan(/\|\=/)
-            @lex_state = :expr_beg
-            return :OP_ASGN, '|'
-          elsif scanner.scan(/\|/)
-            if @lex_state == :expr_fname
-              @lex_state = :expr_end
-              return '|', scanner.matched
-            else
-              @lex_state = :expr_beg
-              return '|', scanner.matched
-            end
-          end
-
         elsif scanner.scan(/\^\=/)
           @lex_state = :expr_beg
           return :OP_ASGN, '^'
@@ -548,26 +698,6 @@ module Opal
           @lex_state = :expr_beg
           return '^', scanner.matched
 
-        elsif scanner.check(/\&/)
-          if scanner.scan(/\&\&\=/)
-            @lex_state = :expr_beg
-            return :OP_ASGN, '&&'
-          elsif scanner.scan(/\&\&/)
-            @lex_state = :expr_beg
-            return '&&', scanner.matched
-          elsif scanner.scan(/\&\=/)
-            @lex_state = :expr_beg
-            return :OP_ASGN, '&'
-          elsif scanner.scan(/\&/)
-            if space_seen && !scanner.check(/\s/) && (@lex_state == :expr_cmdarg || @lex_state == :expr_arg)
-              return '&@', '&'
-            elsif [:expr_beg, :expr_mid].include? @lex_state
-              return '&@', '&'
-            else
-              return '&', '&'
-            end
-          end
-
         elsif scanner.check(/\</)
           if scanner.scan(/\<\<\=/)
             @lex_state = :expr_beg
@@ -576,7 +706,7 @@ module Opal
             if @lex_state == :expr_fname
               @lex_state = :expr_end
               return '<<', '<<'
-            elsif ![:expr_end, :expr_dot, :expr_endarg, :expr_class].include?(@lex_state) && space_seen
+            elsif ![:expr_end, :expr_dot, :expr_endarg, :expr_class].include?(@lex_state) && @space_seen
               if scanner.scan(/(-?)['"]?(\w+)['"]?/)
                 heredoc = scanner[2]
                 # for now just scrap rest of line + skip down one line for
@@ -617,6 +747,11 @@ module Opal
           if scanner.scan(/\>\>\=/)
             return :OP_ASGN, '>>'
           elsif scanner.scan(/\>\>/)
+            if @lex_state == :expr_fname or @lex_state == :expr_dot
+              @lex_state = :expr_arg
+            else
+              @lex_state = :expr_beg
+            end
             return '>>', '>>'
           elsif scanner.scan(/\>\=/)
             if @lex_state == :expr_fname
@@ -659,7 +794,7 @@ module Opal
           end
 
           if @lex_state == :expr_cmdarg || @lex_state == :expr_arg
-            if !scanner.check(/\s/) && space_seen
+            if !scanner.check(/\s/) && @space_seen
               @lex_state = :expr_mid
               return [sign, sign]
             end
@@ -678,73 +813,9 @@ module Opal
             @lex_state = :expr_end
             return :STRING, scanner.scan(/./)
           end
-          #if scanner.scan(/\\/)
-            #c = if scanner.scan(/n/)
-                  #"\n"
-                #else
-                  #scanner.scan(/./)
-                  #scanner.matched
-                #end
-          #else
-            #c = scanner.scan(/./)
-          #end
-
-          #@lex_state = :expr_end
-          #return :STRING, c
-          @lex_state = :expr_beg
-          return '?', scanner.matched
 
-        elsif scanner.scan(/\=\=\=/)
-          if @lex_state == :expr_fname
-            @lex_state = :expr_end
-            return '===', '==='
-          end
-          @lex_state = :expr_beg
-          return '===', '==='
-
-        elsif scanner.scan(/\=\=/)
-          if @lex_state == :expr_fname
-            @lex_state = :expr_end
-            return '==', '=='
-          end
           @lex_state = :expr_beg
-          return '==', '=='
-
-        elsif scanner.scan(/\=\~/)
-          if @lex_state == :expr_fname
-            @lex_state = :expr_end
-            return '=~', '=~'
-          end
-          @lex_state = :expr_beg
-          return '=~', '=~'
-
-        elsif scanner.scan(/\=\>/)
-          @lex_state = :expr_beg
-          return '=>', '=>'
-
-        elsif scanner.scan(/\=/)
-          @lex_state = :expr_beg
-          return '=', '='
-
-        elsif scanner.scan(/\!\=/)
-          if @lex_state == :expr_fname
-            @lex_state == :expr_end
-            return '!=', '!='
-          end
-          @lex_state = :expr_beg
-          return '!=', '!='
-
-        elsif scanner.scan(/\!\~/)
-          @lex_state = :expr_beg
-          return '!~', '!~'
-
-        elsif scanner.scan(/\!/)
-          if @lex_state == :expr_fname
-            @lex_state = :expr_end
-            return '!', '!'
-          end
-          @lex_state = :expr_beg
-          return '!', '!'
+          return '?', scanner.matched
 
         elsif scanner.scan(/\~/)
           if @lex_state == :expr_fname