genmachine 0.1.6 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.2.0

data/genmachine.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{genmachine}
-  s.version = "0.1.6"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joseph Wecker"]
-  s.date = %q{2011-08-18}
+  s.date = %q{2011-08-19}
   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}
@@ -32,12 +32,12 @@ Gem::Specification.new do |s|
     "lib/VERSION",
     "lib/genmachine.rb",
     "lib/genmachine/char_set.rb",
-    "lib/genmachine/generator.rb",
-    "lib/genmachine/generators/helpers/general.rb",
-    "lib/genmachine/generators/helpers/ruby.rb",
-    "lib/genmachine/generators/ruby.rb",
-    "lib/genmachine/generators/templates/ruby/executable.erb",
-    "lib/genmachine/generators/templates/ruby/lib.erb.rb",
+    "lib/genmachine/generators/general_helper.rb",
+    "lib/genmachine/generators/generator.rb",
+    "lib/genmachine/generators/ruby/executable.erb",
+    "lib/genmachine/generators/ruby/helper.rb",
+    "lib/genmachine/generators/ruby/lib.erb.rb",
+    "lib/genmachine/generators/ruby/ruby.rb",
     "lib/genmachine/spec_parser.rb",
     "machines/genmachine.machine",
     "misc/genmachine.vim",

data/lib/VERSION

@@ -1 +1 @@
-0.1.6
+0.2.0

data/lib/genmachine/generators/{helpers/general.rb → general_helper.rb}

@@ -19,7 +19,7 @@ module GenMachine
         states.each do |name,clauses|
           clauses.each do |c|
             c[:exprs].each do |e|
-              return true if e =~ /<<s($|[^a-zA-Z0-9_])/
+              return true if e =~ /\bs\s*>>/
             end
           end
         end
@@ -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/{helpers/ruby.rb → ruby/helper.rb}

@@ -1,6 +1,9 @@
 module GenMachine
   module Helpers
     module Ruby
+      INPUT = '__i'
+      STATE = '__state'
+
       def rb_conditional(clause,states,clauses)
         has_eof_state = eof_state?(states) || eof_clause?(clauses)
         out = ''
@@ -22,13 +25,13 @@ module GenMachine
             if range.is_a? Array
               outs << "nl?" if (range[0] <= 0x0a) && (range[1] >= 0x0a)
               outs << "space?" if (range[0] <= 0x20) && (range[1] >= 0x20)
-              outs << "(c>#{range[0]-1}&&c<#{range[1]+1})"
+              outs << "(#{INPUT}>#{range[0]-1}&&#{INPUT}<#{range[1]+1})"
             else
               outs << case range
                       when 0x0a; 'nl?'
                       when 0x20; 'space?'
                       when :any; has_eof_state ? 'true' : '!eof?'
-                      else "c==#{range}" end
+                      else "#{INPUT}==#{range}" end
             end
           end
         end
@@ -41,7 +44,7 @@ module GenMachine
         cmds = []
         cmds += rb_simple_acc_commands(clause[:acc])
         clause[:exprs].each do |expr|
-          if expr.include? '<<'
+          if expr.include? '>>'
             cmds += rb_acc_commands(expr)
           else
             cmds << rb_vars(expr.strip)
@@ -63,7 +66,7 @@ module GenMachine
             params = $3.split(',').map{|p|rb_vars(p)}
             params << 's'
             params << "'#{rename}'" unless (rename.nil? or rename.strip=='')
-            out << "state=#{funname}(#{params.join(',')})"
+            out << "#{STATE}=#{funname}(#{params.join(',')})"
             add_next = true
           when s =~ /^<done>$/
             out << "return(s)"
@@ -72,7 +75,7 @@ module GenMachine
             out << "return(#{rb_vars($1)})"
             add_next = false
           when s =~ /^(:[a-zA-Z0-9_:-]+)$/
-            out << "state='#{$1}'" unless currstate == $1
+            out << "#{STATE}='#{$1}'" unless currstate == $1
             add_next = true
           else
             out << s
@@ -89,30 +92,23 @@ module GenMachine
       def rb_simple_acc_commands(acc_phrase)
         case
         when (acc_phrase.nil? or acc_phrase == ''); return ['@fwd=true']
-        when acc_phrase.strip == '<<'; return []
-        when acc_phrase.strip =~ /^([a-zA-Z_][a-zA-Z0-9_]*)\s*<<\s*$/
-          return ["#{rb_vars(acc_phrase.strip)}c"]
+        when acc_phrase.strip == '>>'; return []
+        when acc_phrase =~ /^\s*>>\s*([a-zA-Z_][a-zA-Z0-9_]*)\s*$/
+          return ["#{INPUT}.into(#{rb_vars($1)})"]
         else raise("Can't figure out your accumulator statement: #{acc_phrase}")
         end
       end
 
       def rb_acc_commands(acc_phrase)
         case
-        when (acc_phrase.nil? or acc_phrase == ''); return ['@fwd=true']
-        when acc_phrase.strip == '<<'; return []
-        when acc_phrase.strip =~ /^([a-zA-Z_][a-zA-Z0-9_]*)\s*<<\s*(<?)([a-zA-Z_][a-zA-Z0-9_]*)$/
-          into = $1
-          value = $3
-          clear_it = $2 == '<'
-          into = rb_vars(into)
-          value = rb_vars(value)
-          if clear_it
-            out = ["(#{into}<<#{value} if #{value}.size>0)"]
-            out << "#{value}=UString.new"
-          else
-            out = ["#{into}<<#{value}"]
-          end
-          return out
+        when (acc_phrase.nil? or acc_phrase == '')
+          return ['@fwd=true']
+        when acc_phrase.strip == '>>'
+          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*$/
+          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/{templates/ruby → ruby}/lib.erb.rb

@@ -1,22 +1,46 @@
 require 'strscan'
 $KCODE="U"
 
+class Integer
+  def into(v); v << self end
+  def reset!; :nop end
+  def reset; :nop 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)
+      return if size == 0
+      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 <<(kv) k,v = kv; self[k] = v end
+    def reset!; self.clear end
+    def reset; d=dup; d.reset!; d end
   end
 
   class UString < String
+    def into(v)
+      return if size == 0
+      v << self.dup
+      reset!
+    end
+
     def <<(v)
-      begin
-        super([v].pack('U*'))
-      rescue
-        super(v)
-      end
+      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
@@ -29,6 +53,7 @@ module <%= @classname %>
       @c= params.delete(:c) || []
       @name = params.delete(:name)
     end
+    def into(val) val << self end
     def <<(val) @c<<val end
     def [](key) @c[key] end
   end
@@ -97,12 +122,12 @@ module <%= @classname %>
         @leading = true; @indent = 0
       when 0x0a
         nc = peek(4).unpack('U')[0]
-        if nc == 0x0d then getch; c = "\n\r" end
+        if nc == 0x0d then getch; c = UString.new("\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 = "\r\n" end
+        if nc == 0x0a then getch; c = UString.new("\r\n") end
         @last_is_newline = true; @line += 1; @pos = 1
         @leading = true; @indent = 0
       when 0x20
@@ -137,12 +162,12 @@ module <%= @classname %>
       <%- cmds.each do |c| -%>
       <%= rb_vars(c) %>
       <%- end -%>
-      state='<%= first_state %>'
+      <%=STATE%>='<%= first_state %>'
       <%- if states.size > 1 or accumulates?(states) or makes_calls?(states) -%>
         <%- if otype == 'U' -%>
       s = UNode.new(:name=>name,:sline=>@line,:schr=>@pos)
         <%- elsif otype == '[]' -%>
-      s = []
+      s = UArray.new
         <%- elsif otype == '{}' -%>
       s = UHash.new
         <%- end -%>
@@ -151,12 +176,12 @@ module <%= @classname %>
       <%= _acc %> ||= UString.new
       <%- end -%>
       loop do
-        c = nextchar
+        <%= INPUT %> = nextchar
         <%- has_fallthru = false -%>
         <%- if eof_state?(states) -%>
-        state = '{eof}' if c==:eof
+        <%=STATE%> = '{eof}' if <%= INPUT %>==:eof
         <%- end -%>
-        case state
+        case <%=STATE%>
         <%- states.each do |st_name, clauses| -%>
         when '<%= st_name %>'
           <%- if clauses.size > 1 -%>
@@ -185,7 +210,7 @@ module <%= @classname %>
         <%- end -%>
         end
         <%- if has_fallthru -%>
-        error("Unexpected #{c}")
+        error("Unexpected #{<%= INPUT %>}")
         @fwd = true
         return
         <%- end -%>

data/lib/genmachine/generators/{ruby.rb → ruby/ruby.rb}

@@ -2,14 +2,16 @@ module GenMachine
   module Generators
     class RubyGenerator
       require 'erb'
-      require 'genmachine/generators/helpers/ruby'
+      require 'genmachine/generators/generator'
+      require 'genmachine/generators/general_helper'
+      require 'genmachine/generators/ruby/helper'
       include Generator
       include GenMachine::Helpers::Ruby
       include GenMachine::Helpers::General
       GENMACHINE_TARGET = 'ruby'
 
       def initialize(opts)
-        @template_base = File.expand_path(File.dirname(__FILE__))+'/templates/ruby/'
+        @template_base = File.dirname(__FILE__) + '/'
         super(opts)
       end
 

data/lib/genmachine.rb

@@ -1,11 +1,11 @@
 require 'genmachine/spec_parser'
-require 'genmachine/generator'
-require 'genmachine/generators/helpers/general'
 require 'genmachine/char_set'
 
-Dir[File.join(File.dirname(__FILE__),'genmachine','generators','*.rb')].each do |fname|
-  name = File.basename(fname)
-  require "genmachine/generators/#{name}"
+Dir[File.join(File.dirname(__FILE__),'genmachine','generators','*')].each do |fname|
+  if File.directory? fname
+    name = File.basename(fname)
+    require "genmachine/generators/#{name}/#{name}"
+  end
 end
 
 module GenMachine

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 6
-  version: 0.1.6
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Joseph Wecker
@@ -15,11 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-18 00:00:00 -07:00
+date: 2011-08-19 00:00:00 -07:00
 default_executable: genmachine
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :development
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -32,8 +31,8 @@ dependencies:
   name: shoulda
   version_requirements: *id001
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -48,8 +47,8 @@ dependencies:
   name: bundler
   version_requirements: *id002
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -64,8 +63,8 @@ dependencies:
   name: jeweler
   version_requirements: *id003
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -78,6 +77,7 @@ dependencies:
   name: rcov
   version_requirements: *id004
   prerelease: false
+  type: :development
 description: "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."
 email: joseph.wecker@gmail.com
 executables: 
@@ -101,12 +101,12 @@ files:
 - lib/VERSION
 - lib/genmachine.rb
 - lib/genmachine/char_set.rb
-- lib/genmachine/generator.rb
-- lib/genmachine/generators/helpers/general.rb
-- lib/genmachine/generators/helpers/ruby.rb
-- lib/genmachine/generators/ruby.rb
-- lib/genmachine/generators/templates/ruby/executable.erb
-- lib/genmachine/generators/templates/ruby/lib.erb.rb
+- lib/genmachine/generators/general_helper.rb
+- lib/genmachine/generators/generator.rb
+- lib/genmachine/generators/ruby/executable.erb
+- lib/genmachine/generators/ruby/helper.rb
+- lib/genmachine/generators/ruby/lib.erb.rb
+- lib/genmachine/generators/ruby/ruby.rb
 - lib/genmachine/spec_parser.rb
 - machines/genmachine.machine
 - misc/genmachine.vim