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

Use signed ints for ATN serialization not uint16, except for java #3591

Merged
merged 46 commits into from Mar 26, 2022
Merged

Use signed ints for ATN serialization not uint16, except for java #3591

merged 46 commits into from Mar 26, 2022

Commits on Mar 18, 2022

  1. refactor serialize so we don't need comments

    @parrt
    parrt committed Mar 18, 2022
    Copy the full SHA
    b06fdc5 View commit details
    Browse the repository at this point in the history

  2. more cleanup during refactor

    @parrt
    parrt committed Mar 18, 2022
    Copy the full SHA
    68145b2 View commit details
    Browse the repository at this point in the history

  3. store language in serializer obj

    @parrt
    parrt committed Mar 18, 2022
    Copy the full SHA
    7587346 View commit details
    Browse the repository at this point in the history

  4. A lexer rule token type should never be -1 (EOF). 0 is fragment but t… 

    …hen must be > 0.
    @parrt
    parrt committed Mar 18, 2022
    Copy the full SHA
    a77e743 View commit details
    Browse the repository at this point in the history

  5. Go uses int not uint16 for ATN now. java/go/python3 pass

    @parrt
    parrt committed Mar 18, 2022
    Copy the full SHA
    9eb1f83 View commit details
    Browse the repository at this point in the history

  6. remove checks for 0xFFFF in Go.

    @parrt
    parrt committed Mar 18, 2022
    Copy the full SHA
    b4148b8 View commit details
    Browse the repository at this point in the history

  7. C++ uint16_t to int for ATN.

    @parrt
    parrt committed Mar 18, 2022
    Copy the full SHA
    4d2ebbf View commit details
    Browse the repository at this point in the history

  8. add mac php dir; fix type on accept() for generated code to be mixed.

    @parrt
    parrt committed Mar 18, 2022
    Copy the full SHA
    14ce0cd View commit details
    Browse the repository at this point in the history

  9. Add test from @KvanTTT. This PR fixes antlr#3555 for non-Java targets.

    @parrt
    parrt committed Mar 18, 2022
    Copy the full SHA
    9b6db61 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2022

  1. cleanup and add big lexer from antlr#3546

    @parrt
    parrt committed Mar 19, 2022
    Copy the full SHA
    4bc9e38 View commit details
    Browse the repository at this point in the history

  2. increase mvn mem size to 2G

    @parrt
    parrt committed Mar 19, 2022
    Copy the full SHA
    2cf2015 View commit details
    Browse the repository at this point in the history

  3. increase mvn mem size to 8G

    @parrt
    parrt committed Mar 19, 2022
    Copy the full SHA
    986f597 View commit details
    Browse the repository at this point in the history

  4. turn off the big ATN lexer test as we have memory issues during testing.

    @parrt
    parrt committed Mar 19, 2022
    Copy the full SHA
    4087846 View commit details
    Browse the repository at this point in the history

  5. Fixes antlr#3592

    @parrt
    parrt committed Mar 19, 2022
    Copy the full SHA
    82ef98b View commit details
    Browse the repository at this point in the history

  6. Revert "C++ uint16_t to int for ATN." 

    This reverts commit 4d2ebbf.

# Conflicts:
#	runtime/Cpp/runtime/src/atn/ATNSerializer.cpp
#	runtime/Cpp/runtime/src/tree/xpath/XPathLexer.cpp
    @parrt
    parrt committed Mar 19, 2022
    Copy the full SHA
    7b86e1f View commit details
    Browse the repository at this point in the history

  7. C++ uint16_t to int32_t for ATN.

    @parrt
    parrt committed Mar 19, 2022
    Copy the full SHA
    dd829bd View commit details
    Browse the repository at this point in the history

  8. rm unnecessary include file, updating project file. get rid of the 0x… 

    …FFFF does in the C++ deserialization
    @parrt
    parrt committed Mar 19, 2022
    Copy the full SHA
    c82ace5 View commit details
    Browse the repository at this point in the history

  9. rm refs to 0xFFFF in swift

    @parrt
    parrt committed Mar 19, 2022
    Copy the full SHA
    544baa5 View commit details
    Browse the repository at this point in the history

  10. javascript tests were running as Node...added to ignore list.

    @parrt
    parrt committed Mar 19, 2022
    Copy the full SHA
    ac25b86 View commit details
    Browse the repository at this point in the history

  11. don't distinguish between 16 and 32 bit char sets in serialization; P… 

    …ython2/3 updated to work with this change.
    @parrt
    parrt committed Mar 19, 2022
    Copy the full SHA
    6643786 View commit details
    Browse the repository at this point in the history

  12. update C++ to deserialize only 32-bit sets

    @parrt
    parrt committed Mar 19, 2022
    Copy the full SHA
    3f579ba View commit details
    Browse the repository at this point in the history

  13. 0xFFFF -> -1 for C++ target.

    @parrt
    parrt committed Mar 19, 2022
    Copy the full SHA
    d782c68 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'dev' into ATN-to-signed-ints 

    # Conflicts:
#	runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/Go.test.stg
#	tool/resources/org/antlr/v4/tool/templates/codegen/Go/Go.stg
#	tool/resources/org/antlr/v4/tool/templates/codegen/PHP/PHP.stg
    @parrt
    parrt committed Mar 19, 2022
    Copy the full SHA
    3754457 View commit details
    Browse the repository at this point in the history

  15. get other targets to use 32-bit sets in serialization. tests pass loc… 

    …ally.
    @parrt
    parrt committed Mar 19, 2022
    Copy the full SHA
    a70605b View commit details
    Browse the repository at this point in the history

  16. refactor to reduce code size

    @parrt
    parrt committed Mar 19, 2022
    Copy the full SHA
    f966345 View commit details
    Browse the repository at this point in the history

  17. add comment

    @parrt
    parrt committed Mar 19, 2022
    Copy the full SHA
    41896ef View commit details
    Browse the repository at this point in the history

  18. oops. comment out call to writeSerializedATNIntegerHistogram(). I won… 

    …der if this is why it ran out of memory during testing?
    @parrt
    parrt committed Mar 19, 2022
    Copy the full SHA
    525198a View commit details
    Browse the repository at this point in the history

  19. all but Java, Node, PHP, Go work now for the huge lexer file; I have … 

    …set them to ignore. note that the swift target takes over a minute to lex it. I've turned off Node but it does not seem to terminate but it could terminate eventually.
    @parrt
    parrt committed Mar 19, 2022
    Copy the full SHA
    e154984 View commit details
    Browse the repository at this point in the history

  20. all but Java, Node, PHP, Go work now for the huge lexer file; I have … 

    …set them to ignore. note that the swift target takes over a minute to lex it. I've turned off Node but it does not seem to terminate but it could terminate eventually.
    @parrt
    parrt committed Mar 19, 2022
    Copy the full SHA
    46b5166 View commit details
    Browse the repository at this point in the history

  21. Turn off this big lexer because we get memory errors during continuou… 

    …s integration
    @parrt
    parrt committed Mar 19, 2022
    Copy the full SHA
    bef2f0a View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2022

  1. Intermediate commit where I have shuffled around all of the -1 flippi… 

    …ng and bumping by two. work still needs to be done because the token stream rewriter stuff fails. and I assume the other decoding for human readability testing if doesn't work
    @parrt
    parrt committed Mar 20, 2022
    Copy the full SHA
    fcef8c9 View commit details
    Browse the repository at this point in the history

  2. convert decode to use int[]; remove dead code. don't use serializeAsC… 

    …har stuff. more tests pass.
    @parrt
    parrt committed Mar 20, 2022
    Copy the full SHA
    7f7cb03 View commit details
    Browse the repository at this point in the history

  3. more tests passing. simplify. When copying atn, must run ATN through … 

    …serializer to set some state flags.
    @parrt
    parrt committed Mar 20, 2022
    Copy the full SHA
    fe06578 View commit details
    Browse the repository at this point in the history

  4. 0xFFFD+ are not valid char

    @parrt
    parrt committed Mar 20, 2022
    Copy the full SHA
    985f5d9 View commit details
    Browse the repository at this point in the history

  5. clean up. tests passing now

    @parrt
    parrt committed Mar 20, 2022
    Copy the full SHA
    bb0d06a View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2022

  1. huge clean up. Got Java working with 32-bit ATNs!Still working on cle… 

    …anup but I want to run the tests
    @parrt
    parrt committed Mar 21, 2022
    Copy the full SHA
    437f9b6 View commit details
    Browse the repository at this point in the history

  2. Cleanup the hack I did earlier; everything still seems to work

    @parrt
    parrt committed Mar 21, 2022
    Copy the full SHA
    6f30e75 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2022

  1. Use linux DCO not our old contributors certificate of origin

    @parrt
    parrt committed Mar 22, 2022
    Copy the full SHA
    b0f8551 View commit details
    Browse the repository at this point in the history

  2. remove bump-by-2 code

    @parrt
    parrt committed Mar 22, 2022
    Copy the full SHA
    a2cf73f View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2022

  1. clean up per @KvanTTT. Can't test locally on this box. Will see what … 

    …CI says.
    @parrt
    parrt committed Mar 25, 2022
    Copy the full SHA
    d7293dd View commit details
    Browse the repository at this point in the history

  2. tweak comment

    @parrt
    parrt committed Mar 25, 2022
    Copy the full SHA
    40c035e View commit details
    Browse the repository at this point in the history

  3. Merge branch 'dev' of github.com:antlr/antlr4 into dev

    @parrt
    parrt committed Mar 25, 2022
    Copy the full SHA
    1c66fae View commit details
    Browse the repository at this point in the history

  4. Merge branch 'dev' into ATN-to-signed-ints

    @parrt
    parrt committed Mar 25, 2022
    Copy the full SHA
    11ae041 View commit details
    Browse the repository at this point in the history

  5. Revert "Use linux DCO not our old contributors certificate of origin" 

    This reverts commit b0f8551.
    @parrt
    parrt committed Mar 25, 2022
    Copy the full SHA
    db76a47 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'dev' into ATN-to-signed-ints

    @parrt
    parrt committed Mar 25, 2022
    Copy the full SHA
    6b2b6a2 View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2022

  1. see if C++ works in CI for huge ATN

    @parrt
    parrt committed Mar 26, 2022
    Copy the full SHA
    1aa5f18 View commit details
    Browse the repository at this point in the history