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.

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

Updates antlr4 #170

Merged
merged 2 commits into from
Feb 5, 2024
Merged

Updates antlr4 #170

merged 2 commits into from
Feb 5, 2024

Conversation

ncordon
Copy link
Collaborator

@ncordon ncordon commented Feb 1, 2024

Rebases the upstream version of antlr4.

johannesheesterman and others added 2 commits February 1, 2024 10:00
Signed-off-by: Johannes Heesterman <johannes@elfsquad.io>
* added DEFAULT_CHANNEL and HIDDEN_CHANNEL constants

based on:
https://github.com/antlr/antlr4/blob/ebb511a04a60ae5a605aba65471c07dd854e9303/runtime/JavaScript/src/antlr4/Token.js#L59

https://github.com/antlr/antlr4/blob/ebb511a04a60ae5a605aba65471c07dd854e9303/runtime/JavaScript/src/antlr4/Token.js#L65
Signed-off-by: Robert Einhorn <robert.einhorn.hu@gmail.com>

* added DEFAULT_CHANNEL and HIDDEN_CHANNEL constants

antlr/antlr4#4110 (comment)
Signed-off-by: Robert Einhorn <robert.einhorn.hu@gmail.com>

---------

Signed-off-by: Robert Einhorn <robert.einhorn.hu@gmail.com>
@CLAassistant
Copy link

CLAassistant commented Feb 1, 2024

CLA assistant check
All committers have signed the CLA.

@ncordon ncordon merged commit 8ab3370 into main Feb 5, 2024
4 checks passed
@ncordon ncordon deleted the updates-antlr4 branch February 5, 2024 11:19
ncordon added a commit that referenced this pull request Feb 5, 2024
* fix: TypeScript: incorrect type in CommonTokenStream

Signed-off-by: Johannes Heesterman <johannes@elfsquad.io>

* added Token.DEFAULT_CHANNEL and Token.HIDDEN_CHANNEL (#4516)

* added DEFAULT_CHANNEL and HIDDEN_CHANNEL constants

based on:
https://github.com/antlr/antlr4/blob/ebb511a04a60ae5a605aba65471c07dd854e9303/runtime/JavaScript/src/antlr4/Token.js#L59

https://github.com/antlr/antlr4/blob/ebb511a04a60ae5a605aba65471c07dd854e9303/runtime/JavaScript/src/antlr4/Token.js#L65
Signed-off-by: Robert Einhorn <robert.einhorn.hu@gmail.com>

* added DEFAULT_CHANNEL and HIDDEN_CHANNEL constants

antlr/antlr4#4110 (comment)
Signed-off-by: Robert Einhorn <robert.einhorn.hu@gmail.com>

---------

Signed-off-by: Robert Einhorn <robert.einhorn.hu@gmail.com>

---------

Signed-off-by: Johannes Heesterman <johannes@elfsquad.io>
Signed-off-by: Robert Einhorn <robert.einhorn.hu@gmail.com>
Co-authored-by: Johannes Heesterman <johannes@elfsquad.io>
Co-authored-by: Robert Einhorn <robert.einhorn.hu@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants