GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — bpo-42128: Add 'missing :' syntax error message to match statements by pablogsal · Pull Request #24733 · python/cpython

bpo-42128: Add 'missing :' syntax error message to match statements #24733

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

pablogsal merged 2 commits into python:master from pablogsal:match-colon

Mar 18, 2021

Uh oh!

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

Merged

bpo-42128: Add 'missing :' syntax error message to match statements #24733

Show file tree

Hide file tree

Changes from all commits

Commits

Show all changes

2 commits

Select commit Hold shift + click to select a range

451a04e

bpo-42128: Add 'missing :' syntax error message to match statements

pablogsal Mar 3, 2021

ec42b1f

fixup! bpo-42128: Add 'missing :' syntax error message to match state…

pablogsal Mar 17, 2021

File filter

Filter by extension .c (1) .gram (1) .py (1) All 3 file types selected

Viewed files

Clear filters

Conversations

Failed to load comments.

Uh oh!

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

Jump to

Jump to file

Failed to load files.

Uh oh!

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

Diff view

Unified

Split

Hide whitespace

Diff view

Unified

Split

Hide whitespace

There are no files selected for viewing

8 changes: 8 additions & 0 deletions 8 Grammar/python.gram

Show comments

View file

Open in desktop

Original file line number	Diff line number	Diff line change
Expand Up		@@ -211,13 +211,15 @@ finally_block[asdl_stmt_seq*]: 'finally' ':' a=block { a }
		match_stmt[stmt_ty]:
		\| "match" subject=subject_expr ':' NEWLINE INDENT cases[asdl_match_case_seq*]=case_block+ DEDENT {
		CHECK_VERSION(stmt_ty, 10, "Pattern matching is", _Py_Match(subject, cases, EXTRA)) }
		\| invalid_match_stmt
		subject_expr[expr_ty]:
		\| value=star_named_expression ',' values=star_named_expressions? {
		_Py_Tuple(CHECK(asdl_expr_seq*, _PyPegen_seq_insert_in_front(p, value, values)), Load, EXTRA) }
		\| named_expression
		case_block[match_case_ty]:
		\| "case" pattern=patterns guard=guard? ':' body=block {
		_Py_match_case(pattern, guard, body, p->arena) }
		\| invalid_case_block
		guard[expr_ty]: 'if' guard=named_expression { guard }

		patterns[expr_ty]:
Expand Down Expand Up		@@ -853,3 +855,9 @@ invalid_except_block:
		RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a, "exception group must be parenthesized") }
		\| 'except' expression ['as' NAME ] &&':'
		\| 'except' &&':'

		invalid_match_stmt:
		\| "match" subject_expr !':' { CHECK_VERSION(void*, 10, "Pattern matching is", RAISE_SYNTAX_ERROR("expected ':'") ) }

		invalid_case_block:
		\| "case" patterns guard? !':' { RAISE_SYNTAX_ERROR("expected ':'") }

36 changes: 36 additions & 0 deletions 36 Lib/test/test_syntax.py

Show comments

View file

Open in desktop

Original file line number	Diff line number	Diff line change
Expand Up		@@ -825,6 +825,24 @@
		Traceback (most recent call last):
		SyntaxError: expected ':'

		>>> match x
		... case list():
		... pass
		Traceback (most recent call last):
		SyntaxError: expected ':'

		>>> match x:
		... case list()
		... pass
		Traceback (most recent call last):
		SyntaxError: expected ':'

		>>> match x:
		... case [y] if y > 0
		... pass
		Traceback (most recent call last):
		SyntaxError: expected ':'

		Make sure that the old "raise X, Y[, Z]" form is gone:
		>>> raise X, Y
		Traceback (most recent call last):
Expand Down Expand Up		@@ -1159,6 +1177,24 @@ def test_error_parenthesis(self):
		for paren in ")]}":
		self._check_error(paren + "1 + 2", f"unmatched '\\{paren}'")

		def test_match_call_does_not_raise_syntax_error(self):
		code = """
		def match(x):
		return 1+1

		match(34)
		"""
		compile(code, "<string>", "exec")

		def test_case_call_does_not_raise_syntax_error(self):
		code = """
		def case(x):
		return 1+1

		case(34)
		"""
		compile(code, "<string>", "exec")


		def test_main():
		support.run_unittest(SyntaxTestCase)
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 01402520 — 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.