genmachine 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/genmachine.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{genmachine}
-  s.version = "0.1.2"
+  s.version = "0.1.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-16}
+  s.date = %q{2011-08-17}
   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}
@@ -39,6 +39,7 @@ Gem::Specification.new do |s|
     "lib/genmachine/generators/templates/ruby/executable.erb",
     "lib/genmachine/generators/templates/ruby/lib.erb.rb",
     "lib/genmachine/spec_parser.rb",
+    "machines/genmachine.machine",
     "misc/genmachine.vim",
     "test/helper.rb",
     "test/test_genmachine.rb"

data/lib/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

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

@@ -5,17 +5,22 @@ module <%= @classname %>
   def self.parse(str) Parser.new(str).parse end
   def self.parse_file(fname) Parser.new(IO.read(fname)).parse end
 
-  class Node
-    attr_accessor :name, :children, :start_line, :start_pos, :end_line, :end_pos
-    def initialize(name='node',line=:unknown,pos=:unknown)
-      @name = name
-      @children = []
-      @start_line = line
-      @start_pos = pos
-      @end_line = :unknown
-      @end_pos = :unknown
+  class UHash < Hash
+    def <<(kv) k,v = kv; self[k] = v end
+  end
+
+  class UNode
+    attr_accessor :name, :m,:a,:c
+    def initialize(params={})
+      @m = params.delete(:m) || UHash.new
+      @m[:sline] ||= params.delete(:sline)
+      @m[:schr] ||= params.delete(:schr)
+      @a= params.delete(:a) || UHash.new
+      @c= params.delete(:c) || []
+      @name = params.delete(:name)
     end
-    def <<(val) @children<<val end
+    def <<(val) @c<<val end
+    def [](key) @c[key] end
   end
 
   class Parser < StringScanner
@@ -115,7 +120,7 @@ module <%= @classname %>
 
     def eof?() return @last_c == :eof end
 
-<%- @spec_ast.each do |name, args, cmds, first_state, states| -%>
+<%- @spec_ast.each do |name, otype, args, cmds, first_state, states| -%>
   <%- args << "p=nil" -%>
   <%- args << "name='#{name}'" -%>
     def <%= name %>(<%= args.join(',') %>)
@@ -124,7 +129,13 @@ module <%= @classname %>
       <%- end -%>
       state='<%= first_state %>'
       <%- if states.size > 1 or accumulates?(states) or makes_calls?(states) -%>
-      s = Node.new(name,@line,@pos)
+        <%- if otype == 'U' -%>
+      s = UNode.new(:name=>name,:sline=>@line,:schr=>@pos)
+        <%- elsif otype == '[]' -%>
+      s = []
+        <%- elsif otype == '{}' -%>
+      s = UHash.new
+        <%- end -%>
       <%- end -%>
       <%- accumulators(states).each do |_acc| -%>
       <%= _acc %> ||= ''

data/lib/genmachine/spec_parser.rb

@@ -10,7 +10,7 @@ module GenMachine
     end
 
     def build
-      c_name = c_args = c_cmds = c_first_state = c_states = nil
+      c_name = c_type = c_args = c_cmds = c_first_state = c_states = nil
       new_fun = false
       @files.each do |fname|
         File.new(fname,'r').each_with_index do |line, line_no|
@@ -22,11 +22,13 @@ module GenMachine
             if det=='|' && cols[0].include?('(')
               new_fun = true
               unless c_name.nil?
-                @table << [c_name, c_args, c_cmds, c_first_state, process_states(c_states)]
+                @table << [c_name, c_type, c_args, c_cmds, c_first_state, process_states(c_states)]
               end
               parts = cols[0].split('(')
               c_name = parts.shift.to_underscored
-              c_args = parts.join('(').sub(/\)$/,'').split(',')
+              c_args, c_type = parts.join('(').split(/::(U|\[\]|\{\})$/)
+              c_args = c_args[0..-2].split(',')
+              c_type ||= '[]'
               c_states = []
               c_cmds = (cols[3]||'').split(';')
               c_first_state = cols[4]
@@ -56,7 +58,7 @@ module GenMachine
           end
         end
         unless c_name.nil?
-          @table << [c_name, c_args, c_cmds, c_first_state, process_states(c_states)]
+          @table << [c_name, c_type, c_args, c_cmds, c_first_state, process_states(c_states)]
         end
       end
       if @opts[:debug]

data/machines/genmachine.machine

@@ -0,0 +1,3 @@
+Parser for this very format.
+
+| genmachine()::[] |  |  |  |  |

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: genmachine
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Joseph Wecker
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-16 00:00:00 -07:00
+date: 2011-08-17 00:00:00 -07:00
 default_executable: genmachine
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -108,6 +108,7 @@ files:
 - lib/genmachine/generators/templates/ruby/executable.erb
 - lib/genmachine/generators/templates/ruby/lib.erb.rb
 - lib/genmachine/spec_parser.rb
+- machines/genmachine.machine
 - misc/genmachine.vim
 - test/helper.rb
 - test/test_genmachine.rb