genmachine 0.2.2 → 0.2.3

data/TODO

@@ -1,7 +1,7 @@
  - Fix "unexpected ..." so it works again
  - Automatically put {eof?} (by itself) clauses at beginning
  - Get per-state eof? detection working again (for final else clause)
-
+ - Errors when state isn't present. Warnings even if it is never referenced
  - highlight `c` specially
  - Allow `b<<` etc. in statements - implied 'c' source
 

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/genmachine.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{genmachine}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joseph Wecker"]
-  s.date = %q{2011-08-19}
+  s.date = %q{2011-08-20}
   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.2
+0.2.3

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

@@ -107,9 +107,9 @@ module GenMachine
           return []
         when acc_phrase =~ /^\s*([a-zA-Z_][a-zA-Z0-9_.]*)\s*>>\s*$/
           return ["#{rb_vars($1)}.reset!"]
-        when acc_phrase =~ /^\s*([a-zA-Z_][a-zA-Z0-9_.]*)\s*>>\s*([a-zA-Z_][a-zA-Z0-9_.]*)\s*$/
+        when acc_phrase =~ /^\s*(["'a-zA-Z_][^>]*)\s*>>\s*([a-zA-Z_][a-zA-Z0-9_.]*)\s*$/
           return ["#{rb_vars($1)}.into(#{rb_vars($2)})"]
-        when acc_phrase =~ /^\s*([a-zA-Z_][a-zA-Z0-9_.]*)\s*>>>\s*([a-zA-Z_][a-zA-Z0-9_.]*)\s*$/
+        when acc_phrase =~ /^\s*(["'a-zA-Z_][^>]*)\s*>>>\s*([a-zA-Z_][a-zA-Z0-9_.]*)\s*$/
           return ["#{rb_vars($1)}.into!(#{rb_vars($2)})"]
         else raise("Can't figure out your accumulator statement: #{acc_phrase}")
         end

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

@@ -8,6 +8,21 @@ class Integer
   def reset; :nop end
 end
 
+class String
+  def into(v); into!(v) unless size == 0 end
+  def into!(v); v << self.dup; reset!  end
+  def <<(v)
+    begin
+      concat([v].pack('U*'))
+    rescue
+      concat(v)
+    end
+  end
+  def reset!; self.gsub! /./um,'' 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
@@ -28,21 +43,6 @@ module <%= @classname %>
     def reset; d=dup; d.reset!; d end
   end
 
-  class UString < String
-    def into(v); into!(v) unless size == 0 end
-    def into!(v)
-      v << self.dup
-      reset!
-    end
-
-    def <<(v)
-      begin; super([v].pack('U*'))
-      rescue; super(v) end
-    end
-    def reset!; self.gsub! /./um,'' end
-    def reset; d=dup;d.reset!;d end
-  end
-
   class UNode
     attr_accessor :name, :m,:a,:c
     def initialize(params={})
@@ -123,12 +123,12 @@ module <%= @classname %>
         @leading = true; @indent = 0
       when 0x0a
         nc = peek(4).unpack('U')[0]
-        if nc == 0x0d then getch; c = UString.new("\n\r") end
+        if nc == 0x0d then getch; c = "\n\r" end
         @last_is_newline = true; @line += 1; @pos = 1
         @leading = true; @indent = 0
       when 0x0d
         nc = peek(4).unpack('U')[0]
-        if nc == 0x0a then getch; c = UString.new("\r\n") end
+        if nc == 0x0a then getch; c = "\r\n" end
         @last_is_newline = true; @line += 1; @pos = 1
         @leading = true; @indent = 0
       when 0x20,0x09
@@ -158,7 +158,7 @@ module <%= @classname %>
 
 <%- @spec_ast.each do |name, otype, args, cmds, first_state, states| -%>
   <%- args << "p=nil" -%>
-  <%- args << "name=UString.new('#{name}')" -%>
+  <%- args << "name='#{name}'" -%>
     def <%= name %>(<%= args.join(',') %>)
       <%- cmds.each do |c| -%>
       <%= rb_vars(c) %>
@@ -174,7 +174,7 @@ module <%= @classname %>
         <%- end -%>
       <%- end -%>
       <%- accumulators(states).each do |_acc| -%>
-      <%= _acc %> ||= UString.new
+      <%= _acc %> ||= ''
       <%- end -%>
       loop do
         <%= INPUT %> = nextchar
@@ -211,7 +211,7 @@ module <%= @classname %>
         <%- end -%>
         end
         <%- if has_fallthru -%>
-        error("Unexpected #{<%= INPUT %>}")
+        error("Unexpected \"#{[<%= INPUT %>].pack("U*")}\"")
         @fwd = true
         return
         <%- end -%>

data/misc/genmachine.vim

@@ -39,7 +39,7 @@ syn match   gmSpecState   /\s*{[^}]\+}\s*/ contained
 syn match   gmState       /\s*:[^ )({}]\+\s*/ contained
 syn match   gmGlobals     /\$\w\+/ contained
 
-syn region  gmRange       start=/\[/ end=/\]/ skip=/\\\]/ keepend contained contains=gmSpecMetas,gmMetachars,gmRangeDelims
+syn region  gmRange       start=/\[/ end=/\]/ skip=/\\./ keepend contained contains=gmSpecMetas,gmMetachars,gmRangeDelims
 syn match   gmSpecMetas   /\\s\|\\n/ contained
 syn match   gmMetachars   /\\t\|\\r\|\\f\|\\b\|\\a\|\\e\|\\\[\|\\\]\|\\\\/ contained
 syn match   gmRangeDelims /\\\@!\[\|\\\@!]/ contained

metadata

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