genmachine 0.0.1 → 0.1.0

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.1.0

data/bin/genmachine

@@ -57,9 +57,8 @@ unless languages.include? options[:language]
   exit 2
 end
 
-#spec_parser = GenMachine::SpecParser.new(files)
-#options[:spec_ast] = spec_parser.build
-options[:spec_ast] = []
+spec_parser = GenMachine::SpecParser.new(files)
+options[:spec_ast] = spec_parser.build
 gen = generators[options[:language]].new(options)
 gen.generate_class
 gen.generate_executable

data/genmachine.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{genmachine}
-  s.version = "0.0.1"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joseph Wecker"]
@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
     "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/spec_parser.rb",
     "test/helper.rb",

data/lib/genmachine/char_set.rb

@@ -35,8 +35,8 @@ module GenMachine
     def include_char(char) include_range(char,char) end
 
     def include_range(from, to)
-      from = from.utf8_chars[0] if from.is_a?(String)
-      to = to.utf8_chars[0] if to.is_a?(String)
+      from = from.to_utf8_char_array[0] if from.is_a?(String)
+      to = to.to_utf8_char_array[0] if to.is_a?(String)
       @include_intervals << [from,to].sort
       if @include_intervals.length > 1
         @include_intervals.sort!

data/lib/genmachine/generator.rb

@@ -14,24 +14,17 @@ module GenMachine
       end
 
       def generate_class
-        puts "Generate class (#{@classname}): #{@class_fname}"
-        #f = File.new(@class_fname, 'w+')
-        #f.write(@libraries[language].result(binding))
-        #f.close
+        puts "TODO: Generate class (#{@classname}): #{@class_fname}"
       end
 
       def generate_executable
         return unless @gen_executable
-        puts "Generate executable: #{@exe_fname}"
-        #f = File.new(@exe_fname, 'w+')
-        #f.write(@executables[language].result(binding))
-        #f.chmod(0755)
-        #f.close
+        puts "TODO: Generate executable: #{@exe_fname}"
       end
 
       def run_test
         return if @test_file.nil?
-        puts "Run test"
+        puts "TODO: Run test"
       end
     end
   end

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

@@ -52,7 +52,7 @@ module GenMachine
       end
 
       def rb_transition_commands(st,currstate)
-        st = st.strip.split(';').map{|s|s.strip}
+        st = st.strip.split(';').map(&:strip)
         out = []
         add_next = false
         st.each do |s|

data/lib/genmachine/generators/ruby.rb

@@ -1,8 +1,32 @@
 module GenMachine
   module Generators
     class RubyGenerator
+      require 'erb'
+      require 'genmachine/generators/helpers/ruby'
       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/'
+        super(opts)
+      end
+
+      def generate_class
+        library = ERB.new(IO.read(@template_base+'lib.erb.rb'),nil,'-')
+        f = File.new(@class_fname, 'w+')
+        f.write(library.result(binding))
+        f.close
+      end
+
+      def generate_executable
+        executable = ERB.new(IO.read(@template_base+'executable.erb'),nil,'-')
+        f = File.new(@exe_fname, 'w+')
+        f.write(executable.result(binding))
+        f.chmod(0755)
+        f.close
+      end
     end
   end
 end

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

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+# continuation based (if required) or full-file parsing
+require '<%= @classname.to_underscored %>'
+require 'pp'
+pp <%= @classname %>.parse(ARGF.read)

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

@@ -1,7 +1,7 @@
 require 'strscan'
 $KCODE="U"
 
-module <%= classname %>
+module <%= @classname %>
   def self.parse(str) Parser.new(str).parse end
   def self.parse_file(fname) Parser.new(IO.read(fname)).parse end
 
@@ -61,7 +61,7 @@ module <%= classname %>
       @pos = 1
       @leading = true
       @indent = 0
-      @ast = <%= @table[0][0] %>
+      @ast = <%= @spec_ast[0][0] %>
       return @ast
     end
 
@@ -115,7 +115,7 @@ module <%= classname %>
 
     def eof?() return @last_c == :eof end
 
-<%- @table.each do |name, args, cmds, first_state, states| -%>
+<%- @spec_ast.each do |name, args, cmds, first_state, states| -%>
   <%- args << "p=nil" -%>
   <%- args << "name='#{name}'" -%>
     def <%= name %>(<%= args.join(',') %>)
@@ -170,6 +170,7 @@ module <%= classname %>
         <%- end -%>
       end
     end
+
 <%- end -%>
   end
 end

data/lib/genmachine/spec_parser.rb

@@ -6,14 +6,6 @@ module GenMachine
     def initialize(files)
       @table = []
       @files = files
-      @libraries = {}
-      @executables = {}
-      template_base = File.expand_path(File.dirname(__FILE__))+'/templates/'
-      LANGUAGES.each do |lang|
-        tbase = template_base + lang.to_s + '/'
-        @libraries[lang] = ERB.new(IO.read(tbase+'library.erb.rb'),nil,'-')
-        @executables[lang] = ERB.new(IO.read(tbase+'executable.erb'),nil,'-')
-      end
     end
 
     def build
@@ -25,14 +17,14 @@ module GenMachine
           det = line[0..0]
           if det == '|' or det == ':'
             re = (det=='|' ? '\|' : det) + '(?: |$)'
-            cols = line.split(/#{re}/,-1)[1..-1].map{|c| c.strip}
+            cols = line.split(/#{re}/,-1)[1..-1].map(&:strip)
             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)]
               end
               parts = cols[0].split('(')
-              c_name = parts.shift.underscore
+              c_name = parts.shift.to_underscored
               c_args = parts.join('(').sub(/\)$/,'').split(',')
               c_states = []
               c_cmds = (cols[3]||'').split(';')
@@ -49,7 +41,7 @@ module GenMachine
                            :input => inputs,
                            :cond  => conditionals,
                            :acc   => cols[2],
-                           :exprs => (cols[3]||'').split(';'),
+                           :exprs => (cols[3]||'').split(';').map(&:strip),
                            :next  => cols[4]}
             elsif det == ':' && (c_states.size > 0)
               conditionals, inputs = parse_input(cols[1],c_states[-1][:input])
@@ -57,7 +49,7 @@ module GenMachine
               c_states[-1][:input] = inputs
               c_states[-1][:cond] += conditionals
               c_states[-1][:acc]  += cols[2]
-              c_states[-1][:exprs]+= (cols[3]||'').split(';')
+              c_states[-1][:exprs]+= (cols[3]||'').split(';').map(&:strip)
               c_states[-1][:next] += cols[4]
             end
           end
@@ -66,7 +58,9 @@ module GenMachine
           @table << [c_name, c_args, c_cmds, c_first_state, process_states(c_states)]
         end
       end
+      require 'pp'
       pp @table
+      return @table
     end
 
     # consolidate same-name states and (eventually) combine / optimize where

data/lib/genmachine.rb

@@ -1,6 +1,7 @@
 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)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: genmachine
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
-  - 0
   - 1
-  version: 0.0.1
+  - 0
+  version: 0.1.0
 platform: ruby
 authors: 
 - Joseph Wecker
@@ -102,6 +102,7 @@ files:
 - 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/spec_parser.rb
 - test/helper.rb