parser 2.0.0.beta1 → 2.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 461f75016915d79b41bf1d98c2ffd979b85b92a8
-  data.tar.gz: e4e95ba6d0d7a54da4d29f10d103f9a9541a1102
+  metadata.gz: 07879ee1d09632725a820a2ebe8cffd8ab8b96df
+  data.tar.gz: e6e2daa3f5ce930d63f72457fceded6a319309aa
 SHA512:
-  metadata.gz: af23698e24fc19b7c12cb521d21657be6a1aa5b7771562b3643e8be35082765fe02e3e81a8801f8667f28adb0114f3353b512ac9121eb673b68836c05286bfde
-  data.tar.gz: 82bc2d8abbf80d1c46860ae02ebea4dfe284799b88e3a9163b1121993158952eeff5a7c969b27d9d3e2281441eefd056c60c4f55eb66dd199d0324c73dbf6b8c
+  metadata.gz: ebb7af02e3f6c83c57d221857c8a4c3f3606aa61ab84f33cb1ccc10ec6b3433da0fbc44af7a26bc8beb7e3cc6df1ef1feafc30734fa20a86060db212adc92d05
+  data.tar.gz: 97d3ba4a5f88a4dbdaaa9521aa5a24ecae3397d9d5d7f39691a757b74f2aadaa48e14b08fd8b28343ec94c8d6d7b5254663d57407c60f384bb4c17019e5bc9db

data/CHANGELOG.md

@@ -1,9 +1,15 @@
 Changelog
 =========
 
-2.0.0.beta1 (2013-05-25)
+2.0.0.beta2 (2013-05-27)
 ------------------------
 
+Bugs fixed:
+ * Actually return comments from Parser::Base#tokenize instead of nil. (Peter Zotov)
+
+v2.0.0 (2013-05-25)
+-------------------
+
 API modifications:
  * Completely rewrite whitespace handling in lexer (fixes #36). (Peter Zotov)
  * Rename Parser::AST::Node#source_map to #location, #src to #loc (closes #40). (Peter Zotov)

data/lib/parser/base.rb

@@ -33,8 +33,6 @@ module Parser
 
       @static_env  = StaticEnvironment.new
 
-      @comments    = []
-
       @lexer = Lexer.new(version)
       @lexer.diagnostics = @diagnostics
       @lexer.static_env  = @static_env
@@ -90,7 +88,7 @@ module Parser
     def tokenize(source_buffer)
       @lexer.tokens = []
 
-      ast, comments = parse(source_buffer)
+      ast, comments = parse_with_comments(source_buffer)
 
       [ ast, comments, @lexer.tokens ]
     ensure

data/lib/parser/version.rb

@@ -1,3 +1,3 @@
 module Parser
-  VERSION = '2.0.0.beta1'
+  VERSION = '2.0.0.beta2'
 end

data/parser.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake',      '~> 0.9'
   spec.add_development_dependency 'racc'
 
-  spec.add_development_dependency 'minitest',  '~> 4.7.0'
+  spec.add_development_dependency 'minitest',  '~> 5.0'
   spec.add_development_dependency 'simplecov', '~> 0.7'
   spec.add_development_dependency 'coveralls'
   spec.add_development_dependency 'json_pure' # for coveralls on 1.9.2

data/test/test_current.rb

@@ -1,7 +1,7 @@
 require 'helper'
 require 'parser/current'
 
-class TestCurrent < MiniTest::Unit::TestCase
+class TestCurrent < Minitest::Test
   def test_current
     case RUBY_VERSION
     when '1.8.7'

data/test/test_diagnostic.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestDiagnostic < MiniTest::Unit::TestCase
+class TestDiagnostic < Minitest::Test
   def setup
     @buffer = Parser::Source::Buffer.new('(string)')
     @buffer.source = "if (this is some bad code + bugs)"

data/test/test_diagnostic_engine.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestDiagnosticEngine < MiniTest::Unit::TestCase
+class TestDiagnosticEngine < Minitest::Test
   def setup
     @buffer  = Parser::Source::Buffer.new('(source)')
     @buffer.source = 'foobar'

data/test/test_encoding.rb

@@ -2,7 +2,7 @@
 
 require 'helper'
 
-class TestEncoding < MiniTest::Unit::TestCase
+class TestEncoding < Minitest::Test
   def recognize(string)
     Parser::Source::Buffer.recognize_encoding(string)
   end

data/test/test_lexer.rb

@@ -2,7 +2,7 @@
 
 require 'helper'
 
-class TestLexer < MiniTest::Unit::TestCase
+class TestLexer < Minitest::Test
   def setup_lexer(version)
     @lex = Parser::Lexer.new(version)
 

data/test/test_lexer_stack_state.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestLexerStackState < MiniTest::Unit::TestCase
+class TestLexerStackState < Minitest::Test
   def setup
     @state = Parser::Lexer::StackState.new('state')
   end

data/test/test_parse_helper.rb

@@ -1,7 +1,7 @@
 require 'helper'
 require 'parse_helper'
 
-class TestParseHelper < MiniTest::Unit::TestCase
+class TestParseHelper < Minitest::Test
   include ParseHelper
 
   def test_parser_for_ruby_version

data/test/test_parser.rb

@@ -3,7 +3,7 @@
 require 'helper'
 require 'parse_helper'
 
-class TestParser < MiniTest::Unit::TestCase
+class TestParser < Minitest::Test
   include ParseHelper
 
   def parser_for_ruby_version(version)
@@ -4214,7 +4214,10 @@ class TestParser < MiniTest::Unit::TestCase
         Parser::Source::Range.new(source_file, from, to)
       end
 
-      _ast, comments = parser.parse_with_comments(source_file)
+      ast, comments = parser.parse_with_comments(source_file)
+
+      assert_equal s(:send, s(:int, 1), :+, s(:int, 2)),
+                   ast
 
       assert_equal [
                      Parser::Source::Comment.new(range.call(4, 9))
@@ -4231,7 +4234,14 @@ class TestParser < MiniTest::Unit::TestCase
         Parser::Source::Range.new(source_file, from, to)
       end
 
-      _ast, _comments, tokens = parser.tokenize(source_file)
+      ast, comments, tokens = parser.tokenize(source_file)
+
+      assert_equal s(:send, s(:int, 1), :+, s(:int, 2)),
+                   ast
+
+      assert_equal [
+                     Parser::Source::Comment.new(range.call(4, 9))
+                   ], comments
 
       assert_equal [
                      [:tINTEGER, [ 1,       range.call(0, 1) ]],

data/test/test_source_buffer.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestSourceBuffer < MiniTest::Unit::TestCase
+class TestSourceBuffer < Minitest::Test
   def setup
     @buffer = Parser::Source::Buffer.new('(string)')
   end

data/test/test_source_comment.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestSourceComment < MiniTest::Unit::TestCase
+class TestSourceComment < Minitest::Test
   def setup
     @buf = Parser::Source::Buffer.new('(string)')
     @buf.source = "# foo\n=begin foo\nbar\n=end baz\n"

data/test/test_source_comment_associator.rb

@@ -1,7 +1,7 @@
 require 'helper'
 require 'parser/ruby18'
 
-class TestSourceCommentAssociator < MiniTest::Unit::TestCase
+class TestSourceCommentAssociator < Minitest::Test
   def test_associate
     parser = Parser::Ruby18.new
 

data/test/test_source_range.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestSourceRange < MiniTest::Unit::TestCase
+class TestSourceRange < Minitest::Test
   def setup
     @buf = Parser::Source::Buffer.new('(string)')
     @buf.source = "foobar\nbaz"

data/test/test_source_rewriter.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestSourceRewriter < MiniTest::Unit::TestCase
+class TestSourceRewriter < Minitest::Test
   def setup
     @buf = Parser::Source::Buffer.new('(rewriter)')
     @buf.source = 'foo bar baz'

data/test/test_source_rewriter_action.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestSourceRewriterAction < MiniTest::Unit::TestCase
+class TestSourceRewriterAction < Minitest::Test
   def setup
     @buf = Parser::Source::Buffer.new('(rewriter_action)')
     @buf.source = 'foo bar baz'

data/test/test_static_environment.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestStaticEnvironment < MiniTest::Unit::TestCase
+class TestStaticEnvironment < Minitest::Test
   def setup
     @env = Parser::StaticEnvironment.new
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parser
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta1
+  version: 2.0.0.beta2
 platform: ruby
 authors:
 - Peter Zotov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-25 00:00:00.000000000 Z
+date: 2013-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.7.0
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.7.0
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement