genmachine 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/bin/genmachine

@@ -9,31 +9,18 @@ languages = generators.keys
 
 options = {}
 opts = OptionParser.new do |opts|
-  opts.version = '0.0.1'
+  opts.version = GenMachine.version
   opts.banner = BANNER
-  opts.on('-c', '--classname NAME',
-          "Class/module/function name for generated library code "+
-          "(default STATE_TABLE_FILE)") do |v|
-    options[:classname] = v
-  end
+  opts.on('-d', '--[no-]debug', "Verbose debug mode.") {|v| options[:debug] = v}
+  opts.on('-c', '--classname NAME', "Class/module/function name for generated library code "+
+          "(default STATE_TABLE_FILE)") {|v| options[:classname] = v}
   opts.on('-l', '--language LANGUAGE',
           "Language to generate code for- currently one of [#{languages.join(',')}] " +
-          "(default #{languages.first})") do |v|
-    options[:language] = v.to_underscored.to_sym
-  end
-  opts.on('-t', '--test-with FILE',
-          "Try parsing the specified file after generating the parser "+
-          "(default STATE_TABLE_FILE.gmtest if it exists)") do |v|
-    options[:test_file] = v
-  end
-  opts.on('-e', '--[no-]executable',
-          "Generate an executable parser (default true)") do |v|
-    options[:executable] = v
-  end
-  opts.on('-o', '--output-dir DIR',
-          "Output directory for generated file(s) (default ./)") do |v|
-    options[:output_dir] = v
-  end
+          "(default #{languages.first})"){|v|options[:language]=v.to_underscored}
+  opts.on('-t', '--test-with FILE', "Try parsing the specified file after generating the parser "+
+          "(default STATE_TABLE_FILE.gmtest if it exists)"){|v|options[:test_file]=v}
+  opts.on('-e','--[no-]executable',"Generate an executable parser (default true)"){|v|options[:executable]=v}
+  opts.on('-o','--output-dir DIR',"Output directory for generated file(s) (default ./)"){|v|options[:output_dir]=v}
 end
 
 files = opts.parse(ARGV)
@@ -44,11 +31,12 @@ end
 
 file_base = files[0].chomp(File.extname(files[0]))
 name_base = File.basename(file_base)
-options[:executable] ||= true
+options[:debug]        = false if options[:debug].nil?
+options[:executable]   = true  if options[:executable].nil?
 options[:language]   ||= languages.first
 options[:classname]  ||= name_base.capitalize + 'Parser'
 options[:test_file]  ||= files[0] + '.gmtest'
-options[:output_dif] ||= './'
+options[:output_dir] ||= './'
 options[:class_fname]  = options[:classname].to_underscored + '.rb'
 options[:exe_fname]    = name_base.to_underscored
 
@@ -57,7 +45,7 @@ unless languages.include? options[:language]
   exit 2
 end
 
-spec_parser = GenMachine::SpecParser.new(files)
+spec_parser = GenMachine::SpecParser.new(files,options)
 options[:spec_ast] = spec_parser.build
 gen = generators[options[:language]].new(options)
 gen.generate_class

data/genmachine.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{genmachine}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joseph Wecker"]
-  s.date = %q{2011-08-15}
+  s.date = %q{2011-08-16}
   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}
@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
     "VERSION",
     "bin/genmachine",
     "genmachine.gemspec",
+    "lib/VERSION",
     "lib/genmachine.rb",
     "lib/genmachine/char_set.rb",
     "lib/genmachine/generator.rb",

data/lib/VERSION

@@ -0,0 +1 @@
+0.1.2

data/lib/genmachine.rb

@@ -9,6 +9,7 @@ Dir[File.join(File.dirname(__FILE__),'genmachine','generators','*.rb')].each do
 end
 
 module GenMachine
+  VERSION = File.exist?(File.join(File.dirname(__FILE__),'VERSION')) ? File.read(File.join(File.dirname(__FILE__),'VERSION')) : ""
   class << self
     def generators
       Generators.constants.reduce({}) do |langs,const|
@@ -19,5 +20,7 @@ module GenMachine
         langs
       end
     end
+
+    def version() VERSION end
   end
 end

data/lib/genmachine/generator.rb

@@ -4,27 +4,30 @@ module GenMachine
       def initialize(opts={})
         opts ||= {}
         @spec_ast       = opts.delete(:spec_ast)
-        @gen_executable = opts.delete(:executable) || false
+        @gen_executable = opts.delete(:executable)
         @classname      = opts.delete(:classname)  || 'MiscParser'
         @test_file      = opts.delete(:test_file)
         @output_dir     = opts.delete(:output_dir) || './'
         @class_fname    = opts.delete(:class_fname)|| @classname.to_underscored
         @exe_fname      = opts.delete(:exe_fname)  || @classname.sub(/parser$/i,'').to_underscored
+        @debug          = opts.delete(:debug)
+        @gen_executable = false if @gen_executable.nil?
+        @debug          = false if @debug.nil?
         raise ArgumentError, "Must include the table specification data (:spec_ast)" if @spec_ast.nil?
       end
 
       def generate_class
-        puts "TODO: Generate class (#{@classname}): #{@class_fname}"
+        puts "TODO: Generate class (#{@classname}): #{@class_fname}" if @debug
       end
 
       def generate_executable
         return unless @gen_executable
-        puts "TODO: Generate executable: #{@exe_fname}"
+        puts "TODO: Generate executable: #{@exe_fname}" if @debug
       end
 
       def run_test
         return if @test_file.nil?
-        puts "TODO: Run test"
+        puts "TODO: Run test" if @debug
       end
     end
   end

data/lib/genmachine/generators/ruby.rb

@@ -15,14 +15,15 @@ module GenMachine
 
       def generate_class
         library = ERB.new(IO.read(@template_base+'lib.erb.rb'),nil,'-')
-        f = File.new(@class_fname, 'w+')
+        f = File.new(File.join(@output_dir,@class_fname), 'w+')
         f.write(library.result(binding))
         f.close
       end
 
       def generate_executable
+        return unless @gen_executable
         executable = ERB.new(IO.read(@template_base+'executable.erb'),nil,'-')
-        f = File.new(@exe_fname, 'w+')
+        f = File.new(File.join(@output_dir,@exe_fname), 'w+')
         f.write(executable.result(binding))
         f.chmod(0755)
         f.close

data/lib/genmachine/spec_parser.rb

@@ -3,9 +3,10 @@ module GenMachine
   # it'll eventually be replaced when the real parser is written as a
   # genmachine table.
   class SpecParser
-    def initialize(files)
+    def initialize(files,opts)
       @table = []
       @files = files
+      @opts = opts
     end
 
     def build
@@ -58,8 +59,10 @@ module GenMachine
           @table << [c_name, c_args, c_cmds, c_first_state, process_states(c_states)]
         end
       end
-      require 'pp'
-      pp @table
+      if @opts[:debug]
+        require 'pp'
+        pp @table
+      end
       return @table
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: genmachine
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Joseph Wecker
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-15 00:00:00 -07:00
+date: 2011-08-16 00:00:00 -07:00
 default_executable: genmachine
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -98,6 +98,7 @@ files:
 - VERSION
 - bin/genmachine
 - genmachine.gemspec
+- lib/VERSION
 - lib/genmachine.rb
 - lib/genmachine/char_set.rb
 - lib/genmachine/generator.rb