parser 2.1.0.pre1 → 2.1.0.pre2

data/test/test_diagnostic.rb

@@ -11,7 +11,7 @@ class TestDiagnostic < Minitest::Test
 
   def test_verifies_levels
     assert_raises ArgumentError, /level/ do
-      Parser::Diagnostic.new(:foobar, 'foo', @range1)
+      Parser::Diagnostic.new(:foobar, :escape_eof, @range1)
     end
   end
 
@@ -19,9 +19,9 @@ class TestDiagnostic < Minitest::Test
     string     = 'foo'
     highlights = [@range2]
 
-    diag = Parser::Diagnostic.new(:error, string, @range1, highlights)
+    diag = Parser::Diagnostic.new(:error, :escape_eof, @range1, highlights)
     assert diag.frozen?
-    assert diag.message.frozen?
+    assert diag.arguments.frozen?
     assert diag.highlights.frozen?
 
     refute string.frozen?
@@ -36,10 +36,10 @@ class TestDiagnostic < Minitest::Test
       Parser::Source::Range.new(@buffer, 28, 32)
     ]
 
-    diag  = Parser::Diagnostic.new(:error, 'code far too bad',
+    diag  = Parser::Diagnostic.new(:error, :unexpected, { :character => '+' },
                                    location, highlights)
     assert_equal([
-      '(string):1:27: error: code far too bad',
+      "(string):1:27: error: unexpected `+'",
       'if (this is some bad code + bugs)',
       '                     ~~~~ ^ ~~~~ '
     ], diag.render)

data/test/test_diagnostic_engine.rb

@@ -12,7 +12,7 @@ class TestDiagnosticEngine < Minitest::Test
   end
 
   def test_process_warnings
-    warn = Parser::Diagnostic.new(:warning, 'foo', @buffer, 1..2)
+    warn = Parser::Diagnostic.new(:warning, :invalid_escape, @buffer, 1..2)
     @engine.process(warn)
 
     assert_equal [warn], @queue
@@ -21,7 +21,7 @@ class TestDiagnosticEngine < Minitest::Test
   def test_ignore_warnings
     @engine.ignore_warnings = true
 
-    warn = Parser::Diagnostic.new(:warning, 'foo', @buffer, 1..2)
+    warn = Parser::Diagnostic.new(:warning, :invalid_escape, @buffer, 1..2)
     @engine.process(warn)
 
     assert_equal [], @queue
@@ -30,9 +30,9 @@ class TestDiagnosticEngine < Minitest::Test
   def test_all_errors_are_fatal
     @engine.all_errors_are_fatal = true
 
-    error = Parser::Diagnostic.new(:error, 'foo', @buffer, 1..2)
+    error = Parser::Diagnostic.new(:error, :invalid_escape, @buffer, 1..2)
 
-    err = assert_raises Parser::SyntaxError, "foo" do
+    err = assert_raises Parser::SyntaxError, error.message do
       @engine.process(error)
     end
 
@@ -42,14 +42,14 @@ class TestDiagnosticEngine < Minitest::Test
   end
 
   def test_all_errors_are_collected
-    error = Parser::Diagnostic.new(:error, 'foo', @buffer, 1..2)
+    error = Parser::Diagnostic.new(:error, :invalid_escape, @buffer, 1..2)
     @engine.process(error)
 
     assert_equal [error], @queue
   end
 
   def test_fatal_error
-    fatal = Parser::Diagnostic.new(:fatal, 'foo', @buffer, 1..2)
+    fatal = Parser::Diagnostic.new(:fatal, :invalid_escape, @buffer, 1..2)
 
     assert_raises Parser::SyntaxError do
       @engine.process(fatal)

data/test/test_lexer.rb

@@ -3030,6 +3030,14 @@ class TestLexer < Minitest::Test
                    :kIF_MOD,  'if')
   end
 
+  if defined?(Encoding)
+    def test_bug_unicode_in_literal
+      setup_lexer(19)
+      assert_scanned('"\u00a4"',
+                     :tSTRING, "\u00a4")
+    end
+  end
+
   def test_bug_ragel_stack
     assert_scanned("\"\#{$2 ? $2 : 1}\"",
                    :tSTRING_BEG,      "\"",

metadata

@@ -1,75 +1,75 @@
 --- !ruby/object:Gem::Specification
 name: parser
 version: !ruby/object:Gem::Version
-  version: 2.1.0.pre1
+  version: 2.1.0.pre2
 platform: ruby
 authors:
 - Peter Zotov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-12 00:00:00.000000000 Z
+date: 2013-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: slop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.4'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.4.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.4'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.4.5
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
@@ -90,140 +90,140 @@ dependencies:
   name: cliver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.7'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.25'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.25'
 - !ruby/object:Gem::Dependency
   name: simplecov-sublime-ruby-coverage
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: gauntlet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A Ruby parser written in pure Ruby.
@@ -235,10 +235,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rubocop.yml"
-- ".travis.yml"
-- ".yardopts"
+- .gitignore
+- .rubocop.yml
+- .travis.yml
+- .yardopts
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -264,19 +264,15 @@ files:
 - lib/parser/current.rb
 - lib/parser/diagnostic.rb
 - lib/parser/diagnostic/engine.rb
-- lib/parser/lexer.rb
 - lib/parser/lexer.rl
 - lib/parser/lexer/explanation.rb
 - lib/parser/lexer/literal.rb
 - lib/parser/lexer/stack_state.rb
+- lib/parser/messages.rb
 - lib/parser/rewriter.rb
-- lib/parser/ruby18.rb
 - lib/parser/ruby18.y
-- lib/parser/ruby19.rb
 - lib/parser/ruby19.y
-- lib/parser/ruby20.rb
 - lib/parser/ruby20.y
-- lib/parser/ruby21.rb
 - lib/parser/ruby21.y
 - lib/parser/runner.rb
 - lib/parser/runner/ruby_parse.rb
@@ -321,6 +317,11 @@ files:
 - test/test_source_rewriter.rb
 - test/test_source_rewriter_action.rb
 - test/test_static_environment.rb
+- lib/parser/lexer.rb
+- lib/parser/ruby18.rb
+- lib/parser/ruby19.rb
+- lib/parser/ruby20.rb
+- lib/parser/ruby21.rb
 homepage: http://github.com/whitequark/parser
 licenses:
 - MIT
@@ -331,17 +332,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0.preview.1
+rubygems_version: 2.0.0
 signing_key: 
 specification_version: 4
 summary: A Ruby parser written in pure Ruby.