kpeg 0.9.0 → 0.10.0

data/test/test_kpeg_format.rb

@@ -58,7 +58,7 @@ a = c
 b(p) = x
     STR
 
-    gram = match(str)
+    assert match(str) # HACK what is this testing?
   end
 
   def test_assign_with_multiple_args
@@ -289,7 +289,7 @@ Value   = NUMBER:i                      { i }
         | ID:i !ASSIGN                  { vars[i] }
         | OPEN Expr:i CLOSE             { i }
     STR
-    m = match(str)
+    assert match(str) # HACK what is this testing?
   end
 
   def test_seq

data/test/{test_file_parser_roundtrip.rb → test_kpeg_format_parser_round_trip.rb}

@@ -5,7 +5,7 @@ require 'kpeg/grammar_renderer'
 require 'kpeg/code_generator'
 require 'stringio'
 
-class TestKPegRoundtrip < MiniTest::Unit::TestCase
+class TestKPegFormatParserRoundtrip < 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 → test_kpeg_grammar.rb}

@@ -4,8 +4,52 @@ require 'kpeg/format_parser'
 require 'kpeg/code_generator'
 require 'stringio'
 
-class TestKPegCodeGenerator < MiniTest::Unit::TestCase
-  GRAMMAR = <<-'STR'
+class TestKpegGrammar < MiniTest::Unit::TestCase
+  LEFT_RECURSION = <<-'STR'
+
+  name = name:n "[]" { [:array, n] }
+       | < /\w+/ > { [:word, text] }
+
+  root = name
+
+  STR
+
+  def test_left_recursion_invoke_rule_directly
+    parc = KPeg::FormatParser.new(LEFT_RECURSION)
+    assert parc.parse, "Unable to parse"
+
+    gram = parc.grammar
+
+    # gr = KPeg::GrammarRenderer.new(gram)
+    # puts
+    # gr.render(STDOUT)
+
+    cg = KPeg::CodeGenerator.new "TestCalc", gram
+
+    code = cg.make("blah[]")
+    assert_equal true, code.parse("name")
+    assert_equal [:array, [:word, "blah"]], code.result
+  end
+
+  def test_left_recursion_invoke_rule_via_another
+    parc = KPeg::FormatParser.new(LEFT_RECURSION)
+    assert parc.parse, "Unable to parse"
+
+    gram = parc.grammar
+
+    # gr = KPeg::GrammarRenderer.new(gram)
+    # puts
+    # gr.render(STDOUT)
+
+    cg = KPeg::CodeGenerator.new "TestCalc", gram
+
+    code = cg.make("blah[]")
+    assert_equal true, code.parse("root")
+    assert_equal [:array, [:word, "blah"]], code.result
+  end
+
+  def test_gen_calc
+    parc = KPeg::FormatParser.new(<<-'STR')
 Stmt    = - Expr:e EOL                  { @answers << e }
         | ( !EOL . )* EOL               { puts "error" }
 
@@ -41,9 +85,6 @@ EOL     = ('\n' | '\r\n' | '\r' | ';') -
 
 root    = Stmt+
   STR
-
-  def test_parse
-    parc = KPeg::FormatParser.new(GRAMMAR)
     assert parc.parse, "Unable to parse"
 
     gram = parc.grammar
@@ -60,4 +101,6 @@ root    = Stmt+
     assert_equal true, code.parse
     assert_equal [7,56,119], code.instance_variable_get(:@answers)
   end
+
 end
+

data/test/test_kpeg_grammar_renderer.rb

@@ -115,8 +115,6 @@ class TestKPegGrammarRenderer < MiniTest::Unit::TestCase
       g.root = g.term
     end
 
-    m = KPeg.match "4*3-8/9", gram
-
     io = StringIO.new
     gr = KPeg::GrammarRenderer.new(gram)
     gr.render(io)
@@ -151,8 +149,6 @@ root = term
       g.root = g.term
     end
 
-    m = KPeg.match "4*3-8/9", gram
-
     io = StringIO.new
     gr = KPeg::GrammarRenderer.new(gram)
     gr.render(io)
@@ -203,6 +199,31 @@ root = < [a-z]+ >
     assert_equal expected, io.string
   end
 
+  def test_directives
+    gram = KPeg.grammar do |g|
+      g.root = g.dot
+      g.add_directive "header", g.action("\n# coding: UTF-8\n")
+      g.add_directive "footer", g.action("\nrequire 'something'\n")
+    end
+
+    io = StringIO.new
+    gr = KPeg::GrammarRenderer.new(gram)
+    gr.render(io)
+
+    expected = <<-TXT
+%% footer {
+require 'something'
+}
+
+%% header {
+# coding: UTF-8
+}
+
+root = .
+    TXT
+    assert_equal expected, io.string
+  end
+
   def test_setup_actions
     gram = KPeg.grammar do |g|
       g.root = g.dot
@@ -220,7 +241,27 @@ root = .
     TXT
     assert_equal expected, io.string
   end
-  
+
+  def test_variables
+    gram = KPeg.grammar do |g|
+      g.root = g.dot
+      g.set_variable "name", "Foo"
+      g.set_variable "custom_initialize", "true"
+    end
+
+    io = StringIO.new
+    gr = KPeg::GrammarRenderer.new(gram)
+    gr.render(io)
+
+    expected = <<-TXT
+%% custom_initialize = true
+%% name = Foo
+
+root = .
+    TXT
+    assert_equal expected, io.string
+  end
+
   def test_multiple_render
     gram = KPeg.grammar do |g|
       g.root = g.multiple("a", 3, 5)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kpeg
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 55
   prerelease: 
   segments: 
   - 0
-  - 9
+  - 10
   - 0
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors: 
 - Evan Phoenix
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-07 00:00:00 Z
+date: 2012-04-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: minitest
@@ -23,14 +23,13 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 37
+        hash: 27
         segments: 
         - 2
-        - 11
-        - 3
-        version: 2.11.3
+        - 12
+        version: "2.12"
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -56,11 +55,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 35
         segments: 
         - 2
-        - 12
-        version: "2.12"
+        - 16
+        version: "2.16"
   type: :development
   version_requirements: *id003
 description: |-
@@ -80,9 +79,9 @@ extensions: []
 extra_rdoc_files: 
 - History.txt
 - Manifest.txt
+- README.rdoc
 files: 
 - .autotest
-- Gemfile
 - History.txt
 - LICENSE
 - Manifest.txt
@@ -118,14 +117,13 @@ files:
 - lib/kpeg/string_escape.kpeg
 - lib/kpeg/string_escape.rb
 - test/inputs/comments.kpeg
-- test/test_file_parser_roundtrip.rb
-- test/test_gen_calc.rb
 - 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_left_recursion.rb
 - vim/syntax_kpeg/ftdetect/kpeg.vim
 - vim/syntax_kpeg/syntax/kpeg.vim
 - .gemtest
@@ -159,16 +157,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: kpeg
-rubygems_version: 1.8.17
+rubygems_version: 1.8.22
 signing_key: 
 specification_version: 3
 summary: KPeg is a simple PEG library for Ruby
 test_files: 
-- test/test_file_parser_roundtrip.rb
-- test/test_gen_calc.rb
 - 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_left_recursion.rb

data/Gemfile

@@ -1,12 +0,0 @@
-# -*- ruby -*-
-
-# DO NOT EDIT THIS FILE. Instead, edit Rakefile, and run `rake bundler:gemfile`.
-
-source :gemcutter
-
-
-gem "minitest", "~>2.11", :group => [:development, :test]
-gem "rdoc", "~>3.10", :group => [:development, :test]
-gem "hoe", "~>2.15", :group => [:development, :test]
-
-# vim: syntax=ruby

data/test/test_left_recursion.rb

@@ -1,50 +0,0 @@
-require 'minitest/autorun'
-require 'kpeg'
-require 'kpeg/format_parser'
-require 'kpeg/code_generator'
-require 'stringio'
-
-class TestKPegLeftRecursion < MiniTest::Unit::TestCase
-  GRAMMAR = <<-'STR'
-
-  name = name:n "[]" { [:array, n] }
-       | < /\w+/ > { [:word, text] }
-
-  root = name
-
-  STR
-
-  def test_invoke_rule_directly
-    parc = KPeg::FormatParser.new(GRAMMAR)
-    assert parc.parse, "Unable to parse"
-
-    gram = parc.grammar
-
-    # gr = KPeg::GrammarRenderer.new(gram)
-    # puts
-    # gr.render(STDOUT)
-
-    cg = KPeg::CodeGenerator.new "TestCalc", gram
-
-    code = cg.make("blah[]")
-    assert_equal true, code.parse("name")
-    assert_equal [:array, [:word, "blah"]], code.result
-  end
-
-  def test_invoke_rule_via_another
-    parc = KPeg::FormatParser.new(GRAMMAR)
-    assert parc.parse, "Unable to parse"
-
-    gram = parc.grammar
-
-    # gr = KPeg::GrammarRenderer.new(gram)
-    # puts
-    # gr.render(STDOUT)
-
-    cg = KPeg::CodeGenerator.new "TestCalc", gram
-
-    code = cg.make("blah[]")
-    assert_equal true, code.parse("root")
-    assert_equal [:array, [:word, "blah"]], code.result
-  end
-end