kpeg 1.0.0 → 1.1.0

data/lib/kpeg.rb

@@ -1,6 +1,6 @@
 module KPeg
 
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 
   def self.grammar
     g = Grammar.new

data/lib/kpeg/compiled_parser.rb

@@ -265,8 +265,6 @@ module KPeg
         else
           return ans
         end
-
-        return ans
       end
     end
 
@@ -299,8 +297,6 @@ module KPeg
         else
           return ans
         end
-
-        return ans
       end
     end
 

data/lib/kpeg/format_parser.kpeg

@@ -77,7 +77,7 @@ sgl_escape_quote = "\\'" { "'" }
                  | "[" - range_num:e - "]" { [e.to_i, e.to_i] }
 
      curly_block = curly
-           curly = "{" < (/[^{}"']+/ | string | curly)* > "}" { @g.action(text) }
+           curly = "{" < (spaces | /[^{}"']+/ | string | curly)* > "}" { @g.action(text) }
     nested_paren = "(" (/[^()"']+/ | string | nested_paren)* ")"
 
            value = value:v ":" var:n { @g.t(v,n) }

data/lib/kpeg/format_parser.rb

@@ -270,8 +270,6 @@ class KPeg::FormatParser
         else
           return ans
         end
-
-        return ans
       end
     end
 
@@ -304,8 +302,6 @@ class KPeg::FormatParser
         else
           return ans
         end
-
-        return ans
       end
     end
 

data/lib/kpeg/string_escape.rb

@@ -278,8 +278,6 @@ class KPeg::StringEscape
         else
           return ans
         end
-
-        return ans
       end
     end
 
@@ -312,8 +310,6 @@ class KPeg::StringEscape
         else
           return ans
         end
-
-        return ans
       end
     end
 

data/test/test_kpeg_format.rb

@@ -431,6 +431,25 @@ a=b
     assert_equal expected, m.directives
   end
 
+  def test_parser_directive_single_quote
+    m = match <<-GRAMMAR
+%% header {
+# It's a bug I found
+}
+
+a=b
+    GRAMMAR
+
+    assert_rule G.ref("b"), m
+
+    expected = {
+      "header" => KPeg::Action.new("\n# It's a bug I found\n")
+    }
+
+    assert_equal expected, m.directives
+  end
+  
+
   def test_parser_setup
     m = match "%% { def initialize; end }\na=b"
     assert_rule G.ref("b"), m

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: kpeg
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Evan Phoenix
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-04 00:00:00.000000000 Z
+date: 2016-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.8'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.15'
 description: |-
   KPeg is a simple PEG library for Ruby. It provides an API as well as native
   grammar to build the grammar.
@@ -70,10 +70,13 @@ extra_rdoc_files:
 - Manifest.txt
 - README.rdoc
 - examples/phone_number/README.md
+- examples/tiny_markdown/sample.md
 - examples/upper/README.md
 files:
-- .autotest
-- .travis.yml
+- ".autotest"
+- ".hoeignore"
+- ".travis.yml"
+- Gemfile
 - History.txt
 - LICENSE
 - Manifest.txt
@@ -91,6 +94,12 @@ files:
 - examples/phone_number/README.md
 - examples/phone_number/phone_number.kpeg
 - examples/phone_number/phone_number.rb
+- examples/tiny_markdown/Rakefile
+- examples/tiny_markdown/driver.rb
+- examples/tiny_markdown/node.rb
+- examples/tiny_markdown/sample.md
+- examples/tiny_markdown/tiny_markdown.kpeg
+- examples/tiny_markdown/tiny_markdown.kpeg.rb
 - examples/upper/README.md
 - examples/upper/upper.kpeg
 - examples/upper/upper.rb
@@ -116,42 +125,33 @@ files:
 - test/test_kpeg_format_parser_round_trip.rb
 - test/test_kpeg_grammar.rb
 - test/test_kpeg_grammar_renderer.rb
+- test/test_kpeg_string_escape.rb
 - vim/syntax_kpeg/ftdetect/kpeg.vim
 - vim/syntax_kpeg/syntax/kpeg.vim
-- test/test_kpeg_string_escape.rb
-- .gemtest
 homepage: https://github.com/evanphx/kpeg
 licenses:
 - MIT
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
+- "--main"
 - README.rdoc
 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: '0'
 requirements: []
-rubyforge_project: kpeg
-rubygems_version: 2.1.10
+rubyforge_project: 
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: KPeg is a simple PEG library for Ruby
-test_files:
-- test/test_kpeg.rb
-- test/test_kpeg_code_generator.rb
-- test/test_kpeg_compiled_parser.rb
-- test/test_kpeg_format.rb
-- test/test_kpeg_format_parser_round_trip.rb
-- test/test_kpeg_grammar.rb
-- test/test_kpeg_grammar_renderer.rb
-- test/test_kpeg_string_escape.rb
+test_files: []