genmachine 0.2.1 → 0.2.2

data/TODO

@@ -1,6 +1,11 @@
+ - 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)
+
  - highlight `c` specially
  - Allow `b<<` etc. in statements - implied 'c' source
 
+
  - mechanism for simple nondeterminism
  - syn highlight
  - parser generator implementation notes / examples

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/genmachine.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{genmachine}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joseph Wecker"]

data/lib/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/genmachine/generators/general_helper.rb

@@ -33,7 +33,7 @@ module GenMachine
             exprs = c[:exprs].dup
             exprs << c[:acc].dup
             exprs.each do |e|
-              if e =~ /^([a-zA-Z_][a-zA-Z0-9_]*)?\s*>>\s*([a-zA-Z_][a-zA-Z0-9_]*)?$/
+              if e =~ /^([a-zA-Z_][a-zA-Z0-9_]*)?\s*>>>?\s*([a-zA-Z_][a-zA-Z0-9_]*)?$/
                 accs[$1]=true unless ($1.nil? or $1 == '' or $1 == 'p' or $1 == 's')
                 accs[$3]=true unless ($3.nil? or $3 == '' or $3 == 'p' or $3 == 's')
               end

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

@@ -105,10 +105,12 @@ module GenMachine
           return ['@fwd=true']
         when acc_phrase.strip == '>>'
           return []
-        when acc_phrase =~ /^\s*([a-zA-Z_][a-zA-Z0-9_]*)\s*>>\s*$/
+        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_][a-zA-Z0-9_.]*)\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*$/
+          return ["#{rb_vars($1)}.into!(#{rb_vars($2)})"]
         else raise("Can't figure out your accumulator statement: #{acc_phrase}")
         end
       end

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

@@ -3,6 +3,7 @@ $KCODE="U"
 
 class Integer
   def into(v); v << self end
+  def into!(v); into(v) end
   def reset!; :nop end
   def reset; :nop end
 end
@@ -13,15 +14,14 @@ module <%= @classname %>
 
 
   class UArray < Array
-    def into(v)
-      return if size == 0
-      v << self
-    end
+    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
     def into(v) v << self end
     def <<(kv) k,v = kv; self[k] = v end
     def reset!; self.clear end
@@ -29,8 +29,8 @@ module <%= @classname %>
   end
 
   class UString < String
-    def into(v)
-      return if size == 0
+    def into(v); into!(v) unless size == 0 end
+    def into!(v)
       v << self.dup
       reset!
     end
@@ -53,6 +53,7 @@ module <%= @classname %>
       @c= params.delete(:c) || []
       @name = params.delete(:name)
     end
+    def into!(val) val << self end
     def into(val) val << self end
     def <<(val) @c<<val end
     def [](key) @c[key] end
@@ -157,7 +158,7 @@ module <%= @classname %>
 
 <%- @spec_ast.each do |name, otype, args, cmds, first_state, states| -%>
   <%- args << "p=nil" -%>
-  <%- args << "name='#{name}'" -%>
+  <%- args << "name=UString.new('#{name}')" -%>
     def <%= name %>(<%= args.join(',') %>)
       <%- cmds.each do |c| -%>
       <%= rb_vars(c) %>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: genmachine
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Joseph Wecker