kpeg 0.8.5 → 0.9.0

data/test/inputs/comments.kpeg

@@ -0,0 +1,5 @@
+%% name = Name
+word = /\w+/
+root = word
+# kjkjk
+# asldkjf

data/test/test_file_parser_roundtrip.rb

@@ -1,12 +1,12 @@
+require 'minitest/autorun'
 require 'kpeg'
 require 'kpeg/format_parser'
 require 'kpeg/grammar_renderer'
 require 'kpeg/code_generator'
 require 'stringio'
-require 'test/unit'
 
-class TestKPegRoundtrip < Test::Unit::TestCase
-  PATH = File.expand_path("../../lib/kpeg/format.kpeg", __FILE__)
+class TestKPegRoundtrip < MiniTest::Unit::TestCase
+  PATH = File.expand_path("../../lib/kpeg/format_parser.kpeg", __FILE__)
   def test_roundtrip
     data = File.read(PATH)
 

data/test/test_gen_calc.rb

@@ -1,10 +1,10 @@
-require 'test/unit'
+require 'minitest/autorun'
 require 'kpeg'
 require 'kpeg/format_parser'
 require 'kpeg/code_generator'
 require 'stringio'
 
-class TestKPegCodeGenerator < Test::Unit::TestCase
+class TestKPegCodeGenerator < MiniTest::Unit::TestCase
   GRAMMAR = <<-'STR'
 Stmt    = - Expr:e EOL                  { @answers << e }
         | ( !EOL . )* EOL               { puts "error" }

data/test/test_kpeg.rb

@@ -1,8 +1,8 @@
-require 'test/unit'
+require 'minitest/autorun'
 require 'kpeg'
 require 'stringio'
 
-class TestKPeg < Test::Unit::TestCase
+class TestKPeg < MiniTest::Unit::TestCase
   def assert_match(m, str)
     assert_kind_of KPeg::MatchString, m
     assert_equal str, m.string

data/test/test_kpeg_code_generator.rb

@@ -1,10 +1,10 @@
 # encoding: utf-8
-require 'test/unit'
+require 'minitest/autorun'
 require 'kpeg'
 require 'kpeg/code_generator'
 require 'stringio'
 
-class TestKPegCodeGenerator < Test::Unit::TestCase
+class TestKPegCodeGenerator < MiniTest::Unit::TestCase
   def test_dot
     gram = KPeg.grammar do |g|
       g.root = g.dot
@@ -1370,6 +1370,69 @@ end
     assert_equal 5, code.failing_rule_offset
   end
 
+  def test_directive_footer
+    gram = KPeg.grammar do |g|
+      g.root = g.dot
+      g.directives['footer'] = g.action("\n# require 'some/subclass'\n")
+    end
+
+    str = <<-STR
+require 'kpeg/compiled_parser'
+
+class Test < KPeg::CompiledParser
+
+  # root = .
+  def _root
+    _tmp = get_byte
+    set_failed_rule :_root unless _tmp
+    return _tmp
+  end
+
+  Rules = {}
+  Rules[:_root] = rule_info("root", ".")
+end
+
+# require 'some/subclass'
+    STR
+
+    cg = KPeg::CodeGenerator.new "Test", gram
+
+    assert_equal str, cg.output
+
+    assert cg.parse("hello")
+  end
+
+  def test_directive_header
+    gram = KPeg.grammar do |g|
+      g.root = g.dot
+      g.directives['header'] = g.action("\n# coding: UTF-8\n")
+    end
+
+    str = <<-STR
+# coding: UTF-8
+require 'kpeg/compiled_parser'
+
+class Test < KPeg::CompiledParser
+
+  # root = .
+  def _root
+    _tmp = get_byte
+    set_failed_rule :_root unless _tmp
+    return _tmp
+  end
+
+  Rules = {}
+  Rules[:_root] = rule_info("root", ".")
+end
+    STR
+
+    cg = KPeg::CodeGenerator.new "Test", gram
+
+    assert_equal str, cg.output
+
+    assert cg.parse("hello")
+  end
+
   def test_setup_actions
     gram = KPeg.grammar do |g|
       g.root = g.dot

data/test/test_kpeg_compiled_parser.rb

@@ -1,9 +1,9 @@
-require 'test/unit'
+require 'minitest/autorun'
 require 'kpeg'
 require 'kpeg/compiled_parser'
 require 'stringio'
 
-class TestKPegCompiledParser < Test::Unit::TestCase
+class TestKPegCompiledParser < MiniTest::Unit::TestCase
 
   gram = <<-GRAM
   letter = [a-z]

data/test/test_kpeg_format.rb

@@ -1,14 +1,14 @@
-require 'test/unit'
+require 'minitest/autorun'
 require 'kpeg'
 require 'kpeg/format_parser'
 require 'kpeg/grammar_renderer'
 require 'stringio'
 require 'rubygems'
 
-class TestKPegFormat < Test::Unit::TestCase
+class TestKPegFormat < MiniTest::Unit::TestCase
   G = KPeg::Grammar.new
 
-  gram = File.read File.expand_path("../../lib/kpeg/format.kpeg", __FILE__)
+  gram = File.read File.expand_path("../../lib/kpeg/format_parser.kpeg", __FILE__)
   KPeg.compile gram, "TestParser", self
 
   def match(str, gram=nil, log=false)
@@ -386,6 +386,51 @@ Value   = NUMBER:i                      { i }
     assert_rule G.seq(G.ref('b'), G.ref("c")), m
   end
 
+  def test_parser_directive
+    m = match <<-GRAMMAR
+%% header {
+# coding: UTF-8
+}
+
+a=b
+    GRAMMAR
+
+    assert_rule G.ref("b"), m
+
+    expected = {
+      "header" => KPeg::Action.new("\n# coding: UTF-8\n")
+    }
+
+    assert_equal expected, m.directives
+  end
+
+  def test_parser_directive_duplicate
+    m = nil
+
+    out, err = capture_io do
+      m = match <<-GRAMMAR
+%% header {
+# coding: UTF-8
+}
+
+a=b
+
+%% header {
+# coding: ISO-8859-1
+}
+      GRAMMAR
+    end
+
+    assert_empty out
+    assert_equal "directive \"header\" appears more than once\n", err
+
+    expected = {
+      "header" => KPeg::Action.new("\n# coding: ISO-8859-1\n")
+    }
+
+    assert_equal expected, m.directives
+  end
+
   def test_parser_setup
     m = match "%% { def initialize; end }\na=b"
     assert_rule G.ref("b"), m
@@ -469,7 +514,7 @@ fact = fact "*" num
   end
 
   def test_roundtrip
-    path = File.expand_path("../../lib/kpeg/format.kpeg", __FILE__)
+    path = File.expand_path("../../lib/kpeg/format_parser.kpeg", __FILE__)
     parser = KPeg::FormatParser.new File.read(path)
     assert parser.parse, "Unable to parse"
 

data/test/test_kpeg_grammar_renderer.rb

@@ -1,9 +1,9 @@
-require 'test/unit'
+require 'minitest/autorun'
 require 'kpeg'
 require 'kpeg/grammar_renderer'
 require 'stringio'
 
-class TestKPegGrammarRenderer < Test::Unit::TestCase
+class TestKPegGrammarRenderer < MiniTest::Unit::TestCase
   def test_escape
     str = "hello\nbob"
     assert_equal 'hello\nbob', KPeg::GrammarRenderer.escape(str)

data/test/test_left_recursion.rb

@@ -1,10 +1,10 @@
-require 'test/unit'
+require 'minitest/autorun'
 require 'kpeg'
 require 'kpeg/format_parser'
 require 'kpeg/code_generator'
 require 'stringio'
 
-class TestKPegLeftRecursion < Test::Unit::TestCase
+class TestKPegLeftRecursion < MiniTest::Unit::TestCase
   GRAMMAR = <<-'STR'
 
   name = name:n "[]" { [:array, n] }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kpeg
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 59
   prerelease: 
   segments: 
   - 0
-  - 8
-  - 5
-  version: 0.8.5
+  - 9
+  - 0
+  version: 0.9.0
 platform: ruby
 authors: 
 - Evan Phoenix
@@ -15,50 +15,109 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-08 00:00:00 Z
+date: 2012-03-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: minitest
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 37
         segments: 
-        - 0
-        version: "0"
+        - 2
+        - 11
+        - 3
+        version: 2.11.3
   type: :development
   version_requirements: *id001
-description: A tool for generating parsers using PEG
+- !ruby/object:Gem::Dependency 
+  name: rdoc
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 3
+        - 10
+        version: "3.10"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 2
+        - 12
+        version: "2.12"
+  type: :development
+  version_requirements: *id003
+description: |-
+  KPeg is a simple PEG library for Ruby. It provides an API as well as native
+  grammar to build the grammar.
+  
+  KPeg strives to provide a simple, powerful API without being too exotic.
+  
+  KPeg supports direct left recursion of rules via the
+  {OMeta memoization}[http://www.vpri.org/pdf/tr2008003_experimenting.pdf] trick.
 email: 
 - evan@fallingsnow.net
 executables: 
 - kpeg
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- History.txt
+- Manifest.txt
 files: 
+- .autotest
+- Gemfile
+- History.txt
+- LICENSE
+- Manifest.txt
+- README.rdoc
+- Rakefile
+- bin/kpeg
+- examples/calculator/calculator.kpeg
+- examples/calculator/calculator.rb
+- examples/foreign_reference/literals.kpeg
+- examples/foreign_reference/matcher.kpeg
+- examples/foreign_reference/matcher.rb
+- examples/lua_string/driver.rb
+- examples/lua_string/lua_string.kpeg
+- examples/lua_string/lua_string.kpeg.rb
+- examples/phone_number/README.md
+- examples/phone_number/phone_number.kpeg
+- examples/phone_number/phone_number.rb
+- examples/upper/README.md
+- examples/upper/upper.kpeg
+- examples/upper/upper.rb
+- kpeg.gemspec
+- lib/hoe/kpeg.rb
+- lib/kpeg.rb
 - lib/kpeg/code_generator.rb
 - lib/kpeg/compiled_parser.rb
+- lib/kpeg/format_parser.kpeg
 - lib/kpeg/format_parser.rb
 - lib/kpeg/grammar.rb
 - lib/kpeg/grammar_renderer.rb
 - lib/kpeg/match.rb
 - lib/kpeg/parser.rb
 - lib/kpeg/position.rb
+- lib/kpeg/string_escape.kpeg
 - lib/kpeg/string_escape.rb
-- lib/kpeg/version.rb
-- lib/kpeg.rb
-- bin/kpeg
-- doc/syntax_kpeg/ftdetect/kpeg.vim
-- doc/syntax_kpeg/syntax/kpeg.vim
-- README.md
-- Rakefile
-- kpeg.gemspec
-- Gemfile
+- test/inputs/comments.kpeg
 - test/test_file_parser_roundtrip.rb
 - test/test_gen_calc.rb
 - test/test_kpeg.rb
@@ -67,12 +126,16 @@ files:
 - test/test_kpeg_format.rb
 - test/test_kpeg_grammar_renderer.rb
 - test/test_left_recursion.rb
+- vim/syntax_kpeg/ftdetect/kpeg.vim
+- vim/syntax_kpeg/syntax/kpeg.vim
+- .gemtest
 homepage: https://github.com/evanphx/kpeg
 licenses: []
 
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --main
+- README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -95,11 +158,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.8.15
+rubyforge_project: kpeg
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
-summary: Peg-based Code Generator
+summary: KPeg is a simple PEG library for Ruby
 test_files: 
 - test/test_file_parser_roundtrip.rb
 - test/test_gen_calc.rb

data/README.md

@@ -1,183 +0,0 @@
-KPeg
-====
-
-KPeg is a simple PEG library for Ruby. It provides an API as well as native grammar to build the grammar.
-
-KPeg strives to provide a simple, powerful API without being too exotic.
-
-KPeg supports direct left recursion of rules via the [OMeta memoization](http://www.vpri.org/pdf/tr2008003_experimenting.pdf) trick.
-
-## Writing your first grammar
-
-### Setting up your grammar
-
-All grammars start with with the class/module name that will be your parser
-
-    %% name = Example::Parser
-
-After that a block of ruby code can be defined that will be added into the class body of your parser. Attributes that are defined in this block can be accessed within your parser as instance variables. Methods can also be defined in this block and used in action blocks as well.
-
-    %% {
-      attr_accessor :something_cool
-      
-      def something_awesome
-        # do something awesome
-      end
-    }
-
-### Defining literals
-
-Literals are static declarations of characters or regular expressions designed for reuse in the grammar. These can be constants or variables. Literals can take strings, regular expressions or character ranges
-
-    ALPHA = /[A-Za-z]/
-    DIGIT = /[0-9]/
-    period = "."
-    string = "a string"
-    regex = /(regexs?)+/
-    char_range = [b-t]
-
-Literals can also accept multiple definitions
-
-    vowel = "a" | "e" | "i" | "o" | "u"
-    alpha = /[A-Z]/ | /[a-z]/
-
-### Defining Rules for Values
-
-Before you can start parsing a string you will need to define rules that you will use to accept or reject that string. There are many different types of rules available in kpeg 
-
-The most basic of these rules is a string capture
-
-    alpha = < /[A-Za-z]/ > { text }
-
-
-While this looks very much like the ALPHA literal defined above it differs in one important way, the text captured by the rule defined between the < and > symbols will be set as the text variable in block that follows. You can also explicitly define the variable that you would like but only with existing rules or literals.
-
-    letter = alpha:a { a }
-
-Additionally blocks can return true or false values based upon an expression within the block. To return true if a test passes do the following:
-
-    match_greater_than_10 = < num:n > &{ n > 10 }
-
-To test and return a false value if the test passes do the following:
-
-    do_not_match_greater_than_10 = < num:n > !{ n > 10 }
-
-Rules can also act like functions and take parameters. An example of this is lifted from the [Email List Validator](https://github.com/larb/email_address_validator), where an ascii value is passed in and the character is evaluated against it returning a true if it matches
-
-    d(num) = <.> &{ text[0] == num }
-
-Rules support some regular expression syntax for matching
-
-+ maybe ?
-+ many +
-+ kleene *
-+ groupings ()
-
-Examples
-
-    letters = alpha+
-    words = alpha+ space* period?
-    sentence = (letters+ | space+)+
-
-Kpeg also allows a rule to define the acceptable number of matches in the form of a range. In regular expressions this is often denoted with syntax like {0,3}. Kpeg uses this syntax to accomplish match ranges [min, max].
-
-    matches_3_to_5_times = letter[3,5]
-    matches_3_to_any_times = letter[3,*]
-
-### Defining Actions
-
-Illustrated above in some of the examples, kpeg allows you to perform actions based upon a match that are described in block provided or in the rule definition itself.
-
-    num = /[1-9][0-9]*/
-    sum = < num:n1 "+" num:n2 > { n1 + n2 }
-
-As of version 0.8 an alternate syntax has been added for calling defined methods as actions.
-
-    %% {
-      def add(n1, n2){
-        n1 + n2
-      }
-    }
-    num = /[1-9][0-9]*/
-    sum = < num:n1 "+" num:n2 > ~add(n1, n2)
-
-### Referencing an external grammar
-
-Kpeg allows you to run a rule that is defined in an external grammar. This is useful if there is a defined set of rules that you would like to reuse in another parser. To do this, create your grammar and generate a parser using the kpeg command line tool.
-
-    kpeg literals.kpeg
-
-Once you have the generated parser, include that file into your new grammar
-
-    %{
-      require "literals.kpeg.rb"
-    }
-
-Then create a variable to hold to foreign interface and pass it the class name of your parser. In this case my parser class name is Literal 
-
-    %foreign_grammer = Literal
-
-You can then use rules defined in the foreign grammar in the local grammar file like so
-
-    sentence = (%foreign_grammer.alpha %foreign_grammer.space*)+ %foreign_grammer.period
-
-### Comments
-
-Kpeg allows comments to be added to the grammar file by using the # symbol
-
-    # This is a comment in my grammar
-
-## Generating and running your parser
-
-Before you can generate your parser you will need to define a root rule. This will be the first rule run against the string provided to the parser
-
-    root = sentence
-
-To generate the parser run the kpeg command with the kpeg file(s) as an argument. This will generate a ruby file with the same name as your grammar file.
-
-    kpeg example.kpeg
-
-Include your generated parser file into an application that you want to use the parser in and run it. Create a new instance of the parser and pass in the string you want to evaluate. When parse is called on the parser instance it will return a true if the sting is matched, or false if it doesn't. 
-
-    require "example.kpeg.rb"
-
-    parser = Example::Parser.new(string_to_evaluate)
-    parser.parse
-
-## Shortcuts and other techniques
-
-Per vito, you can get the current line or current column in the following way 
-
-    line = { current_line }
-    column = { current_column }
-    foo = line:line ... { # use line here }
-
-## AST Generation
-
-As of Kpeg 0.8 a parser can now generate an AST. To define an AST node use the following syntax
-
-    %% assign = ast Assignment(name, value)
-
-Once you have a defined AST node, it can be used in your grammar like so
-
-    assignment = identifier:i space* = space* value:v ~assign(i,v)
-
-This will create a new Assign node that you can add into your AST.
-
-For a good example of usage check out [Talon](https://github.com/evanphx/talon)
-
-## Examples
-
-There are several examples available in the /examples directory. The upper parser has a readme with a step by step description of the grammar.
-
-## Projects using kpeg
-
-[Dang](https://github.com/veganstraightedge/dang)
-
-[Email Address Validator](https://github.com/larb/email_address_validator)
-
-[Callisto](https://github.com/dwaite/Callisto)
-
-[Doodle](https://github.com/vito/doodle)
-
-[Kanbanpad](https://kanbanpad.com) (uses kpeg for parsing of the 'enter something' bar)