mirror of
https://github.com/python/cpython
synced 2024-09-15 21:50:10 +00:00
bpo-2180: Treat line continuation at EOF as a SyntaxError
(GH-13401)
This makes the parser consistent with the tokenize module (already the case in `pypy`). sample ------ ```python x = 5\ ``` before ------ ```console $ python3 t.py $ python3 -mtokenize t.py t.py:2:0: error: EOF in multi-line statement ``` after ----- ```console $ ./python t.py File "t.py", line 3 x = 5\ ^ SyntaxError: unexpected EOF while parsing $ ./python -m tokenize t.py t.py:2:0: error: EOF in multi-line statement ``` https://bugs.python.org/issue2180
This commit is contained in:
parent
e917f2ed9a
commit
abea73bf4a
|
@ -1,7 +1,9 @@
|
||||||
"""test script for a few new invalid token catches"""
|
"""test script for a few new invalid token catches"""
|
||||||
|
|
||||||
import unittest
|
import sys
|
||||||
from test import support
|
from test import support
|
||||||
|
from test.support import script_helper
|
||||||
|
import unittest
|
||||||
|
|
||||||
class EOFTestCase(unittest.TestCase):
|
class EOFTestCase(unittest.TestCase):
|
||||||
def test_EOFC(self):
|
def test_EOFC(self):
|
||||||
|
@ -24,5 +26,27 @@ def test_EOFS(self):
|
||||||
else:
|
else:
|
||||||
raise support.TestFailed
|
raise support.TestFailed
|
||||||
|
|
||||||
|
def test_line_continuation_EOF(self):
|
||||||
|
"""A contination at the end of input must be an error; bpo2180."""
|
||||||
|
expect = 'unexpected EOF while parsing (<string>, line 1)'
|
||||||
|
with self.assertRaises(SyntaxError) as excinfo:
|
||||||
|
exec('x = 5\\')
|
||||||
|
self.assertEqual(str(excinfo.exception), expect)
|
||||||
|
with self.assertRaises(SyntaxError) as excinfo:
|
||||||
|
exec('\\')
|
||||||
|
self.assertEqual(str(excinfo.exception), expect)
|
||||||
|
|
||||||
|
@unittest.skipIf(not sys.executable, "sys.executable required")
|
||||||
|
def test_line_continuation_EOF_from_file_bpo2180(self):
|
||||||
|
"""Ensure tok_nextc() does not add too many ending newlines."""
|
||||||
|
with support.temp_dir() as temp_dir:
|
||||||
|
file_name = script_helper.make_script(temp_dir, 'foo', '\\')
|
||||||
|
rc, out, err = script_helper.assert_python_failure(file_name)
|
||||||
|
self.assertIn(b'unexpected EOF while parsing', err)
|
||||||
|
|
||||||
|
file_name = script_helper.make_script(temp_dir, 'foo', 'y = 6\\')
|
||||||
|
rc, out, err = script_helper.assert_python_failure(file_name)
|
||||||
|
self.assertIn(b'unexpected EOF while parsing', err)
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
unittest.main()
|
unittest.main()
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
Treat line continuation at EOF as a ``SyntaxError`` by Anthony Sottile.
|
|
@ -983,7 +983,8 @@ tok_nextc(struct tok_state *tok)
|
||||||
return EOF;
|
return EOF;
|
||||||
/* Last line does not end in \n,
|
/* Last line does not end in \n,
|
||||||
fake one */
|
fake one */
|
||||||
strcpy(tok->inp, "\n");
|
if (tok->inp[-1] != '\n')
|
||||||
|
strcpy(tok->inp, "\n");
|
||||||
}
|
}
|
||||||
tok->inp = strchr(tok->inp, '\0');
|
tok->inp = strchr(tok->inp, '\0');
|
||||||
done = tok->inp[-1] == '\n';
|
done = tok->inp[-1] == '\n';
|
||||||
|
@ -1674,6 +1675,14 @@ tok_get(struct tok_state *tok, char **p_start, char **p_end)
|
||||||
tok->cur = tok->inp;
|
tok->cur = tok->inp;
|
||||||
return ERRORTOKEN;
|
return ERRORTOKEN;
|
||||||
}
|
}
|
||||||
|
c = tok_nextc(tok);
|
||||||
|
if (c == EOF) {
|
||||||
|
tok->done = E_EOF;
|
||||||
|
tok->cur = tok->inp;
|
||||||
|
return ERRORTOKEN;
|
||||||
|
} else {
|
||||||
|
tok_backup(tok, c);
|
||||||
|
}
|
||||||
tok->cont_line = 1;
|
tok->cont_line = 1;
|
||||||
goto again; /* Read next line */
|
goto again; /* Read next line */
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue