udat 1.1.3 → 1.2.0

data/lib/udat.rb

@@ -52,6 +52,11 @@ class Udat
 
       [rational|2/3]
 
+      The following 7 characters must be escaped with a backslash, when
+      being part of a tag or being part of the content of a scalar:
+
+      \< \> \[ \] \| \~ \\
+
 
     Arrays (or sets):
 
@@ -69,6 +74,21 @@ class Udat
       References like in YAML with &id and *id
       are not directly supported by UDAT.
 
+      Empty arrays, sets or maps must contain the ~ character, to avoid
+      ambiguity with scalars:
+
+      [   ]                  scalar containing three spaces
+      [ ~ ]                  empty array
+      [list of numbers| ~ ]  empty array, tagged with "list of numbers"
+      [ ~ comment ]          empty array with a comment
+      [ comment ~ ]          another empty array with a comment
+      [ ~~ ]                 empty array too (multiple ~ are allowed)
+
+      It is also allowed to write ~ in non-empty arrays. In that case the ~
+      symbol is ignored.
+
+      [~ [1] [2] [3] ]       Array containing "1", "2" and "3"
+
 
     Ordered or unordered maps:
 
@@ -145,7 +165,7 @@ class Udat
   # Returns an escaped version of a string, where backslashes are preceding
   # certain reserved characters.
   def self.escape_string(string)
-    string.to_s.gsub /([<>\[\]|\\])/, "\\\\\\1"
+    string.to_s.gsub /([<>\[\]|~\\])/, "\\\\\\1"
   end
   # Calls Udat.escape_string.
   def escape_string(string)
@@ -245,8 +265,8 @@ class Udat
         if char.empty?
           raise UdatParseError, "Backslash at end of input."
         end
-        if char =~ /([<>\[\]|\\])/
-          string << char
+        if char =~ /([<>\[\]|~\\])/
+          string << char if string
         elsif char == "\n"
         elsif char == "\r"
           next_char = input[pos + 1, 1]
@@ -259,9 +279,16 @@ class Udat
         if tag
           raise UdatParseError, "Multiple occurrences of pipe symbol."
         end
+        unless string
+          raise UdatParseError, "Unexpected occurrence of pipe symbol."
+        end
         tag = string
         string = ""
         pos += 1
+      when "~"
+        collection ||= UdatCollection.new(tag, [])
+        string = nil
+        pos += 1
       when "<"
         if key
           raise UdatParseError, "Unexpected opening angle bracket."
@@ -289,7 +316,7 @@ class Udat
       when "]"
         break
       else
-        string << char
+        string << char if string
         pos += 1
       end
     end
@@ -810,6 +837,7 @@ class UdatCollection < Udat
   def encoded_content
     synchronize do
       return (
+        @entries.empty? ? "~" :
         @entries.collect do |key, value|
           if key
             "<#{key.encode}>[#{value.encode}]"

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: udat
 version: !ruby/object:Gem::Version 
-  version: 1.1.3
-date: 2007-05-24 00:00:00 +00:00
+  version: 1.2.0
+date: 2007-05-25 00:00:00 +00:00
 summary: Parser and generator for UDAT documents, a generic data format similar to XML or YAML.
 require_paths: 
 - lib/