@@ -263,24 +263,25 @@ func TestLex(t *testing.T) {
263
263
{'(' , nil },
264
264
{NUMBER , py .Int (1 )},
265
265
{')' , nil },
266
+ {NEWLINE , nil },
266
267
{ENDMARKER , nil },
267
268
}},
268
- {"{\n 1\n }" , "" , "exec " , LexTokens {
269
- {FILE_INPUT , nil },
269
+ {"{\n 1\n }" , "" , "single " , LexTokens {
270
+ {SINGLE_INPUT , nil },
270
271
{'{' , nil },
271
272
{NUMBER , py .Int (1 )},
272
273
{'}' , nil },
273
274
{ENDMARKER , nil },
274
275
}},
275
- {"[\n 1\n ]" , "" , "exec " , LexTokens {
276
- {FILE_INPUT , nil },
276
+ {"[\n 1\n ]" , "" , "eval " , LexTokens {
277
+ {EVAL_INPUT , nil },
277
278
{'[' , nil },
278
279
{NUMBER , py .Int (1 )},
279
280
{']' , nil },
280
281
{ENDMARKER , nil },
281
282
}},
282
- {"1\\ \n 2" , "" , "exec " , LexTokens {
283
- {FILE_INPUT , nil },
283
+ {"1\\ \n 2" , "" , "eval " , LexTokens {
284
+ {EVAL_INPUT , nil },
284
285
{NUMBER , py .Int (1 )},
285
286
{NUMBER , py .Int (2 )},
286
287
{ENDMARKER , nil },
@@ -295,33 +296,33 @@ func TestLex(t *testing.T) {
295
296
{NUMBER , py .Int (1 )},
296
297
{ENDMARKER , nil },
297
298
}},
298
- {"'1\\ \n 2'" , "" , "exec " , LexTokens {
299
- {FILE_INPUT , nil },
299
+ {"'1\\ \n 2'" , "" , "single " , LexTokens {
300
+ {SINGLE_INPUT , nil },
300
301
{STRING , py .String ("12" )},
301
302
{ENDMARKER , nil },
302
303
}},
303
- {"0x1234 +\t 0.1-6.1j" , "" , "exec " , LexTokens {
304
- {FILE_INPUT , nil },
304
+ {"0x1234 +\t 0.1-6.1j" , "" , "eval " , LexTokens {
305
+ {EVAL_INPUT , nil },
305
306
{NUMBER , py .Int (0x1234 )},
306
307
{'+' , nil },
307
308
{NUMBER , py .Float (0.1 )},
308
309
{'-' , nil },
309
310
{NUMBER , py .Complex (complex (0 , 6.1 ))},
310
311
{ENDMARKER , nil },
311
312
}},
312
- {"001" , "illegal decimal with leading zero" , "exec " , LexTokens {
313
- {FILE_INPUT , nil },
313
+ {"001" , "illegal decimal with leading zero" , "eval " , LexTokens {
314
+ {EVAL_INPUT , nil },
314
315
}},
315
- {"u'''1\n 2\n '''" , "" , "exec " , LexTokens {
316
- {FILE_INPUT , nil },
316
+ {"u'''1\n 2\n '''" , "" , "eval " , LexTokens {
317
+ {EVAL_INPUT , nil },
317
318
{STRING , py .String ("1\n 2\n " )},
318
319
{ENDMARKER , nil },
319
320
}},
320
- {"\" hello\n " , "Unterminated \" x\" string" , "exec " , LexTokens {
321
- {FILE_INPUT , nil },
321
+ {"\" hello\n " , "Unterminated \" x\" string" , "eval " , LexTokens {
322
+ {EVAL_INPUT , nil },
322
323
}},
323
- {"1 >>-3\n a <<=+12" , "" , "exec " , LexTokens {
324
- {FILE_INPUT , nil },
324
+ {"1 >>-3\n a <<=+12" , "" , "eval " , LexTokens {
325
+ {EVAL_INPUT , nil },
325
326
{NUMBER , py .Int (1 )},
326
327
{GTGT , nil },
327
328
{'-' , nil },
@@ -333,8 +334,8 @@ func TestLex(t *testing.T) {
333
334
{NUMBER , py .Int (12 )},
334
335
{ENDMARKER , nil },
335
336
}},
336
- {"$asdasd" , "invalid syntax" , "exec " , LexTokens {
337
- {FILE_INPUT , nil },
337
+ {"$asdasd" , "invalid syntax" , "eval " , LexTokens {
338
+ {EVAL_INPUT , nil },
338
339
}},
339
340
} {
340
341
lts , err := LexString (test .in , test .mode )
@@ -595,7 +596,7 @@ func TestLexerReadString(t *testing.T) {
595
596
{`BR"""a\nc"""` , STRING , py .Bytes (string (`a\nc` )), `` },
596
597
{`rB'''a\"c'''` , STRING , py .Bytes (string (`a\"c` )), `` },
597
598
} {
598
- x , err := NewLex (bytes .NewBufferString (test .in ), "exec " )
599
+ x , err := NewLex (bytes .NewBufferString (test .in ), "eval " )
599
600
if err != nil {
600
601
t .Fatal (err )
601
602
}
0 commit comments