Skip to content

[5.7] Fix a few DSL APIs #583

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 14 commits into from
Jul 21, 2022
Merged

[5.7] Fix a few DSL APIs #583

merged 14 commits into from
Jul 21, 2022

Conversation

hamishknight
Copy link
Contributor

@hamishknight hamishknight commented Jul 15, 2022 •
edited by stephentyrone
Loading

5.7 cherry-pick of #578 + #580

Fix CharacterClass.newlineSequence such that it doesn't crash, CharacterClass.any such that it matches newlines, and implement CharacterClass.anyNonNewline.

Also fix Anchor.startOfLine and Anchor.endOfLine such that they always match newlines.

Resolves #537
Resolves #553
Resolves #571
Resolves #539

Resolves rdar://97029702

@hamishknight
Allow matching tests to specify semantic level
d6a6e22
@hamishknight
Rip out unused _CharacterClassModel API
cf3cfbe 
Remove the DSL -> _CharacterClassModel conversion,
and _CharacterClassModel's custom character class
matching logic, none of which is being used.
@hamishknight
Remove _CharacterClassModel conformance to RegexComponent
c36eb1f
@hamishknight
Internalize _CharacterClassModel
3b4a34f 
`makeDSLTreeCharacterClass` was the last API
that required it to be public. Remove it, and
replace it with some static members on `_AST.Atom`.
@hamishknight
Fix CharacterClass.newlineSequence
b72e262 
Map to `.newlineSequence` instead of `.newline`,
which allows it to create the correct consumer.

rdar://96330096
@hamishknight
Rename any -> dot
6fb86fc 
Explicitly disambiguate the fact we're talking
about `.`, which does not match newlines unless in
single line mode.
@hamishknight
Re-introduce DSLTree.Atom.any
9757edd 
This time as a "true any" that matches any
character, including newlines.
@hamishknight
Fix CharacterClass.any
fbe598c 
This should map to `.any`, not `.dot`.

rdar://96509234
@hamishknight
Rename startOfLine/endOfLine -> caretAnchor/dollarAnchor
cb9c5fb
@hamishknight
Move AssertionKind onto the DSL
3f3d253 
This enum will start including cases that only the
DSL can use, so move it off the AST.
@hamishknight
Fix Anchor.startOfLine and Anchor.endOfLine
540ab8c 
Introduce `startOfInput` and `endOfInput` assertion
kinds, and map the DSL to them such that they do
not depend on matching options.

rdar://97029630
@hamishknight
Add some tests for CharacterClass.anyGraphemeCluster
f1026b3
@hamishknight
Add some tests for CharacterClass.horizontalWhitespace
ae3157c
@hamishknight
Implement CharacterClass.anyNonNewline
3c7d34f 
rdar://97029702
@hamishknight hamishknight added the r5.7 5.7 Release Cherry Picks label Jul 15, 2022
@hamishknight hamishknight mentioned this pull request Jul 15, 2022
Closed
milseman
milseman approved these changes Jul 15, 2022
View reviewed changes
Copy link
Member

@milseman milseman left a comment

Choose a reason for hiding this comment

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

LGTM

@Azoy
Copy link
Contributor

Azoy commented Jul 21, 2022

Explanation:
The proposed CharacterClass.anyNonNewline was not yet implemented, and a few character classes and anchors were not behaving correctly as proposed. Specifically, Character.newlineSequence was crashing, Character.any was not matching newlines, and Anchor.startOfLine and Anchor.endOfLine were not always matching newlines.

Scope:
Part of this PR is purely additive in terms of .anyNonNewline, so existing clients are unaffected. The bug fixes in this PR should be purely bug fixes, existing clients who were relying on the buggy behavior will have different runtime behavior, but will otherwise still compile.

Main Branch PR:
#578 and #580

Resolves:
rdar://97029702

Risk:
Low

Reviewed By:
@milseman

Testing:
Added a bunch of tests to ensure that we are now correctly matching the various buggy character classes/anchors and added tests to ensure that .anyNonNewline works as intended.

@hamishknight
Copy link
Contributor Author

@swift-ci please test

@hamishknight hamishknight mentioned this pull request Jul 21, 2022
Closed
@hamishknight hamishknight merged commit 8087a3d into swiftlang:swift/release/5.7 Jul 21, 2022
@hamishknight hamishknight deleted the character-work-5.7 branch July 21, 2022 22:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@milseman milseman milseman approved these changes

@stephentyrone stephentyrone stephentyrone approved these changes

Assignees
No one assigned
Labels
r5.7 5.7 Release Cherry Picks
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@hamishknight @Azoy @milseman @stephentyrone