peglite 0.0.2 → 0.0.3

data/.gemspec

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

data/CHANGELOG.yaml

@@ -1,3 +1,8 @@
+- version: 0.0.3
+  date:    
+  changes:
+  - rule() now defines first class methods
+  - start a json.rb example
 - version: 0.0.2
   date:    Wed Jan  2 18:05:30 PST 2013
   changes:

data/Gemfile.lock

@@ -0,0 +1,14 @@
+PATH
+  remote: .
+  specs:
+    peglite (0.0.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  peglite!

data/ToDo

@@ -1,2 +1,13 @@
+- Define all Pegex atoms
+- Make better error msgs
+  - Add a rule-stack line
+  - Add error syntax
+- Deal with toprule global
+  - Work with inheritance
+    - Maybe toprule method
+
+
 + Add \A automatically
 + Add accessor for @input
+
+

data/examples/json.rb

@@ -0,0 +1,36 @@
+require 'peglite'
+
+class MyJson < PegLite
+  rule json: "object | array"
+  rule node: "object | array | value"
+  rule object: "_ LCURLY _ ( pair ( _ COMMA _ pair )* )? _ RCURLY _"
+  rule pair: "string _ COLON _ node"
+  rule array: "_ LSQUARE _ ( node ( _ COMMA _ node)* )? _ RSQUARE _"
+  rule value: "string | number | boolean | null"
+  rule string: (/"((?:\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})|[^"\x00-\x1f])*)"/)
+  rule number: (/(\-?(?:0|[1-9][0-9]*)(?:\.[0-9]*)?(?:[eE][\-\+]?[0-9]+)?)/)
+  rule boolean: "true | false"
+  rule true: /(true)/
+  rule false: /(false)/
+  rule null: /(null)/
+
+  # TODO Parse findings are correct but need methods to reshape them
+end
+
+# Test from Parslet's json.rb
+# https://github.com/kschiess/parslet/blob/master/example/json.rb
+s = %{
+  [ 1, 2, 3, null,
+    "asdfasdf asdfds", { "a": -1.2 }, { "b": true, "c": false },
+    0.1e24, true, false, [ 1 ] ]
+}
+
+out = XXX MyJson.new(debug: false).parse(s)
+
+p out; puts
+
+out == [
+  1, 2, 3, nil,
+  "asdfasdf asdfds", { "a" => -1.2 }, { "b" => true, "c" => false },
+  0.1e24, true, false, [ 1 ]
+] || raise("MyJson is a failure")

data/lib/peglite.rb

@@ -7,33 +7,40 @@ require 'yaml'; def YYY *args; args.each \
 
 #------------------------------------------------------------------------------
 class PegLite
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 
-  $PegLiteRules = {}         # TODO get rid of global variable smell
   def self.rule args
     name, rule = args.first
     name = name.to_s
     $PegLiteTopRule ||= name
     if rule.kind_of? Regexp
       regex = Regexp.new(rule.to_s.sub(/:/, ':\\A'))
-      $PegLiteRules[name] = {
+      rule = {
         'type' => 'rgx',
         'rule' => regex,
         'min' => 1,
         'max' => 1,
       }
     elsif rule.kind_of? String
-      $PegLiteRules[name] = PegLite::Compiler.new(rule).compile
+      rule = PegLite::Compiler.new(rule).compile
     else
       fail "Don't know how to make rule '#{name}' from '#{rule}'"
     end
+    self.send :define_method, "rule_#{name}" do
+      match rule
+    end
   end
 
   # TODO define all the Pegex Atoms here
   rule _: (/\s*/)
   rule __: (/\s+/)
+  rule LCURLY: (/\{/)
+  rule RCURLY: (/\}/)
+  rule LSQUARE: (/\[/)
+  rule RSQUARE: (/\]/)
   rule EQUAL: (/=/)
   rule COMMA: (/,/)
+  rule COLON: (/:/)
   rule PLUS: (/\+/)
   rule NL: (/\n/)
   rule EOL: (/\r?\n/)
@@ -53,7 +60,6 @@ class PegLite
 
     @pos = 0
     @far = 0
-    @rules = $PegLiteRules
     yield self if block_given?
   end
 
@@ -69,12 +75,9 @@ class PegLite
   def match rule=nil
     if not rule.kind_of? Hash
       rule ||= caller.first.scan(/(\w+)/).last.first
-      rule_name = rule
-      if rule.kind_of? String
-        rule = @rules[rule]
-      end
-      fail "Can't find rule for '#{rule_name}'" \
-        if not(rule and rule.kind_of? Hash)
+      method_name = "rule_#{rule}"
+      return send method_name if respond_to? method_name
+      fail "Can't find rule for '#{rule}'"
     end
 
     pos, count, matched, type, child, min, max =
@@ -128,15 +131,9 @@ class PegLite
   # TODO move trace/debug out of default match_ref method
   def match_ref ref
     trace "Try #{ref}" if @debug
-    begin
-      m = self.method(ref).call
-    rescue NameError => e
-      if @rules[ref]
-        m = match @rules[ref]
-      else
-        fail "No rule defined for '#{ref}'"
-      end
-    end
+    method = [ ref, "rule_#{ref}" ].find{|e| respond_to? e}
+    fail "No rule defined for '#{ref}'" unless method
+    m = send method
     if m
       m = (@wrap and not m.empty?) ? [{ref => m}] : m
       trace "Got #{ref}" if @debug

data/test/address.rb

@@ -74,12 +74,12 @@ end
 # This class defines a complete address parser using PegLite
 class AddressParser < PegLite
   rule address: "name street place"
-  rule name: (/(.*?)\n/)
-  rule street: (/(.*?)\n/)
+  rule name: /(.*?)\n/
+  rule street: /(.*?)\n/
   rule place: "city COMMA _ state __ zip NL"
-  rule city: (/(\w+(?: \w+)?)/)
-  rule state: (/(WA|OR|CA)/)  # Left Coast Rulez
-  rule zip: (/(\d{5})/)
+  rule city: /(\w+(?: \w+)?)/
+  rule state: /(WA|OR|CA)/ # Left Coast Rulez
+  rule zip: /(\d{5})/
 end
 
 # Extend AddressParser

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: peglite
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -22,10 +22,12 @@ files:
 - .gemspec
 - CHANGELOG.yaml
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
 - ToDo
+- examples/json.rb
 - examples/parslet1.rb
 - examples/parslet2.rb
 - lib/peglite.rb