opal 0.5.5 → 0.6.0

data/opal/corelib/string/inheritance.rb

@@ -0,0 +1,78 @@
+class String
+  def self.inherited(klass)
+    replace = Class.new(String::Wrapper)
+
+    %x{
+      klass._proto        = replace._proto;
+      klass._proto._klass = klass;
+      klass._alloc        = replace._alloc;
+      klass.__parent      = #{String::Wrapper};
+
+      klass.$allocate = replace.$allocate;
+      klass.$new      = replace.$new;
+    }
+  end
+end
+
+class String::Wrapper
+  def self.allocate(string = "")
+    obj = super()
+    `obj.literal = string`
+    obj
+  end
+
+  def self.new(*args, &block)
+    obj = allocate
+    obj.initialize(*args, &block)
+    obj
+  end
+
+  def self.[](*objects)
+    allocate(objects)
+  end
+
+  def initialize(string = '')
+    @literal = string
+  end
+
+  def method_missing(*args, &block)
+    result = @literal.__send__(*args, &block)
+
+    if `result._isString != null`
+      if `result == #@literal`
+        self
+      else
+        self.class.allocate(result)
+      end
+    else
+      result
+    end
+  end
+
+  def initialize_copy(other)
+    @literal = `other.literal`.clone
+  end
+
+  def respond_to?(name, *)
+    super || @literal.respond_to?(name)
+  end
+
+  def ==(other)
+    @literal == other
+  end
+
+  alias eql? ==
+  alias === ==
+
+  def to_s
+    @literal
+  end
+
+  def to_str
+    self
+  end
+
+  def inspect
+    @literal.inspect
+  end
+end

data/opal/corelib/struct.rb

@@ -49,6 +49,10 @@ class Struct
     }
   end
 
+  class << self
+    alias [] new
+  end
+
   include Enumerable
 
   def initialize(*args)
@@ -89,12 +93,14 @@ class Struct
     return enum_for :each unless block_given?
 
     members.each { |name| yield self[name] }
+    self
   end
 
   def each_pair
     return enum_for :each_pair unless block_given?
 
     members.each { |name| yield name, self[name] }
+    self
   end
 
   def eql?(other)
@@ -130,4 +136,6 @@ class Struct
 
     result
   end
+
+  alias to_s inspect
 end

data/opal/corelib/time.rb

@@ -1,3 +1,5 @@
+require 'corelib/comparable'
+
 class Time
   include Comparable
 
@@ -5,7 +7,7 @@ class Time
     var days_of_week = #{%w[Sunday Monday Tuesday Wednesday Thursday Friday Saturday Sunday]},
         short_days   = #{%w[Sun Mon Tue Wed Thu Fri Sat]},
         short_months = #{%w[Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec]},
-        long_months  = #{%w[January Febuary March April May June July August September October November December]};
+        long_months  = #{%w[January February March April May June July August September October November December]};
   }
 
   def self.at(seconds, frac = 0)
@@ -34,7 +36,7 @@ class Time
           return new Date(year, month - 1, day, hour, minute, second);
 
         case 7:
-          #{raise NotImplementedError};
+          return new Date(year, month - 1, day, hour, minute, second);
 
         default:
           return new Date();
@@ -95,28 +97,13 @@ class Time
     raise TypeError, 'missing year (got nil)' if year.nil?
 
     %x{
-      switch (arguments.length) {
-        case 1:
-          return new Date(Date.UTC(year, 0));
-
-        case 2:
-          return new Date(Date.UTC(year, month - 1));
-
-        case 3:
-          return new Date(Date.UTC(year, month - 1, day));
-
-        case 4:
-          return new Date(Date.UTC(year, month - 1, day, hour));
-
-        case 5:
-          return new Date(Date.UTC(year, month - 1, day, hour, minute));
-
-        case 6:
-          return new Date(Date.UTC(year, month - 1, day, hour, minute, second));
-
-        case 7:
-          #{raise NotImplementedError};
+      if (month > 12 || day > 31 || hour > 24 || minute > 59 || second > 59) {
+        #{raise ArgumentError};
       }
+
+      var date = new Date(Date.UTC(year, (month || 1) - 1, (day || 1), (hour || 0), (minute || 0), (second || 0)));
+      date.tz_offset = 0
+      return date;
     }
   end
 
@@ -136,7 +123,11 @@ class Time
 
     other = Opal.coerce_to other, Integer, :to_int
 
-    `new Date(self.getTime() + (other * 1000))`
+    %x{
+      var result = new Date(self.getTime() + (other * 1000));
+      result.tz_offset = self.tz_offset;
+      return result;
+    }
   end
 
   def -(other)
@@ -145,7 +136,11 @@ class Time
     else
       other = Opal.coerce_to other, Integer, :to_int
 
-      `new Date(self.getTime() - (other * 1000))`
+      %x{
+        var result = new Date(self.getTime() - (other * 1000));
+        result.tz_offset = self.tz_offset;
+        return result;
+      }
     end
   end
 
@@ -157,6 +152,12 @@ class Time
     `#{to_f} === #{other.to_f}`
   end
 
+  def asctime
+    strftime '%a %b %e %H:%M:%S %Y'
+  end
+
+  alias ctime asctime
+
   def day
     `self.getDate()`
   end
@@ -186,7 +187,11 @@ class Time
   end
 
   def inspect
-    `self.toString()`
+    if utc?
+      strftime '%Y-%m-%d %H:%M:%S UTC'
+    else
+      strftime '%Y-%m-%d %H:%M:%S %z'
+    end
   end
 
   alias mday day
@@ -227,10 +232,10 @@ class Time
         result = string.match(/[A-Z]{3,4}/)[0];
       }
       else {
-        result = string.match(/\\([^)]+\\)/)[0].match(/[A-Z]/g).join('');
+        result = string.match(/\([^)]+\)/)[0].match(/[A-Z]/g).join('');
       }
 
-      if (result == "GMT" && /(GMT\\W*\\d{4})/.test(string)) {
+      if (result == "GMT" && /(GMT\W*\d{4})/.test(string)) {
         return RegExp.$1;
       }
       else {
@@ -239,13 +244,25 @@ class Time
     }
   end
 
+  def getgm
+    %x{
+      var result = new Date(self.getTime());
+      result.tz_offset = 0;
+      return result;
+    }
+  end
+
+  def gmt?
+    `self.tz_offset == 0`
+  end
+
   def gmt_offset
     `-self.getTimezoneOffset() * 60`
   end
 
   def strftime(format)
     %x{
-      return format.replace(/%([\\-_#^0]*:{0,2})(\\d+)?([EO]*)(.)/g, function(full, flags, width, _, conv) {
+      return format.replace(/%([\-_#^0]*:{0,2})(\d+)?([EO]*)(.)/g, function(full, flags, width, _, conv) {
         var result = "",
             width  = parseInt(width),
             zero   = flags.indexOf('0') !== -1,
@@ -408,11 +425,11 @@ class Time
             break;
 
           case 'n':
-            result += "\\n";
+            result += "\n";
             break;
 
           case 't':
-            result += "\\t";
+            result += "\t";
             break;
 
           case '%':
@@ -497,6 +514,12 @@ class Time
     `self.getDay() === 2`
   end
 
+  alias utc? gmt?
+
+  def utc_offset
+    `self.getTimezoneOffset() * -60`
+  end
+
   def wday
     `self.getDay()`
   end
@@ -509,14 +532,3 @@ class Time
     `self.getFullYear()`
   end
 end
-
-# FIXME: move this to stdlib when the corelib has its own path
-class Time
-  def self.parse(str)
-    `new Date(Date.parse(str))`
-  end
-
-  def iso8601
-    strftime('%FT%T%z')
-  end
-end

data/opal/corelib/variables.rb

@@ -0,0 +1,24 @@
+# regexp matches
+$& = $~ = $` = $' = nil
+
+# stub library path
+$: = []
+$" = []
+
+# split lines
+$/ = "\n"
+$, = nil
+
+ARGV = []
+ARGF = Object.new
+ENV  = {}
+
+$VERBOSE = false
+$DEBUG   = false
+$SAFE    = 0
+
+RUBY_PLATFORM       = 'opal'
+RUBY_ENGINE         = 'opal'
+RUBY_VERSION        = '2.0.0'
+RUBY_ENGINE_VERSION = '0.6.0'
+RUBY_RELEASE_DATE   = '2014-03-05'

data/opal/opal.rb

@@ -12,11 +12,14 @@ require 'corelib/comparable'
 require 'corelib/enumerable'
 require 'corelib/enumerator'
 require 'corelib/array'
+require 'corelib/array/inheritance'
 require 'corelib/hash'
 require 'corelib/string'
+require 'corelib/string/inheritance'
 require 'corelib/match_data'
-require 'corelib/encoding'
 require 'corelib/numeric'
+require 'corelib/complex'
+require 'corelib/rational'
 require 'corelib/proc'
 require 'corelib/method'
 require 'corelib/range'
@@ -24,29 +27,4 @@ require 'corelib/time'
 require 'corelib/struct'
 require 'corelib/io'
 require 'corelib/main'
-require 'native'
-
-# regexp matches
-$& = $~ = $` = $' = nil
-
-# stub library path
-$: = []
-$" = []
-
-# split lines
-$/ = "\n"
-$, = " "
-
-ARGV = []
-ARGF = Object.new
-ENV  = {}
-
-$VERBOSE = false
-$DEBUG   = false
-$SAFE    = 0
-
-RUBY_PLATFORM       = 'opal'
-RUBY_ENGINE         = 'opal'
-RUBY_VERSION        = '1.9.3'
-RUBY_ENGINE_VERSION = '0.5.5'
-RUBY_RELEASE_DATE   = '2013-11-25'
+require 'corelib/variables'

data/spec/cli/compiler_spec.rb

@@ -0,0 +1,136 @@
+require File.expand_path('../spec_helper', __FILE__)
+
+describe Opal::Compiler do
+  it "should compile simple ruby values" do
+    expect_compiled("3.142").to include("return 3.142")
+    expect_compiled("123e1").to include("return 1230")
+    expect_compiled("123E+10").to include("return 1230000000000")
+    expect_compiled("false").to include("return false")
+    expect_compiled("true").to include("return true")
+    expect_compiled("nil").to include("return nil")
+  end
+
+  it "should compile ruby strings" do
+    expect_compiled('"hello world"').to include('return "hello world"')
+    expect_compiled('"hello #{100}"').to include('"hello "', '100')
+  end
+
+  it "should compile method calls" do
+    expect_compiled("self.inspect").to include("$inspect()")
+    expect_compiled("self.map { |a| a + 10 }").to include("$map")
+  end
+
+  it "should compile constant lookups" do
+    expect_compiled("Object").to include("scope.Object")
+    expect_compiled("Array").to include("scope.Array")
+  end
+
+  describe "class names" do
+    it "generates a named function for class using $ prefix" do
+      expect_compiled("class Foo; end").to include("function $Foo")
+    end
+  end
+
+  describe "debugger special method" do
+    it "generates debugger keyword in javascript" do
+      expect_compiled("debugger").to include("debugger")
+      expect_compiled("debugger").to_not include("$debugger")
+    end
+  end
+
+  describe "DATA special variable" do
+    it "is not a special case unless __END__ part present in source" do
+      expect_compiled("DATA").to include("DATA")
+      expect_compiled("DATA\n__END__").to_not include("DATA")
+    end
+
+    it "DATA gets compiled as a reference to special $__END__ variable" do
+      expect_compiled("a = DATA\n__END__").to include("a = $__END__")
+    end
+
+    it "causes the compiler to create a reference to special __END__ variable" do
+      expect_compiled("DATA\n__END__\nFord Perfect").to include("$__END__ = ")
+    end
+
+    it "does not create a reference to __END__ vairbale unless __END__ content present" do
+      expect_compiled("DATA").to_not include("$__END__ = ")
+    end
+  end
+
+  describe "escapes in x-strings" do
+    it "compiles the exscapes directly as appearing in x-strings" do
+      expect_compiled('`"hello\nworld"`').to include('"hello\nworld"')
+      expect_compiled('%x{"hello\nworld"}').to include('"hello\nworld"')
+    end
+  end
+
+  describe "pre-processed if conditions" do
+    it "compiles if blocks using RUBY_ENGINE/RUBY_PLATFORM == opal" do
+      expect_compiled(<<-RUBY).to include("should_compile_fine")
+        if RUBY_ENGINE == 'opal'
+          :should_compile_fine
+        end
+      RUBY
+
+      expect_compiled(<<-RUBY).to include("so_should_this")
+        if RUBY_PLATFORM == 'opal'
+          :so_should_this
+        end
+      RUBY
+    end
+
+    it "skips elsif/else parts" do
+      expect_compiled(<<-RUBY).to_not include("should_be_skipped")
+        if RUBY_PLATFORM == "opal"
+          :ok
+        else
+          :should_be_skipped
+        end
+      RUBY
+
+      result = expect_compiled(<<-RUBY)
+        if RUBY_ENGINE == 'opal'
+          :this_compiles
+        elsif false
+          :this_does_not_compile
+        else
+          :this_neither
+        end
+      RUBY
+
+      result.to_not include("this_does_not_compile", "this_neither")
+    end
+
+    it "generates if-code as normal without check" do
+      expect_compiled(<<-RUBY).to include("should_compile", "and_this")
+        if some_conditional
+          :should_compile
+        else
+          :and_this
+        end
+      RUBY
+    end
+  end
+
+  describe "pre-processed unless conditionals" do
+    it "skips over if using RUBY_ENGINE/RUBY_PLATFORM == 'opal'" do
+      expect_compiled(<<-RUBY).to_not include("should_not_compile")
+        unless RUBY_ENGINE == 'opal'
+          :should_not_compile
+        end
+      RUBY
+    end
+
+    it "generates unless code as normal if no check" do
+      expect_compiled(<<-RUBY).to include("this_should_compile")
+        unless this_is_true
+          :this_should_compile
+        end
+      RUBY
+    end
+  end
+
+  def expect_compiled(source)
+    expect(Opal::Compiler.new.compile source)
+  end
+end