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

Commits on Sep 18, 2024

  1. Modify lexer to support modes for string templates.

    @RZhang05
    RZhang05 committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    d078326 View commit details
    Browse the repository at this point in the history

  2. Add parsing support for string templates.

    @RZhang05
    RZhang05 committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    7ebe45b View commit details
    Browse the repository at this point in the history

  3. Checking and interpreting for string templates.

    @RZhang05
    RZhang05 committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    0795b4c View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2024

  1. Interpret string templates with basic tests

    @RZhang05
    RZhang05 committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    32f1c1d View commit details
    Browse the repository at this point in the history

  2. Add placeholder for compiler linting.

    @RZhang05
    RZhang05 committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    6a36212 View commit details
    Browse the repository at this point in the history

  3. Fix parsing of invalid strings.

    @RZhang05
    RZhang05 committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    d90bbf6 View commit details
    Browse the repository at this point in the history

  4. Run stringer to update elementtype file.

    @RZhang05
    RZhang05 committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    81c3004 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2024

  1. Improve error messages and tests

    @RZhang05
    RZhang05 committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    99f4ae4 View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2024

  1. Allow escaping of string template $ and add tests.

    @RZhang05
    RZhang05 committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    cfa540e View commit details
    Browse the repository at this point in the history

  2. Reset lexer state.

    @RZhang05
    RZhang05 committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    0cc3a36 View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2024

  1. Change string template token to \( for backwards compatibility.

    @RZhang05
    RZhang05 committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    942eb03 View commit details
    Browse the repository at this point in the history

  2. Restrict supported types in template.

    @RZhang05
    RZhang05 committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    e3d152d View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2024

  1. Limit string templates to identifiers only.

    @RZhang05
    RZhang05 committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    1ec5b7e View commit details
    Browse the repository at this point in the history

  2. Clean up changes.

    @RZhang05
    RZhang05 committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    1ae7fe9 View commit details
    Browse the repository at this point in the history

  3. Fix checker test.

    @RZhang05
    RZhang05 committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    8799cac View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2024

  1. Initial test of stringer interface.

    @RZhang05
    RZhang05 committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    67d950b View commit details
    Browse the repository at this point in the history

  2. Add test for custom toString.

    @RZhang05
    RZhang05 committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    6d60b9d View commit details
    Browse the repository at this point in the history

  3. Add test for conformance error.

    @RZhang05
    RZhang05 committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    6298e1f View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2024

  1. Fix tests for native interface types.

    @RZhang05
    RZhang05 committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    aa51455 View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2024

  1. Refactor code from review.

    @RZhang05
    RZhang05 committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    bda6b28 View commit details
    Browse the repository at this point in the history

  2. Refactor stringer, improve generator, update simple types.

    @RZhang05
    RZhang05 committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    5f16333 View commit details
    Browse the repository at this point in the history

  3. Update tests.

    @RZhang05
    RZhang05 committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    ab157ad View commit details
    Browse the repository at this point in the history

  4. Fix generator conditional conformances check.

    @RZhang05
    RZhang05 committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    72ff98c View commit details
    Browse the repository at this point in the history

  5. Code cleanup.

    @RZhang05
    RZhang05 committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    060945d View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2024

  1. Add ConformingType interface.

    @RZhang05
    RZhang05 committed Oct 3, 2024
    Configuration menu
    Copy the full SHA
    ad94aeb View commit details
    Browse the repository at this point in the history

  2. Clean up unnecessary code.

    @RZhang05
    RZhang05 committed Oct 3, 2024
    Configuration menu
    Copy the full SHA
    26428cb View commit details
    Browse the repository at this point in the history

  3. Remove unused code.

    @RZhang05
    RZhang05 committed Oct 3, 2024
    Configuration menu
    Copy the full SHA
    447f055 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2024

  1. Add simple tests, fix formatting.

    @RZhang05
    RZhang05 committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    c81e69c View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2024

  1. Update code after review.

    @RZhang05
    RZhang05 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    57805ee View commit details
    Browse the repository at this point in the history

  2. Fix linting.

    @RZhang05
    RZhang05 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    cd83793 View commit details
    Browse the repository at this point in the history

  3. Abstract common functionality, clean up.

    @RZhang05
    RZhang05 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    fab5f6c View commit details
    Browse the repository at this point in the history

  4. Code cleanup.

    @RZhang05
    RZhang05 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    6983288 View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2024

  1. Merge pull request #3585 from RZhang05/identifier-string-template 

    Limited string templates: \(identifier)
    @SupunS
    SupunS authored Oct 18, 2024
    Configuration menu
    Copy the full SHA
    3208a5d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/onflow/cadence into featu… 

    …re/string-templates
    @SupunS
    SupunS committed Oct 18, 2024
    Configuration menu
    Copy the full SHA
    1772f43 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #3626 from onflow/supun/string-templates 

    Sync `feature/string-templates` branch with `master`
    @SupunS
    SupunS authored Oct 18, 2024
    Configuration menu
    Copy the full SHA
    a185a42 View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2024

  1. Merge remote-tracking branch 'upstream/feature/string-templates' into… 

    … introduce-stringer
    @RZhang05
    RZhang05 committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    3d4f6a4 View commit details
    Browse the repository at this point in the history

  2. Fix imports.

    @RZhang05
    RZhang05 committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    b9243e3 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2024

  1. Update tests/checker/stringer_test.go

    @turbolent
    turbolent authored Oct 25, 2024
    Configuration menu
    Copy the full SHA
    f30b70c View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2024

  1. Invert flag for readability.

    @RZhang05
    RZhang05 committed Oct 28, 2024
    Configuration menu
    Copy the full SHA
    bd4c77d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'introduce-stringer' of https://github.com/RZhang05/cadence 

     into introduce-stringer
    @RZhang05
    RZhang05 committed Oct 28, 2024
    Configuration menu
    Copy the full SHA
    46d882c View commit details
    Browse the repository at this point in the history

  3. Small fix.

    @RZhang05
    RZhang05 committed Oct 28, 2024
    Configuration menu
    Copy the full SHA
    58d7d66 View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2024

  1. Merge branch 'master' of https://github.com/onflow/cadence into featu… 

    …re/string-templates
    @SupunS
    SupunS committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    f3b4828 View commit details
    Browse the repository at this point in the history

  2. Fix tests

    @SupunS
    SupunS committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    f642b8e View commit details
    Browse the repository at this point in the history

  3. Merge pull request #3594 from RZhang05/introduce-stringer 

    Introduce StructStringer
    @turbolent
    turbolent authored Oct 30, 2024
    Configuration menu
    Copy the full SHA
    262de48 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #3657 from onflow/supun/update-string-templates 

    Sync `feature/string-templates` branch with `master`
    @SupunS
    SupunS authored Oct 30, 2024
    Configuration menu
    Copy the full SHA
    4f9e343 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' of https://github.com/onflow/cadence into featu… 

    …re/string-templates
    @SupunS
    SupunS committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    7baf551 View commit details
    Browse the repository at this point in the history

  6. Refactor and fix struct string tests

    @SupunS
    SupunS committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    247a13d View commit details
    Browse the repository at this point in the history

  7. Merge pull request #3661 from onflow/supun/refactor-tests 

    Refactor and update struct stringer tests
    @SupunS
    SupunS authored Oct 30, 2024
    Configuration menu
    Copy the full SHA
    1210573 View commit details
    Browse the repository at this point in the history