genmachine 0.1.4 → 0.1.6

data/TODO

@@ -1,3 +1,9 @@
+
+ - `<<` always clears the source (doesn't have to literally for `c`) - so no <<<
+ - Allow   `<<b`   etc. in statements for throwing away values
+ - 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.1.4
+0.1.6

data/genmachine.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{genmachine}
-  s.version = "0.1.4"
+  s.version = "0.1.6"
 
   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.1.4
+0.1.6

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

@@ -108,7 +108,7 @@ module GenMachine
           value = rb_vars(value)
           if clear_it
             out = ["(#{into}<<#{value} if #{value}.size>0)"]
-            out << "#{value}=''"
+            out << "#{value}=UString.new"
           else
             out = ["#{into}<<#{value}"]
           end

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

@@ -9,6 +9,16 @@ module <%= @classname %>
     def <<(kv) k,v = kv; self[k] = v end
   end
 
+  class UString < String
+    def <<(v)
+      begin
+        super([v].pack('U*'))
+      rescue
+        super(v)
+      end
+    end
+  end
+
   class UNode
     attr_accessor :name, :m,:a,:c
     def initialize(params={})
@@ -51,10 +61,10 @@ module <%= @classname %>
         b = source
         source =
           case
-          when b.size >= 4 && b[0] == 0 && b[1] == 0 && b[2] == 0; JSON.iconv('utf-8', 'utf-32be', b)
-          when b.size >= 4 && b[0] == 0 && b[2] == 0; JSON.iconv('utf-8', 'utf-16be', b)
-          when b.size >= 4 && b[1] == 0 && b[2] == 0 && b[3] == 0; JSON.iconv('utf-8', 'utf-32le', b)
-          when b.size >= 4 && b[1] == 0 && b[3] == 0; JSON.iconv('utf-8', 'utf-16le', b)
+          when b.size >= 4 && b[0] == 0 && b[1] == 0 && b[2] == 0; Iconv.iconv('utf-8', 'utf-32be', b)
+          when b.size >= 4 && b[0] == 0 && b[2] == 0; Iconv.iconv('utf-8', 'utf-16be', b)
+          when b.size >= 4 && b[1] == 0 && b[2] == 0 && b[3] == 0; Iconv.iconv('utf-8', 'utf-32le', b)
+          when b.size >= 4 && b[1] == 0 && b[3] == 0; Iconv.iconv('utf-8', 'utf-16le', b)
           else b end
       end
       return source
@@ -86,12 +96,12 @@ module <%= @classname %>
         @last_is_newline = true; @line += 1; @pos = 1
         @leading = true; @indent = 0
       when 0x0a
-        nc = peek(1).unpack('U')[0]
+        nc = peek(4).unpack('U')[0]
         if nc == 0x0d then getch; c = "\n\r" end
         @last_is_newline = true; @line += 1; @pos = 1
         @leading = true; @indent = 0
       when 0x0d
-        nc = peek(1).unpack('U')[0]
+        nc = peek(4).unpack('U')[0]
         if nc == 0x0a then getch; c = "\r\n" end
         @last_is_newline = true; @line += 1; @pos = 1
         @leading = true; @indent = 0
@@ -138,7 +148,7 @@ module <%= @classname %>
         <%- end -%>
       <%- end -%>
       <%- accumulators(states).each do |_acc| -%>
-      <%= _acc %> ||= ''
+      <%= _acc %> ||= UString.new
       <%- end -%>
       loop do
         c = nextchar

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: genmachine
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Joseph Wecker
@@ -19,6 +19,7 @@ date: 2011-08-18 00:00:00 -07:00
 default_executable: genmachine
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  type: :development
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -31,8 +32,8 @@ dependencies:
   name: shoulda
   version_requirements: *id001
   prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency 
+  type: :development
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -47,8 +48,8 @@ dependencies:
   name: bundler
   version_requirements: *id002
   prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency 
+  type: :development
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -63,8 +64,8 @@ dependencies:
   name: jeweler
   version_requirements: *id003
   prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency 
+  type: :development
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -77,7 +78,6 @@ 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: