udon 0.0.2 → 0.0.3

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.2.1"
+  gem "genmachine", "~> 0.2.2"
 end

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/udon/udon_parser.rb

@@ -3,46 +3,46 @@ $KCODE="U"
 
 class Integer
   def into(v); v << self end
+  def into!(v); into(v) end
   def reset!; :nop end
   def reset; :nop end
 end
 
+class String
+  def into(v); into!(v) unless size == 0 end
+  def into!(v); v << self.dup; reset!  end
+  def <<(v)
+    begin
+      concat([v].pack('U*'))
+    rescue
+      concat(v)
+    end
+  end
+  def reset!; self.gsub! /./um,'' end
+  def reset; d=dup;d.reset!;d 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 into(v); into!(v) unless size == 0 end
+    def into!(v); 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 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
-    end
-    def reset!; self.gsub! /./um,'' end
-    def reset; d=dup;d.reset!;d end
-  end
-
   class UNode
     attr_accessor :name, :m,:a,:c
     def initialize(params={})
@@ -53,6 +53,7 @@ module UdonParser
       @c= params.delete(:c) || []
       @name = params.delete(:name)
     end
+    def into!(val) val << self end
     def into(val) val << self end
     def <<(val) @c<<val end
     def [](key) @c[key] end
@@ -122,12 +123,12 @@ module UdonParser
         @leading = true; @indent = 0
       when 0x0a
         nc = peek(4).unpack('U')[0]
-        if nc == 0x0d then getch; c = UString.new("\n\r") end
+        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(4).unpack('U')[0]
-        if nc == 0x0a then getch; c = UString.new("\r\n") end
+        if nc == 0x0a then getch; c = "\r\n" end
         @last_is_newline = true; @line += 1; @pos = 1
         @leading = true; @indent = 0
       when 0x20,0x09
@@ -158,8 +159,8 @@ module UdonParser
     def document(p=nil,name='document')
       __state=':data_or_child'
       s = UArray.new
-      a ||= UString.new
-      b ||= UString.new
+      a ||= ''
+      b ||= ''
       loop do
         __i = nextchar
         __state = '{eof}' if __i==:eof
@@ -168,12 +169,13 @@ module UdonParser
             case
             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
+            when __i==35,__i==124; @fwd=true; b.reset!; a.into(s); __state=':child'; next
             else @fwd=true; b.into(a); __state=':data'; next
             end
         when ':child'
-            if __i==35
-              a.into(s); __state=comment(':data_or_child',s); next
+            case
+            when __i==35; __state=comment(':data_or_child',s); next
+            when __i==124; __state=node(':data_or_child',s); next
             end
         when '{eof}'
             @fwd=true; b.into(a); a.into(s); return(s)
@@ -183,15 +185,18 @@ module UdonParser
             else __i.into(a); next
             end
         end
+        error("Unexpected \"#{[__i].pack("U*")}\"")
+        @fwd = true
+        return
       end
     end
 
-    def comment(ns,p=nil,name='comment')
+    def comment(retstate,p=nil,name='comment')
       ibase=@indent+1
       ipar=@indent
       __state=':first:ws'
       s = UNode.new(:name=>name,:sline=>@line,:schr=>@pos)
-      a ||= UString.new
+      a ||= ''
       loop do
         __i = nextchar
         __state = '{eof}' if __i==:eof
@@ -207,11 +212,11 @@ module UdonParser
             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)
+            when (@indent<=ipar); @fwd=true; s.into(p); return(retstate)
             else __i.into(a); ibase=@indent; __state=':data'; next
             end
         when '{eof}'
-            @fwd=true; a.into(s); s.into(p); return(ns)
+            @fwd=true; a.into(s); s.into(p); return(retstate)
         when ':data'
             case
             when nl?; a.into(s); __state=':nl'; next
@@ -221,5 +226,133 @@ module UdonParser
       end
     end
 
+    def node(retstate,p=nil,name='node')
+      ipar=@indent
+      __state=':ident'
+      s = UNode.new(:name=>name,:sline=>@line,:schr=>@pos)
+      a ||= ''
+      loop do
+        __i = nextchar
+        case __state
+        when ':ident:child:nl'
+            if !eof?
+              @fwd=true; error('nyi'); return(retstate)
+            end
+        when ':ident:child'
+            case
+            when (eof?); @fwd=true; a.into(s); s.into(p); return(retstate)
+            when nl?; __i.into(a); a.into(s); __state=':ident:child:nl'; next
+            when !eof?; __i.into(a); next
+            end
+        when ':ident:a_or_c'
+            case
+            when (eof?); @fwd=true; a.into(s.c.last); s.into(p); return(retstate)
+            when __i==58; a.reset!; s.c.pop.into(aname); __state=':ident:attr:val'; next
+            when __i==9,space?; __i.into(a); next
+            when nl?; __i.into(a); a.into(s.c.last); __state=':ident:nl'; next
+            when !eof?; __i.into(a); __state=':ident:child'; next
+            end
+        when ':ident'
+            case
+            when (eof?); @fwd=true; error('er1'); return(retstate)
+            when __i==9,space?; __state=':ident:nxt'; next
+            when nl?; __state=':ident:nl'; next
+            when (__i>45&&__i<48),__i==123; @fwd=true; __state=':ident:nxt'; next
+            when !eof?; @fwd=true; __state=cstr(':ident:nameret',s); next
+            end
+        when ':ident:attr:val'
+            if !eof?
+              @fwd=true; error('nyi'); return(retstate)
+            end
+        when ':ident:nxt'
+            case
+            when (eof?); @fwd=true; s.into(p); return(retstate)
+            when (__i>45&&__i<48),__i==123; error('nyi'); return(retstate)
+            when nl?; __state=':ident:nl'; next
+            when __i==9,space?; next
+            when !eof?; @fwd=true; __state=cstr(':ident:a_or_c',s); next
+            end
+        when ':ident:nameret'
+            @fwd=true; s.name.reset!; s.c.pop.into(s.name); __state=':ident:nxt'; next
+        when ':ident:nl'
+            case
+            when (eof?); @fwd=true; error('er3'); return(retstate)
+            when __i==9,space?; next
+            when nl?; next
+            when (@indent<=ipar); @fwd=true; s.into(p); return(retstate)
+            when !eof?; @fwd=true; ibase=@indent; __state=':ident:nxt'; next
+            end
+        end
+        error("Unexpected \"#{[__i].pack("U*")}\"")
+        @fwd = true
+        return
+      end
+    end
+
+    def cstr(retstate,p=nil,name='cstr')
+      __state=':first'
+      s = UArray.new
+      a ||= ''
+      b ||= ''
+      loop do
+        __i = nextchar
+        case __state
+        when ':bt-dat'
+            case
+            when __i==96; a.into!(p); return(retstate)
+            when !eof?; __i.into(a); next
+            end
+        when ':first'
+            case
+            when (eof?); @fwd=true; a.into!(p); return(retstate)
+            when __i==34; __state=':dq-dat'; next
+            when __i==39; __state=':sq-dat'; next
+            when __i==96; __state=':bt-dat'; next
+            when nl?,(__i>8&&__i<11),space?; @fwd=true; a.into!(p); return(retstate)
+            when !eof?; __i.into(a); __state=':dat'; next
+            end
+        when ':dq-dat:esc'
+            case
+            when __i==116; "\t".into(a); __state=':dq-dat'; next
+            when __i==110; "\n".into(a); __state=':dq-dat'; next
+            when __i==114; "\r".into(a); __state=':dq-dat'; next
+            when __i==102; "\f".into(a); __state=':dq-dat'; next
+            when __i==98; "\b".into(a); __state=':dq-dat'; next
+            when __i==97; "\a".into(a); __state=':dq-dat'; next
+            when __i==101; "\e".into(a); __state=':dq-dat'; next
+            when __i==115; "\s".into(a); __state=':dq-dat'; next
+            when !eof?; __i.into(a); __state=':dq-dat'; next
+            end
+        when ':sq-dat'
+            case
+            when __i==92; __state=':sq-dat:esc'; next
+            when __i==39; a.into!(p); return(retstate)
+            when !eof?; __i.into(a); next
+            end
+        when ':dq-dat'
+            case
+            when __i==92; __state=':dq-dat:esc'; next
+            when __i==34; a.into!(p); return(retstate)
+            when !eof?; __i.into(a); next
+            end
+        when ':sq-dat:esc'
+            case
+            when __i==92; __i.into(a); __state=':sq-dat'; next
+            when __i==39; __i.into(a); __state=':sq-dat'; next
+            when !eof?; __i.into(b); '\\'.into(a); b.into(a); __state=':sq-dat'; next
+            end
+        when ':dat'
+            case
+            when (eof?); @fwd=true; a.into!(p); return(retstate)
+            when nl?,(__i>8&&__i<11),space?; @fwd=true; a.into!(p); return(retstate)
+            when !eof?; __i.into(a); next
+            end
+        end
+        error("Unexpected \"#{[__i].pack("U*")}\"")
+        @fwd = true
+        return
+      end
+    end
+
   end
 end

data/machines/udon.machine

@@ -4,20 +4,21 @@
 +-----------------+-----------------+-----+-----------------+------------------------+
 | :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>>s     | :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) |
+| :child          | [#]             | >>  |                | comment(:data_or_child) |
+| :child          | [|]             | >>  |                | node(:data_or_child)    |
 | {eof}           |                 |     | b>>a;  a>>s    | <done>                  |
 +-----------------+-----------------+-----+----------------+-------------------------+
 # TODO: lots more children
 
  Block comments
 +-----------------+-----------------+-----+-----------------+------------------------+
-| comment(ns)::U  |                 |     | ibase=$indent+1 | :first:ws              |
+| comment(retstate)::U |           |     | ibase=$indent+1 | :first:ws              |
 :                 :                 :     : ipar=$indent    :                        :
 +-----------------+-----------------+-----+-----------------+------------------------+
 | :first:ws       | [ \t]           | >>  | ibase += 1      | :first:ws              |
@@ -30,8 +31,91 @@
 | :nl             | {$indent>ibase} |     |                 | :data                  |
 | :nl             | [ \t]           | >>  |                 | :nl                    |
 | :nl             | [\n]            | >>a | a>>s            | :nl                    |
-| :nl             | {$indent<=ipar} |     | s>>p            | <ns>                   |
+| :nl             | {$indent<=ipar} |     | s>>p            | <retstate>             |
 | :nl             | .               | >>a | ibase=$indent   | :data                  |
 +-----------------+-----------------+-----+----------------+-------------------------+
-| {eof}           |                 |     | a>>s; s>>p      | <ns>                   |
+| {eof}           |                 |     | a>>s; s>>p      | <retstate>             |
++-----------------+-----------------+-----+-----------------+------------------------+
+
+ Nodes
++-----------------+-----------------+-----+-----------------+------------------------+
+| node(retstate)::U |               |     | ipar=$indent    | :ident                 |
+:                 :                 :     :                 :                        :
++-----------------+-----------------+-----+-----------------+------------------------+
+| :ident          | {eof?}          |     | error('er1')    | <retstate>             |
+| :ident          | [ \t]           | >>  |                 | :ident:nxt             |
+| :ident          | [\n]            | >>  |                 | :ident:nl              |
+| :ident          | [./{]           |     |                 | :ident:nxt             |
+| :ident          | .               |     |                 | cstr(:ident:nameret)   |
+| :ident:nameret  |                 |     | s.name>>        | :ident:nxt             |
+:                 :                 :     : s.c.pop>>s.name :                        :
++-----------------+-----------------+-----+-----------------+------------------------+
+| :ident:nxt      | {eof?}          |     | s>>p            | <retstate>             |
+| :ident:nxt      | [./{]           | >>  | error('nyi')    | <retstate>             |
+| :ident:nxt      | [\n]            | >>  |                 | :ident:nl              |
+| :ident:nxt      | [ \t]           | >>  |                 | :ident:nxt             |
+| :ident:nxt      | .               |     |                 | cstr(:ident:a_or_c)    |
++-----------------+-----------------+-----+-----------------+------------------------+
+| :ident:nl       | {eof?}          |     | error('er3')    | <retstate>             |
+| :ident:nl       | [ \t]           | >>  |                 | :ident:nl              |
+| :ident:nl       | [\n]            | >>  |                 | :ident:nl              |
+| :ident:nl       | {$indent<=ipar} |     | s>>p            | <retstate>             |
+| :ident:nl       | .               |     | ibase=$indent   | :ident:nxt             |
++-----------------+-----------------+-----+-----------------+------------------------+
+| :ident:a_or_c   | {eof?}          |     | a>>s.c.last     | <retstate>             |
+:                 :                 :     : s>>p            :                        :
+| :ident:a_or_c   | [:]             | >>  | a>>             | :ident:attr:val        |
+:                 :                 :     : s.c.pop>>aname  :                        :
+| :ident:a_or_c   | [ \t]           | >>a |                 | :ident:a_or_c          |
+| :ident:a_or_c   | [\n]            | >>a | a>>s.c.last     | :ident:nl              | # was child
+| :ident:a_or_c   | .               | >>a |                 | :ident:child           |
++-----------------+-----------------+-----+-----------------+------------------------+
+| :ident:child    | {eof?}          |     | a>>s            | <retstate>             |
+:                 :                 :     : s>>p            :                        :
+| :ident:child    | [\n]            | >>a | a>>s            | :ident:child:nl        |
+| :ident:child    | .               | >>a |                 | :ident:child           |
++-----------------+-----------------+-----+-----------------+------------------------+
+| :ident:child:nl | .               |     | error('nyi')    | <retstate>             |
+| :ident:attr:val | .               |     | error('nyi')    | <retstate>             |
++-----------------+-----------------+-----+-----------------+------------------------+
+
+ Basic Control Strings
++-----------------+-----------------+-----+-----------------+------------------------+
+| cstr(retstate)  |                 |     |                 | :first                 |
+| :first          | {eof?}          |     | a>>>p           | <retstate>             |
+| :first          | ["]             | >>  |                 | :dq-dat                |
+| :first          | [']             | >>  |                 | :sq-dat                |
+| :first          | [`]             | >>  |                 | :bt-dat                |
+| :first          | [ \t\n]         |     | a>>>p           | <retstate>             |
+| :first          | .               | >>a |                 | :dat                   |
++-----------------+-----------------+-----+-----------------+------------------------+
+| :dat            | {eof?}          |     | a>>>p           | <retstate>             |
+| :dat            | [ \t\n]         |     | a>>>p           | <retstate>             |
+| :dat            | .               | >>a |                 | :dat                   |
++-----------------+-----------------+-----+-----------------+------------------------+
+| :dq-dat         | [\\]            | >>  |                 | :dq-dat:esc            |
+| :dq-dat         | ["]             | >>  | a>>>p           | <retstate>             |
+| :dq-dat         | .               | >>a |                 | :dq-dat                |
++-----------------+-----------------+-----+-----------------+------------------------+
+# TODO: move these to a separate metachar function?
+| :dq-dat:esc     | [t]             | >>  | "\t">>a         | :dq-dat                |
+| :dq-dat:esc     | [n]             | >>  | "\n">>a         | :dq-dat                |
+| :dq-dat:esc     | [r]             | >>  | "\r">>a         | :dq-dat                |
+| :dq-dat:esc     | [f]             | >>  | "\f">>a         | :dq-dat                |
+| :dq-dat:esc     | [b]             | >>  | "\b">>a         | :dq-dat                |
+| :dq-dat:esc     | [a]             | >>  | "\a">>a         | :dq-dat                |
+| :dq-dat:esc     | [e]             | >>  | "\e">>a         | :dq-dat                |
+| :dq-dat:esc     | [s]             | >>  | "\s">>a         | :dq-dat                |
+| :dq-dat:esc     | .               | >>a |                 | :dq-dat                |
++-----------------+-----------------+-----+-----------------+------------------------+
+| :sq-dat         | [\\]            | >>  |                 | :sq-dat:esc            |
+| :sq-dat         | [']             | >>  | a>>>p           | <retstate>             |
+| :sq-dat         | .               | >>a |                 | :sq-dat                |
++-----------------+-----------------+-----+-----------------+------------------------+
+| :sq-dat:esc     | [\\]            | >>a |                 | :sq-dat                |
+| :sq-dat:esc     | [']             | >>a |                 | :sq-dat                |
+| :sq-dat:esc     | .               | >>b | '\\'>>a; b>>a   | :sq-dat                |
++-----------------+-----------------+-----+-----------------+------------------------+
+| :bt-dat         | [`]             | >>  | a>>>p           | <retstate>             |
+| :bt-dat         | .               | >>a |                 | :bt-dat                |
 +-----------------+-----------------+-----+-----------------+------------------------+

data/test/helper.rb

@@ -39,7 +39,15 @@ def gaussian(mean, stddev)
   end
 end
 
-def randstr(avg_length, char_dists = [[0.1,' '],[0.1,('A'..'Z')],[0.8,('a'..'z')]])
+def randstr(avg_length, char_dists = nil)
+  char_dists ||= [[0.10,  " \t"],
+                  [0.05,  "\n\r"],
+                  [0.40,  ('a'..'z')],
+                  [0.15,  ('A'..'Z')],
+                  [0.15,  ('0'..'9')],
+                  [0.075, (32..126)],
+                  [0.05,  (0..255)],
+                  [0.025, (0..0xffff)]]
   ret = ''
   char_dists = char_dists.scan /./umn if char_dists.is_a?(String)
   chrs = char_dists.sort_by{|n|n[0]}

data/test/test_udon.rb

@@ -2,45 +2,145 @@ require 'helper'
 $KCODE='U'
 
 class TestUdon < MiniTest::Unit::TestCase
+  TRIGGER_UDON = /(^\s*(#|\||<).*$|<\||<:)/u
+  WHITESPACE   = "      \t\n\r"
+
   def test_blank_documents
-    assert_equal(''.udon,[])
+    ##############
+    assert_equal         [],                    ''.udon
+    ##############
     (0..3).each do
-      s = randstr(200,"      \t\n\r")
-      assert_equal(s,s.udon.join(''))
+      s = randstr(200,WHITESPACE)
+      ##############
+      assert_equal       s,                     s.udon.join('')
+      ##############
     end
   end
 
-  def test_passthrough_documents
-    chars = [[0.10,  " \t"],
-             [0.05,  "\n\r"],
-             [0.40,  ('a'..'z')],
-             [0.15,  ('A'..'Z')],
-             [0.15,  ('0'..'9')],
-             [0.075, (32..126)],
-             [0.05,  (0..255)],
-             [0.025, (0..0xffff)]]
+  def test_passthru_documents
     (0..3).each do
-      s = randstr(100,chars)
-      s.gsub! /^\s*(<\||#|\|)/u, '' # Remove stuff that triggers udon mode
-      assert_equal(s,s.udon.join(''))
+      s = randstr(100).gsub(TRIGGER_UDON,'')
+      ##############
+      assert_equal       s,                     s.udon.join('')
+      ##############
     end
   end
 
-  def test_block_comment_indent_level
-    leading = randstr(200,"      \t\n\r") + "\n"
+  def test_only_block_comment
+    ##############
+    assert_equal         '#hi'.udon[0].name,    'comment'
+    assert_equal         '#hi'.udon[0].c[0],    'hi'
+    assert_equal         '#  hi'.udon[0].c[0],  'hi'
+    ##############
+  end
+
+  def test_block_comment_indent_level_with_leading
+    leading = randstr(200,WHITESPACE) + "\n"
+    following = randstr(200,WHITESPACE)
     comment = <<-COMMENT
-      #  line 1
-         line 2
-        line 3
+      #  line 0
+         line 1
+        line 2
+
        line 4
+
+      # comment 2
      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])
+    r = (leading + comment + following).udon
+    lines = r[-2].c
+    ##############
+    assert_instance_of   UdonParser::UNode,     r[-2]
+    assert_equal         'comment',             r[-2].name
+    assert_equal         'line 0',              lines[0]
+    assert_equal         'line 1',              lines[1]
+    assert_equal         'line 2',              lines[2]
+    assert_equal         "\n",                  lines[3]
+    assert_equal         'line 4',              lines[4]
+    assert_instance_of   UdonParser::UNode,     r[-1]
+    assert_equal         'comment',             r[-1].name
+    ##############
+  end
+
+  def test_block_comment_in_passthru
+    leading = randstr(200).gsub(TRIGGER_UDON,'') + "\n"
+    following = randstr(200).gsub(TRIGGER_UDON,'')
+    comment = <<-COMMENT
+      # the-comment
+      and back to normal
+    COMMENT
+    r = (leading + comment + following).udon
+    # Find the comment
+    found_i = nil
+    r.each_with_index{|c,i| if c.is_a?(UdonParser::UNode) then found_i=i; break end}
+    ##############
+    refute_nil           found_i
+    assert               found_i < r.size
+    assert               found_i > 0
+    assert_equal         'comment',             r[found_i].name
+    assert_equal         leading,               r[0..(found_i-1)].join('')
+    assert_equal         following,             r[(found_i+2)..-1].join('')
+    ##############
+  end
+
+  def test_simple_node
+    r = "asdf\n|the-node\nasdf".udon
+    ##############
+    assert_instance_of   UdonParser::UNode,     r[1]
+    assert_equal         'the-node',            r[1].name
+    assert_equal         "asdf\n",              r[0]
+    assert_equal         "asdf",                r[2]
+    ##############
+  end
+
+  def test_node_name
+    ##############
+    assert_equal         'hello-there!',        '|hello-there!'.udon[0].name
+    assert_equal         "hello there!\t",      '|"hello there!\t"'.udon[0].name
+    assert_equal         'hello there!\t',      "|'hello there!\\t'".udon[0].name
+    assert_equal         'hello there!\t',      '|`hello there!\t`'.udon[0].name
+    ##############
+  end
+
+  def test_node_name_with_inline_children
+    ##############
+    assert_equal         'hello-there!',        '|hello-there! c'.udon[0].name
+    assert_equal         "hello there!\t",      '|"hello there!\t" c'.udon[0].name
+    assert_equal         'hello there!\t',      "|'hello there!\\t' c".udon[0].name
+    assert_equal         'hello there!\t',      '|`hello there!\t` c'.udon[0].name
+    ##############
   end
+
+  def test_node_name_with_nextline_children
+    ##############
+    assert_equal         'hello-there!',        "|hello-there!\nc".udon[0].name
+    assert_equal         "hello there!\t",      "|\"hello there!\\t\"\nc".udon[0].name
+    assert_equal         'hello there!\t',      "|'hello there!\\t'\nc".udon[0].name
+    assert_equal         'hello there!\t',      "|`hello there!\\t`\nc".udon[0].name
+    ##############
+  end
+
+SCRATCH=<<-SCRATCH
+
+|one         # Sets ipar
+ a:b         # no base
+   c:d       # no base
+  e:f        # no base
+      g h i  # sets base to indent
+
+|one blah    # Sets ipar to indent
+  asdf       # sets base to indent
+
+# SO: first non-ident non-inline child sets base (or its own ipar)
+
+
+
+|asdf
+  `howdy fejw ioafj weifj <:oawj:> fa weoi`: kvjjfejiwo
+  `howdy fejw ioafj weifj <:oawj:> fa weoi` kvjjfejiwo
+
+
+
+
+SCRATCH
+
 end

data/udon.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{udon}
-  s.version = "0.0.2"
+  s.version = "0.0.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-19}
+  s.date = %q{2011-08-20}
   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.2.1"])
+      s.add_development_dependency(%q<genmachine>, ["~> 0.2.2"])
     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.2.1"])
+      s.add_dependency(%q<genmachine>, ["~> 0.2.2"])
     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.2.1"])
+    s.add_dependency(%q<genmachine>, ["~> 0.2.2"])
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: udon
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Joseph Wecker
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-19 00:00:00 -07:00
+date: 2011-08-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -116,12 +116,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 19
         segments: 
         - 0
         - 2
-        - 1
-        version: 0.2.1
+        - 2
+        version: 0.2.2
   name: genmachine
   version_requirements: *id007
   prerelease: false