Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
fa21bf01
Commit
fa21bf01
authored
Jan 19, 2012
by
Meador Inge
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #12705: Raise SyntaxError when compiling multiple statements as single interactive statement
parent
00c7f852
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
52 additions
and
0 deletions
+52
-0
Include/errcode.h
Include/errcode.h
+1
-0
Lib/test/test_compile.py
Lib/test/test_compile.py
+28
-0
Misc/NEWS
Misc/NEWS
+3
-0
Parser/parsetok.c
Parser/parsetok.c
+17
-0
Python/pythonrun.c
Python/pythonrun.c
+3
-0
No files found.
Include/errcode.h
View file @
fa21bf01
...
...
@@ -30,6 +30,7 @@ extern "C" {
#define E_EOLS 24
/* EOL in single-quoted string */
#define E_LINECONT 25
/* Unexpected characters after a line continuation */
#define E_IDENTIFIER 26
/* Invalid characters in identifier */
#define E_BADSINGLE 27
/* Ill-formed single statement input */
#ifdef __cplusplus
}
...
...
Lib/test/test_compile.py
View file @
fa21bf01
...
...
@@ -6,6 +6,12 @@ from test import support
class
TestSpecifics
(
unittest
.
TestCase
):
def
compile_single
(
self
,
source
):
compile
(
source
,
"<single>"
,
"single"
)
def
assertInvalidSingle
(
self
,
source
):
self
.
assertRaises
(
SyntaxError
,
self
.
compile_single
,
source
)
def
test_no_ending_newline
(
self
):
compile
(
"hi"
,
"<test>"
,
"exec"
)
compile
(
"hi
\
r
"
,
"<test>"
,
"exec"
)
...
...
@@ -442,6 +448,28 @@ if 1:
if
isinstance
(
obj
,
types
.
CodeType
):
self
.
assertIs
(
obj
.
co_filename
,
c
.
co_filename
)
def
test_single_statement
(
self
):
self
.
compile_single
(
"1 + 2"
)
self
.
compile_single
(
"
\
n
1 + 2"
)
self
.
compile_single
(
"1 + 2
\
n
"
)
self
.
compile_single
(
"1 + 2
\
n
\
n
"
)
self
.
compile_single
(
"1 + 2
\
t
\
t
\
n
"
)
self
.
compile_single
(
"1 + 2
\
t
\
t
\
n
"
)
self
.
compile_single
(
"1 + 2 # one plus two"
)
self
.
compile_single
(
"1; 2"
)
self
.
compile_single
(
"import sys; sys"
)
self
.
compile_single
(
"def f():
\
n
pass"
)
self
.
compile_single
(
"while False:
\
n
pass"
)
self
.
compile_single
(
"if x:
\
n
f(x)"
)
self
.
compile_single
(
"if x:
\
n
f(x)
\
n
else:
\
n
g(x)"
)
self
.
compile_single
(
"class T:
\
n
pass"
)
def
test_bad_single_statement
(
self
):
self
.
assertInvalidSingle
(
'1
\
n
2'
)
self
.
assertInvalidSingle
(
'def f(): pass'
)
self
.
assertInvalidSingle
(
'a = 13
\
n
b = 187'
)
self
.
assertInvalidSingle
(
'del x
\
n
del y'
)
self
.
assertInvalidSingle
(
'f()
\
n
g()'
)
def
test_main
():
support
.
run_unittest
(
TestSpecifics
)
...
...
Misc/NEWS
View file @
fa21bf01
...
...
@@ -10,6 +10,9 @@ What's New in Python 3.3 Alpha 1?
Core and Builtins
-----------------
- Issue #12705: A SyntaxError exception is now raised when attempting to
compile multiple statements as a single interactive statement.
- Fix the builtin module initialization code to store the init function for
future reinitialization.
...
...
Parser/parsetok.c
View file @
fa21bf01
...
...
@@ -224,6 +224,23 @@ parsetok(struct tok_state *tok, grammar *g, int start, perrdetail *err_ret,
if
(
err_ret
->
error
==
E_DONE
)
{
n
=
ps
->
p_tree
;
ps
->
p_tree
=
NULL
;
/* Check that the source for a single input statement really
is a single statement by looking at what is left in the
buffer after parsing. Trailing whitespace and comments
are OK. */
if
(
start
==
single_input
)
{
char
*
cur
=
tok
->
cur
;
char
c
=
*
tok
->
cur
;
while
(
c
==
' '
||
c
==
'\t'
||
c
==
'\n'
||
c
==
'\014'
)
c
=
*++
cur
;
if
(
c
&&
c
!=
'#'
)
{
err_ret
->
error
=
E_BADSINGLE
;
n
=
NULL
;
}
}
}
else
n
=
NULL
;
...
...
Python/pythonrun.c
View file @
fa21bf01
...
...
@@ -2129,6 +2129,9 @@ err_input(perrdetail *err)
case
E_IDENTIFIER
:
msg
=
"invalid character in identifier"
;
break
;
case
E_BADSINGLE
:
msg
=
"multiple statements found while compiling a single statement"
;
break
;
default:
fprintf
(
stderr
,
"error=%d
\n
"
,
err
->
error
);
msg
=
"unknown parsing error"
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment