Add soft keywords by gvanrossum · Pull Request #20370 · python/cpython · GitHub
Skip to content

Add soft keywords - #20370

Merged
miss-islington merged 4 commits into
masterfrom
soft-keywords
May 26, 2020
Merged

Add soft keywords#20370
miss-islington merged 4 commits into
masterfrom
soft-keywords

Conversation

@gvanrossum

@gvanrossum gvanrossum commented May 25, 2020 •
edited by miss-islington
Loading

Copy link
Copy Markdown
Member

These are like keywords but they only work in context; they are not reserved except when there is an exact match.

This would enable things like match statements without reserving match (which would be bad for the re.match() function and probably lots of other places).

Automerge-Triggered-By: @gvanrossum

@gvanrossum
gvanrossum requested a review from pablogsal as a code owner May 25, 2020 03:40
@gvanrossum
gvanrossum marked this pull request as draft May 25, 2020 03:40
@gvanrossum gvanrossum mentioned this pull request May 25, 2020
Open
@gvanrossum

gvanrossum commented May 25, 2020 •
edited
Loading

Copy link
Copy Markdown
Member Author

gvanrossum added 2 commits May 25, 2020 16:36
@gvanrossum
Add soft keywords
3cbe7c3 
These are like keywords but they only work in context;
they are not reserved except when there is an exact match.

This would enable things like match statements.
@gvanrossum
Fix D() macro usage for soft keywords
8225723
@gvanrossum
gvanrossum marked this pull request as ready for review May 25, 2020 23:40
@gvanrossum

gvanrossum commented May 25, 2020

Copy link
Copy Markdown
Member Author

Fixed an unfortunate interaction with the new D() macro calls. Deleted the print statement easter egg. Now ready for review. (How to test this other than by adding a print statement?)

@pablogsal

pablogsal commented May 26, 2020 •
edited
Loading

Copy link
Copy Markdown
Member

How to test this other than by adding a print statement?

A weak test would be adding something like this that uses the double quotes in the grammar and checks that _PyPegen_expect_soft_keyword is generated in the source and that something with single quotes in the grammar does not include _PyPegen_expect_soft_keyword in the source.

@gvanrossum

gvanrossum commented May 26, 2020 •
edited
Loading

Copy link
Copy Markdown
Member Author

Now with tests. I'd like to keep this as an easter egg, hence the skip issue label. No need to backport to 3.9 (unless you'd rather keep the source of Tools/peg_generator identical).

pablogsal
pablogsal reviewed May 26, 2020
View reviewed changes
Comment thread Lib/test/test_peg_generator/test_c_parser.py Outdated
pablogsal
pablogsal approved these changes May 26, 2020
View reviewed changes

@pablogsal pablogsal left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

I left one question

@miss-islington

miss-islington commented May 26, 2020

Copy link
Copy Markdown
Contributor

@miss-islington
miss-islington merged commit b45af1a into master May 26, 2020
@miss-islington
miss-islington deleted the soft-keywords branch May 26, 2020 17:58
@pablogsal pablogsal mentioned this pull request May 26, 2020
Merged
lysnikolaou added a commit to lysnikolaou/cpython that referenced this pull request May 27, 2020
@lysnikolaou
[3.9] Backport pythonGH-20370 and pythonGH-20436: Soft keywords
d315e95
pablogsal pushed a commit that referenced this pull request May 27, 2020
@lysnikolaou
[3.9] Backport GH-20370 and GH-20436: Soft keywords (GH-20458)
1bfe659
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@pablogsal pablogsal pablogsal approved these changes

Assignees

No one assigned

Labels

skip issue skip news

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@gvanrossum @pablogsal @miss-islington @the-knights-who-say-ni @bedevere-bot