udon 0.0.1 → 0.0.2

data/Gemfile

@@ -12,5 +12,5 @@ group :development do
   gem "rcov", ">= 0"
   gem "reek", "~> 1.2.8"
   gem "roodi", "~> 2.1.0"
-  gem "genmachine", "~> 0.1.6"
+  gem "genmachine", "~> 0.2.1"
 end

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/udon/udon_parser.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 UdonParser
   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 UdonParser
       @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,15 +122,15 @@ module UdonParser
         @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
+      when 0x20,0x09
         @indent += 1 if @leading
         @last_is_space = true; @pos += 1
       else @leading = false; @pos += 1 end
@@ -131,71 +156,66 @@ module UdonParser
     def eof?() return @last_c == :eof end
 
     def document(p=nil,name='document')
-      state=':data_or_child'
-      s = []
+      __state=':data_or_child'
+      s = UArray.new
       a ||= UString.new
       b ||= UString.new
-      trash ||= UString.new
       loop do
-        c = nextchar
-        state = '{eof}' if c==:eof
-        case state
+        __i = nextchar
+        __state = '{eof}' if __i==:eof
+        case __state
         when ':data_or_child'
             case
-            when nl?; @fwd=true; (a<<b if b.size>0); b=UString.new; state=':data'; next
-            when space?; b<<c; next
-            when c==35,c==124; @fwd=true; (trash<<b if b.size>0); b=UString.new; state=':child'; next
-            else @fwd=true; (a<<b if b.size>0); b=UString.new; state=':data'; next
+            when nl?; @fwd=true; b.into(a); __state=':data'; next
+            when __i==9,space?; __i.into(b); next
+            when __i==35,__i==124; @fwd=true; b.reset!; __state=':child'; next
+            else @fwd=true; b.into(a); __state=':data'; next
             end
         when ':child'
-            if c==35
-              @fwd=true; (s<<a if a.size>0); a=UString.new; state=comment(':data_or_child',s); next
+            if __i==35
+              a.into(s); __state=comment(':data_or_child',s); next
             end
         when '{eof}'
-            @fwd=true; (a<<b if b.size>0); b=UString.new; (s<<a if a.size>0); a=UString.new; return(s)
+            @fwd=true; b.into(a); a.into(s); return(s)
         when ':data'
             case
-            when nl?; a<<c; (s<<a if a.size>0); a=UString.new; state=':data_or_child'; next
-            else a<<c; next
+            when nl?; __i.into(a); a.into(s); __state=':data_or_child'; next
+            else __i.into(a); next
             end
         end
       end
     end
 
     def comment(ns,p=nil,name='comment')
+      ibase=@indent+1
       ipar=@indent
-      ibase=ipar+100
-      state=':1st:ws'
+      __state=':first:ws'
       s = UNode.new(:name=>name,:sline=>@line,:schr=>@pos)
       a ||= UString.new
       loop do
-        c = nextchar
-        state = '{eof}' if c==:eof
-        case state
-        when ':nl'
+        __i = nextchar
+        __state = '{eof}' if __i==:eof
+        case __state
+        when ':first:ws'
             case
-            when (@indent>ibase); @fwd=true; state=':child'; next
-            when nl?,(c>8&&c<11),space?; next
-            when (@indent<=ipar); @fwd=true; p<<s; return(ns)
-            else a<<c; ibase = @indent; state=':child'; next
+            when __i==9,space?; ibase += 1; next
+            when nl?; __state=':nl'; next
+            else __i.into(a); __state=':data'; next
             end
-        when ':child'
-            case
-            when nl?; (s<<a if a.size>0); a=UString.new; state=':nl'; next
-            else a<<c; next
-            end
-        when ':1st'
+        when ':nl'
             case
-            when nl?; (s<<a if a.size>0); a=UString.new; state=':nl'; next
-            else a<<c; next
+            when (@indent>ibase); @fwd=true; __state=':data'; next
+            when __i==9,space?; next
+            when nl?; __i.into(a); a.into(s); next
+            when (@indent<=ipar); @fwd=true; s.into(p); return(ns)
+            else __i.into(a); ibase=@indent; __state=':data'; next
             end
         when '{eof}'
-            @fwd=true; (s<<a if a.size>0); a=UString.new; p<<s; return(ns)
-        when ':1st:ws'
+            @fwd=true; a.into(s); s.into(p); return(ns)
+        when ':data'
             case
-            when c==9,space?; next
-            when nl?; state=':nl'; next
-            else a<<c; state=':1st'; next
+            when nl?; a.into(s); __state=':nl'; next
+            else __i.into(a); next
             end
         end
       end

data/machines/udon.machine

@@ -1,42 +1,37 @@
  Main entrypoint - a complete udon document
-
-+-----------------+----------+-----+----------------+-------------------------+
-| document()::[]  |          |     |                | :data_or_child          |
-| :data_or_child  | [\n]     |     | a<<<b          | :data                   |
-| :data_or_child  | [ ]      | b<< |                | :data_or_child          |
-| :data_or_child  | [#|]     |     | trash<<<b      | :child                  |
-| :data_or_child  | .        |     | a<<<b          | :data                   |
-
-| :data           | [\n]     | a<< | s<<<a          | :data_or_child          |
-| :data           | .        | a<< |                | :data                   |
-| :child          | [#]      |     | s<<<a          | comment(:data_or_child) |
-| {eof}           |          |     | a<<<b; s<<<a   | <done>                  |
++-----------------+-----------------+-----+----------------+-------------------------+
+| document()::[]  |                 |     |                | :data_or_child          |
++-----------------+-----------------+-----+-----------------+------------------------+
+| :data_or_child  | [\n]            |     | b>>a           | :data                   |
+| :data_or_child  | [ \t]           | >>b |                | :data_or_child          |
+| :data_or_child  | [#|]            |     | b>>            | :child                  |
+| :data_or_child  | .               |     | b>>a           | :data                   |
++-----------------+-----------------+-----+----------------+-------------------------+
+| :data           | [\n]            | >>a | a>>s           | :data_or_child          |
+| :data           | .               | >>a |                | :data                   |
++-----------------+-----------------+-----+----------------+-------------------------+
+| :child          | [#]             | >>  | a>>s           | comment(:data_or_child) |
+| {eof}           |                 |     | b>>a;  a>>s    | <done>                  |
++-----------------+-----------------+-----+----------------+-------------------------+
 # TODO: lots more children
 
- For error recovery (go to the next line)
-#+-----------------+----------+-----+----------------+--------------+
-#| to_nextline(ns) |          |     |                | :scan        |
-#| :scan           | {eof?}   |     |                | <ns>         |
-#| :scan           | [\n]     |     |                | <ns>         |
-#| :scan           | .        | <<  |                | :scan        |
-#+-----------------+----------+-----+----------------+--------------+
-
  Block comments
-+-----------------+-----------------+-----+-----------------+--------------+
-| comment(ns)::U  |                 |     | ipar=$indent    | :1st:ws      |
-:                 :                 :     : ibase=ipar+100  :              :
-| :1st:ws         | [ \t]           | <<  |                 | :1st:ws      |
-| :1st:ws         | [\n]            | <<  |                 | :nl          |
-| :1st:ws         | .               | a<< |                 | :1st         |
-| :1st            | [\n]            | <<  | s<<<a           | :nl          |
-| :1st            | .               | a<< |                 | :1st         |
-| :nl             | {$indent>ibase} |     |                 | :child       |
-| :nl             | [ \t\n]         | <<  |                 | :nl          |
-| :nl             | {$indent<=ipar} |     | p<<s            | <ns>         |
-| :nl             | .               | a<< | ibase = $indent | :child       |
-| :child          | [\n]            | <<  | s<<<a           | :nl          |
-| :child          | .               | a<< |                 | :child       |
-| {eof}           |                 |     | s<<<a; p<<s     | <ns>         |
-+-----------------+-----------------+-----+-----------------+--------------+
-
-
++-----------------+-----------------+-----+-----------------+------------------------+
+| comment(ns)::U  |                 |     | ibase=$indent+1 | :first:ws              |
+:                 :                 :     : ipar=$indent    :                        :
++-----------------+-----------------+-----+-----------------+------------------------+
+| :first:ws       | [ \t]           | >>  | ibase += 1      | :first:ws              |
+| :first:ws       | [\n]            | >>  |                 | :nl                    |
+| :first:ws       | .               | >>a |                 | :data                  |
++-----------------+-----------------+-----+----------------+-------------------------+
+| :data           | [\n]            | >>  | a>>s            | :nl                    |
+| :data           | .               | >>a |                 | :data                  |
++-----------------+-----------------+-----+----------------+-------------------------+
+| :nl             | {$indent>ibase} |     |                 | :data                  |
+| :nl             | [ \t]           | >>  |                 | :nl                    |
+| :nl             | [\n]            | >>a | a>>s            | :nl                    |
+| :nl             | {$indent<=ipar} |     | s>>p            | <ns>                   |
+| :nl             | .               | >>a | ibase=$indent   | :data                  |
++-----------------+-----------------+-----+----------------+-------------------------+
+| {eof}           |                 |     | a>>s; s>>p      | <ns>                   |
++-----------------+-----------------+-----+-----------------+------------------------+

data/test/test_udon.rb

@@ -4,9 +4,9 @@ $KCODE='U'
 class TestUdon < MiniTest::Unit::TestCase
   def test_blank_documents
     assert_equal(''.udon,[])
-    (0..5).each do
+    (0..3).each do
       s = randstr(200,"      \t\n\r")
-      assert_equal(s.udon.join(''),s)
+      assert_equal(s,s.udon.join(''))
     end
   end
 
@@ -19,17 +19,28 @@ class TestUdon < MiniTest::Unit::TestCase
              [0.075, (32..126)],
              [0.05,  (0..255)],
              [0.025, (0..0xffff)]]
-    (0..5).each do
-      s = randstr(500,chars)
-      s.gsub! /^\s*(<\||#|\|)/u, ''
-      assert_equal(s.udon.join(''),s)
+    (0..3).each do
+      s = randstr(100,chars)
+      s.gsub! /^\s*(<\||#|\|)/u, '' # Remove stuff that triggers udon mode
+      assert_equal(s,s.udon.join(''))
     end
   end
 
-  def test_block_comments
-    #leading = randstr(200,"      \t\n\r")
-    #comment = "# hello\na"
-    #following = randstr(200,"     \t\n\r")
-    #(leading + comment + following).udon_pp
+  def test_block_comment_indent_level
+    leading = randstr(200,"      \t\n\r") + "\n"
+    comment = <<-COMMENT
+      #  line 1
+         line 2
+        line 3
+       line 4
+     COMMENT
+    following = randstr(200,"     \t\n\r")
+    s = (leading + comment + following)
+    r = s.udon
+    assert_instance_of(UdonParser::UNode, r.last)
+    assert_equal('line 1', r.last.c[0])
+    assert_equal('line 2', r.last.c[1])
+    assert_equal('line 3', r.last.c[2])
+    assert_equal('line 4', r.last.c[3])
   end
 end

data/udon.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{udon}
-  s.version = "0.0.1"
+  s.version = "0.0.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-18}
+  s.date = %q{2011-08-19}
   s.description = %q{Parse and generate udon, inspired by zml, haml, json, and more.}
   s.email = %q{joseph.wecker@gmail.com}
   s.extra_rdoc_files = [
@@ -47,7 +47,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<reek>, ["~> 1.2.8"])
       s.add_development_dependency(%q<roodi>, ["~> 2.1.0"])
-      s.add_development_dependency(%q<genmachine>, ["~> 0.1.6"])
+      s.add_development_dependency(%q<genmachine>, ["~> 0.2.1"])
     else
       s.add_dependency(%q<minitest>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -55,7 +55,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<reek>, ["~> 1.2.8"])
       s.add_dependency(%q<roodi>, ["~> 2.1.0"])
-      s.add_dependency(%q<genmachine>, ["~> 0.1.6"])
+      s.add_dependency(%q<genmachine>, ["~> 0.2.1"])
     end
   else
     s.add_dependency(%q<minitest>, [">= 0"])
@@ -64,7 +64,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<reek>, ["~> 1.2.8"])
     s.add_dependency(%q<roodi>, ["~> 2.1.0"])
-    s.add_dependency(%q<genmachine>, ["~> 0.1.6"])
+    s.add_dependency(%q<genmachine>, ["~> 0.2.1"])
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: udon
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 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: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :development
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -32,8 +31,8 @@ dependencies:
   name: minitest
   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,8 +77,8 @@ dependencies:
   name: rcov
   version_requirements: *id004
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -94,8 +93,8 @@ dependencies:
   name: reek
   version_requirements: *id005
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -110,22 +109,23 @@ dependencies:
   name: roodi
   version_requirements: *id006
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 21
         segments: 
         - 0
+        - 2
         - 1
-        - 6
-        version: 0.1.6
+        version: 0.2.1
   name: genmachine
   version_requirements: *id007
   prerelease: false
+  type: :development
 description: Parse and generate udon, inspired by zml, haml, json, and more.
 email: joseph.wecker@gmail.com
 executables: []