parser 1.3.1 → 1.3.2

data/doc/css/common.css

@@ -0,0 +1,68 @@
+body
+{
+    font-size:   14px;
+    line-height: 1.6;
+    margin:      0 auto;
+    max-width:   960px;
+}
+
+p code
+{
+    background:    #f2f2f2;
+    padding-left:  3px;
+    padding-right: 3px;
+}
+
+pre.code
+{
+    font-size:   13px;
+    line-height: 1.4;
+}
+
+/**
+ * YARD uses generic table styles, using a special class means those tables
+ * don't get messed up.
+ */
+.table
+{
+    border:          1px solid #ccc;
+    border-right:    none;
+    border-collapse: separate;
+    border-spacing:  0;
+    text-align:      left;
+}
+
+.table.full
+{
+    width: 100%;
+}
+
+    .table .field_name
+    {
+        min-width: 160px;
+    }
+
+    .table thead tr th.no_sort:first-child
+    {
+        width: 25px;
+    }
+
+    .table thead tr th, .table tbody tr td
+    {
+        border-bottom:  1px solid #ccc;
+        border-right:   1px solid #ccc;
+        min-width:      20px;
+        padding:        8px 5px;
+        text-align:     left;
+        vertical-align: top;
+    }
+
+    .table tbody tr:last-child td
+    {
+        border-bottom: none;
+    }
+
+    .table tr:nth-child(odd) td
+    {
+        background: #f9f9f9;
+    }

data/lib/parser/builders/default.rb

@@ -393,19 +393,19 @@ module Parser
                   lt_t, superclass,
                   body, end_t)
       n(:class, [ name, superclass, body ],
-        definition_map(class_t, lt_t, nil, end_t))
+        module_definition_map(class_t, name, lt_t, end_t))
     end
 
     def def_sclass(class_t, lshft_t, expr,
                    body, end_t)
       n(:sclass, [ expr, body ],
-        definition_map(class_t, lshft_t, nil, end_t))
+        module_definition_map(class_t, nil, lshft_t, end_t))
     end
 
     def def_module(module_t, name,
                    body, end_t)
       n(:module, [ name, body ],
-        definition_map(module_t, nil, nil, end_t))
+        module_definition_map(module_t, name, nil, end_t))
     end
 
     #
@@ -978,6 +978,16 @@ module Parser
       Source::Map::Variable.new(name_range, expr_l)
     end
 
+    def module_definition_map(keyword_t, name_e, operator_t, end_t)
+      if name_e
+        name_l = name_e.src.expression
+      end
+
+      Source::Map::Definition.new(loc(keyword_t),
+                                  loc(operator_t), name_l,
+                                  loc(end_t))
+    end
+
     def definition_map(keyword_t, operator_t, name_t, end_t)
       Source::Map::Definition.new(loc(keyword_t),
                                   loc(operator_t), loc(name_t),

data/lib/parser/lexer.rl

@@ -461,7 +461,7 @@ class Parser::Lexer
   global_var     = '$'
       ( bareword | digit+
       | [`'+~*$&?!@/\\;,.=:<>"] # `
-      | '-' [A-Za-z0-9_]?
+      | '-' c_alnum
       )
   ;
 
@@ -1802,7 +1802,7 @@ class Parser::Lexer
 
       c_any
       => {
-        message = Parser::ERRORS[:unexpected] % { :character => tok.inspect }
+        message = Parser::ERRORS[:unexpected] % { :character => tok.inspect[1..-2] }
         diagnostic :fatal, message
       };
 

data/lib/parser/source/range.rb

@@ -47,7 +47,7 @@ module Parser
       end
 
       def to_source
-        source_line[column_range]
+        @source_buffer.source[self.begin_pos...self.end_pos]
       end
 
       def is?(*what)

data/lib/parser/version.rb

@@ -1,3 +1,3 @@
 module Parser
-  VERSION = '1.3.1'
+  VERSION = '1.3.2'
 end

data/parser.gemspec

@@ -10,6 +10,7 @@ Gem::Specification.new do |spec|
   spec.summary       = spec.description
   spec.homepage      = 'http://github.com/whitequark/parser'
   spec.license       = 'MIT'
+  spec.has_rdoc      = 'yard'
 
   spec.files         = `git ls-files`.split($/) + %w(
                           lib/parser/lexer.rb
@@ -36,6 +37,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'simplecov-sublime-ruby-coverage'
 
-  spec.add_development_dependency 'github-markup'
   spec.add_development_dependency 'yard'
+  spec.add_development_dependency 'kramdown'
 end

data/test/parse_helper.rb

@@ -55,7 +55,7 @@ module ParseHelper
   end
 
   # Use like this:
-  # ```
+  # ~~~
   # assert_parses(
   #   s(:send, s(:lit, 10), :+, s(:lit, 20))
   #   %q{10 + 20},
@@ -65,7 +65,7 @@ module ParseHelper
   #     },
   #     %w(1.8 1.9) # optional
   # )
-  # ```
+  # ~~~
   def assert_parses(ast, code, source_maps='', versions=ALL_VERSIONS)
     with_versions(code, versions) do |version, parser|
       source_file = Parser::Source::Buffer.new('(assert_parses)')
@@ -103,13 +103,13 @@ module ParseHelper
   end
 
   # Use like this:
-  # ```
+  # ~~~
   # assert_diagnoses(
   #   [:warning, :ambiguous_prefix, { prefix: '*' }],
   #   %q{foo *bar},
   #   %q{    ^ location
   #     |     ~~~ highlights (0)})
-  # ```
+  # ~~~
   def assert_diagnoses(diagnostic, code, source_maps='', versions=ALL_VERSIONS)
     with_versions(code, versions) do |version, parser|
       source_file = Parser::Source::Buffer.new('(assert_diagnoses)')

data/test/test_lexer.rb

@@ -622,9 +622,10 @@ class TestLexer < MiniTest::Unit::TestCase
     util_lex_token("$`", :tBACK_REF, "$`")
   end
 
-  def test_global_dash_nothing
-    util_lex_token("$- ", :tGVAR, "$-")
-  end
+  # This was removed in 2.1.
+  # def test_global_dash_nothing
+  #   util_lex_token("$- ", :tGVAR, "$-")
+  # end
 
   def test_global_dash_something
     util_lex_token("$-x", :tGVAR, "$-x")

data/test/test_parser.rb

@@ -529,6 +529,14 @@ class TestParser < MiniTest::Unit::TestCase
       %q{~~~~ expression})
   end
 
+  def test_gvar_dash_empty
+    assert_diagnoses(
+      [:fatal, :unexpected, { :character => '$' }],
+      %q{$- },
+      %q{^ location},
+      %w(2.1))
+  end
+
   def test_back_ref
     assert_parses(
       s(:back_ref, :$+),
@@ -1285,6 +1293,7 @@ class TestParser < MiniTest::Unit::TestCase
         s(:nil)),
       %q{module Foo; nil; end},
       %q{~~~~~~ keyword
+        |       ~~~ name
         |                 ~~~ end})
   end
 
@@ -1322,6 +1331,7 @@ class TestParser < MiniTest::Unit::TestCase
         s(:nil)),
       %q{class Foo; nil; end},
       %q{~~~~~ keyword
+        |      ~~~ name
         |                ~~~ end})
   end
 

data/test/test_source_range.rb

@@ -56,6 +56,14 @@ class TestSourceRange < MiniTest::Unit::TestCase
     assert_equal 5, sr_end.end_pos
   end
 
+  def test_to_source
+    sr = Parser::Source::Range.new(@sfile, 0, 3)
+    assert_equal "foo", sr.to_source
+
+    sr_multi = Parser::Source::Range.new(@sfile, 0, 10)
+    assert_equal "foobar\nbaz", sr_multi.to_source
+  end
+
   def test_to_s
     sr = Parser::Source::Range.new(@sfile, 8, 9)
     assert_equal "(string):2:2", sr.to_s

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parser
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Peter Zotov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-09 00:00:00.000000000 Z
+date: 2013-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast
@@ -151,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: github-markup
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -165,7 +165,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -200,6 +200,8 @@ files:
 - doc/AST_FORMAT.md
 - doc/CUSTOMIZATION.md
 - doc/INTERNALS.md
+- doc/css/.gitkeep
+- doc/css/common.css
 - lib/parser.rb
 - lib/parser/all.rb
 - lib/parser/ast/node.rb
@@ -306,4 +308,4 @@ test_files:
 - test/test_source_rewriter.rb
 - test/test_source_rewriter_action.rb
 - test/test_static_environment.rb
-has_rdoc: 
+has_rdoc: yard