Mercurial > repos > tabletprog
annotate modules/json.tp @ 167:5a6a55592c45
Fix some JSON parser bugs
| author | Mike Pavone <pavone@retrodev.com> |
|---|---|
| date | Sun, 11 Aug 2013 03:01:05 -0700 |
| parents | e7642715d575 |
| children | 9d8ae39e8e67 |
| rev | line source |
|---|---|
| 154 | 1 { |
| 2 startArr <- "[" byte: 0 | |
| 3 endArr <- "]" byte: 0 | |
| 4 startObj <- "{" byte: 0 | |
| 5 endObj <- "}" byte: 0 | |
| 6 quote <- "\"" byte: 0 | |
| 7 esc <- "\\" byte: 0 | |
| 8 zero <- "0" byte: 0 | |
| 9 nine <- "9" byte: 0 | |
| 10 neg <- "-" byte: 0 | |
| 11 space <- " " byte: 0 | |
| 12 comma <- "," byte: 0 | |
|
167
5a6a55592c45
Fix some JSON parser bugs
Mike Pavone <pavone@retrodev.com>
parents:
166
diff
changeset
|
13 tab <- " " byte: 0 |
|
166
e7642715d575
Handle newlines and carriage returns in JSON decoder
Mike Pavone <pavone@retrodev.com>
parents:
165
diff
changeset
|
14 nl <- "\n" byte: 0 |
|
e7642715d575
Handle newlines and carriage returns in JSON decoder
Mike Pavone <pavone@retrodev.com>
parents:
165
diff
changeset
|
15 cr <- "\r" byte: 0 |
| 154 | 16 colon <- ":" byte: 0 |
|
165
fe816637fcc4
Add support for parsing true and false to JSON parser
Mike Pavone <pavone@retrodev.com>
parents:
154
diff
changeset
|
17 t <- "t" byte: 0 |
|
fe816637fcc4
Add support for parsing true and false to JSON parser
Mike Pavone <pavone@retrodev.com>
parents:
154
diff
changeset
|
18 f <- "f" byte: 0 |
| 154 | 19 |
| 20 parseNumAt <- :str :at :recvResult { | |
| 21 num <- 0 | |
| 22 l <- str length | |
| 23 minus <- false | |
| 24 aft <- -1 | |
| 25 while: { at < l } do: { | |
| 26 b <- str byte: at | |
| 27 if: b = neg { | |
| 28 minus <- true | |
| 29 } else: { | |
| 30 if: b >= zero && b <= nine { | |
| 31 num <- num * 10 + (str byte: at) - zero | |
| 32 } else: { | |
| 33 aft <- at | |
| 34 at <- l | |
| 35 } | |
| 36 } | |
| 37 at <- at + 1 | |
| 38 } | |
| 39 if: aft < 0 { | |
| 40 aft <- at | |
| 41 } | |
| 42 if: minus { | |
| 43 num <- 0 - num | |
| 44 } | |
| 45 #{ | |
| 46 value <- num | |
| 47 after <- aft | |
| 48 } | |
| 49 } | |
| 50 | |
| 51 parseStrAt <- :src :at :recvResult { | |
| 52 //TODO: Deal with escaped characters | |
| 53 end <- src find: "\"" startingAt: at + 1 else: { src length } | |
| 54 #{ | |
| 55 value <- src from: (at + 1) withLength: (end - at - 1) | |
| 56 after <- end + 1 | |
| 57 } | |
| 58 } | |
| 59 | |
| 60 _decode:at <- :text :cur { | |
| 61 ret <- false | |
| 62 b <- text byte: cur | |
| 63 if: b = neg || b >= zero && b <= nine { | |
| 64 text parseNumAt: cur | |
| 65 } else: { | |
| 66 if: b = quote { | |
| 67 text parseStrAt: cur | |
| 68 } else: { | |
| 69 if: b = startArr { | |
| 70 len <- text length | |
| 71 val <- #[] | |
| 72 cur <- cur + 1 | |
| 73 aft <- -1 | |
| 74 while: { cur < len } do: { | |
| 75 b <- text byte: cur | |
| 76 if: b = endArr { | |
| 77 aft <- cur + 1 | |
| 78 cur <- len | |
| 79 } else: { | |
|
166
e7642715d575
Handle newlines and carriage returns in JSON decoder
Mike Pavone <pavone@retrodev.com>
parents:
165
diff
changeset
|
80 if: b = comma || b = space || b = tab || b = nl || b = cr { |
| 154 | 81 cur <- cur + 1 |
| 82 } else: { | |
| 83 el <- _decode: text at: cur | |
| 84 cur <- el after | |
| 85 val append: (el value) | |
| 86 } | |
| 87 } | |
| 88 } | |
| 89 #{ | |
| 90 value <- val | |
| 91 after <- aft | |
| 92 } | |
| 93 } else: { | |
| 94 if: b = startObj { | |
| 95 len <- text length | |
| 96 val <- dict linear | |
| 97 cur <- cur + 1 | |
| 98 aft <- -1 | |
| 99 expectKey <- true | |
| 100 key <- "" | |
| 101 while: { cur < len } do: { | |
| 102 b <- text byte: cur | |
|
166
e7642715d575
Handle newlines and carriage returns in JSON decoder
Mike Pavone <pavone@retrodev.com>
parents:
165
diff
changeset
|
103 if: b = comma || b = space || b = tab || b = colon || b = nl || b = cr { |
| 154 | 104 cur <- cur + 1 |
| 105 } else: { | |
| 106 if: expectKey { | |
| 107 if: b = endObj { | |
| 108 aft <- cur + 1 | |
| 109 cur <- len | |
| 110 } else: { | |
| 111 kd <- _decode: text at: cur | |
| 112 key <- kd value | |
| 113 cur <- kd after | |
|
167
5a6a55592c45
Fix some JSON parser bugs
Mike Pavone <pavone@retrodev.com>
parents:
166
diff
changeset
|
114 |
| 154 | 115 expectKey <- false |
| 116 } | |
| 117 } else: { | |
| 118 el <- _decode: text at: cur | |
| 119 val set: key (el value) | |
| 120 cur <- el after | |
| 121 expectKey <- true | |
| 122 } | |
| 123 } | |
| 124 } | |
| 125 #{ | |
| 126 after <- aft | |
| 127 value <- val | |
| 128 } | |
| 129 } else: { | |
|
165
fe816637fcc4
Add support for parsing true and false to JSON parser
Mike Pavone <pavone@retrodev.com>
parents:
154
diff
changeset
|
130 if: b = t && (text from: cur withLength: 4) = "true" { |
|
fe816637fcc4
Add support for parsing true and false to JSON parser
Mike Pavone <pavone@retrodev.com>
parents:
154
diff
changeset
|
131 #{ |
|
fe816637fcc4
Add support for parsing true and false to JSON parser
Mike Pavone <pavone@retrodev.com>
parents:
154
diff
changeset
|
132 value <- true |
|
fe816637fcc4
Add support for parsing true and false to JSON parser
Mike Pavone <pavone@retrodev.com>
parents:
154
diff
changeset
|
133 after <- cur + 4 |
|
fe816637fcc4
Add support for parsing true and false to JSON parser
Mike Pavone <pavone@retrodev.com>
parents:
154
diff
changeset
|
134 } |
|
fe816637fcc4
Add support for parsing true and false to JSON parser
Mike Pavone <pavone@retrodev.com>
parents:
154
diff
changeset
|
135 } else: { |
|
fe816637fcc4
Add support for parsing true and false to JSON parser
Mike Pavone <pavone@retrodev.com>
parents:
154
diff
changeset
|
136 if: b = f && (text from: cur withLength: 5) = "false" { |
|
fe816637fcc4
Add support for parsing true and false to JSON parser
Mike Pavone <pavone@retrodev.com>
parents:
154
diff
changeset
|
137 #{ |
|
fe816637fcc4
Add support for parsing true and false to JSON parser
Mike Pavone <pavone@retrodev.com>
parents:
154
diff
changeset
|
138 value <- false |
|
fe816637fcc4
Add support for parsing true and false to JSON parser
Mike Pavone <pavone@retrodev.com>
parents:
154
diff
changeset
|
139 after <- cur + 5 |
|
fe816637fcc4
Add support for parsing true and false to JSON parser
Mike Pavone <pavone@retrodev.com>
parents:
154
diff
changeset
|
140 } |
|
fe816637fcc4
Add support for parsing true and false to JSON parser
Mike Pavone <pavone@retrodev.com>
parents:
154
diff
changeset
|
141 } else: { |
|
fe816637fcc4
Add support for parsing true and false to JSON parser
Mike Pavone <pavone@retrodev.com>
parents:
154
diff
changeset
|
142 #{ |
|
fe816637fcc4
Add support for parsing true and false to JSON parser
Mike Pavone <pavone@retrodev.com>
parents:
154
diff
changeset
|
143 value <- "foobar" |
|
fe816637fcc4
Add support for parsing true and false to JSON parser
Mike Pavone <pavone@retrodev.com>
parents:
154
diff
changeset
|
144 after <- (text length) |
|
fe816637fcc4
Add support for parsing true and false to JSON parser
Mike Pavone <pavone@retrodev.com>
parents:
154
diff
changeset
|
145 } |
|
fe816637fcc4
Add support for parsing true and false to JSON parser
Mike Pavone <pavone@retrodev.com>
parents:
154
diff
changeset
|
146 } |
| 154 | 147 } |
|
165
fe816637fcc4
Add support for parsing true and false to JSON parser
Mike Pavone <pavone@retrodev.com>
parents:
154
diff
changeset
|
148 |
| 154 | 149 } |
| 150 } | |
| 151 } | |
| 152 } | |
| 153 } | |
| 154 #{ | |
| 155 decode <- :text { | |
| 156 (_decode: text at: 0) value | |
| 157 } | |
| 158 } | |
| 159 } |