number parsing and nested array

[scpubgit/TenDotTcl.git] / json.tcl

diff --git a/json.tcl b/json.tcl
index 67c1b2e..4b8c13a 100644 (file)
--- a/json.tcl
+++ b/json.tcl
@@ -60,11 +60,10 @@ namespace eval ten::json {
 
     proc deparse {data} {
       switch -regexp [lindex $data 0] {
-        ^true|false|null$ { uplevel 1 return [lindex $data 0] }
-        ^num|str|obj|list$ {}
+        ^true|false|null$  { lindex $data 0 }
+        ^num|str|obj|list$ { eval $data }
         default { error [ concat "Invalid JSON type " [lindex $data 0 0] ] }
       }
-      eval $data
     }
   }
 
@@ -107,31 +106,57 @@ namespace eval ten::json {
 
     variable json
 
-    proc eat_comma {} {
+    proc eat_spaces {} {
       variable json
       set json [string trimleft $json]
-      if {[string index $json 0] eq ","} {
-        set json [string range $json 1 end]
+    }
+
+    proc eat_char {char} {
+      variable json
+      eat_spaces
+      if {[string index $json 0] eq "$char"} {
+        eat_any
       }
     }
 
-    proc parse_list {} {
+    proc eat_any {} {
       variable json
       set json [ string range $json 1 end ]
+    }
+
+    proc parse_list {} {
+      variable json
+      eat_any
       set tcl {list}
       while {"$json" ne ""} {
         if {[string index $json 0] eq "]"} {
+          eat_any
           return $tcl
         }
         lappend tcl [ parse ]
-        eat_comma
+        eat_char ,
+      }
+      error "Ran out of JSON. Confused now."
+    }
+
+    proc parse_obj {} {
+      variable json
+      eat_char
+      set tcl {obj}
+      while {"$json" ne ""} {
+        if {[string index $json 0] eq "]"} {
+          eat_char
+          return $tcl
+        }
+        lappend tcl [ 
+        lappend tcl [ parse ]
+        eat_char ,
       }
       error "Ran out of JSON. Confused now."
     }
 
     proc parse_str {} {
       variable json
-puts $json
       # like Text::Balanced except ugly (borrowed from tcvJSON's code)
       set reStr {(?:(?:\")(?:[^\\\"]*(?:\\.[^\\\"]*)*)(?:\"))}
       if {![regexp $reStr $json string]} {
@@ -144,9 +169,20 @@ puts $json
       list str [subst -nocommand -novariable [string range $string 1 end-1]]
     }
 
+    proc parse_num {} {
+      variable json
+      string is double -failindex last $json
+      if {$last == 0} {
+        error "Saw number but wasn't - $json"
+      }
+      set num [string range $json 0 [expr {$last - 1}]]
+      set json [string range $json $last end]
+      list num $num
+    }
+
     proc parse {} {
       variable json
-      set json [string trimleft $json]
+      eat_spaces
       if {$json eq ""} {
         return
       }
@@ -155,7 +191,7 @@ puts $json
         {\[} { parse_list }
         {\"} { parse_str }
 
-        {[-0-9]} { parse_number }
+        {[-0-9]} { parse_num }
 
         default { error "argh" }
       }
@@ -163,8 +199,13 @@ puts $json
   }
 
   proc parse_json {json} {
-    set parse::json $json
-    parse::parse
+    set parse::json [ string trim $json ]
+    set result [ parse::parse ]
+    parse::eat_spaces
+    if {$parse::json ne ""} {
+      error "Had JSON left over: $parse::json"
+    }
+    return $result
   }
 }
 
@@ -189,4 +230,4 @@ dict for {k v} [ ten::json::tclify_json [
 
 #puts [ ten::json::parse_json $jtext ]
 
-puts [ ten::json::parse_json {["foo"]} ]
+puts [ ten::json::parse_json {["foo",2345,["bar"]]} ]