Skip to content
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

Merge string-templates branch to master #3660

Merged
merged 48 commits into from
Oct 30, 2024
Merged

Merge string-templates branch to master #3660

merged 48 commits into from
Oct 30, 2024

Conversation

SupunS
Copy link
Member

@SupunS SupunS commented Oct 30, 2024

Closes #3579

Description

Merging two awesome features added by @RZhang05 🎉 🎉

Both were already reviewed and merged to the feature branch. Now that the FLIPs were also approved, merging them back to master.

  • Targeted PR against master branch
  • Linked to Github issue with discussion and accepted design OR link to spec that describes this work
  • Code follows the standards mentioned here
  • Updated relevant documentation
  • Re-reviewed Files changed in the Github PR explorer
  • Added appropriate labels

@RZhang05
Modify lexer to support modes for string templates.
d078326
@RZhang05
Add parsing support for string templates.
7ebe45b
@RZhang05
Checking and interpreting for string templates.
0795b4c
@RZhang05
Interpret string templates with basic tests
32f1c1d
@RZhang05
Add placeholder for compiler linting.
6a36212
@RZhang05
Fix parsing of invalid strings.
d90bbf6
@RZhang05
Run stringer to update elementtype file.
81c3004
@RZhang05
Improve error messages and tests
99f4ae4
@RZhang05
Allow escaping of string template $ and add tests.
cfa540e
@RZhang05
Reset lexer state.
0cc3a36
@RZhang05
Change string template token to \( for backwards compatibility.
942eb03
@RZhang05
Restrict supported types in template.
e3d152d
@RZhang05
Limit string templates to identifiers only.
1ec5b7e
@RZhang05
Clean up changes.
1ae7fe9
@RZhang05
Fix checker test.
8799cac
@RZhang05
Initial test of stringer interface.
67d950b
@RZhang05
Add test for custom toString.
6d60b9d
@RZhang05
Add test for conformance error.
6298e1f
@RZhang05
Fix tests for native interface types.
aa51455
@RZhang05
Refactor code from review.
bda6b28
@RZhang05
Refactor stringer, improve generator, update simple types.
5f16333
@RZhang05
Update tests.
ab157ad
@RZhang05
Fix generator conditional conformances check.
72ff98c
@RZhang05
Code cleanup.
060945d
@RZhang05
Add ConformingType interface.
ad94aeb
@RZhang05
Clean up unnecessary code.
26428cb
@RZhang05
Remove unused code.
447f055
@RZhang05
Add simple tests, fix formatting.
c81e69c
@RZhang05
Update code after review.
57805ee
@RZhang05
Fix linting.
cd83793
RZhang05 and others added 15 commits October 16, 2024 14:54
@RZhang05
Abstract common functionality, clean up.
fab5f6c
@RZhang05
Code cleanup.
6983288
@SupunS
Merge pull request #3585 from RZhang05/identifier-string-template
3208a5d 
Limited string templates: \(identifier)
@SupunS
Merge branch 'master' of https://github.com/onflow/cadence into featu…
1772f43 
…re/string-templates
@SupunS
Merge pull request #3626 from onflow/supun/string-templates
a185a42 
Sync `feature/string-templates` branch with `master`
@RZhang05
Merge remote-tracking branch 'upstream/feature/string-templates' into…
3d4f6a4 
… introduce-stringer
@RZhang05
Fix imports.
b9243e3
@turbolent
Update tests/checker/stringer_test.go
f30b70c
@RZhang05
Invert flag for readability.
bd4c77d
@RZhang05
Merge branch 'introduce-stringer' of https://github.com/RZhang05/cadence
46d882c 
 into introduce-stringer
@RZhang05
Small fix.
58d7d66
@SupunS
Merge branch 'master' of https://github.com/onflow/cadence into featu…
f3b4828 
…re/string-templates
@SupunS
Fix tests
f642b8e
@turbolent
Merge pull request #3594 from RZhang05/introduce-stringer
262de48 
Introduce StructStringer
@SupunS
Merge pull request #3657 from onflow/supun/update-string-templates
4f9e343 
Sync `feature/string-templates` branch with `master`
@SupunS SupunS self-assigned this Oct 30, 2024
@github-actions GitHub Actions
Copy link

Cadence Benchstat comparison

This branch with compared with the base branch onflow:master commit 085280e
The command for i in {1..N}; do go test ./... -run=XXX -bench=. -benchmem -shuffle=on; done was used.
Bench tests were run a total of 7 times on each branch.

Collapsed results for better readability

@SupunS SupunS mentioned this pull request Oct 30, 2024
Merged
6 tasks
@SupunS
Merge pull request #3661 from onflow/supun/refactor-tests
1210573 
Refactor and update struct stringer tests
@SupunS SupunS marked this pull request as ready for review October 30, 2024 20:08
@SupunS SupunS added the Feature label Oct 30, 2024
turbolent
turbolent approved these changes Oct 30, 2024
View reviewed changes
Copy link
Member

@turbolent turbolent left a comment

Choose a reason for hiding this comment

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

Awesome! 👏

@turbolent turbolent requested a review from jsproz October 30, 2024 20:30
@SupunS SupunS merged commit 1b27cc3 into master Oct 30, 2024
15 of 20 checks passed
@SupunS SupunS mentioned this pull request Oct 30, 2024
Closed
6 tasks
@turbolent turbolent deleted the feature/string-templates branch October 30, 2024 21:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@turbolent turbolent turbolent approved these changes

@jsproz jsproz Awaiting requested review from jsproz

Assignees

@SupunS SupunS

Labels
Feature
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Add string formatting function
3 participants
@SupunS @turbolent @RZhang05