pegex 0.0.1 → 0.0.2

data/.gemspec

@@ -2,7 +2,7 @@
 
 GemSpec = Gem::Specification.new do |gem|
   gem.name = 'pegex'
-  gem.version = '0.0.1'
+  gem.version = '0.0.2'
   gem.license = 'MIT'
   gem.required_ruby_version = '>= 1.9.1'
 

data/CHANGELOG.yaml

@@ -1,3 +1,6 @@
+- version: 0.0.2
+  date:    Wed Dec 19 23:58:14 PST 2012
+  changes: Fixed a regex bug
 - version: 0.0.1
   date:    Wed Dec 19 16:06:49 PST 2012
   changes: Ported from Pegex.pm CPAN module.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pegex (0.0.1)
+    pegex (0.0.2)
 
 GEM
   remote: https://rubygems.org/

data/ToDo

@@ -0,0 +1,7 @@
+- Finish porting tests from perl
+- Support grammar self compile:
+  > ruby -Ilib -rfoo/grammar -ecompile
+- Use pegex-tml
+- Use pegex-pgx
+
+- Move optimize into pegex/grammar or pegex/compiler

data/lib/pegex.rb

@@ -1,6 +1,4 @@
-module Pegex
-  VERSION = '0.0.1'
-end
+module Pegex;end
 
 require 'pegex/parser'
 require 'pegex/grammar'
@@ -10,9 +8,10 @@ def pegex grammar_text, receiver=nil
     require 'pegex/tree/wrap'
     receiver = Pegex::Tree::Wrap.new
   end
-  receiver = receiver.new if receiver.class == Class
-  return Pegex::Parser.new { |o|
-    o.grammar = Pegex::Grammar.new {|g| g.text = grammar_text}
-    o.receiver = receiver
-  }
+  receiver = receiver.new \
+    if receiver.class == Class
+  return Pegex::Parser.new do |p|
+    p.grammar = Pegex::Grammar.new {|g| g.text = grammar_text}
+    p.receiver = receiver
+  end
 end

data/lib/pegex/compiler.rb

@@ -3,6 +3,10 @@ require 'pegex/pegex/grammar'
 require 'pegex/pegex/ast'
 require 'pegex/grammar/atoms'
 
+# TODO:
+# Regenerate #make_tree's (or just #tree's?) similar to this:
+#  ruby -rpp -rpegex/compiler -e 'pp Pegex::Compiler.new.compile(File.read "share/jsony.pgx").tree''
+
 class Pegex::Compiler
   attr_accessor :tree
 

data/lib/pegex/input.rb

@@ -18,11 +18,8 @@ class Pegex::Input
   end
 
   def open
-    if defined? @string
-      @buffer = @string
-    else
-      fail "Pegex::Input::open failed. No source to open"
-    end
+    @buffer = @string \
+      or fail "Pegex::Input::open failed. No source to open"
     @is_open = true
   end
 

data/lib/pegex/pegex/ast.rb

@@ -113,7 +113,7 @@ class Pegex::Pegex::AST < Pegex::Tree
   def got_regular_expression got
     got.gsub! /\s*#.*\n/, ''
     got.gsub! /\s+/, ''
-    got.gsub! /\  \:|\=|\!/, " ?#{$1}"
+    got.gsub! /\((\:|\=|\!)/, '(?\1'
     return {'.rgx' => got}
   end
 

data/test/optimize.rb

@@ -0,0 +1,18 @@
+require './test/lib/test_pegex'
+
+__END__
+#TODO
+TestML.require_or_skip 'psych'
+
+TestML.run do |t|
+  t.eval '*grammar.compile.optimize.yaml.clean == *yaml'
+end
+
+TestML.data <<'...'
+=== Question Mark Expansion
+--- grammar
+a: /(:foo)/
+--- yaml
+a:
+  .rgx: /(?:foo)/
+...

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pegex
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -45,6 +45,7 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
+- ToDo
 - lib/pegex.rb
 - lib/pegex/compiler.rb
 - lib/pegex/grammar.rb
@@ -68,6 +69,7 @@ files:
 - test/lib/test_pegex.rb
 - test/lib/testast.rb
 - test/lib/xxx.rb
+- test/optimize.rb
 - test/tree-pegex.tml
 - test/tree.rb
 - test/tree.tml