opal 0.4.2 → 0.4.3

data/{opal → corelib}/opal/string.rb

@@ -2,6 +2,7 @@ class String
   include Comparable
 
   `def._isString = true`
+  `var native_string = "".constructor;`
 
   def self.try_convert(what)
     what.to_str
@@ -11,7 +12,7 @@ class String
 
   def self.new(str = '')
     %x{
-      return new String(str)
+      return new native_string(str)
     }
   end
 
@@ -75,7 +76,7 @@ class String
   end
 
   def ==(other)
-    `other == String(#{self})`
+    `other == native_string(#{self})`
   end
 
   alias === ==
@@ -429,7 +430,7 @@ class String
       }
 
       var initial = #{self}.substr(0, #{self}.length - 1);
-      var last    = String.fromCharCode(#{self}.charCodeAt(#{self}.length - 1) + 1);
+      var last    = native_string.fromCharCode(#{self}.charCodeAt(#{self}.length - 1) + 1);
 
       return initial + last;
     }
@@ -455,8 +456,8 @@ class String
   # TODO handle case where search is regexp
   def rindex(search, offset = undefined)
     %x{
-      var search_type = (search == null ? Opal.NilClass : search.$class());
-      if (search_type != String && search_type != RegExp) {
+      var search_type = (search == null ? Opal.NilClass : search.constructor);
+      if (search_type != native_string && search_type != RegExp) {
         var msg = "type mismatch: " + search_type + " given";
         #{raise TypeError.new(`msg`)};
       }
@@ -471,7 +472,7 @@ class String
           offset = #{self}.length + offset;
         }
 
-        if (search_type == String) {
+        if (search_type == native_string) {
           result = #{self}.lastIndexOf(search, offset);
         }
         else {
@@ -482,7 +483,7 @@ class String
         }
       }
       else {
-        if (search_type == String) {
+        if (search_type == native_string) {
           result = #{self}.lastIndexOf(search);
         }
         else {
@@ -645,7 +646,7 @@ class String
         return $1 ? $0.toUpperCase() : $0.toLowerCase();
       });
 
-      if (#{self}.constructor === String) {
+      if (#{self}.constructor === native_string) {
         return str;
       }
 
@@ -750,7 +751,7 @@ class String
           var start = last_from.charCodeAt(0) + 1;
           var end = char.charCodeAt(0);
           for (var c = start; c < end; c++) {
-            from_chars_expanded.push(String.fromCharCode(c));
+            from_chars_expanded.push(native_string.fromCharCode(c));
           }
           from_chars_expanded.push(char);
           in_range = null;
@@ -796,7 +797,7 @@ class String
               var start = last_from.charCodeAt(0) + 1;
               var end = char.charCodeAt(0);
               for (var c = start; c < end; c++) {
-                to_chars_expanded.push(String.fromCharCode(c));
+                to_chars_expanded.push(native_string.fromCharCode(c));
               }
               to_chars_expanded.push(char);
               in_range = null;
@@ -885,7 +886,7 @@ class String
           var start = last_from.charCodeAt(0) + 1;
           var end = char.charCodeAt(0);
           for (var c = start; c < end; c++) {
-            from_chars_expanded.push(String.fromCharCode(c));
+            from_chars_expanded.push(native_string.fromCharCode(c));
           }
           from_chars_expanded.push(char);
           in_range = null;
@@ -931,7 +932,7 @@ class String
               var start = last_from.charCodeAt(0) + 1;
               var end = char.charCodeAt(0);
               for (var c = start; c < end; c++) {
-                to_chars_expanded.push(String.fromCharCode(c));
+                to_chars_expanded.push(native_string.fromCharCode(c));
               }
               to_chars_expanded.push(char);
               in_range = null;
@@ -1012,7 +1013,7 @@ class MatchData < Array
 
   def self.new(regexp, match_groups)
     %x{
-      var instance = new Opal.MatchData;
+      var instance = new Opal.MatchData._alloc;
       for (var i = 0, len = match_groups.length; i < len; i++) {
         var group = match_groups[i];
         if (group == undefined) {

data/lib/opal.rb

@@ -1,4 +1,7 @@
 require 'opal/parser'
+require 'opal/require_parser'
+require 'opal/builder'
+require 'opal/erb'
 require 'opal/version'
 
 # Opal is a ruby to javascript compiler, with a runtime for running
@@ -15,26 +18,24 @@ module Opal
     Parser.new.parse(source, options)
   end
 
-  # Returns the path to the opal corelib. Used by Opal::Processor to load
-  # opal runtime and core lib.
-  #
-  # @return [String]
   def self.core_dir
-    File.expand_path('../../opal', __FILE__)
+    File.expand_path('../../corelib', __FILE__)
+  end
+
+  def self.std_dir
+    File.expand_path('../../stdlib', __FILE__)
   end
 
   # Add a file path to opals load path. Any gem containing ruby code that Opal
   # has access to should add a load path through this method. Load paths added
   # here should only be paths which contain code targeted at being compiled by
   # Opal.
-  #
-  # @param [String] path file path to add
   def self.append_path(path)
     paths << path
   end
 
   # Private, don't add to these directly (use .append_path instead).
   def self.paths
-    @paths ||= [core_dir]
+    @paths ||= [core_dir, std_dir]
   end
 end

data/lib/opal/builder.rb

@@ -0,0 +1,81 @@
+require 'opal/require_parser'
+require 'erb'
+
+module Opal
+  class Builder
+
+    BUILDERS = { ".rb" => :build_ruby, ".js" => :build_js, ".erb" => :build_erb }
+
+    def self.build(name)
+      Builder.new.build name
+    end
+
+    def initialize
+      @paths = Opal.paths.clone
+    end
+
+    def append_path(path)
+      @paths << path
+    end
+
+    def build(path)
+      @segments = []
+      @handled = {}
+
+      require_asset path
+
+      @segments.join
+    end
+
+    def require_asset(path)
+      location = find_asset path
+
+      build_asset location
+    end
+
+    def find_asset(path)
+      file_types = %w[.rb .js .js.erb]
+
+      @paths.each do |root|
+        file_types.each do |type|
+          test = File.join root, "#{path}#{type}"
+
+          if File.exist? test
+            return test
+          end
+        end
+      end
+
+      raise "Could not find asset: #{path}"
+    end
+
+    def build_asset(path)
+      ext = File.extname path
+
+      unless builder = BUILDERS[ext]
+        raise "Unknown builder for #{ext}"
+      end
+
+      @segments << __send__(builder, path)
+    end
+
+    def build_ruby(path)
+      parser = RequireParser.new
+      result = parser.parse File.read(path)
+
+      parser.requires.each do |r|
+        require_asset r
+      end
+
+      result
+    end
+
+    def build_js(path)
+      File.read(path)
+    end
+
+    def build_erb(path)
+      ::ERB.new(File.read(path)).result binding
+    end
+  end
+end

data/lib/opal/erb.rb

@@ -0,0 +1,17 @@
+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.<<(\""
+      end
+
+      code = "ERB.new('#{name}') do |out|\nout.<<(\"#{ body }\")\nout.join\nend\n"
+      Opal.parse code
+    end
+  end
+end

data/lib/opal/grammar.rb

@@ -1967,7 +1967,7 @@ racc_reduce_table = [
   1, 181, :_reduce_93,
   1, 181, :_reduce_94,
   1, 149, :_reduce_95,
-  1, 149, :_reduce_96,
+  1, 149, :_reduce_none,
   1, 150, :_reduce_97,
   3, 150, :_reduce_98,
   1, 182, :_reduce_none,
@@ -2243,8 +2243,8 @@ racc_reduce_table = [
   1, 253, :_reduce_369,
   2, 143, :_reduce_370,
   1, 143, :_reduce_none,
-  1, 198, :_reduce_372,
-  1, 198, :_reduce_373,
+  1, 198, :_reduce_none,
+  1, 198, :_reduce_none,
   1, 198, :_reduce_none,
   1, 199, :_reduce_375,
   1, 256, :_reduce_none,
@@ -2277,14 +2277,14 @@ racc_reduce_table = [
   1, 264, :_reduce_403,
   1, 264, :_reduce_none,
   2, 184, :_reduce_405,
-  1, 184, :_reduce_none,
+  1, 184, :_reduce_406,
   1, 267, :_reduce_none,
   1, 267, :_reduce_none,
   1, 267, :_reduce_none,
   1, 267, :_reduce_none,
   3, 255, :_reduce_411,
-  1, 254, :_reduce_none,
-  1, 254, :_reduce_none,
+  1, 254, :_reduce_412,
+  1, 254, :_reduce_413,
   2, 254, :_reduce_none,
   2, 254, :_reduce_none,
   1, 178, :_reduce_416,
@@ -3261,16 +3261,12 @@ def _reduce_94(val, _values, result)
 end
 
 def _reduce_95(val, _values, result)
-      result = s(:lit, val[0].intern)
+      result = s(:sym, val[0].intern)
     
     result
 end
 
-def _reduce_96(val, _values, result)
-      result = s(:lit, val[0])
-    
-    result
-end
+# reduce 96 omitted
 
 def _reduce_97(val, _values, result)
       result = s(:undef, val[0])
@@ -3517,16 +3513,19 @@ end
 
 def _reduce_188(val, _values, result)
       result = new_call val[1], :"+@", s(:arglist)
-      result = val[1] if val[1][0] == :lit and Numeric === val[1][1]
+      result = val[1] if [:int, :float].include? val[1][0]
     
     result
 end
 
 def _reduce_189(val, _values, result)
       result = new_call val[1], :"-@", s(:arglist)
-      if val[1][0] == :lit and Numeric === val[1][1]
+      if val[1][0] == :int
         val[1][1] = -val[1][1]
         result = val[1]
+      elsif val[1][0] == :float
+        val[1][1] = -val[1][1].to_f
+        result = val[1]
       end
     
     result
@@ -4513,17 +4512,9 @@ end
 
 # reduce 371 omitted
 
-def _reduce_372(val, _values, result)
-      result = s(:lit, val[0])
-    
-    result
-end
+# reduce 372 omitted
 
-def _reduce_373(val, _values, result)
-      result = s(:lit, val[0])
-    
-    result
-end
+# reduce 373 omitted
 
 # reduce 374 omitted
 
@@ -4707,13 +4698,17 @@ end
 # reduce 404 omitted
 
 def _reduce_405(val, _values, result)
-      result = val[1].intern
+      result = s(:sym, val[1].intern)
       @lex_state = :expr_end
     
     result
 end
 
-# reduce 406 omitted
+def _reduce_406(val, _values, result)
+      result = s(:sym, val[0].intern)
+    
+    result
+end
 
 # reduce 407 omitted
 
@@ -4729,9 +4724,17 @@ def _reduce_411(val, _values, result)
     result
 end
 
-# reduce 412 omitted
+def _reduce_412(val, _values, result)
+      result = s(:int, val[0])
+    
+    result
+end
 
-# reduce 413 omitted
+def _reduce_413(val, _values, result)
+      result = s(:float, val[0])
+    
+    result
+end
 
 # reduce 414 omitted
 
@@ -4798,7 +4801,7 @@ def _reduce_425(val, _values, result)
 end
 
 def _reduce_426(val, _values, result)
-      result = s(:lit, @line)
+      result = s(:int, @line)
     
     result
 end
@@ -5057,7 +5060,7 @@ def _reduce_471(val, _values, result)
 end
 
 def _reduce_472(val, _values, result)
-      result = [s(:lit, val[0].intern), val[1]]
+      result = [s(:sym, val[0].intern), val[1]]
     
     result
 end

data/lib/opal/grammar.y

@@ -382,12 +382,9 @@ fname:
 fitem:
     fname
     {
-      result = s(:lit, val[0].intern)
+      result = s(:sym, val[0].intern)
     }
   | symbol
-    {
-      result = s(:lit, val[0])
-    }
 
 undef_list:
     fitem
@@ -480,14 +477,17 @@ arg:
   | '+@' arg
     {
       result = new_call val[1], :"+@", s(:arglist)
-      result = val[1] if val[1][0] == :lit and Numeric === val[1][1]
+      result = val[1] if [:int, :float].include? val[1][0]
     }
   | '-@' arg
     {
       result = new_call val[1], :"-@", s(:arglist)
-      if val[1][0] == :lit and Numeric === val[1][1]
+      if val[1][0] == :int
         val[1][1] = -val[1][1]
         result = val[1]
+      elsif val[1][0] == :float
+        val[1][1] = -val[1][1].to_f
+        result = val[1]
       end
     }
   | arg '|' arg
@@ -1221,13 +1221,7 @@ opt_ensure:
 
 literal:
     numeric
-    {
-      result = s(:lit, val[0])
-    }
   | symbol
-    {
-      result = s(:lit, val[0])
-    }
   | dsym
 
 strings:
@@ -1384,10 +1378,13 @@ string_dvar:
 symbol:
     SYMBOL_BEG sym
     {
-      result = val[1].intern
+      result = s(:sym, val[1].intern)
       @lex_state = :expr_end
     }
   | SYMBOL
+    {
+      result = s(:sym, val[0].intern)
+    }
 
 sym: fname
   | IVAR
@@ -1402,7 +1399,13 @@ dsym:
 
 numeric:
     INTEGER
+    {
+      result = s(:int, val[0])
+    }
   | FLOAT
+    {
+      result = s(:float, val[0])
+    }
   | '-@NUM' INTEGER =LOWEST
   | '-@NUM' FLOAT   =LOWEST
 
@@ -1449,7 +1452,7 @@ variable:
     }
   | LINE
     {
-      result = s(:lit, @line)
+      result = s(:int, @line)
     }
 
 var_ref:
@@ -1659,7 +1662,7 @@ assoc:
     }
   | LABEL arg_value
     {
-      result = [s(:lit, val[0].intern), val[1]]
+      result = [s(:sym, val[0].intern), val[1]]
     }
 
 operation: