rkelly 1.0.3 → 1.0.4

data/lib/rkelly/nodes/node.rb

@@ -77,7 +77,7 @@ edge [ ];
       end
     end
 
-    %w[EmptyStatement ExpressionStatement True Delete Return TypeOf
+    %w[EmptyStatement Parenthetical ExpressionStatement True Delete Return TypeOf
        SourceElements Number LogicalNot AssignExpr FunctionBody
        ObjectLiteral UnaryMinus Throw This BitwiseNot Element String
        Array CaseBlock Null Break Parameter Block False Void Regexp

data/lib/rkelly/tokenizer.rb

@@ -89,7 +89,7 @@ module RKelly
         [value, value]
       end
     end
-  
+
     def tokenize(string)
       raw_tokens(string).map { |x| x.to_racc_token }
     end
@@ -111,7 +111,9 @@ module RKelly
           longest_token = match
         }
 
-        accepting_regexp = followable_by_regex(longest_token)
+        if longest_token.name != :S
+          accepting_regexp = followable_by_regex(longest_token)
+        end
 
         longest_token.line = line_number
         line_number += longest_token.value.scan(/\n/).length

data/lib/rkelly/visitors/ecma_visitor.rb

@@ -5,6 +5,10 @@ module RKelly
         @indent = 0
       end
 
+      def visit_ParentheticalNode(o)
+        "(#{o.value.accept(self)})"
+      end
+
       def visit_SourceElementsNode(o)
         o.value.map { |x| "#{indent}#{x.accept(self)}" }.join("\n")
       end
@@ -31,6 +35,7 @@ module RKelly
 
       def visit_ForNode(o)
         init    = o.init ? o.init.accept(self) : ';'
+        init    << ';' unless init.end_with? ';' # make sure it has a ;
         test    = o.test ? o.test.accept(self) : ''
         counter = o.counter ? o.counter.accept(self) : ''
         "for(#{init} #{test}; #{counter}) #{o.value.accept(self)}"
@@ -180,8 +185,6 @@ module RKelly
         [:Divide, '/'],
         [:Equal, '=='],
         [:Greater, '>'],
-        [:Greater, '>'],
-        [:GreaterOrEqual, '>='],
         [:GreaterOrEqual, '>='],
         [:In, 'in'],
         [:InstanceOf, 'instanceof'],

data/lib/rkelly/visitors/evaluation_visitor.rb

@@ -315,7 +315,7 @@ module RKelly
           when Numeric
             object.value
           when ::String
-            s = object.value.gsub(/(\A[\s\xB\xA0]*|[\s\xB\xA0]*\Z)/, '')
+            s = object.value.gsub(/(\A[\s\xA0]*|[\s\xA0]*\Z)/, '')
             if s.length == 0
               0
             else

data/lib/rkelly/visitors/pointcut_visitor.rb

@@ -23,7 +23,7 @@ module RKelly
       ALL_NODES.each do |type|
         define_method(:"visit_#{type}Node") do |o|
           @matches << o if @pattern === o
-          super
+          super(o)
         end
       end
     end

data/lib/rkelly/visitors/visitor.rb

@@ -6,7 +6,7 @@ module RKelly
         String This True
       }
       SINGLE_VALUE_NODES = %w{
-        AssignExpr BitwiseNot Block Delete Element ExpressionStatement
+        Parenthetical AssignExpr BitwiseNot Block Delete Element ExpressionStatement
         FunctionBody LogicalNot Return Throw TypeOf UnaryMinus UnaryPlus Void
       }
       BINARY_NODES = %w{

data/test/ecma_script_test_case.rb

@@ -1,9 +1,9 @@
-require File.dirname(__FILE__) + "/helper"
-
 class ECMAScriptTestCase < Test::Unit::TestCase
   include RKelly::JS
 
-  undef :default_test
+  if method_defined? :default_test
+    undef :default_test
+  end
 
   def setup
     @runtime = RKelly::Runtime.new

data/test/execute_test_case.rb

@@ -1,9 +1,9 @@
-require File.dirname(__FILE__) + "/helper"
-
 class ExecuteTestCase < Test::Unit::TestCase
   include RKelly::Nodes
 
-  undef :default_test
+  if method_defined? :default_test
+    undef :default_test
+  end
 
   def assert_execute(expected, code)
     scope_chain = @runtime.execute(code)

data/test/helper.rb

@@ -1,5 +1,5 @@
 require 'test/unit'
 require 'rkelly'
-require 'test/node_test_case'
-require 'test/execute_test_case'
 require 'test/ecma_script_test_case'
+require 'test/execute_test_case'
+require 'test/node_test_case'

data/test/node_test_case.rb

@@ -1,9 +1,9 @@
-require File.dirname(__FILE__) + "/helper"
-
 class NodeTestCase < Test::Unit::TestCase
   include RKelly::Nodes
 
-  undef :default_test
+  if method_defined? :default_test
+    undef :default_test
+  end
 
   def assert_sexp(expected, actual)
     assert_equal(expected, actual.to_sexp)

data/test/test_ecma_visitor.rb

@@ -183,6 +183,12 @@ class ECMAVisitorTest < Test::Unit::TestCase
     assert_to_ecma('for(foo in bar) { var x = 10; }')
   end
 
+  def test_for_node
+    assert_to_ecma('for(var i = 0; i < 10; i++) { var x = 10; }')
+    assert_to_ecma('var i = 0; for(; i < 10; i++) { var x = 10; }')
+    assert_to_ecma('var i; for(i = 0; i < 6; ++i) { var x = 10; }')
+  end
+
   def assert_to_ecma(expected, actual = nil)
     ecma = @parser.parse(actual || expected).to_ecma
     ecma = ecma.gsub(/\n/, ' ').gsub(/\s+/, ' ')

data/test/test_tokenizer.rb

@@ -64,7 +64,7 @@ class TokenizerTest < Test::Unit::TestCase
     ], tokens)
   end
 
-  def test_regex
+  def test_regular_expression
     tokens = @tokenizer.tokenize("foo = /=asdf/;")
     assert_tokens([
                  [:IDENT, 'foo'],
@@ -74,6 +74,20 @@ class TokenizerTest < Test::Unit::TestCase
     ], tokens)
   end
 
+  def test_regular_expression_invalid
+    tokens = @tokenizer.tokenize("foo = (1 / 2) / 3")
+    assert_tokens([[:IDENT, "foo"],
+                   ["=", "="],
+                   ["(", "("],
+                   [:NUMBER, 1],
+                   ["/", "/"],
+                   [:NUMBER, 2],
+                   [")", ")"],
+                   ["/", "/"],
+                   [:NUMBER, 3]
+                  ], tokens)
+  end
+
   def test_regular_expression_escape
     tokens = @tokenizer.tokenize('foo = /\/asdf/gi;')
     assert_tokens([

metadata

@@ -1,51 +1,37 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rkelly
-version: !ruby/object:Gem::Version 
-  hash: 17
+version: !ruby/object:Gem::Version
+  version: 1.0.4
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 3
-  version: 1.0.3
 platform: ruby
-authors: 
+authors:
 - Aaron Patterson
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-02-28 00:00:00 -08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-12-06 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: hoe
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2152981200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 41
-        segments: 
-        - 2
-        - 9
-        - 1
-        version: 2.9.1
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.12'
   type: :development
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: *2152981200
 description: The RKelly library will parse JavaScript and return a parse tree.
-email: 
+email:
 - aaron.patterson@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - Manifest.txt
 - CHANGELOG.rdoc
 - README.rdoc
-files: 
+files:
 - CHANGELOG.rdoc
 - Manifest.txt
 - README.rdoc
@@ -246,42 +232,33 @@ files:
 - test/test_while_node.rb
 - test/test_with_node.rb
 - .gemtest
-has_rdoc: true
 homepage: http://rkelly.rubyforge.org/
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.rdoc
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: rkelly
-rubygems_version: 1.5.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: The RKelly library will parse JavaScript and return a parse tree.
-test_files: 
+test_files:
 - test/execution_contexts/test_10_1_3-1.rb
 - test/expressions/test_11_3_1.rb
 - test/expressions/test_11_3_2.rb