twostroke 0.2.1 → 0.2.2

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

@@ -33,7 +33,7 @@ module Twostroke::Runtime::Types
       
       # javascript's ^$ match the start and end of the entire string
       # ruby's ^$ are line-based, so convert to \A and \z
-        gsub(/([^\[]|\A)\^/,"\\1\\A").gsub("$","\\z").
+        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 }
@@ -42,10 +42,12 @@ module Twostroke::Runtime::Types
     def self.exec(scope, this, args)
       re = this.is_a?(RegExp) ? this : constructor_function.(nil, nil, this)
       str = Twostroke::Runtime::Types.to_string(args[0] || Twostroke::Runtime::Types::Undefined.new).string
-      if md = re.regexp.match(str)
+      idx = re.global ? Twostroke::Runtime::Types.to_uint32(re.get("lastIndex")) : 0
+      if md = re.regexp.match(str, idx)
         result = Twostroke::Runtime::Types::Array.new md.to_a.map { |s| s ? Twostroke::Runtime::Types::String.new(s) : Twostroke::Runtime::Types::Undefined.new }
         result.put "index", Twostroke::Runtime::Types::Number.new(md.offset(0).first)
         result.put "input", Twostroke::Runtime::Types::String.new(str)
+        re.put "lastIndex", Twostroke::Runtime::Types::Number.new(md.offset(0).last)
         result
       else
         Twostroke::Runtime::Types::Null.new

data/lib/twostroke/runtime/vm.rb

@@ -7,6 +7,7 @@ module Twostroke::Runtime
       @bytecode = bytecode
       @global_scope = GlobalScope.new self
       @lib = {}
+      @name_args = {}
     end
     
     def execute(section = :main, scope = nil, this = nil)
@@ -16,6 +17,18 @@ module Twostroke::Runtime
     def throw_error(type, message)
       throw :exception, lib[type].(nil, global_scope.root_object, [Types::String.new(message)])
     end
+    
+    def section_name_args(section)
+      unless @name_args[section]
+        ops = bytecode[section].take_while { |ins,arg| [:".name", :".arg"].include? ins }
+        @name_args[section] = [
+          ops.select { |ins,arg| :".name" == ins }.map { |ins,arg| arg }.first,
+          ops.select { |ins,arg| :".arg" == ins }.map { |ins,arg| arg.to_s }
+        ]
+      else
+        @name_args[section]
+      end
+    end
   
   private
     def error!(msg)

data/lib/twostroke/runtime/vm_frame.rb

@@ -37,10 +37,9 @@ module Twostroke::Runtime
       
       until @return
         ins, arg = insns[ip]
-        st = @stack.size
         @ip += 1
         if respond_to? ins
-          if @exception = catch(:exception) { public_send ins, arg; nil }
+          if @exception = catch(:exception) { send ins, arg; nil }
 #            puts "--> #{Types.to_string(exception).string}  #{@name || "(anonymous function)"}:#{@line}  <#{@section}+#{@ip}>"
             throw :exception, @exception if catch_stack.empty? && finally_stack.empty?
             if catch_stack.any?
@@ -411,8 +410,7 @@ module Twostroke::Runtime
     end
     
     def close(arg)
-      name = vm.bytecode[arg].select { |ins,arg| ins == :".name" }.map { |ins,arg| arg }.first
-      arguments = vm.bytecode[arg].select { |ins,arg| ins == :".arg" }.map(&:last).map(&:to_s)
+      name, arguments = vm.section_name_args arg
       scope = @scope
       fun = Types::Function.new(->(outer_scope, this, args) { VM::Frame.new(vm, arg, fun).execute(scope.close, this, args) }, "...", name || "", arguments)
       stack.push fun

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twostroke
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-10 00:00:00.000000000 Z
+date: 2012-01-11 00:00:00.000000000 Z
 dependencies: []
 description: An implementation of Javascript written in pure Ruby. Twostroke contains
   a parser, a bytecode compiler, a VM, and a minimal implementation of the Javascript
@@ -125,3 +125,4 @@ signing_key:
 specification_version: 3
 summary: A Ruby implementation of Javascript
 test_files: []
+has_rdoc: