File tree Expand file tree Collapse file tree 2 files changed +11
-92
lines changed Expand file tree Collapse file tree 2 files changed +11
-92
lines changed Original file line number Diff line number Diff line change @@ -677,7 +677,7 @@ public function parseComment()
677
677
// - "SELECT */* comment */ FROM ..."
678
678
// - "SELECT 2*/* comment */3 AS `six`;"
679
679
$ next = $ this ->last + 1 ;
680
- if (($ next < $ this ->len ) && $ this ->str [$ next ] === '* ' ) {
680
+ if (($ next < $ this ->len ) && $ this ->str [$ next ] === '* ' && $ token === ' */ ' ) {
681
681
// Conflict in "*/*": first "*" was not for ending a comment.
682
682
// Stop here and let other parsing method define the true behavior of that first star.
683
683
$ this ->last = $ iBak ;
Original file line number Diff line number Diff line change 28
28
},
29
29
{
30
30
"@type": "PhpMyAdmin\\SqlParser\\Token",
31
- "token": "/",
32
- "value": "/",
33
- "keyword": null,
34
- "type": 2,
35
- "flags": 1,
36
- "position": 7
37
- },
38
- {
39
- "@type": "PhpMyAdmin\\SqlParser\\Token",
40
- "token": "*",
41
- "value": "*",
42
- "keyword": null,
43
- "type": 2,
44
- "flags": 1,
45
- "position": 8
46
- },
47
- {
48
- "@type": "PhpMyAdmin\\SqlParser\\Token",
49
- "token": "*/",
50
- "value": "*/",
31
+ "token": "/**/",
32
+ "value": "/**/",
51
33
"keyword": null,
52
34
"type": 4,
53
35
"flags": 2,
54
- "position": 9
36
+ "position": 7
55
37
},
56
38
{
57
39
"@type": "PhpMyAdmin\\SqlParser\\Token",
154
136
},
155
137
{
156
138
"@type": "PhpMyAdmin\\SqlParser\\Token",
157
- "token": "/",
158
- "value": "/",
159
- "keyword": null,
160
- "type": 2,
161
- "flags": 1,
162
- "position": 36
163
- },
164
- {
165
- "@type": "PhpMyAdmin\\SqlParser\\Token",
166
- "token": "*",
167
- "value": "*",
168
- "keyword": null,
169
- "type": 2,
170
- "flags": 1,
171
- "position": 37
172
- },
173
- {
174
- "@type": "PhpMyAdmin\\SqlParser\\Token",
175
- "token": "*",
176
- "value": "*",
177
- "keyword": null,
178
- "type": 2,
179
- "flags": 1,
180
- "position": 38
181
- },
182
- {
183
- "@type": "PhpMyAdmin\\SqlParser\\Token",
184
- "token": "*/",
185
- "value": "*/",
139
+ "token": "/***/",
140
+ "value": "/***/",
186
141
"keyword": null,
187
142
"type": 4,
188
143
"flags": 2,
189
- "position": 39
144
+ "position": 36
190
145
},
191
146
{
192
147
"@type": "PhpMyAdmin\\SqlParser\\Token",
235
190
},
236
191
{
237
192
"@type": "PhpMyAdmin\\SqlParser\\Token",
238
- "token": "/",
239
- "value": "/",
240
- "keyword": null,
241
- "type": 2,
242
- "flags": 1,
243
- "position": 51
244
- },
245
- {
246
- "@type": "PhpMyAdmin\\SqlParser\\Token",
247
- "token": "*",
248
- "value": "*",
249
- "keyword": null,
250
- "type": 2,
251
- "flags": 1,
252
- "position": 52
253
- },
254
- {
255
- "@type": "PhpMyAdmin\\SqlParser\\Token",
256
- "token": "*",
257
- "value": "*",
258
- "keyword": null,
259
- "type": 2,
260
- "flags": 1,
261
- "position": 53
262
- },
263
- {
264
- "@type": "PhpMyAdmin\\SqlParser\\Token",
265
- "token": " ",
266
- "value": " ",
267
- "keyword": null,
268
- "type": 3,
269
- "flags": 0,
270
- "position": 54
271
- },
272
- {
273
- "@type": "PhpMyAdmin\\SqlParser\\Token",
274
- "token": "*/",
275
- "value": "*/",
193
+ "token": "/** */",
194
+ "value": "/** */",
276
195
"keyword": null,
277
196
"type": 4,
278
197
"flags": 2,
279
- "position": 55
198
+ "position": 51
280
199
},
281
200
{
282
201
"@type": "PhpMyAdmin\\SqlParser\\Token",
369
288
"position": null
370
289
}
371
290
],
372
- "count": 40 ,
291
+ "count": 31 ,
373
292
"idx": 0
374
293
},
375
294
"delimiter": ";",
You can’t perform that action at this time.
0 commit comments