rkelly 1.0.4 → 1.0.7

data/lib/rkelly/constants.rb

@@ -1,3 +1,3 @@
 module RKelly
-  VERSION = '1.0.4'
+  VERSION = '1.0.7'
 end

data/lib/rkelly/generated_parser.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.7
+# This file is automatically generated by Racc 1.4.9
 # from Racc grammer file "".
 #
 
@@ -280,7 +280,7 @@ clist = [
 '96,22,23,24,,,,,,,,43,44,,,,,112,22,23,24,92,,,28,,,27,25,26,87,,,,112',
 '32,,86,92,,33,28,,45,46,47,48,,,,,,,,,,27,25,26,87,,,,,32,,86,,,33,',
 ',,27,25,26,87,,,,,32,,86,,,33' ]
-        racc_action_table = arr = Array.new(8578, nil)
+        racc_action_table = arr = ::Array.new(8578, nil)
         idx = 0
         clist.each do |str|
           str.split(',', -1).each do |i|
@@ -575,7 +575,7 @@ clist = [
 '36,92,92,92,36,,,36,,,485,485,485,485,,,,92,485,,485,92,,485,92,,485',
 '485,485,485,,,,,,,,,,36,36,36,36,,,,,36,,36,,,36,,,,92,92,92,92,,,,',
 '92,,92,,,92' ]
-        racc_action_check = arr = Array.new(8578, nil)
+        racc_action_check = arr = ::Array.new(8578, nil)
         idx = 0
         clist.each do |str|
           str.split(',', -1).each do |i|

data/lib/rkelly/nodes/binary_node.rb

@@ -8,11 +8,11 @@ module RKelly
       end
     end
 
-    %w[Subtract LessOrEqual GreaterOrEqual Add Multiply While NotEqual
+    %w[Subtract LessOrEqual GreaterOrEqual Add Multiply NotEqual
        DoWhile Switch LogicalAnd UnsignedRightShift Modulus While
        NotStrictEqual Less With In Greater BitOr StrictEqual LogicalOr
        BitXOr LeftShift Equal BitAnd InstanceOf Divide RightShift].each do |node|
-      eval "class #{node}Node < BinaryNode; end"
+      const_set "#{node}Node", Class.new(BinaryNode)
     end
   end
 end

data/lib/rkelly/token.rb

@@ -11,5 +11,9 @@ module RKelly
       return transformer.call(name, value) if transformer
       [name, value]
     end
+
+    def to_s
+      return "#{self.name}: #{self.value}"
+    end
   end
 end

data/lib/rkelly/tokenizer.rb

@@ -45,7 +45,15 @@ module RKelly
       '/='  => :DIVEQUAL,
     }
 
-    TOKENS_THAT_IMPLY_DIVISION = [:IDENT, :NUMBER, ')', ']', '}']
+    # Some keywords can be followed by regular expressions (eg, return and throw).
+    # Others can be followed by division.
+    KEYWORDS_THAT_IMPLY_DIVISION = %w{
+      this true false null
+    }
+
+    KEYWORDS_THAT_IMPLY_REGEX = KEYWORDS - KEYWORDS_THAT_IMPLY_DIVISION
+
+    SINGLE_CHARS_THAT_IMPLY_DIVISION = [')', ']', '}']
 
     def initialize(&block)
       @lexemes = []
@@ -72,17 +80,26 @@ module RKelly
         [LITERALS[value], value]
       end
 
-      token(:IDENT, /\A([_\$A-Za-z][_\$0-9A-Za-z]*)/) do |type,value|
+      token(:RAW_IDENT, /\A([_\$A-Za-z][_\$0-9A-Za-z]*)/) do |type,value|
         if KEYWORDS.include?(value)
           [value.upcase.to_sym, value]
         elsif RESERVED.include?(value)
           [:RESERVED, value]
         else
-          [type, value]
+          [:IDENT, value]
         end
       end
 
-      token(:REGEXP, /\A\/(?:[^\/\r\n\\]*(?:\\[^\r\n][^\/\r\n\\]*)*)\/[gi]*/)
+      # To distinguish regular expressions from comments, we require that
+      # regular expressions start with a non * character (ie, not look like
+      # /*foo*/). Note that we can't depend on the length of the match to
+      # correctly distinguish, since `/**/i` is longer if matched as a regular
+      # expression than as matched as a comment.
+      # Incidentally, we're also not matching empty regular expressions
+      # (eg, // and //g). Here we could depend on match length and priority to
+      # determine that these are actually comments, but it turns out to be
+      # easier to not match them in the first place.
+      token(:REGEXP, /\A\/(?:[^\/\r\n\\*]|\\[^\r\n])[^\/\r\n\\]*(?:\\[^\r\n][^\/\r\n\\]*)*\/[gim]*/)
       token(:S, /\A[\s\r\n]*/m)
 
       token(:SINGLE_CHAR, /\A./) do |type, value|
@@ -129,10 +146,16 @@ module RKelly
     end
 
     def followable_by_regex(current_token)
-     name = current_token.name
-     name = current_token.value if name == :SINGLE_CHAR
-     #the tokens that imply division vs. start of regex form a disjoint set
-     !TOKENS_THAT_IMPLY_DIVISION.include?(name)
+      case current_token.name
+      when :RAW_IDENT
+        KEYWORDS_THAT_IMPLY_REGEX.include?(current_token.value)
+      when :NUMBER
+        false
+      when :SINGLE_CHAR
+        !SINGLE_CHARS_THAT_IMPLY_DIVISION.include?(current_token.value)
+      else
+        true
+      end
     end
   end
 end

data/lib/rkelly/visitors/ecma_visitor.rb

@@ -232,7 +232,11 @@ module RKelly
       end
 
       def visit_CaseClauseNode(o)
-        case_code = "#{indent}case #{o.left ? o.left.accept(self) : nil}:\n"
+        if o.left
+          case_code = "#{indent}case #{o.left.accept(self)}:\n"
+        else
+          case_code = "#{indent}default:\n"
+        end
         @indent += 1
         case_code += "#{o.value.accept(self)}\n"
         @indent -= 1
@@ -292,7 +296,8 @@ module RKelly
       end
 
       def visit_ForInNode(o)
-        "for(#{o.left.accept(self)} in #{o.right.accept(self)}) " +
+        var = o.left.is_a?(RKelly::Nodes::VarDeclNode) ? 'var ' : ''
+        "for(#{var}#{o.left.accept(self)} in #{o.right.accept(self)}) " +
           "#{o.value.accept(self)}"
       end
 

data/test/test_ecma_visitor.rb

@@ -110,6 +110,17 @@ class ECMAVisitorTest < Test::Unit::TestCase
     }")
   end
 
+  def test_switch_default_node
+    assert_to_ecma("switch(a) {
+                   case 1:
+                    foo();
+                   break;
+                   default:
+                    bar();
+                   break;
+    }")
+  end
+
   def test_do_while_node
     assert_to_ecma("do { foo(); } while(true);")
   end
@@ -181,6 +192,7 @@ class ECMAVisitorTest < Test::Unit::TestCase
 
   def test_for_in_node
     assert_to_ecma('for(foo in bar) { var x = 10; }')
+    assert_to_ecma('for(var foo in bar) { var x = 10; }')
   end
 
   def test_for_node

data/test/test_tokenizer.rb

@@ -100,6 +100,7 @@ class TokenizerTest < Test::Unit::TestCase
 
   def test_regular_expression_is_not_found_if_prev_token_implies_division
     {:IDENT => 'foo',
+     :TRUE => 'true',
      :NUMBER => 1,
      ')' => ')',
      ']' => ']',
@@ -115,6 +116,25 @@ class TokenizerTest < Test::Unit::TestCase
     end
   end
 
+  def test_regular_expression_is_found_if_prev_token_is_non_literal_keyword
+    {:RETURN => 'return',
+     :THROW => 'throw'}.each do |name, value|
+      tokens = @tokenizer.tokenize("#{value}/2/")
+      assert_tokens([
+                  [name, value],
+                   [:REGEXP, "/2/"],
+      ], tokens)
+    end
+  end
+
+  def test_regular_expression_is_not_found_if_block_comment_with_re_modifier
+    tokens = @tokenizer.tokenize("/**/i")
+    assert_tokens([
+      [:COMMENT, "/**/"],
+      [:IDENT, "i"]
+    ], tokens)
+  end
+
   def test_comment_assign
     tokens = @tokenizer.tokenize("foo = /**/;")
     assert_tokens([

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rkelly
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,27 +9,48 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-06 00:00:00.000000000Z
+date: 2012-10-10 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &2152981200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *2152981200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: The RKelly library will parse JavaScript and return a parse tree.
 email:
 - aaron.patterson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
-- Manifest.txt
 - CHANGELOG.rdoc
+- Manifest.txt
 - README.rdoc
 files:
 - CHANGELOG.rdoc
@@ -254,7 +275,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rkelly
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: The RKelly library will parse JavaScript and return a parse tree.