genmachine 0.2.3 → 0.2.4

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/genmachine.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{genmachine}
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joseph Wecker"]
-  s.date = %q{2011-08-20}
+  s.date = %q{2011-08-23}
   s.default_executable = %q{genmachine}
   s.description = %q{Takes a state table where the following are defined: state, input+conditions, accumulate-action, pre-transition-actions, and transition-to. It takes that state table and generates very fast parsers. Similar to Ragel. Currently only outputs pure Ruby.}
   s.email = %q{joseph.wecker@gmail.com}

data/lib/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/lib/genmachine/generators/ruby/lib.erb.rb

@@ -22,18 +22,18 @@ class String
   def reset; d=dup;d.reset!;d end
 end
 
+class Array
+  def into(v); into!(v) unless size == 0 end
+  def into!(v); v << self end
+  def reset!; self.clear end
+  def reset; d=dup;d.reset!;d end
+end
 
 module <%= @classname %>
   def self.parse(str) Parser.new(str).parse end
   def self.parse_file(fname) Parser.new(IO.read(fname)).parse end
 
 
-  class UArray < Array
-    def into(v); into!(v) unless size == 0 end
-    def into!(v); v << self end
-    def reset!; self.clear end
-    def reset; d=dup;d.reset!;d end
-  end
 
   class UHash < Hash
     def into!(v) v << self end
@@ -168,7 +168,7 @@ module <%= @classname %>
         <%- if otype == 'U' -%>
       s = UNode.new(:name=>name,:sline=>@line,:schr=>@pos)
         <%- elsif otype == '[]' -%>
-      s = UArray.new
+      s = []
         <%- elsif otype == '{}' -%>
       s = UHash.new
         <%- end -%>

data/lib/genmachine/spec_parser.rb

@@ -83,6 +83,8 @@ module GenMachine
     def parse_input(val,inputs=nil)
       iters = 0
       conds = []
+      val.gsub! /([^\\])\\\[/, '\1<left-square-bracket>'
+      val.gsub! /([^\\])\\\]/, '\1<right-square-bracket>'
       while val.strip.length > 0 && iters < 100
         case
         when val =~ /--+/um
@@ -112,10 +114,11 @@ module GenMachine
                '\r' => "\r", '\f' => "\f",
                '\b' => "\b", '\a' => "\a",
                '\e' => "\e", '\s' => " ",
-               '\[' => '[',  '\]' => ']',
                "\\\\" => '\\'}
     def parse_combine_ranges(raw, input)
-      raw.gsub!(/\\[tnrfbaes\[\]]/){|m| ESCAPES[m]}
+      raw.gsub!(/\\[tnrfbaes\\]/){|m| ESCAPES[m]}
+      raw.gsub!('<left-square-bracket>', '[')
+      raw.gsub!('<right-square-bracket>', ']')
       if raw =~ /((?:.-.)*)((?:.)*)/um
         ranges = $1
         singles = $2

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: genmachine
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Joseph Wecker
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-20 00:00:00 -07:00
+date: 2011-08-23 00:00:00 -07:00
 default_executable: genmachine
 dependencies: 
 - !ruby/object:Gem::Dependency