json 1.0.1 → 1.0.2

data/CHANGES

@@ -1,3 +1,5 @@
+2007-03-24 (1.0.2)
+  * Ext Parser didn't parse 0e0 correctly into 0.0: Fixed!
 2007-03-24 (1.0.1)
   * Forgot some object files in the build dir. I really like that- not!
 2007-03-24 (1.0.0)

data/Rakefile

@@ -77,24 +77,20 @@ end
 desc "Generate diagrams of ragel parser (ps)"
 task :ragel_dot_ps do
   root = 'diagrams'
-  cd EXT_PARSER_DIR do
-    specs = []
-    File.new('parser.rl').grep(/^\s*machine\s*(\S+);\s*$/) { specs << $1 }
-    for s in specs 
-      sh "ragel parser.rl -S#{s} | #{RAGEL_CODEGEN} -p -V|dot -Tps -o#{root}/#{s}.ps"
-    end
+  specs = []
+  File.new(RAGEL_PATH).grep(/^\s*machine\s*(\S+);\s*$/) { specs << $1 }
+  for s in specs 
+    sh "ragel #{RAGEL_PATH} -S#{s} | #{RAGEL_CODEGEN} -p -V|dot -Tps -o#{root}/#{s}.ps"
   end
 end
 
 desc "Generate diagrams of ragel parser (png)"
 task :ragel_dot_png do
   root = 'diagrams'
-  cd EXT_PARSER_DIR do
-    specs = []
-    File.new('parser.rl').grep(/^\s*machine\s*(\S+);\s*$/) { specs << $1 }
-    for s in specs 
-      sh "ragel parser.rl -S#{s} | #{RAGEL_CODEGEN} -p -V|dot -Tpng -o#{root}/#{s}.png"
-    end
+  specs = []
+  File.new(RAGEL_PATH).grep(/^\s*machine\s*(\S+);\s*$/) { specs << $1 }
+  for s in specs 
+    sh "ragel #{RAGEL_PATH} -S#{s} | #{RAGEL_CODEGEN} -p -V|dot -Tpng -o#{root}/#{s}.png"
   end
 end
 

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.0.2

data/bin/prettify_json.rb

@@ -0,0 +1,75 @@
+#!/usr/bin/env ruby
+$KCODE = 'U'
+require 'json'
+require 'fileutils'
+include FileUtils
+
+# Parses the argument array _args_, according to the pattern _s_, to
+# retrieve the single character command line options from it. If _s_ is
+# 'xy:' an option '-x' without an option argument is searched, and an
+# option '-y foo' with an option argument ('foo').
+#
+# An option hash is returned with all found options set to true or the
+# found option argument.
+def go(s, args = ARGV)
+  b, v = s.scan(/(.)(:?)/).inject([{},{}]) { |t,(o,a)|
+    t[a.empty? ? 0 : 1][o] = a.empty? ? false : nil
+    t
+  }
+  while a = args.shift
+    a !~ /\A-(.+)/ and args.unshift a and break
+    p = $1
+    until p == ''
+      o = p.slice!(0, 1)
+      if v.key?(o)
+        v[o] = if p == '': args.shift or break 1 else p end
+        break
+      elsif b.key?(o)
+        b[o] = true
+      else
+        args.unshift a
+        break 1
+      end
+    end and break
+  end
+  b.merge(v)
+end
+
+opts = go 'slhi:', args = ARGV.dup
+if opts['h'] || opts['l'] && opts['s']
+  puts <<EOT
+Usage: #{File.basename($0)} [OPTION] [FILE]
+
+If FILE is skipped, this scripts waits for input from STDIN. Otherwise
+FILE is opened, read, and used as input for the prettifier.
+
+OPTION can be
+  -s     to output the shortest possible JSON (precludes -l)
+  -l     to output a longer, better formatted JSON (precludes -s)
+  -i EXT prettifies FILE in place, saving a backup to FILE.EXT
+  -h     this help
+EOT
+  exit 0
+end
+
+filename = nil
+json = JSON[
+  if args.empty?
+    STDIN.read
+  else
+    File.read filename = args.first
+  end
+]
+
+output = if opts['s']
+  JSON.fast_generate json
+else # default is -l
+  JSON.pretty_generate json
+end
+
+if opts['i'] && filename
+  cp filename, "#{filename}.#{opts['i']}"
+  File.open(filename, 'w') { |f| f.puts output }
+else
+  puts output
+end

data/ext/json/ext/parser/parser.c

@@ -39,11 +39,11 @@ static char *JSON_parse_float(JSON_Parser *json, char *p, char *pe, VALUE *resul
 
 
 #line 42 "parser.c"
-static const int JSON_object_start = 0;
-
+static const int JSON_object_start = 1;
 static const int JSON_object_first_final = 27;
+static const int JSON_object_error = 0;
 
-static const int JSON_object_error = 1;
+static const int JSON_object_en_main = 1;
 
 #line 92 "parser.rl"
 
@@ -67,12 +67,12 @@ static char *JSON_parse_object(JSON_Parser *json, char *p, char *pe, VALUE *resu
 		goto _out;
 	switch ( cs )
 	{
-case 0:
+case 1:
 	if ( (*p) == 123 )
 		goto st2;
-	goto st1;
-st1:
-	goto _out1;
+	goto st0;
+st0:
+	goto _out0;
 st2:
 	if ( ++p == pe )
 		goto _out2;
@@ -80,14 +80,14 @@ case 2:
 	switch( (*p) ) {
 		case 13: goto st2;
 		case 32: goto st2;
-		case 34: goto tr13;
+		case 34: goto tr2;
 		case 47: goto st23;
-		case 125: goto tr10;
+		case 125: goto tr4;
 	}
 	if ( 9 <= (*p) && (*p) <= 10 )
 		goto st2;
-	goto st1;
-tr13:
+	goto st0;
+tr2:
 #line 78 "parser.rl"
 	{
         char *np = JSON_parse_string(json, p, pe, &last_name);
@@ -107,7 +107,7 @@ case 3:
 	}
 	if ( 9 <= (*p) && (*p) <= 10 )
 		goto st3;
-	goto st1;
+	goto st0;
 st4:
 	if ( ++p == pe )
 		goto _out4;
@@ -116,7 +116,7 @@ case 4:
 		case 42: goto st5;
 		case 47: goto st7;
 	}
-	goto st1;
+	goto st0;
 st5:
 	if ( ++p == pe )
 		goto _out5;
@@ -161,7 +161,7 @@ case 8:
 			goto tr11;
 	} else if ( (*p) >= 9 )
 		goto st8;
-	goto st1;
+	goto st0;
 tr11:
 #line 67 "parser.rl"
 	{
@@ -185,11 +185,11 @@ case 9:
 		case 32: goto st9;
 		case 44: goto st10;
 		case 47: goto st15;
-		case 125: goto tr10;
+		case 125: goto tr4;
 	}
 	if ( 9 <= (*p) && (*p) <= 10 )
 		goto st9;
-	goto st1;
+	goto st0;
 st10:
 	if ( ++p == pe )
 		goto _out10;
@@ -197,12 +197,12 @@ case 10:
 	switch( (*p) ) {
 		case 13: goto st10;
 		case 32: goto st10;
-		case 34: goto tr13;
+		case 34: goto tr2;
 		case 47: goto st11;
 	}
 	if ( 9 <= (*p) && (*p) <= 10 )
 		goto st10;
-	goto st1;
+	goto st0;
 st11:
 	if ( ++p == pe )
 		goto _out11;
@@ -211,7 +211,7 @@ case 11:
 		case 42: goto st12;
 		case 47: goto st14;
 	}
-	goto st1;
+	goto st0;
 st12:
 	if ( ++p == pe )
 		goto _out12;
@@ -243,7 +243,7 @@ case 15:
 		case 42: goto st16;
 		case 47: goto st18;
 	}
-	goto st1;
+	goto st0;
 st16:
 	if ( ++p == pe )
 		goto _out16;
@@ -267,7 +267,7 @@ case 18:
 	if ( (*p) == 10 )
 		goto st9;
 	goto st18;
-tr10:
+tr4:
 #line 83 "parser.rl"
 	{ goto _out27; }
 	goto st27;
@@ -276,7 +276,7 @@ st27:
 		goto _out27;
 case 27:
 #line 279 "parser.c"
-	goto st1;
+	goto st0;
 st19:
 	if ( ++p == pe )
 		goto _out19;
@@ -285,7 +285,7 @@ case 19:
 		case 42: goto st20;
 		case 47: goto st22;
 	}
-	goto st1;
+	goto st0;
 st20:
 	if ( ++p == pe )
 		goto _out20;
@@ -317,7 +317,7 @@ case 23:
 		case 42: goto st24;
 		case 47: goto st26;
 	}
-	goto st1;
+	goto st0;
 st24:
 	if ( ++p == pe )
 		goto _out24;
@@ -342,7 +342,7 @@ case 26:
 		goto st2;
 	goto st26;
 	}
-	_out1: cs = 1; goto _out; 
+	_out0: cs = 0; goto _out; 
 	_out2: cs = 2; goto _out; 
 	_out3: cs = 3; goto _out; 
 	_out4: cs = 4; goto _out; 
@@ -390,11 +390,11 @@ case 26:
 
 
 #line 393 "parser.c"
-static const int JSON_value_start = 0;
-
+static const int JSON_value_start = 1;
 static const int JSON_value_first_final = 12;
+static const int JSON_value_error = 0;
 
-static const int JSON_value_error = 1;
+static const int JSON_value_en_main = 1;
 
 #line 167 "parser.rl"
 
@@ -416,47 +416,29 @@ static char *JSON_parse_value(JSON_Parser *json, char *p, char *pe, VALUE *resul
 		goto _out;
 	switch ( cs )
 	{
-case 0:
+case 1:
 	switch( (*p) ) {
-		case 34: goto tr9;
-		case 45: goto tr10;
-		case 91: goto tr11;
+		case 34: goto tr0;
+		case 45: goto tr2;
+		case 91: goto tr3;
 		case 102: goto st2;
 		case 110: goto st6;
 		case 116: goto st9;
-		case 123: goto tr15;
+		case 123: goto tr7;
 	}
 	if ( 48 <= (*p) && (*p) <= 57 )
-		goto tr10;
-	goto st1;
-st1:
-	goto _out1;
-tr5:
-#line 123 "parser.rl"
-	{
-        *result = Qnil;
-    }
-	goto st12;
-tr6:
-#line 126 "parser.rl"
-	{
-        *result = Qfalse;
-    }
-	goto st12;
-tr7:
-#line 129 "parser.rl"
-	{
-        *result = Qtrue;
-    }
-	goto st12;
-tr9:
+		goto tr2;
+	goto st0;
+st0:
+	goto _out0;
+tr0:
 #line 132 "parser.rl"
 	{
         char *np = JSON_parse_string(json, p, pe, result);
         if (np == NULL) goto _out12; else {p = (( np))-1;}
     }
 	goto st12;
-tr10:
+tr2:
 #line 137 "parser.rl"
 	{
         char *np;
@@ -467,20 +449,38 @@ tr10:
         goto _out12;
     }
 	goto st12;
-tr11:
+tr3:
 #line 146 "parser.rl"
 	{ 
         char *np = JSON_parse_array(json, p, pe, result);
         if (np == NULL) goto _out12; else {p = (( np))-1;}
     }
 	goto st12;
-tr15:
+tr7:
 #line 151 "parser.rl"
 	{ 
         char *np =  JSON_parse_object(json, p, pe, result);
         if (np == NULL) goto _out12; else {p = (( np))-1;}
     }
 	goto st12;
+tr11:
+#line 126 "parser.rl"
+	{
+        *result = Qfalse;
+    }
+	goto st12;
+tr14:
+#line 123 "parser.rl"
+	{
+        *result = Qnil;
+    }
+	goto st12;
+tr17:
+#line 129 "parser.rl"
+	{
+        *result = Qtrue;
+    }
+	goto st12;
 st12:
 	if ( ++p == pe )
 		goto _out12;
@@ -488,79 +488,79 @@ case 12:
 #line 156 "parser.rl"
 	{ goto _out12; }
 #line 491 "parser.c"
-	goto st1;
+	goto st0;
 st2:
 	if ( ++p == pe )
 		goto _out2;
 case 2:
 	if ( (*p) == 97 )
 		goto st3;
-	goto st1;
+	goto st0;
 st3:
 	if ( ++p == pe )
 		goto _out3;
 case 3:
 	if ( (*p) == 108 )
 		goto st4;
-	goto st1;
+	goto st0;
 st4:
 	if ( ++p == pe )
 		goto _out4;
 case 4:
 	if ( (*p) == 115 )
 		goto st5;
-	goto st1;
+	goto st0;
 st5:
 	if ( ++p == pe )
 		goto _out5;
 case 5:
 	if ( (*p) == 101 )
-		goto tr6;
-	goto st1;
+		goto tr11;
+	goto st0;
 st6:
 	if ( ++p == pe )
 		goto _out6;
 case 6:
 	if ( (*p) == 117 )
 		goto st7;
-	goto st1;
+	goto st0;
 st7:
 	if ( ++p == pe )
 		goto _out7;
 case 7:
 	if ( (*p) == 108 )
 		goto st8;
-	goto st1;
+	goto st0;
 st8:
 	if ( ++p == pe )
 		goto _out8;
 case 8:
 	if ( (*p) == 108 )
-		goto tr5;
-	goto st1;
+		goto tr14;
+	goto st0;
 st9:
 	if ( ++p == pe )
 		goto _out9;
 case 9:
 	if ( (*p) == 114 )
 		goto st10;
-	goto st1;
+	goto st0;
 st10:
 	if ( ++p == pe )
 		goto _out10;
 case 10:
 	if ( (*p) == 117 )
 		goto st11;
-	goto st1;
+	goto st0;
 st11:
 	if ( ++p == pe )
 		goto _out11;
 case 11:
 	if ( (*p) == 101 )
-		goto tr7;
-	goto st1;
+		goto tr17;
+	goto st0;
 	}
-	_out1: cs = 1; goto _out; 
+	_out0: cs = 0; goto _out; 
 	_out12: cs = 12; goto _out; 
 	_out2: cs = 2; goto _out; 
 	_out3: cs = 3; goto _out; 
@@ -586,11 +586,11 @@ case 11:
 
 
 #line 589 "parser.c"
-static const int JSON_integer_start = 0;
-
+static const int JSON_integer_start = 1;
 static const int JSON_integer_first_final = 5;
+static const int JSON_integer_error = 0;
 
-static const int JSON_integer_error = 1;
+static const int JSON_integer_en_main = 1;
 
 #line 191 "parser.rl"
 
@@ -613,16 +613,16 @@ static char *JSON_parse_integer(JSON_Parser *json, char *p, char *pe, VALUE *res
 		goto _out;
 	switch ( cs )
 	{
-case 0:
+case 1:
 	switch( (*p) ) {
 		case 45: goto st2;
 		case 48: goto st3;
 	}
 	if ( 49 <= (*p) && (*p) <= 57 )
 		goto st4;
-	goto st1;
-st1:
-	goto _out1;
+	goto st0;
+st0:
+	goto _out0;
 st2:
 	if ( ++p == pe )
 		goto _out2;
@@ -631,13 +631,13 @@ case 2:
 		goto st3;
 	if ( 49 <= (*p) && (*p) <= 57 )
 		goto st4;
-	goto st1;
+	goto st0;
 st3:
 	if ( ++p == pe )
 		goto _out3;
 case 3:
 	if ( 48 <= (*p) && (*p) <= 57 )
-		goto st1;
+		goto st0;
 	goto tr4;
 tr4:
 #line 188 "parser.rl"
@@ -648,7 +648,7 @@ st5:
 		goto _out5;
 case 5:
 #line 651 "parser.c"
-	goto st1;
+	goto st0;
 st4:
 	if ( ++p == pe )
 		goto _out4;
@@ -657,7 +657,7 @@ case 4:
 		goto st4;
 	goto tr4;
 	}
-	_out1: cs = 1; goto _out; 
+	_out0: cs = 0; goto _out; 
 	_out2: cs = 2; goto _out; 
 	_out3: cs = 3; goto _out; 
 	_out5: cs = 5; goto _out; 
@@ -678,11 +678,11 @@ case 4:
 
 
 #line 681 "parser.c"
-static const int JSON_float_start = 0;
-
+static const int JSON_float_start = 1;
 static const int JSON_float_first_final = 10;
+static const int JSON_float_error = 0;
 
-static const int JSON_float_error = 1;
+static const int JSON_float_en_main = 1;
 
 #line 222 "parser.rl"
 
@@ -705,16 +705,16 @@ static char *JSON_parse_float(JSON_Parser *json, char *p, char *pe, VALUE *resul
 		goto _out;
 	switch ( cs )
 	{
-case 0:
+case 1:
 	switch( (*p) ) {
 		case 45: goto st2;
 		case 48: goto st3;
 	}
 	if ( 49 <= (*p) && (*p) <= 57 )
 		goto st9;
-	goto st1;
-st1:
-	goto _out1;
+	goto st0;
+st0:
+	goto _out0;
 st2:
 	if ( ++p == pe )
 		goto _out2;
@@ -723,21 +723,24 @@ case 2:
 		goto st3;
 	if ( 49 <= (*p) && (*p) <= 57 )
 		goto st9;
-	goto st1;
+	goto st0;
 st3:
 	if ( ++p == pe )
 		goto _out3;
 case 3:
-	if ( (*p) == 46 )
-		goto st4;
-	goto st1;
+	switch( (*p) ) {
+		case 46: goto st4;
+		case 69: goto st6;
+		case 101: goto st6;
+	}
+	goto st0;
 st4:
 	if ( ++p == pe )
 		goto _out4;
 case 4:
 	if ( 48 <= (*p) && (*p) <= 57 )
 		goto st5;
-	goto st1;
+	goto st0;
 st5:
 	if ( ++p == pe )
 		goto _out5;
@@ -750,9 +753,9 @@ case 5:
 		if ( 48 <= (*p) && (*p) <= 57 )
 			goto st5;
 	} else if ( (*p) >= 45 )
-		goto st1;
-	goto tr8;
-tr8:
+		goto st0;
+	goto tr7;
+tr7:
 #line 216 "parser.rl"
 	{ goto _out10; }
 	goto st10;
@@ -760,8 +763,8 @@ st10:
 	if ( ++p == pe )
 		goto _out10;
 case 10:
-#line 764 "parser.c"
-	goto st1;
+#line 767 "parser.c"
+	goto st0;
 st6:
 	if ( ++p == pe )
 		goto _out6;
@@ -772,28 +775,28 @@ case 6:
 	}
 	if ( 48 <= (*p) && (*p) <= 57 )
 		goto st8;
-	goto st1;
+	goto st0;
 st7:
 	if ( ++p == pe )
 		goto _out7;
 case 7:
 	if ( 48 <= (*p) && (*p) <= 57 )
 		goto st8;
-	goto st1;
+	goto st0;
 st8:
 	if ( ++p == pe )
 		goto _out8;
 case 8:
 	switch( (*p) ) {
-		case 69: goto st1;
-		case 101: goto st1;
+		case 69: goto st0;
+		case 101: goto st0;
 	}
 	if ( (*p) > 46 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
 			goto st8;
 	} else if ( (*p) >= 45 )
-		goto st1;
-	goto tr8;
+		goto st0;
+	goto tr7;
 st9:
 	if ( ++p == pe )
 		goto _out9;
@@ -805,9 +808,9 @@ case 9:
 	}
 	if ( 48 <= (*p) && (*p) <= 57 )
 		goto st9;
-	goto st1;
+	goto st0;
 	}
-	_out1: cs = 1; goto _out; 
+	_out0: cs = 0; goto _out; 
 	_out2: cs = 2; goto _out; 
 	_out3: cs = 3; goto _out; 
 	_out4: cs = 4; goto _out; 
@@ -833,12 +836,12 @@ case 9:
 
 
 
-#line 837 "parser.c"
-static const int JSON_array_start = 0;
-
+#line 840 "parser.c"
+static const int JSON_array_start = 1;
 static const int JSON_array_first_final = 17;
+static const int JSON_array_error = 0;
 
-static const int JSON_array_error = 1;
+static const int JSON_array_en_main = 1;
 
 #line 267 "parser.rl"
 
@@ -849,24 +852,24 @@ static char *JSON_parse_array(JSON_Parser *json, char *p, char *pe, VALUE *resul
     *result = rb_ary_new();
 
     
-#line 853 "parser.c"
+#line 856 "parser.c"
 	{
 	cs = JSON_array_start;
 	}
 #line 275 "parser.rl"
     
-#line 859 "parser.c"
+#line 862 "parser.c"
 	{
 	if ( p == pe )
 		goto _out;
 	switch ( cs )
 	{
-case 0:
+case 1:
 	if ( (*p) == 91 )
 		goto st2;
-	goto st1;
-st1:
-	goto _out1;
+	goto st0;
+st0:
+	goto _out0;
 st2:
 	if ( ++p == pe )
 		goto _out2;
@@ -874,23 +877,23 @@ case 2:
 	switch( (*p) ) {
 		case 13: goto st2;
 		case 32: goto st2;
-		case 34: goto tr8;
-		case 45: goto tr8;
+		case 34: goto tr2;
+		case 45: goto tr2;
 		case 47: goto st13;
-		case 91: goto tr8;
-		case 93: goto tr7;
-		case 102: goto tr8;
-		case 110: goto tr8;
-		case 116: goto tr8;
-		case 123: goto tr8;
+		case 91: goto tr2;
+		case 93: goto tr4;
+		case 102: goto tr2;
+		case 110: goto tr2;
+		case 116: goto tr2;
+		case 123: goto tr2;
 	}
 	if ( (*p) > 10 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr8;
+			goto tr2;
 	} else if ( (*p) >= 9 )
 		goto st2;
-	goto st1;
-tr8:
+	goto st0;
+tr2:
 #line 248 "parser.rl"
 	{
         VALUE v = Qnil;
@@ -907,17 +910,17 @@ st3:
 	if ( ++p == pe )
 		goto _out3;
 case 3:
-#line 911 "parser.c"
+#line 914 "parser.c"
 	switch( (*p) ) {
 		case 13: goto st3;
 		case 32: goto st3;
 		case 44: goto st4;
 		case 47: goto st9;
-		case 93: goto tr7;
+		case 93: goto tr4;
 	}
 	if ( 9 <= (*p) && (*p) <= 10 )
 		goto st3;
-	goto st1;
+	goto st0;
 st4:
 	if ( ++p == pe )
 		goto _out4;
@@ -925,21 +928,21 @@ case 4:
 	switch( (*p) ) {
 		case 13: goto st4;
 		case 32: goto st4;
-		case 34: goto tr8;
-		case 45: goto tr8;
+		case 34: goto tr2;
+		case 45: goto tr2;
 		case 47: goto st5;
-		case 91: goto tr8;
-		case 102: goto tr8;
-		case 110: goto tr8;
-		case 116: goto tr8;
-		case 123: goto tr8;
+		case 91: goto tr2;
+		case 102: goto tr2;
+		case 110: goto tr2;
+		case 116: goto tr2;
+		case 123: goto tr2;
 	}
 	if ( (*p) > 10 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr8;
+			goto tr2;
 	} else if ( (*p) >= 9 )
 		goto st4;
-	goto st1;
+	goto st0;
 st5:
 	if ( ++p == pe )
 		goto _out5;
@@ -948,7 +951,7 @@ case 5:
 		case 42: goto st6;
 		case 47: goto st8;
 	}
-	goto st1;
+	goto st0;
 st6:
 	if ( ++p == pe )
 		goto _out6;
@@ -980,7 +983,7 @@ case 9:
 		case 42: goto st10;
 		case 47: goto st12;
 	}
-	goto st1;
+	goto st0;
 st10:
 	if ( ++p == pe )
 		goto _out10;
@@ -1004,7 +1007,7 @@ case 12:
 	if ( (*p) == 10 )
 		goto st3;
 	goto st12;
-tr7:
+tr4:
 #line 259 "parser.rl"
 	{ goto _out17; }
 	goto st17;
@@ -1012,8 +1015,8 @@ st17:
 	if ( ++p == pe )
 		goto _out17;
 case 17:
-#line 1016 "parser.c"
-	goto st1;
+#line 1019 "parser.c"
+	goto st0;
 st13:
 	if ( ++p == pe )
 		goto _out13;
@@ -1022,7 +1025,7 @@ case 13:
 		case 42: goto st14;
 		case 47: goto st16;
 	}
-	goto st1;
+	goto st0;
 st14:
 	if ( ++p == pe )
 		goto _out14;
@@ -1047,7 +1050,7 @@ case 16:
 		goto st2;
 	goto st16;
 	}
-	_out1: cs = 1; goto _out; 
+	_out0: cs = 0; goto _out; 
 	_out2: cs = 2; goto _out; 
 	_out3: cs = 3; goto _out; 
 	_out4: cs = 4; goto _out; 
@@ -1129,12 +1132,12 @@ static VALUE json_string_escape(char *p, char *pe)
 }
 
 
-#line 1133 "parser.c"
-static const int JSON_string_start = 0;
-
+#line 1136 "parser.c"
+static const int JSON_string_start = 1;
 static const int JSON_string_first_final = 8;
+static const int JSON_string_error = 0;
 
-static const int JSON_string_error = 1;
+static const int JSON_string_en_main = 1;
 
 #line 350 "parser.rl"
 
@@ -1145,37 +1148,37 @@ static char *JSON_parse_string(JSON_Parser *json, char *p, char *pe, VALUE *resu
 
     *result = rb_str_new("", 0);
     
-#line 1149 "parser.c"
+#line 1152 "parser.c"
 	{
 	cs = JSON_string_start;
 	}
 #line 358 "parser.rl"
     json->memo = p;
     
-#line 1156 "parser.c"
+#line 1159 "parser.c"
 	{
 	if ( p == pe )
 		goto _out;
 	switch ( cs )
 	{
-case 0:
+case 1:
 	if ( (*p) == 34 )
 		goto st2;
-	goto st1;
-st1:
-	goto _out1;
+	goto st0;
+st0:
+	goto _out0;
 st2:
 	if ( ++p == pe )
 		goto _out2;
 case 2:
 	switch( (*p) ) {
-		case 34: goto tr4;
+		case 34: goto tr2;
 		case 92: goto st3;
 	}
 	if ( 0 <= (*p) && (*p) <= 31 )
-		goto st1;
+		goto st0;
 	goto st2;
-tr4:
+tr2:
 #line 342 "parser.rl"
 	{
         *result = json_string_escape(json->memo + 1, p);
@@ -1188,8 +1191,8 @@ st8:
 	if ( ++p == pe )
 		goto _out8;
 case 8:
-#line 1192 "parser.c"
-	goto st1;
+#line 1195 "parser.c"
+	goto st0;
 st3:
 	if ( ++p == pe )
 		goto _out3;
@@ -1205,7 +1208,7 @@ case 3:
 		case 116: goto st2;
 		case 117: goto st4;
 	}
-	goto st1;
+	goto st0;
 st4:
 	if ( ++p == pe )
 		goto _out4;
@@ -1218,7 +1221,7 @@ case 4:
 			goto st5;
 	} else
 		goto st5;
-	goto st1;
+	goto st0;
 st5:
 	if ( ++p == pe )
 		goto _out5;
@@ -1231,7 +1234,7 @@ case 5:
 			goto st6;
 	} else
 		goto st6;
-	goto st1;
+	goto st0;
 st6:
 	if ( ++p == pe )
 		goto _out6;
@@ -1244,7 +1247,7 @@ case 6:
 			goto st7;
 	} else
 		goto st7;
-	goto st1;
+	goto st0;
 st7:
 	if ( ++p == pe )
 		goto _out7;
@@ -1257,9 +1260,9 @@ case 7:
 			goto st2;
 	} else
 		goto st2;
-	goto st1;
+	goto st0;
 	}
-	_out1: cs = 1; goto _out; 
+	_out0: cs = 0; goto _out; 
 	_out2: cs = 2; goto _out; 
 	_out8: cs = 8; goto _out; 
 	_out3: cs = 3; goto _out; 
@@ -1281,12 +1284,12 @@ case 7:
 
 
 
-#line 1285 "parser.c"
-static const int JSON_start = 0;
-
+#line 1288 "parser.c"
+static const int JSON_start = 1;
 static const int JSON_first_final = 10;
+static const int JSON_error = 0;
 
-static const int JSON_error = 1;
+static const int JSON_en_main = 1;
 
 #line 390 "parser.rl"
 
@@ -1352,7 +1355,7 @@ static VALUE cParser_parse(VALUE self)
     VALUE result = Qnil;
 
     
-#line 1356 "parser.c"
+#line 1359 "parser.c"
 	{
 	cs = JSON_start;
 	}
@@ -1360,28 +1363,28 @@ static VALUE cParser_parse(VALUE self)
     p = json->source;
     pe = p + json->len;
     
-#line 1364 "parser.c"
+#line 1367 "parser.c"
 	{
 	if ( p == pe )
 		goto _out;
 	switch ( cs )
 	{
-st0:
+st1:
 	if ( ++p == pe )
-		goto _out0;
-case 0:
+		goto _out1;
+case 1:
 	switch( (*p) ) {
-		case 13: goto st0;
-		case 32: goto st0;
+		case 13: goto st1;
+		case 32: goto st1;
 		case 47: goto st2;
-		case 91: goto tr7;
-		case 123: goto tr8;
+		case 91: goto tr3;
+		case 123: goto tr4;
 	}
 	if ( 9 <= (*p) && (*p) <= 10 )
-		goto st0;
-	goto st1;
-st1:
-	goto _out1;
+		goto st1;
+	goto st0;
+st0:
+	goto _out0;
 st2:
 	if ( ++p == pe )
 		goto _out2;
@@ -1390,7 +1393,7 @@ case 2:
 		case 42: goto st3;
 		case 47: goto st5;
 	}
-	goto st1;
+	goto st0;
 st3:
 	if ( ++p == pe )
 		goto _out3;
@@ -1404,7 +1407,7 @@ st4:
 case 4:
 	switch( (*p) ) {
 		case 42: goto st4;
-		case 47: goto st0;
+		case 47: goto st1;
 	}
 	goto st3;
 st5:
@@ -1412,16 +1415,16 @@ st5:
 		goto _out5;
 case 5:
 	if ( (*p) == 10 )
-		goto st0;
+		goto st1;
 	goto st5;
-tr7:
+tr3:
 #line 381 "parser.rl"
 	{
         char *np = JSON_parse_array(json, p, pe, &result);
         if (np == NULL) goto _out10; else {p = (( np))-1;}
     }
 	goto st10;
-tr8:
+tr4:
 #line 376 "parser.rl"
 	{
         char *np = JSON_parse_object(json, p, pe, &result);
@@ -1432,7 +1435,7 @@ st10:
 	if ( ++p == pe )
 		goto _out10;
 case 10:
-#line 1436 "parser.c"
+#line 1439 "parser.c"
 	switch( (*p) ) {
 		case 13: goto st10;
 		case 32: goto st10;
@@ -1440,7 +1443,7 @@ case 10:
 	}
 	if ( 9 <= (*p) && (*p) <= 10 )
 		goto st10;
-	goto st1;
+	goto st0;
 st6:
 	if ( ++p == pe )
 		goto _out6;
@@ -1449,7 +1452,7 @@ case 6:
 		case 42: goto st7;
 		case 47: goto st9;
 	}
-	goto st1;
+	goto st0;
 st7:
 	if ( ++p == pe )
 		goto _out7;
@@ -1474,8 +1477,8 @@ case 9:
 		goto st10;
 	goto st9;
 	}
-	_out0: cs = 0; goto _out; 
 	_out1: cs = 1; goto _out; 
+	_out0: cs = 0; goto _out; 
 	_out2: cs = 2; goto _out; 
 	_out3: cs = 3; goto _out; 
 	_out4: cs = 4; goto _out; 

data/ext/json/ext/parser/parser.rl

@@ -217,7 +217,7 @@ static char *JSON_parse_integer(JSON_Parser *json, char *p, char *pe, VALUE *res
 
     main := '-'? (
               (('0' | [1-9][0-9]*) '.' [0-9]+ ([Ee] [+\-]?[0-9]+)?)
-              | ([1-9][0-9]* ([Ee] [+\-]?[0-9]+))
+              | (('0' | [1-9][0-9]*) ([Ee] [+\-]?[0-9]+))
              )  (^[0-9Ee.\-] @exit );
 }%%
 

data/lib/json/version.rb

@@ -1,6 +1,6 @@
 module JSON
   # JSON version
-  VERSION         = '1.0.1'
+  VERSION         = '1.0.2'
   VERSION_ARRAY   = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/tests/test_json.rb

@@ -48,6 +48,7 @@ class TC_JSON < Test::Unit::TestCase
     assert_equal([-23], parse('[-23]'))
     assert_equal([23], parse('[23]'))
     assert_equal([0.23], parse('[0.23]'))
+    assert_equal([0.0], parse('[0e0]'))
     assert_raises(JSON::ParserError) { parse('[+23.2]') }
     assert_raises(JSON::ParserError) { parse('[+23]') }
     assert_raises(JSON::ParserError) { parse('[.23]') }

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: json
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
-date: 2007-03-27 00:00:00 +02:00
+  version: 1.0.2
+date: 2007-04-02 00:00:00 +02:00
 summary: A JSON implementation as a Ruby extension
 require_paths: 
 - ext/json/ext
@@ -31,101 +31,102 @@ post_install_message:
 authors: 
 - Florian Frank
 files: 
-- bin
-- VERSION
-- TODO
-- tests
-- GPL
-- install.rb
 - ext
+- tools
+- tests
+- lib
 - diagrams
+- bin
+- data
 - benchmarks
+- GPL
 - Rakefile
-- data
-- lib
-- README
-- tools
+- TODO
+- VERSION
 - CHANGES
-- bin/edit_json.rb
-- tests/test_json_fixtures.rb
-- tests/runner.rb
-- tests/test_json.rb
+- install.rb
+- README
+- ext/json
+- ext/json/ext
+- ext/json/ext/generator
+- ext/json/ext/parser
+- ext/json/ext/generator/generator.c
+- ext/json/ext/generator/unicode.c
+- ext/json/ext/generator/extconf.rb
+- ext/json/ext/generator/unicode.h
+- ext/json/ext/parser/unicode.c
+- ext/json/ext/parser/extconf.rb
+- ext/json/ext/parser/parser.rl
+- ext/json/ext/parser/unicode.h
+- ext/json/ext/parser/parser.c
+- tools/fuzz.rb
+- tools/server.rb
 - tests/fixtures
 - tests/test_json_unicode.rb
+- tests/test_json_fixtures.rb
 - tests/test_json_generate.rb
 - tests/test_json_addition.rb
-- tests/fixtures/fail27.json
-- tests/fixtures/fail22.json
-- tests/fixtures/fail26.json
-- tests/fixtures/fail16.json
-- tests/fixtures/fail28.json
-- tests/fixtures/fail25.json
-- tests/fixtures/pass18.json
-- tests/fixtures/fail9.json
-- tests/fixtures/fail20.json
-- tests/fixtures/fail24.json
-- tests/fixtures/fail14.json
-- tests/fixtures/fail4.json
-- tests/fixtures/fail7.json
+- tests/test_json.rb
+- tests/runner.rb
 - tests/fixtures/fail10.json
-- tests/fixtures/fail13.json
-- tests/fixtures/fail6.json
-- tests/fixtures/fail21.json
-- tests/fixtures/fail23.json
-- tests/fixtures/fail3.json
-- tests/fixtures/fail1.json
+- tests/fixtures/fail20.json
 - tests/fixtures/fail11.json
-- tests/fixtures/fail5.json
-- tests/fixtures/pass1.json
+- tests/fixtures/fail21.json
 - tests/fixtures/fail12.json
+- tests/fixtures/fail22.json
+- tests/fixtures/fail13.json
+- tests/fixtures/pass18.json
+- tests/fixtures/fail23.json
+- tests/fixtures/fail14.json
+- tests/fixtures/fail24.json
 - tests/fixtures/fail15.json
-- tests/fixtures/pass3.json
-- tests/fixtures/fail8.json
+- tests/fixtures/fail16.json
+- tests/fixtures/fail25.json
 - tests/fixtures/fail17.json
+- tests/fixtures/fail26.json
+- tests/fixtures/fail27.json
 - tests/fixtures/fail19.json
+- tests/fixtures/fail28.json
+- tests/fixtures/pass1.json
 - tests/fixtures/pass2.json
+- tests/fixtures/pass3.json
+- tests/fixtures/fail1.json
 - tests/fixtures/fail2.json
-- ext/json
-- ext/json/ext
-- ext/json/ext/generator
-- ext/json/ext/parser
-- ext/json/ext/generator/unicode.c
-- ext/json/ext/generator/unicode.h
-- ext/json/ext/generator/extconf.rb
-- ext/json/ext/generator/generator.c
-- ext/json/ext/parser/parser.c
-- ext/json/ext/parser/unicode.c
-- ext/json/ext/parser/parser.rl
-- ext/json/ext/parser/unicode.h
-- ext/json/ext/parser/extconf.rb
-- benchmarks/benchmark_generator.rb
-- benchmarks/benchmark.txt
-- benchmarks/benchmark_parser.rb
-- benchmarks/benchmark_rails.rb
-- data/example.json
-- data/prototype.js
-- data/index.html
+- tests/fixtures/fail3.json
+- tests/fixtures/fail4.json
+- tests/fixtures/fail5.json
+- tests/fixtures/fail6.json
+- tests/fixtures/fail7.json
+- tests/fixtures/fail8.json
+- tests/fixtures/fail9.json
 - lib/json
 - lib/json.rb
-- lib/json/FalseClass.xpm
-- lib/json/TrueClass.xpm
-- lib/json/ext.rb
-- lib/json/common.rb
-- lib/json/Hash.xpm
 - lib/json/pure
-- lib/json/Key.xpm
-- lib/json/Numeric.xpm
 - lib/json/Array.xpm
+- lib/json/ext.rb
+- lib/json/FalseClass.xpm
+- lib/json/Numeric.xpm
+- lib/json/Hash.xpm
+- lib/json/version.rb
+- lib/json/TrueClass.xpm
 - lib/json/editor.rb
 - lib/json/String.xpm
-- lib/json/pure.rb
+- lib/json/common.rb
+- lib/json/Key.xpm
 - lib/json/NilClass.xpm
-- lib/json/version.rb
 - lib/json/json.xpm
-- lib/json/pure/parser.rb
+- lib/json/pure.rb
 - lib/json/pure/generator.rb
-- tools/server.rb
-- tools/fuzz.rb
+- lib/json/pure/parser.rb
+- bin/edit_json.rb
+- bin/prettify_json.rb
+- data/prototype.js
+- data/example.json
+- data/index.html
+- benchmarks/benchmark_generator.rb
+- benchmarks/benchmark_rails.rb
+- benchmarks/benchmark.txt
+- benchmarks/benchmark_parser.rb
 test_files: 
 - tests/runner.rb
 rdoc_options: