Commit 2c99c66
committed
PROT-5778: support identifiers that begin with digits
The lexer dispatched any digit-leading token to lexNumber, which
consumed the digit run and returned a Number without checking what
followed. An identifier like "1_x_coffee_buyer" therefore lexed as
Number(1) followed by Ident(_x_coffee_buyer), which then failed to
parse ("Unexpected token in statement").
lexNumber now hands off to lexIdent when the token is followed by
identifier characters, so the whole thing lexes as a single Ident.
The handoff is guarded on the token containing a digit: the dispatcher
also routes a bare sign here, so "-foo" keeps its previous behavior.
JSON property names are arbitrary customer data rather than
programmer-chosen symbols, so leading digits are legitimate. This
mirrors the equivalent fix in the Go implementation
(segmentio/fql#86) -- both now lex "friends.1.last" identically.1 parent d8d7c06 commit 2c99c66
2 files changed
Lines changed: 50 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
130 | 130 | | |
131 | 131 | | |
132 | 132 | | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
133 | 168 | | |
134 | 169 | | |
135 | 170 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
176 | 176 | | |
177 | 177 | | |
178 | 178 | | |
179 | | - | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
| 183 | + | |
| 184 | + | |
| 185 | + | |
| 186 | + | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
| 190 | + | |
| 191 | + | |
| 192 | + | |
| 193 | + | |
180 | 194 | | |
181 | 195 | | |
182 | 196 | | |
| |||
0 commit comments