rison 1.0.0 → 1.1.0

data/README.html

@@ -21,15 +21,28 @@
 
 <h1>rison<span style="color:#F99">.rb</span></h1>
 
+<h2>Installing</h2>
+
+<p><tt>sudo gem install rison</tt> (or <a href="http://rubyforge.org/frs/?group_id=4896">download from RubyForge</a>)</p>
+
 <h2>Examples</h2>
 
 <pre><code>  require 'rison'
+
   
   Rison.load('!t')         # => true
 
   Rison.load('!(1,2,3)')   # => [1, 2, 3]
 
-  Rison.load('(a:0)')      # => {'a' => 0}
+  Rison.load('(a:0)')      # => {:a => 0}
+  
+  
+  Rison.dump(true)         # => '!t'
+  
+  Rison.dump([1, 2, 3])    # => '!(1,2,3)'
+  
+  Rison.dump({:a => 0})    # => '(a:0)'
+
 </code></pre>
 
 <h2>Links</h2>

data/Rakefile.rb

@@ -5,7 +5,7 @@ require 'rake/gempackagetask'
 
 GEMSPEC = Gem::Specification.new do |s|
   s.name = 'rison'
-  s.version = '1.0.0'
+  s.version = '1.1.0'
   s.platform = Gem::Platform::RUBY
   s.has_rdoc = false
   s.summary = 'Pure Ruby parser for Rison (http://mjtemplate.org/examples/rison.html)'
@@ -35,13 +35,23 @@ Rake::TestTask.new do |t|
 end
 
 
-task :parse_stdin do
+namespace :stdin do
   $:.unshift 'lib'
-
   require 'rison'
   require 'pp'
-  
-  pp Rison.load($stdin.read.chomp)
+
+  task :lex do
+    pp Rison.lex($stdin.read.chomp).to_a
+  end
+  task :parse do
+    parsed = Rison.parse(Rison.lex($stdin.read.chomp))
+    
+    if parsed.has_error?
+      p parsed
+    else
+      pp Rison.load(parsed)
+    end
+  end
 end
 
 

data/lib/rison/dump.rb

@@ -0,0 +1,47 @@
+module Rison
+  def self.dump(object)
+    case object
+      when NilClass then '!n'
+
+      when TrueClass then '!t'
+
+      when FalseClass then '!f'
+        
+      when Symbol then dump(object.to_s)
+
+      when Rational then object.to_f.to_s
+      
+      when Numeric then object.to_s
+
+      when String
+        if object.empty?
+          "''"
+        elsif id?(object)
+          object
+        else
+          quote(object)
+        end
+
+      when Hash
+        '(%s)' % (object.sort_by { |k, v| k.to_s }.map { |(k, v)| '%s:%s' % [ dump(k), dump(v) ] } * ',')
+
+      when Array
+        '!(%s)' % (object.map { |x| dump(x) } * ',')
+
+      else
+        raise ArgumentError, 'cannot serialize: %p' % object
+    end
+  end
+
+  def self.quote(string)
+    "'%s'" % escape(string)
+  end
+
+  def self.escape(string)
+    string.gsub('!', '!!').gsub("'", "!'") 
+  end
+
+  def self.id?(string)
+    string !~ /^(-|\d)/ && string !~  /['!:(),*@$ ]/
+  end
+end

data/lib/rison/evaluator.rb

@@ -16,9 +16,7 @@ module Rison
         evaluate(child_nodes[1])
       end
 
-      for_member_pair do
-        evaluate(child_nodes[0])
-      end
+      # for_member_pair
 
       for_member_pairs do
         evaluate(child_nodes[2]).merge(evaluate(child_nodes[0]))
@@ -70,10 +68,12 @@ module Rison
         nil
       end
 
-      # for_id_idstart
+      for_id_idstart do
+        evaluate(child_nodes[0]).to_sym
+      end
 
       for_id_idstart_idchars do
-        evaluate(child_nodes[0]) + evaluate(child_nodes[1])
+        (evaluate(child_nodes[0]) + evaluate(child_nodes[1])).to_sym
       end    
 
       # for_idchars_idchar
@@ -89,6 +89,8 @@ module Rison
       for_idchar_char do
         child_nodes[0].token.value
       end
+      
+      # for_idchar_idstart
 
       for_idstart_char do
         child_nodes[0].token.value
@@ -122,13 +124,13 @@ module Rison
         "'"
       end
 
+      # for_strchar_idchar
+      
       for_strchar_num do
         evaluate(child_nodes[0]).to_s
       end
 
-      for_number_int do
-        evaluate(child_nodes[0])
-      end
+      # for_number_int
 
       for_number_int_frac do
         evaluate(child_nodes[0]) + evaluate(child_nodes[1])

data/lib/rison/grammar.rb

@@ -60,12 +60,13 @@ module Rison
     
     for_symbol 'idchar' do
       # any Unicode character not in '!:(),*@$
-      idchar_char %w| char_token |
+      idchar_char %w| idchar_safe_token |
+      idchar_idstart %w| idstart |
     end
   
     for_symbol 'idstart' do
       # any Unicode character not in -, digit, or idchar
-      idstart_char %w| char_token |
+      idstart_char %w| idstart_safe_token |
     end
   
     for_symbol 'string' do
@@ -85,6 +86,7 @@ module Rison
       strchar_char %w| char_token |
       strchar_quoted_exclamation %w| !! |
       strchar_quoted_single_quote %w| !' |
+      strchar_idchar %w| idchar |
       strchar_num %w| number |
     end
   

data/lib/rison/lexer.rb

@@ -20,7 +20,10 @@ module Rison
       ['e-?\d+', 'exponent_token'],
       ['\.\d+', 'frac_token'],
       ['-?\d+', 'integer_token'],
-      ['.', 'char_token']
+      
+      ["[^\\-0-9'!:(),*@$ ]", 'idstart_safe_token'],
+      ["[^'!:(),*@$ ]", 'idchar_safe_token'],
+      ["[^'!]", 'char_token']      
     
     ].each do |(pattern, token)|
       for_pattern(pattern) { create_token(token || pattern) }

data/lib/rison/parser.rb

@@ -8,332 +8,352 @@ module Rison
   
     start_with 0
   
-    at_state(44) {
-      for_symbols(",", "_End_", ")") { reduce_with "value_false" }
+    at_state(48) {
+      for_symbols("'") { shift_to 2 }
+      for_symbols("object") { shift_to 25 }
+      for_symbols("value") { shift_to 50 }
+      for_symbols("number") { shift_to 46 }
+      for_symbols("!") { shift_to 47 }
+      for_symbols("string") { shift_to 26 }
+      for_symbols("array") { shift_to 28 }
+      for_symbols("idstart") { shift_to 38 }
+      for_symbols("integer_token") { shift_to 5 }
+      for_symbols("!t") { shift_to 24 }
+      for_symbols(")") { shift_to 49 }
+      for_symbols("idstart_safe_token") { shift_to 14 }
+      for_symbols("!f") { shift_to 27 }
+      for_symbols("(") { shift_to 29 }
+      for_symbols("id") { shift_to 53 }
+      for_symbols("int") { shift_to 8 }
+      for_symbols("!n") { shift_to 1 }
+      for_symbols("elements") { shift_to 54 }
     }
   
-    at_state(31) {
-      for_symbols("integer_token") { shift_to 6 }
-      for_symbols("!") { shift_to 11 }
-      for_symbols("!t") { shift_to 33 }
-      for_symbols("array") { shift_to 10 }
-      for_symbols("number") { shift_to 45 }
-      for_symbols("'") { shift_to 34 }
-      for_symbols("string") { shift_to 9 }
-      for_symbols("object") { shift_to 46 }
-      for_symbols("id") { shift_to 15 }
-      for_symbols("!f") { shift_to 44 }
-      for_symbols("!n") { shift_to 1 }
-      for_symbols("char_token") { shift_to 16 }
-      for_symbols("idstart") { shift_to 2 }
-      for_symbols("int") { shift_to 18 }
-      for_symbols("value") { shift_to 32 }
-      for_symbols("(") { shift_to 24 }
+    at_state(47) {
+      for_symbols("(") { shift_to 48 }
+    }
+  
+    at_state(22) {
+      for_symbols(",", ":", "_End_", ")") { reduce_with "non_empty_string" }
     }
   
     at_state(19) {
-      for_symbols("!!", ",", "integer_token", "!'", "'", "_End_", ")", "char_token") { reduce_with "exponent_literal" }
+      for_symbols("!!", "idstart_safe_token", "integer_token", "!'", "'", "char_token", "idchar_safe_token") { reduce_with "strchar_num" }
     }
   
-    at_state(7) {
-      for_symbols(",", ":", "_End_", ")") { reduce_with "idchars_idchars" }
+    at_state(5) {
+      for_symbols("!!", ",", "frac_token", "idstart_safe_token", "integer_token", ":", "!'", "_End_", "'", "exponent_token", "char_token", ")", "idchar_safe_token") { reduce_with "integer_literal" }
     }
   
-    at_state(3) {
-      for_symbols("idchar") { shift_to 3 }
-      for_symbols("integer_token") { shift_to 6 }
-      for_symbols("idchars") { shift_to 7 }
-      for_symbols("int") { shift_to 5 }
-      for_symbols("char_token") { shift_to 4 }
-      for_symbols(",", ":", "_End_", ")") { reduce_with "idchars_idchar" }
+    at_state(54) {
+      for_symbols(")") { shift_to 55 }
     }
   
-    at_state(50) {
-      for_symbols(",", "_End_", ")") { reduce_with "empty_array" }
+    at_state(45) {
+      for_symbols(",", ")") { reduce_with "pair_key_value" }
     }
   
-    at_state(49) {
-      for_symbols(",", "_End_", ")") { reduce_with "empty_object" }
+    at_state(41) {
+      for_symbols(",", ":", "_End_", ")") { reduce_with "idchars_idchars" }
     }
   
-    at_state(48) {
+    at_state(31) {
       for_symbols(",", "_End_", ")") { reduce_with "non_empty_object" }
     }
   
-    at_state(45) {
-      for_symbols(",", "_End_", ")") { reduce_with "value_number" }
+    at_state(8) {
+      for_symbols("exp") { shift_to 9 }
+      for_symbols("exponent_token") { shift_to 13 }
+      for_symbols("frac") { shift_to 11 }
+      for_symbols("frac_token") { shift_to 10 }
+      for_symbols("!!", ",", "idstart_safe_token", "integer_token", "!'", "_End_", "'", "char_token", ")", "idchar_safe_token") { reduce_with "number_int" }
     }
   
-    at_state(40) {
-      for_symbols("!!", "integer_token", "!'", "'", "char_token") { reduce_with "strchar_num" }
+    at_state(7) {
+      for_symbols("!!", ",", "idstart_safe_token", "integer_token", ":", "!'", "_End_", "'", "char_token", ")", "idchar_safe_token") { reduce_with "idchar_char" }
     }
   
-    at_state(27) {
-      for_symbols("id") { shift_to 29 }
-      for_symbols("key") { shift_to 30 }
-      for_symbols("'") { shift_to 34 }
-      for_symbols("members") { shift_to 28 }
-      for_symbols("char_token") { shift_to 16 }
-      for_symbols("pair") { shift_to 26 }
-      for_symbols("idstart") { shift_to 2 }
-      for_symbols("string") { shift_to 25 }
+    at_state(53) {
+      for_symbols(",", "_End_", ")") { reduce_with "value_id" }
     }
   
-    at_state(24) {
-      for_symbols(")") { shift_to 49 }
-      for_symbols("id") { shift_to 29 }
-      for_symbols("members") { shift_to 47 }
-      for_symbols("key") { shift_to 30 }
-      for_symbols("'") { shift_to 34 }
-      for_symbols("char_token") { shift_to 16 }
-      for_symbols("pair") { shift_to 26 }
-      for_symbols("idstart") { shift_to 2 }
-      for_symbols("string") { shift_to 25 }
+    at_state(21) {
+      for_symbols("'") { shift_to 22 }
     }
   
-    at_state(18) {
-      for_symbols("exponent_token") { shift_to 19 }
-      for_symbols("exp") { shift_to 23 }
-      for_symbols("frac") { shift_to 21 }
-      for_symbols("!!", ",", "integer_token", "!'", "'", "_End_", "char_token", ")") { reduce_with "number_int" }
-      for_symbols("frac_token") { shift_to 20 }
+    at_state(55) {
+      for_symbols(",", "_End_", ")") { reduce_with "non_empty_array" }
     }
   
-    at_state(8) {
-      for_symbols(",", ":", "_End_", ")") { reduce_with "id_idstart_idchars" }
+    at_state(52) {
+      for_symbols(")") { reduce_with "element_values" }
     }
   
-    at_state(4) {
-      for_symbols(",", "integer_token", ":", "_End_", "char_token", ")") { reduce_with "idchar_char" }
+    at_state(44) {
+      for_symbols("'") { shift_to 2 }
+      for_symbols("object") { shift_to 25 }
+      for_symbols("number") { shift_to 46 }
+      for_symbols("!") { shift_to 47 }
+      for_symbols("string") { shift_to 26 }
+      for_symbols("array") { shift_to 28 }
+      for_symbols("idstart") { shift_to 38 }
+      for_symbols("value") { shift_to 45 }
+      for_symbols("integer_token") { shift_to 5 }
+      for_symbols("!t") { shift_to 24 }
+      for_symbols("idstart_safe_token") { shift_to 14 }
+      for_symbols("!f") { shift_to 27 }
+      for_symbols("(") { shift_to 29 }
+      for_symbols("id") { shift_to 53 }
+      for_symbols("int") { shift_to 8 }
+      for_symbols("!n") { shift_to 1 }
     }
   
-    at_state(32) {
-      for_symbols(",", ")") { reduce_with "pair_key_value" }
+    at_state(42) {
+      for_symbols(",", ":", "_End_", ")") { reduce_with "id_idstart_idchars" }
     }
   
-    at_state(14) {
-      for_symbols("value") { shift_to 13 }
-      for_symbols("integer_token") { shift_to 6 }
-      for_symbols("!") { shift_to 11 }
-      for_symbols("!t") { shift_to 33 }
-      for_symbols("array") { shift_to 10 }
-      for_symbols("number") { shift_to 45 }
-      for_symbols("'") { shift_to 34 }
-      for_symbols("string") { shift_to 9 }
-      for_symbols("object") { shift_to 46 }
-      for_symbols("id") { shift_to 15 }
-      for_symbols("!f") { shift_to 44 }
-      for_symbols("!n") { shift_to 1 }
-      for_symbols("char_token") { shift_to 16 }
-      for_symbols("idstart") { shift_to 2 }
-      for_symbols("int") { shift_to 18 }
-      for_symbols("elements") { shift_to 17 }
-      for_symbols("(") { shift_to 24 }
+    at_state(36) {
+      for_symbols("members") { shift_to 37 }
+      for_symbols("'") { shift_to 2 }
+      for_symbols("key") { shift_to 43 }
+      for_symbols("idstart") { shift_to 38 }
+      for_symbols("string") { shift_to 33 }
+      for_symbols("idstart_safe_token") { shift_to 14 }
+      for_symbols("pair") { shift_to 35 }
+      for_symbols("id") { shift_to 34 }
     }
   
-    at_state(2) {
-      for_symbols("idchar") { shift_to 3 }
-      for_symbols("integer_token") { shift_to 6 }
-      for_symbols("int") { shift_to 5 }
-      for_symbols(",", ":", "_End_", ")") { reduce_with "id_idstart" }
-      for_symbols("char_token") { shift_to 4 }
-      for_symbols("idchars") { shift_to 8 }
+    at_state(3) {
+      for_symbols(",", ":", "_End_", ")") { reduce_with "empty_string" }
     }
   
-    at_state(47) {
-      for_symbols(")") { shift_to 48 }
+    at_state(39) {
+      for_symbols(",", ":", "_End_", ")") { reduce_with "idchars_int" }
     }
   
     at_state(35) {
-      for_symbols("!!", "integer_token", "!'", "'", "char_token") { reduce_with "strchar_quoted_single_quote" }
-    }
-  
-    at_state(29) {
-      for_symbols(":") { reduce_with "key_id" }
+      for_symbols(",") { shift_to 36 }
+      for_symbols(")") { reduce_with "member_pair" }
     }
   
-    at_state(21) {
-      for_symbols("exp") { shift_to 22 }
-      for_symbols("exponent_token") { shift_to 19 }
-      for_symbols("!!", ",", "integer_token", "!'", "'", "_End_", "char_token", ")") { reduce_with "number_int_frac" }
+    at_state(27) {
+      for_symbols(",", "_End_", ")") { reduce_with "value_false" }
     }
   
-    at_state(16) {
-      for_symbols(",", "integer_token", ":", "_End_", "char_token", ")") { reduce_with "idstart_char" }
+    at_state(18) {
+      for_symbols("!!", "idstart_safe_token", "integer_token", "!'", "'", "char_token", "idchar_safe_token") { reduce_with "strchar_quoted_exclamation" }
     }
   
-    at_state(10) {
-      for_symbols(",", "_End_", ")") { reduce_with "value_array" }
+    at_state(11) {
+      for_symbols("exp") { shift_to 12 }
+      for_symbols("!!", ",", "idstart_safe_token", "integer_token", "!'", "_End_", "'", "char_token", ")", "idchar_safe_token") { reduce_with "number_int_frac" }
+      for_symbols("exponent_token") { shift_to 13 }
     }
   
-    at_state(9) {
-      for_symbols(",", "_End_", ")") { reduce_with "value_string" }
+    at_state(51) {
+      for_symbols("'") { shift_to 2 }
+      for_symbols("object") { shift_to 25 }
+      for_symbols("value") { shift_to 50 }
+      for_symbols("elements") { shift_to 52 }
+      for_symbols("number") { shift_to 46 }
+      for_symbols("!") { shift_to 47 }
+      for_symbols("string") { shift_to 26 }
+      for_symbols("array") { shift_to 28 }
+      for_symbols("idstart") { shift_to 38 }
+      for_symbols("integer_token") { shift_to 5 }
+      for_symbols("!t") { shift_to 24 }
+      for_symbols("idstart_safe_token") { shift_to 14 }
+      for_symbols("!f") { shift_to 27 }
+      for_symbols("(") { shift_to 29 }
+      for_symbols("id") { shift_to 53 }
+      for_symbols("int") { shift_to 8 }
+      for_symbols("!n") { shift_to 1 }
     }
   
-    at_state(17) {
-      for_symbols(")") { reduce_with "element_values" }
+    at_state(50) {
+      for_symbols(",") { shift_to 51 }
+      for_symbols(")") { reduce_with "element_value" }
     }
   
-    at_state(0) {
-      for_symbols("integer_token") { shift_to 6 }
-      for_symbols("!") { shift_to 11 }
-      for_symbols("!t") { shift_to 33 }
-      for_symbols("array") { shift_to 10 }
-      for_symbols("number") { shift_to 45 }
-      for_symbols("'") { shift_to 34 }
-      for_symbols("string") { shift_to 9 }
-      for_symbols("object") { shift_to 46 }
-      for_symbols("id") { shift_to 15 }
-      for_symbols("!f") { shift_to 44 }
-      for_symbols("!n") { shift_to 1 }
-      for_symbols("char_token") { shift_to 16 }
-      for_symbols("idstart") { shift_to 2 }
-      for_symbols("int") { shift_to 18 }
-      for_symbols("(") { shift_to 24 }
-      for_symbols("value") { shift_to 53 }
+    at_state(43) {
+      for_symbols(":") { shift_to 44 }
     }
   
     at_state(38) {
-      for_symbols("'") { reduce_with "strchars_chars" }
+      for_symbols("idchars") { shift_to 42 }
+      for_symbols(",", ":", "_End_", ")") { reduce_with "id_idstart" }
+      for_symbols("idstart") { shift_to 17 }
+      for_symbols("integer_token") { shift_to 5 }
+      for_symbols("idstart_safe_token") { shift_to 14 }
+      for_symbols("idchar") { shift_to 40 }
+      for_symbols("idchar_safe_token") { shift_to 7 }
+      for_symbols("int") { shift_to 39 }
     }
   
-    at_state(34) {
-      for_symbols("integer_token") { shift_to 6 }
-      for_symbols("char_token") { shift_to 39 }
-      for_symbols("strchar") { shift_to 36 }
-      for_symbols("number") { shift_to 40 }
-      for_symbols("!'") { shift_to 35 }
-      for_symbols("'") { shift_to 43 }
-      for_symbols("int") { shift_to 18 }
-      for_symbols("!!") { shift_to 37 }
-      for_symbols("strchars") { shift_to 41 }
+    at_state(37) {
+      for_symbols(")") { reduce_with "member_pairs" }
     }
   
-    at_state(26) {
-      for_symbols(")") { reduce_with "member_pair" }
-      for_symbols(",") { shift_to 27 }
+    at_state(15) {
+      for_symbols("!!", "idstart_safe_token", "integer_token", "!'", "'", "char_token", "idchar_safe_token") { reduce_with "strchar_idchar" }
     }
   
-    at_state(5) {
-      for_symbols(",", ":", "_End_", ")") { reduce_with "idchars_int" }
+    at_state(12) {
+      for_symbols("!!", ",", "idstart_safe_token", "integer_token", "!'", "_End_", "'", "char_token", ")", "idchar_safe_token") { reduce_with "number_int_frac_exp" }
     }
   
-    at_state(53) {
-      for_symbols("_End_") { reduce_with "start" }
+    at_state(40) {
+      for_symbols(",", ":", "_End_", ")") { reduce_with "idchars_idchar" }
+      for_symbols("idstart") { shift_to 17 }
+      for_symbols("integer_token") { shift_to 5 }
+      for_symbols("idchars") { shift_to 41 }
+      for_symbols("idstart_safe_token") { shift_to 14 }
+      for_symbols("idchar") { shift_to 40 }
+      for_symbols("idchar_safe_token") { shift_to 7 }
+      for_symbols("int") { shift_to 39 }
     }
   
-    at_state(52) {
-      for_symbols(",", "_End_", ")") { reduce_with "non_empty_array" }
+    at_state(34) {
+      for_symbols(":") { reduce_with "key_id" }
     }
   
-    at_state(46) {
-      for_symbols(",", "_End_", ")") { reduce_with "value_object" }
+    at_state(32) {
+      for_symbols(",", "_End_", ")") { reduce_with "empty_object" }
     }
   
-    at_state(41) {
-      for_symbols("'") { shift_to 42 }
+    at_state(23) {
+      for_symbols("_End_") { reduce_with "start" }
     }
   
-    at_state(37) {
-      for_symbols("!!", "integer_token", "!'", "'", "char_token") { reduce_with "strchar_quoted_exclamation" }
+    at_state(17) {
+      for_symbols("!!", ",", "idstart_safe_token", "integer_token", ":", "!'", "_End_", "'", "char_token", ")", "idchar_safe_token") { reduce_with "idchar_idstart" }
     }
   
-    at_state(25) {
-      for_symbols(":") { reduce_with "key_string" }
+    at_state(16) {
+      for_symbols("idstart") { shift_to 17 }
+      for_symbols("!'") { shift_to 6 }
+      for_symbols("strchars") { shift_to 20 }
+      for_symbols("'") { reduce_with "strchars_char" }
+      for_symbols("integer_token") { shift_to 5 }
+      for_symbols("idchar") { shift_to 15 }
+      for_symbols("char_token") { shift_to 4 }
+      for_symbols("idstart_safe_token") { shift_to 14 }
+      for_symbols("strchar") { shift_to 16 }
+      for_symbols("idchar_safe_token") { shift_to 7 }
+      for_symbols("int") { shift_to 8 }
+      for_symbols("number") { shift_to 19 }
+      for_symbols("!!") { shift_to 18 }
     }
   
-    at_state(22) {
-      for_symbols("!!", ",", "integer_token", "!'", "'", "_End_", "char_token", ")") { reduce_with "number_int_frac_exp" }
+    at_state(4) {
+      for_symbols("!!", "idstart_safe_token", "integer_token", "!'", "'", "char_token", "idchar_safe_token") { reduce_with "strchar_char" }
     }
   
-    at_state(13) {
-      for_symbols(")") { reduce_with "element_value" }
-      for_symbols(",") { shift_to 14 }
+    at_state(49) {
+      for_symbols(",", "_End_", ")") { reduce_with "empty_array" }
     }
   
-    at_state(51) {
-      for_symbols(")") { shift_to 52 }
+    at_state(25) {
+      for_symbols(",", "_End_", ")") { reduce_with "value_object" }
     }
   
-    at_state(43) {
-      for_symbols(",", ":", "_End_", ")") { reduce_with "empty_string" }
+    at_state(10) {
+      for_symbols("!!", ",", "idstart_safe_token", "integer_token", "!'", "_End_", "'", "exponent_token", "char_token", ")", "idchar_safe_token") { reduce_with "frac_literal" }
     }
   
-    at_state(42) {
-      for_symbols(",", ":", "_End_", ")") { reduce_with "non_empty_string" }
+    at_state(28) {
+      for_symbols(",", "_End_", ")") { reduce_with "value_array" }
     }
   
-    at_state(39) {
-      for_symbols("!!", "integer_token", "!'", "'", "char_token") { reduce_with "strchar_char" }
+    at_state(26) {
+      for_symbols(",", "_End_", ")") { reduce_with "value_string" }
     }
   
-    at_state(33) {
-      for_symbols(",", "_End_", ")") { reduce_with "value_true" }
+    at_state(0) {
+      for_symbols("'") { shift_to 2 }
+      for_symbols("object") { shift_to 25 }
+      for_symbols("value") { shift_to 23 }
+      for_symbols("number") { shift_to 46 }
+      for_symbols("!") { shift_to 47 }
+      for_symbols("string") { shift_to 26 }
+      for_symbols("array") { shift_to 28 }
+      for_symbols("idstart") { shift_to 38 }
+      for_symbols("integer_token") { shift_to 5 }
+      for_symbols("!t") { shift_to 24 }
+      for_symbols("idstart_safe_token") { shift_to 14 }
+      for_symbols("!f") { shift_to 27 }
+      for_symbols("(") { shift_to 29 }
+      for_symbols("id") { shift_to 53 }
+      for_symbols("int") { shift_to 8 }
+      for_symbols("!n") { shift_to 1 }
     }
   
-    at_state(36) {
-      for_symbols("integer_token") { shift_to 6 }
-      for_symbols("char_token") { shift_to 39 }
-      for_symbols("'") { reduce_with "strchars_char" }
-      for_symbols("strchar") { shift_to 36 }
-      for_symbols("number") { shift_to 40 }
-      for_symbols("!'") { shift_to 35 }
-      for_symbols("int") { shift_to 18 }
-      for_symbols("!!") { shift_to 37 }
-      for_symbols("strchars") { shift_to 38 }
+    at_state(46) {
+      for_symbols(",", "_End_", ")") { reduce_with "value_number" }
     }
   
-    at_state(30) {
-      for_symbols(":") { shift_to 31 }
+    at_state(24) {
+      for_symbols(",", "_End_", ")") { reduce_with "value_true" }
     }
   
-    at_state(12) {
-      for_symbols("value") { shift_to 13 }
-      for_symbols("elements") { shift_to 51 }
-      for_symbols("integer_token") { shift_to 6 }
-      for_symbols("!") { shift_to 11 }
-      for_symbols("!t") { shift_to 33 }
-      for_symbols("array") { shift_to 10 }
-      for_symbols("number") { shift_to 45 }
-      for_symbols("'") { shift_to 34 }
-      for_symbols("string") { shift_to 9 }
-      for_symbols("object") { shift_to 46 }
-      for_symbols("id") { shift_to 15 }
-      for_symbols("!f") { shift_to 44 }
-      for_symbols("!n") { shift_to 1 }
-      for_symbols("char_token") { shift_to 16 }
-      for_symbols("idstart") { shift_to 2 }
-      for_symbols("int") { shift_to 18 }
-      for_symbols(")") { shift_to 50 }
-      for_symbols("(") { shift_to 24 }
+    at_state(20) {
+      for_symbols("'") { reduce_with "strchars_chars" }
     }
   
-    at_state(11) {
-      for_symbols("(") { shift_to 12 }
+    at_state(13) {
+      for_symbols("!!", ",", "idstart_safe_token", "integer_token", "!'", "_End_", "'", "char_token", ")", "idchar_safe_token") { reduce_with "exponent_literal" }
     }
   
-    at_state(6) {
-      for_symbols("!!", "frac_token", ",", "integer_token", ":", "!'", "'", "_End_", "char_token", ")", "exponent_token") { reduce_with "integer_literal" }
+    at_state(9) {
+      for_symbols("!!", ",", "idstart_safe_token", "integer_token", "!'", "_End_", "'", "char_token", ")", "idchar_safe_token") { reduce_with "number_int_exp" }
     }
   
     at_state(1) {
       for_symbols(",", "_End_", ")") { reduce_with "value_null" }
     }
   
-    at_state(28) {
-      for_symbols(")") { reduce_with "member_pairs" }
+    at_state(33) {
+      for_symbols(":") { reduce_with "key_string" }
     }
   
-    at_state(23) {
-      for_symbols("!!", ",", "integer_token", "!'", "'", "_End_", ")", "char_token") { reduce_with "number_int_exp" }
+    at_state(30) {
+      for_symbols(")") { shift_to 31 }
     }
   
-    at_state(20) {
-      for_symbols("!!", ",", "integer_token", "!'", "'", "_End_", "char_token", ")", "exponent_token") { reduce_with "frac_literal" }
+    at_state(29) {
+      for_symbols("'") { shift_to 2 }
+      for_symbols("members") { shift_to 30 }
+      for_symbols("key") { shift_to 43 }
+      for_symbols("idstart") { shift_to 38 }
+      for_symbols("string") { shift_to 33 }
+      for_symbols("idstart_safe_token") { shift_to 14 }
+      for_symbols(")") { shift_to 32 }
+      for_symbols("pair") { shift_to 35 }
+      for_symbols("id") { shift_to 34 }
     }
   
-    at_state(15) {
-      for_symbols(",", "_End_", ")") { reduce_with "value_id" }
+    at_state(14) {
+      for_symbols("!!", ",", "idstart_safe_token", "integer_token", ":", "!'", "_End_", "'", "char_token", ")", "idchar_safe_token") { reduce_with "idstart_char" }
+    }
+  
+    at_state(6) {
+      for_symbols("!!", "idstart_safe_token", "integer_token", "!'", "'", "char_token", "idchar_safe_token") { reduce_with "strchar_quoted_single_quote" }
+    }
+  
+    at_state(2) {
+      for_symbols("'") { shift_to 3 }
+      for_symbols("idstart") { shift_to 17 }
+      for_symbols("!'") { shift_to 6 }
+      for_symbols("integer_token") { shift_to 5 }
+      for_symbols("idchar") { shift_to 15 }
+      for_symbols("char_token") { shift_to 4 }
+      for_symbols("idstart_safe_token") { shift_to 14 }
+      for_symbols("strchar") { shift_to 16 }
+      for_symbols("idchar_safe_token") { shift_to 7 }
+      for_symbols("int") { shift_to 8 }
+      for_symbols("strchars") { shift_to 21 }
+      for_symbols("number") { shift_to 19 }
+      for_symbols("!!") { shift_to 18 }
     }
   
   end

data/lib/rison.rb

@@ -2,6 +2,7 @@ require 'dhaka'
 require 'rison/lexer'
 require 'rison/parser'
 require 'rison/evaluator'
+require 'rison/dump'
 
 module Rison
 

data/test/test_dump.rb

@@ -0,0 +1,65 @@
+require 'test/unit'
+require 'rison'
+require 'rison/dump'
+
+class RisonDumpTests < Test::Unit::TestCase
+  def r(object)
+    Rison.dump(object)
+  end
+  
+  def test_true
+    assert_equal '!t', r(true)
+  end
+  
+  def test_false
+    assert_equal '!f', r(false)
+  end
+  
+  def test_nil
+    assert_equal '!n', r(nil)
+  end
+  
+  def test_integers
+    assert_equal '0', r(0)
+    assert_equal '42', r(42)
+    assert_equal '-42', r(-42)
+  end
+  
+  def test_fractions
+    assert_equal '1.5', r(Rational(3, 2))
+    assert_equal '99.99', r(Rational(9999, 100))
+  end
+  
+  def test_ids
+    ['a', 'a-z', 'domain.com'].each { |s| assert_equal s, r(s) }
+  end
+  
+  def test_strings
+    assert_equal "''", r('')
+    assert_equal "'0a'", r('0a')
+    assert_equal "'-h'", r('-h')
+    assert_equal "'can!'t'", r("can't")
+    assert_equal "'wow!!'", r('wow!')
+    assert_equal "'abc def'", r('abc def')
+    assert_equal "'user@domain.com'", r('user@domain.com')
+    assert_equal "'US $10'", r('US $10')
+  end
+  
+  def test_empty_object
+    assert_equal '()', r({})
+  end
+  
+  def test_non_empty_objects
+    assert_equal '(a:0)', r({:a => 0})
+    assert_equal '(id:!n,type:/common/document)', r({'id' => nil, 'type' => '/common/document'})
+    assert_equal '(id:!n,type:/common/document)', r({:id => nil, :type => :'/common/document'})
+  end
+  
+  def test_empty_array
+    assert_equal '!()', r([])
+  end
+  
+  def test_non_empty_arrays
+    assert_equal %{!(!t,!f,!n,'')}, r([true, false, nil, ''])
+  end
+end

data/test/{test_rison.rb → test_parser.rb}

@@ -1,18 +1,18 @@
 require 'test/unit'
 require 'rison'
 
-class RisonTests < Test::Unit::TestCase
+class RisonParserTests < Test::Unit::TestCase
 
   def rison(string)
     parsed = Rison.parse(Rison.lex(string))
     
-    if parsed.has_error?
-      p parsed
-    end
-    
-    Rison.evaluate(parsed)
+    parsed.has_error?? parsed : Rison.evaluate(parsed)
   end
 
+  def assert_invalid(string)
+    rison(string).is_a?(Dhaka::ParseErrorResult)
+  end
+  
   # cf. http://mjtemplate.org/examples/rison.html
   
   def test_true
@@ -27,10 +27,6 @@ class RisonTests < Test::Unit::TestCase
     assert_equal nil, rison('!n')
   end
   
-  def test_empty_string
-    assert_equal '', rison(%{''})
-  end
-  
   def test_zero
     assert_equal 0, rison('0')
   end
@@ -61,28 +57,31 @@ class RisonTests < Test::Unit::TestCase
   def test_fraction_and_exponent
     assert_equal 150, rison('1.5e2')
   end
-  
-  def test_single_character
-    assert_equal 'a', rison('a')
+
+  def test_ids
+    %w( a a-z domain.com ).each { |s| assert_equal s.to_sym, rison(s) }
   end
   
-  def test_string_with_leading_digit
+  def test_strings
+    assert_equal '', rison("''")
     assert_equal '0a', rison("'0a'")
+    assert_equal '-h', rison("'-h'")
+    assert_equal "can't", rison("'can!'t'")
+    assert_equal 'wow!', rison("'wow!!'")
+    assert_equal 'abc def', rison("'abc def'")
+    assert_equal 'user@domain.com', rison("'user@domain.com'")
+    assert_equal 'US $10', rison("'US $10'")
   end
-  
-  def test_unquoted_string
-    assert_equal 'abc def', rison('abc def')
-  end
-  
+
   def test_empty_object
     assert_equal Hash.new, rison('()')
   end
   
   def test_non_empty_objects
-    expected = {'a' => 0}
+    expected = {:a => 0}
     assert_equal expected, rison('(a:0)')
   
-    expected = {'id' => nil, 'type' => '/common/document'}
+    expected = {:id => nil, :type => :'/common/document'}
     assert_equal expected, rison('(id:!n,type:/common/document)')
   end
   
@@ -94,29 +93,8 @@ class RisonTests < Test::Unit::TestCase
     assert_equal [ true, false, nil, '' ], rison(%{!(!t,!f,!n,'')})
   end
   
-  def test_unquoted_string_with_leading_minus
-    assert_equal '-h', rison('-h')
+  def test_invalid_expressions
+    assert_invalid 'abc def'
   end
   
-  def test_unquoted_string_with_minus
-    assert_equal 'a-z', rison('a-z')
-  end
-  
-  def test_domain_name
-    assert_equal 'domain.com', rison('domain.com')
-  end
-  
-  def test_email
-    assert_equal 'user@domain.com', rison('user@domain.com')
-  end
-  
-  def test_money
-    assert_equal 'US $10', rison('US $10')
-  end
-  
-  def test_quoting
-    assert_equal "can't", rison("'can!'t'")
-    assert_equal 'wow!', rison("'wow!!'")
-  end
-
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4.7
 specification_version: 2
 name: rison
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
-date: 2007-11-18 00:00:00 +00:00
+  version: 1.1.0
+date: 2007-11-19 00:00:00 +00:00
 summary: Pure Ruby parser for Rison (http://mjtemplate.org/examples/rison.html)
 require_paths: 
 - lib
@@ -37,12 +37,14 @@ authors:
 - Tim Fletcher
 files: 
 - lib/rison
+- lib/rison/dump.rb
 - lib/rison/evaluator.rb
 - lib/rison/grammar.rb
 - lib/rison/lexer.rb
 - lib/rison/parser.rb
 - lib/rison.rb
-- test/test_rison.rb
+- test/test_dump.rb
+- test/test_parser.rb
 - COPYING.txt
 - Rakefile.rb
 - README.html