twostroke 0.2.2 → 0.2.3

data/lib/twostroke/runtime/lib/etc.rb

@@ -3,25 +3,11 @@ module Twostroke::Runtime
     evaled = 0
     eval = Types::Function.new(->(_scope, this, args) {      
         src = Types.to_string(args[0] || Types::Undefined.new).string + ";"
-        
         begin
-          parser = Twostroke::Parser.new Twostroke::Lexer.new src
-          parser.parse
-
-          evaled += 1
-          compiler = Twostroke::Compiler::TSASM.new parser.statements, "evaled_#{evaled}_"
-          compiler.compile
+          scope.global_scope.vm.eval src, _scope, this
         rescue Twostroke::SyntaxError => e
           Lib.throw_syntax_error e.to_s
         end
-        
-        vm = scope.global_scope.vm
-        compiler.bytecode.each do |k,v|
-          vm.bytecode[k] = v
-        end
-        
-        vm.bytecode[:"evaled_#{evaled}_main"][-2] = [:ret]
-        vm.execute :"evaled_#{evaled}_main", _scope, this
       }, nil, "eval", [])
     eval.inherits_caller_this = true
     scope.set_var "eval", eval

data/lib/twostroke/runtime/lib/function.rb

@@ -4,13 +4,6 @@ module Twostroke::Runtime
     scope.set_var "Function", obj
     
     proto = Types::Object.new
-    proto.proto_put "toString", Types::Function.new(->(scope, this, args) {
-        if this.is_a?(Types::Function)
-          this.primitive_value
-        else
-          Lib.throw_type_error "Function.prototype.toString is not generic"
-        end
-      }, nil, "toString", [])
     proto.proto_put "valueOf", Types::Function.new(->(scope, this, args) { this }, nil, "valueOf", [])
     proto.define_own_property "arity", get: ->(this) { this.arguments.size }, writable: false
     proto.define_own_property "length", get: ->(this) { this.arguments.size }, writable: false
@@ -38,7 +31,8 @@ module Twostroke::Runtime
       end, nil, "call", [])
     # Function.prototype.toString
     proto.proto_put "toString", Types::Function.new(->(scope, this, args) do
-        this.primitive_value
+        Lib.throw_type_error "Function.prototype.toString is not generic" unless this.is_a? Types::Function
+        Types::String.new "function #{this.name}(#{this.arguments.join ","}) { #{this.source || "[native code]"} }"
       end, nil, "toString", [])
     obj.proto_put "prototype", proto
   end

data/lib/twostroke/runtime/lib/math.rb

@@ -32,9 +32,14 @@ module Twostroke::Runtime
     }, nil, "parseInt", [])
     
     # one argument functions
-    %w(sqrt sin cos tan).each do |method|
+    %w(sqrt sin cos tan exp).each do |method|
       obj.proto_put method, Types::Function.new(->(scope, this, args) {
-          Types::Number.new(Math.send method, Types.to_number(args[0] || Undefined.new).number)
+          ans = begin
+                  Math.send method, Types.to_number(args[0] || Undefined.new).number
+                rescue Math::DomainError
+                  Float::NAN
+                end
+          Types::Number.new(ans)
         }, nil, method, [])
     end
 
@@ -63,5 +68,12 @@ module Twostroke::Runtime
     obj.proto_put "min", Types::Function.new(->(scope, this, args) {
         Types::Number.new [Float::INFINITY, *args.map { |a| Types.to_number(a).number }].min
       }, nil, "min", [])
+      
+    obj.proto_put "pow", Types::Function.new(->(scope, this, args) {
+        a = Types.to_number(args[0] || Types::Undefined.new).number
+        b = Types.to_number(args[1] || Types::Undefined.new).number
+        ans = a ** b
+        Types::Number.new(ans.is_a?(Complex) ? Float::NAN : ans)
+      }, nil, "random", [])
   end
 end

data/lib/twostroke/runtime/lib/number.js

@@ -0,0 +1,3 @@
+Math.round = function(x) {
+    return Math.floor(Number(x) + 0.5);
+};

data/lib/twostroke/runtime/lib/number.rb

@@ -22,7 +22,7 @@ module Twostroke::Runtime
     proto.proto_put "toExponential", Types::Function.new(->(scope, this, args) do
         n = Types.to_number(this)
         if n.nan? || n.infinite?
-          Types::String.new n.to_s
+          Types::String.new n.number.to_s
         else
           places = Math.log(n.number, 10).floor
           significand = n.number / (10 ** places).to_f
@@ -41,25 +41,32 @@ module Twostroke::Runtime
       end, nil, "toExponential", [])
     # Number.prototype.toFixed
     proto.proto_put "toFixed", Types::Function.new(->(scope, this, args) do
-        digits = Types.to_number(args[0] || Undefined.new)
+        digits = Types.to_number(args[0] || Types::Undefined.new)
         if digits.nan? || digits.infinite?
           digits = 0
         else
           digits = digits.number
         end
-        Types::String.new sprintf("%.#{[[0,digits].max,20].min}f", Types.to_number(this).number)
+        digits = [[0,digits].max,20].min
+        Types::String.new sprintf("%.#{digits}f", Types.to_number(this).number.round(digits))
       end, nil, "toFixed", [])
     # Number.prototype.toLocaleString
     proto.proto_put "toLocaleString", proto.get("toString")
     # Number.prototype.toString
     proto.proto_put "toPrecision", Types::Function.new(->(scope, this, args) do
-        digits = Types.to_number(args[0] || Undefined.new)
+        n = Types.to_number(this).number
+        return Types::String.new(n.to_s) unless args[0]
+        digits = Types.to_number(args[0] || Types::Undefined.new)
         if digits.nan? || digits.infinite?
           digits = 0
         else
           digits = digits.number
         end
-        Types::Number.new Types.to_number(this).number.round([[digits,0].max, 100].min)
+        Lib.throw_range_error "toPrecision() argument must be between 1 and 21" unless (1..21).include? digits
+        fixup = 10 ** Math.log(n, 10).floor
+        n /= fixup.to_f
+        n = n.round digits - fixup
+        Types::String.new (n * fixup).to_s
       end, nil, "toString", [])
     obj.proto_put "prototype", proto
     obj.proto_put "MAX_VALUE", Types::Number.new(Float::MAX)

data/lib/twostroke/runtime/lib/object.rb

@@ -30,11 +30,11 @@ module Twostroke::Runtime
         proto = args[0].prototype
         this = Types.to_object(this || Types::Undefined.new)
         while proto.is_a?(Types::Object)
-          return Types::Boolean.new(true) if this == proto
+          return Types::Boolean.true if this == proto
           proto = proto.prototype
         end
       end
-      Types::Boolean.new false
+      Types::Boolean.false
     }, nil, "isPrototypeOf", [])
     proto.proto_put "propertyIsEnumerable", Types::Function.new(->(scope, this, args) {
       this = Types.to_object(this || Types::Undefined.new)
@@ -42,9 +42,9 @@ module Twostroke::Runtime
       if this.has_accessor(prop)
         Types::Boolean.new this.accessors[prop][:enumerable]
       elsif this.has_property(prop)
-        Types::Boolean.new true
+        Types::Boolean.true
       else
-        Types::Boolean.new false
+        Types::Boolean.false
       end
     }, nil, "propertyIsEnumerable", [])
     

data/lib/twostroke/runtime/lib/regexp.rb

@@ -4,8 +4,8 @@ module Twostroke::Runtime
     scope.set_var "RegExp", regexp
     proto = Types::Object.new
     proto.proto_put "toString", Types::Function.new(->(scope, this, args) {
-        Lib.throw_type_error "RegExp.prototype.toString is not generic" unless this.is_a?(Types::RegExp)
-        this.primitive_value
+        Lib.throw_type_error "RegExp.prototype.toString is not generic" unless this.is_a? Types::RegExp
+        Types::String.new this.regexp.inspect + (this.global ? "g" : "")
       }, nil, "toString", [])
     proto.define_own_property "global", get: ->(this) {
         Types::Boolean.new this.global

data/lib/twostroke/runtime/scope.rb

@@ -32,11 +32,7 @@ module Twostroke::Runtime
     end
     
     def delete(var)
-      if has_var var
-        @locals.delete var
-      else
-        parent.delete var
-      end
+      parent.delete var
     end
     
     def close

data/lib/twostroke/runtime/types.rb

@@ -34,7 +34,7 @@ module Twostroke::Runtime::Types
     elsif object.is_a?(String)
       Number.new(Float(object.string)) rescue Number.new(Float::NAN)
     else # object is Object
-      to_number to_primitive(object)
+      to_number to_primitive(object, "Number")
     end
   end
   
@@ -70,7 +70,7 @@ module Twostroke::Runtime::Types
     elsif object.is_a?(String)
       object
     else
-      to_string to_primitive(object)
+      to_string to_primitive(object, "String")
     end
   end
   
@@ -128,6 +128,21 @@ module Twostroke::Runtime::Types
     end
   end
   
+  def self.marshal(ruby_object)
+    case ruby_object
+    when ::String;          String.new ruby_object
+    when Fixnum, Float;     Number.new ruby_object
+    when ::Array;           Array.new ruby_object.map { |el| box el }
+    when Hash;              o = Object.new
+                            ruby_object.each { |k,v| o.put k.to_s, box(v) }
+                            o
+    when nil;               Null.new
+    when true;              Boolean.true
+    when false;             Boolean.false
+    else                    Undefined.new
+    end
+  end
+  
   require File.expand_path("../types/value.rb", __FILE__)
   require File.expand_path("../types/object.rb", __FILE__)
   Dir.glob(File.expand_path("../types/*", __FILE__)).each do |f|

data/lib/twostroke/runtime/types/array.rb

@@ -26,6 +26,10 @@ module Twostroke::Runtime
           end, writable: true, enumerable: false
       end
       
+      def to_ruby
+        items.map &:to_ruby
+      end
+      
       def length
         items.size
       end

data/lib/twostroke/runtime/types/boolean.rb

@@ -4,7 +4,7 @@ module Twostroke::Runtime::Types
       @@true ||= Boolean.new(true)
     end
     def self.false
-      @@false ||= Null.new(false)
+      @@false ||= Boolean.new(false)
     end
   
     attr_reader :boolean
@@ -12,6 +12,10 @@ module Twostroke::Runtime::Types
       @boolean = boolean
     end
     
+    def to_ruby
+      boolean
+    end
+    
     def ===(other)
       other.is_a?(Boolean) && boolean == other.boolean
     end

data/lib/twostroke/runtime/types/boolean_object.rb

@@ -18,8 +18,8 @@ module Twostroke::Runtime::Types
       @boolean = boolean
     end
     
-    def primitive_value
-      Boolean.new boolean
+    def to_ruby
+      boolean
     end
   end
 end

data/lib/twostroke/runtime/types/function.rb

@@ -50,6 +50,10 @@ module Twostroke::Runtime::Types
       put "prototype", proto
     end
     
+    def to_ruby
+      ->(this, *args) { call(nil, this, args.map(&Twostroke::Runtime::Types.method(:marshal))).to_ruby }
+    end
+    
     def prototype
       @prototype ||= Function.constructor_function.get("prototype") if Function.constructor_function
     end
@@ -69,10 +73,6 @@ module Twostroke::Runtime::Types
       "function"
     end
     
-    def primitive_value
-      String.new "function #{name}(#{arguments.join ","}) { #{source || "[native code]"} }"
-    end
-    
     def call(upper_scope, this, args)
       retn_val = function.(upper_scope, this || upper_scope.global_scope.root_object, args)
       # prevent non-Value objects being returned to javascript

data/lib/twostroke/runtime/types/number.rb

@@ -5,6 +5,10 @@ module Twostroke::Runtime::Types
       @number = number
     end
     
+    def to_ruby
+      number
+    end
+    
     def ===(other)
       if number.zero? && other.is_a?(Number) && other.number.zero?
         # in javascript, -0 and 0 are not equal
@@ -15,15 +19,19 @@ module Twostroke::Runtime::Types
         other.is_a?(Number) && number == other.number
       end
     end
+    
     def typeof
       "number"
     end
+    
     def zero?
       number.zero?
     end
+    
     def nan?
       number.is_a?(Float) && number.nan?
     end
+    
     def infinite?
       number.is_a?(Float) && number.infinite?
     end

data/lib/twostroke/runtime/types/number_object.rb

@@ -18,8 +18,8 @@ module Twostroke::Runtime::Types
       super()
     end
     
-    def primitive_value
-      Number.new number
+    def to_ruby
+      number
     end
   end
 end

data/lib/twostroke/runtime/types/object.rb

@@ -13,6 +13,10 @@ module Twostroke::Runtime::Types
       proto_put "constructor", @_class
     end
     
+    def to_ruby
+      Twostroke::Context::ObjectProxy.new self
+    end
+    
     def _class=(c)
       proto_put "constructor", (@_class = c)
     end
@@ -41,13 +45,7 @@ module Twostroke::Runtime::Types
     
     def construct(opts = {})
       @constructing = true
-      opts.each do |k,v|
-        if respond_to? "#{k}="
-          send "#{k}=", v
-        else
-          instance_variable_set "@#{k}", v
-        end
-      end
+      opts.each { |k,v| send "#{k}=", v }
       yield if block_given?
       @constructing = false
     end

data/lib/twostroke/runtime/types/regexp.rb

@@ -24,8 +24,8 @@ module Twostroke::Runtime::Types
       super()
     end
     
-    def primitive_value
-      String.new(regexp.inspect + (@global ? "g" : ""))
+    def to_ruby
+      regexp
     end
     
     def self.to_ruby_regexp(src)
@@ -36,7 +36,7 @@ module Twostroke::Runtime::Types
         gsub(/([^\[]|\A)\^/,"\\1\\A").gsub(/((\]|\A)([^\[]*))\$/,"\\1\\z").
       
       # javascript supports \cA through \cZ for control characters
-        gsub(/\\c[a-z]/i) { |m| (m.last.downcase.ord - 'a'.ord).chr }
+        gsub(/\\c[a-z]/i) { |m| (m[-1].downcase.ord - 'a'.ord + 1).chr }
     end
     
     def self.exec(scope, this, args)

data/lib/twostroke/runtime/types/string.rb

@@ -5,6 +5,10 @@ module Twostroke::Runtime::Types
       @string = string
     end
     
+    def to_ruby
+      string
+    end
+    
     def ===(other)
       other.is_a?(String) && string == other.string
     end

data/lib/twostroke/runtime/types/string_object.rb

@@ -12,14 +12,17 @@ module Twostroke::Runtime
         @string = string
         super()
       end
-    
-      def primitive_value
-        String.new string
+      
+      def to_ruby
+        string
       end
       
       def get(prop, this = self)
         if prop =~ /\A\d+\z/
-          String.new string[prop.to_i]
+          idx = prop.to_i
+          unless idx < 0 or idx >= string.length
+            String.new string[idx]
+          end
         else
           super prop, this
         end

data/lib/twostroke/runtime/types/value.rb

@@ -1,12 +1,12 @@
 module Twostroke::Runtime::Types
   class Value
-    def typeof
-      "VALUE"
-    end
-    
     def has_instance(obj)
       Twostroke::Runtime::Lib.throw_type_error "Expected a function in instanceof check"
     end
+    
+    def to_ruby
+      nil
+    end
   end
   
   class Primitive < Value

data/lib/twostroke/runtime/vm.rb

@@ -8,6 +8,7 @@ module Twostroke::Runtime
       @global_scope = GlobalScope.new self
       @lib = {}
       @name_args = {}
+      @vm_eval_counter = 0
     end
     
     def execute(section = :main, scope = nil, this = nil)
@@ -29,6 +30,17 @@ module Twostroke::Runtime
         @name_args[section]
       end
     end
+    
+    def eval(source, scope = nil, this = nil)
+      parser = Twostroke::Parser.new Twostroke::Lexer.new source
+      parser.parse
+      prefix = "#{@vm_eval_counter += 1}_"
+      compiler = Twostroke::Compiler::TSASM.new parser.statements, prefix
+      compiler.compile
+      compiler.bytecode[:"#{prefix}main"][-2] = [:ret]
+      bytecode.merge! compiler.bytecode
+      execute :"#{prefix}main", scope, this
+    end
   
   private
     def error!(msg)