GeezerVison

Original file line number	Diff line number	Diff line change
Expand Up		@@ -53,13 +53,17 @@ ATEQUAL '@='
		RARROW '->'
		ELLIPSIS '...'
		COLONEQUAL ':='
		EXCLAMATION '!'

		OP
		AWAIT
		ASYNC
		TYPE_IGNORE
		TYPE_COMMENT
		SOFT_KEYWORD
		FSTRING_START
		FSTRING_MIDDLE
		FSTRING_END
		ERRORTOKEN

		# These aren't used by the C tokenizer but are needed for tokenize.py
Expand Down

54 changes: 48 additions & 6 deletions 54 Grammar/python.gram

Show comments

View file

Open in desktop

Original file line number	Diff line number	Diff line change
Expand Up		@@ -194,7 +194,7 @@ yield_stmt[stmt_ty]: y=yield_expr { _PyAST_Expr(y, EXTRA) }

		assert_stmt[stmt_ty]: 'assert' a=expression b=[',' z=expression { z }] { _PyAST_Assert(a, b, EXTRA) }

		import_stmt[stmt_ty]:
		import_stmt[stmt_ty]:
		\| invalid_import
		\| import_name
		\| import_from
Expand Down Expand Up		@@ -415,8 +415,8 @@ try_stmt[stmt_ty]:
		\| invalid_try_stmt
		\| 'try' &&':' b=block f=finally_block { _PyAST_Try(b, NULL, NULL, f, EXTRA) }
		\| 'try' &&':' b=block ex[asdl_excepthandler_seq*]=except_block+ el=[else_block] f=[finally_block] { _PyAST_Try(b, ex, el, f, EXTRA) }
		\| 'try' &&':' b=block ex[asdl_excepthandler_seq*]=except_star_block+ el=[else_block] f=[finally_block] {
		CHECK_VERSION(stmt_ty, 11, "Exception groups are",
		\| 'try' &&':' b=block ex[asdl_excepthandler_seq*]=except_star_block+ el=[else_block] f=[finally_block] {
		CHECK_VERSION(stmt_ty, 11, "Exception groups are",
		_PyAST_TryStar(b, ex, el, f, EXTRA)) }


Expand Down Expand Up		@@ -807,7 +807,7 @@ atom[expr_ty]:
		\| 'True' { _PyAST_Constant(Py_True, NULL, EXTRA) }
		\| 'False' { _PyAST_Constant(Py_False, NULL, EXTRA) }
		\| 'None' { _PyAST_Constant(Py_None, NULL, EXTRA) }
		\| &STRING strings
		\| &(STRING\|FSTRING_START) strings
		\| NUMBER
		\| &'(' (tuple \| group \| genexp)
		\| &'[' (list \| listcomp)
Expand Down Expand Up		@@ -877,7 +877,26 @@ lambda_param[arg_ty]: a=NAME { _PyAST_arg(a->v.Name.id, NULL, NULL, EXTRA) }
		# LITERALS
		# ========

		strings[expr_ty] (memo): a=STRING+ { _PyPegen_concatenate_strings(p, a) }
		fstring_middle[expr_ty]:
		\| fstring_replacement_field
		\| t=FSTRING_MIDDLE { _PyPegen_constant_from_token(p, t) }
		fstring_replacement_field[expr_ty]:
		\| '{' a=(yield_expr \| star_expressions) debug_expr="="? conversion=[fstring_conversion] format=[fstring_full_format_spec] '}' {
		_PyPegen_formatted_value(p, a, debug_expr, conversion, format, EXTRA)
		}
		\| invalid_replacement_field
		fstring_conversion[expr_ty]:
		\| conv_token="!" conv=NAME { _PyPegen_check_fstring_conversion(p, conv_token, conv) }
		fstring_full_format_spec[expr_ty]:
		\| ':' spec=fstring_format_spec* { spec ? _PyAST_JoinedStr((asdl_expr_seq*)spec, EXTRA) : NULL }
		fstring_format_spec[expr_ty]:
		\| t=FSTRING_MIDDLE { _PyPegen_constant_from_token(p, t) }
		\| fstring_replacement_field
		fstring[expr_ty]:
		\| a=FSTRING_START b=fstring_middle* c=FSTRING_END { _PyPegen_joined_str(p, a, (asdl_expr_seq*)b, c) }

		string[expr_ty]: s[Token*]=STRING { _PyPegen_constant_from_string(p, s) }
		strings[expr_ty] (memo): a[asdl_expr_seq*]=(fstring\|string)+ { _PyPegen_concatenate_strings(p, a, EXTRA) }

		list[expr_ty]:
		\| '[' a=[star_named_expressions] ']' { _PyAST_List(a, Load, EXTRA) }
Expand Down Expand Up		@@ -1118,6 +1137,8 @@ invalid_expression:
		_PyPegen_check_legacy_stmt(p, a) ? NULL : p->tokens[p->mark-1]->level == 0 ? NULL :
		RAISE_SYNTAX_ERROR_KNOWN_RANGE(a, b, "invalid syntax. Perhaps you forgot a comma?") }
		\| a=disjunction 'if' b=disjunction !('else'\|':') { RAISE_SYNTAX_ERROR_KNOWN_RANGE(a, b, "expected 'else' after 'if' expression") }
		\| a='lambda' [lambda_params] b=':' &(FSTRING_MIDDLE \| fstring_replacement_field) {
		RAISE_SYNTAX_ERROR_KNOWN_RANGE(a, b, "f-string: lambda expressions are not allowed without parentheses") }

		invalid_named_expression(memo):
		\| a=expression ':=' expression {
Expand Down Expand Up		@@ -1241,7 +1262,7 @@ invalid_group:
		invalid_import:
		\| a='import' dotted_name 'from' dotted_name {
		RAISE_SYNTAX_ERROR_STARTING_FROM(a, "Did you mean to use 'from ... import ...' instead?") }


		invalid_import_from_targets:
		\| import_from_as_names ',' NEWLINE {
		RAISE_SYNTAX_ERROR("trailing comma not allowed without surrounding parentheses") }
Expand Down Expand Up		@@ -1335,3 +1356,24 @@ invalid_kvpair:
		\| expression a=':' &('}'\|',') {RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a, "expression expected after dictionary key and ':'") }
		invalid_starred_expression:
		\| a='*' expression '=' b=expression { RAISE_SYNTAX_ERROR_KNOWN_RANGE(a, b, "cannot assign to iterable argument unpacking") }
		invalid_replacement_field:
		\| '{' a='=' { RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a, "f-string: valid expression required before '='") }
		\| '{' a='!' { RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a, "f-string: valid expression required before '!'") }
		\| '{' a=':' { RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a, "f-string: valid expression required before ':'") }
		\| '{' a='}' { RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a, "f-string: valid expression required before '}'") }
		\| '{' !(yield_expr \| star_expressions) { RAISE_SYNTAX_ERROR_ON_NEXT_TOKEN("f-string: expecting a valid expression after '{'")}
		\| '{' (yield_expr \| star_expressions) !('=' \| '!' \| ':' \| '}') {
		PyErr_Occurred() ? NULL : RAISE_SYNTAX_ERROR_ON_NEXT_TOKEN("f-string: expecting '=', or '!', or ':', or '}'") }
		\| '{' (yield_expr \| star_expressions) '=' !('!' \| ':' \| '}') {
		PyErr_Occurred() ? NULL : RAISE_SYNTAX_ERROR_ON_NEXT_TOKEN("f-string: expecting '!', or ':', or '}'") }
		\| '{' (yield_expr \| star_expressions) '='? invalid_conversion_character
		\| '{' (yield_expr \| star_expressions) '='? ['!' NAME] !(':' \| '}') {
		PyErr_Occurred() ? NULL : RAISE_SYNTAX_ERROR_ON_NEXT_TOKEN("f-string: expecting ':' or '}'") }
		\| '{' (yield_expr \| star_expressions) '='? ['!' NAME] ':' fstring_format_spec* !'}' {
		PyErr_Occurred() ? NULL : RAISE_SYNTAX_ERROR_ON_NEXT_TOKEN("f-string: expecting '}', or format specs") }
		\| '{' (yield_expr \| star_expressions) '='? ['!' NAME] !'}' {
		PyErr_Occurred() ? NULL : RAISE_SYNTAX_ERROR_ON_NEXT_TOKEN("f-string: expecting '}'") }

		invalid_conversion_character:
		\| '!' &(':' \| '}') { RAISE_SYNTAX_ERROR_ON_NEXT_TOKEN("f-string: missing conversion character") }
		\| '!' !NAME { RAISE_SYNTAX_ERROR_ON_NEXT_TOKEN("f-string: invalid conversion character") }

22 changes: 14 additions & 8 deletions 22 Include/internal/pycore_token.h

Show comments

View file

Open in desktop

Original file line number	Diff line number	Diff line change
Expand Up		@@ -67,14 +67,18 @@ extern "C" {
		#define RARROW 51
		#define ELLIPSIS 52
		#define COLONEQUAL 53
		#define OP 54
		#define AWAIT 55
		#define ASYNC 56
		#define TYPE_IGNORE 57
		#define TYPE_COMMENT 58
		#define SOFT_KEYWORD 59
		#define ERRORTOKEN 60
		#define N_TOKENS 64
		#define EXCLAMATION 54
		#define OP 55
		#define AWAIT 56
		#define ASYNC 57
		#define TYPE_IGNORE 58
		#define TYPE_COMMENT 59
		#define SOFT_KEYWORD 60
		#define FSTRING_START 61
		#define FSTRING_MIDDLE 62
		#define FSTRING_END 63
		#define ERRORTOKEN 64
		#define N_TOKENS 68
		#define NT_OFFSET 256

		/* Special definitions for cooperation with parser */
Expand All		@@ -86,6 +90,8 @@ extern "C" {
		(x) == NEWLINE \|\| \
		(x) == INDENT \|\| \
		(x) == DEDENT)
		#define ISSTRINGLIT(x) ((x) == STRING \|\| \
		(x) == FSTRING_MIDDLE)


		// Symbols exported for test_peg_generator
Expand Down

5 changes: 0 additions & 5 deletions 5 Lib/test/test_ast.py

Show comments

View file

Open in desktop

Original file line number	Diff line number	Diff line change
Expand Up		@@ -774,11 +774,6 @@ def test_parenthesized_with_feature_version(self):
		ast.parse('with (CtxManager() as example): ...', feature_version=(3, 8))
		ast.parse('with CtxManager() as example: ...', feature_version=(3, 8))

		def test_debug_f_string_feature_version(self):
		ast.parse('f"{x=}"', feature_version=(3, 8))
		with self.assertRaises(SyntaxError):
		ast.parse('f"{x=}"', feature_version=(3, 7))

		def test_assignment_expression_feature_version(self):
		ast.parse('(x := 0)', feature_version=(3, 8))
		with self.assertRaises(SyntaxError):
Expand Down

6 changes: 3 additions & 3 deletions 6 Lib/test/test_cmd_line_script.py

Show comments

View file

Open in desktop

Original file line number	Diff line number	Diff line change
Expand Up		@@ -636,9 +636,9 @@ def test_syntaxerror_multi_line_fstring(self):
		self.assertEqual(
		stderr.splitlines()[-3:],
		[
		b' foo"""',
		b' ^',
		b'SyntaxError: f-string: empty expression not allowed',
		b' foo = f"""{}',
		b' ^',
		b'SyntaxError: f-string: valid expression required before \'}\'',
		],
		)

Expand Down

4 changes: 3 additions & 1 deletion 4 Lib/test/test_eof.py

Show comments

View file

Open in desktop

Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,6 +4,7 @@
		from test import support
		from test.support import os_helper
		from test.support import script_helper
		from test.support import warnings_helper
		import unittest

		class EOFTestCase(unittest.TestCase):
Expand Down Expand Up		@@ -36,10 +37,11 @@ def test_EOFS_with_file(self):
		rc, out, err = script_helper.assert_python_failure(file_name)
		self.assertIn(b'unterminated triple-quoted string literal (detected at line 3)', err)

		@warnings_helper.ignore_warnings(category=SyntaxWarning)
		def test_eof_with_line_continuation(self):
		expect = "unexpected EOF while parsing (<string>, line 1)"
		try:
		compile('"\\xhh" \\', '<string>', 'exec', dont_inherit=True)
		compile('"\\Xhh" \\', '<string>', 'exec')
		except SyntaxError as msg:
		self.assertEqual(str(msg), expect)
		else:
Expand Down

3 changes: 2 additions & 1 deletion 3 Lib/test/test_exceptions.py

Show comments

View file

Open in desktop

Original file line number	Diff line number	Diff line change
Expand Up		@@ -155,6 +155,7 @@ def ckmsg(src, msg):

		ckmsg(s, "'continue' not properly in loop")
		ckmsg("continue\n", "'continue' not properly in loop")
		ckmsg("f'{6 0}'", "invalid syntax. Perhaps you forgot a comma?")

		def testSyntaxErrorMissingParens(self):
		def ckmsg(src, msg, exception=SyntaxError):
Expand Down Expand Up		@@ -227,7 +228,7 @@ def testSyntaxErrorOffset(self):
		check('Python = "\u1e54\xfd\u0163\u0125\xf2\xf1" +', 1, 20)
		check(b'# -- coding: cp1251 --\nPython = "\xcf\xb3\xf2\xee\xed" +',
		2, 19, encoding='cp1251')
		check(b'Python = "\xcf\xb3\xf2\xee\xed" +', 1, 18)
		check(b'Python = "\xcf\xb3\xf2\xee\xed" +', 1, 10)
		check('x = "a', 1, 5)
		check('lambda x: x = 2', 1, 1)
		check('f{a + b + c}', 1, 2)
Expand Down

Oops, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

Add this suggestion to a batch that can be applied as a single commit. This suggestion is invalid because no changes were made to the code. Suggestions cannot be applied while the pull request is closed. Suggestions cannot be applied while viewing a subset of changes. Only one suggestion per line can be applied in a batch. Add this suggestion to a batch that can be applied as a single commit. Applying suggestions on deleted lines is not supported. You must change the existing code in this line in order to create a valid suggestion. Outdated suggestions cannot be applied. This suggestion has been applied or marked resolved. Suggestions cannot be applied from pending reviews. Suggestions cannot be applied on multi-line comments. Suggestions cannot be applied while the pull request is queued to merge. Suggestion cannot be applied right now. Please check back later.

You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.