Skip to content

Commit 840f7e0

Browse files
kaby76rvrooman-codelogic
authored andcommitted
Fixes for antlr#3539--clean up of python3 grammars (antlr#3540)
* Fixes for antlr#3539 Typescript cannot work because the declaration of the constructor for CommonToken() is wrong. * Fix python/python3/TypeScript * Remove grammars that only add to confusion. * Update Dart port, but this cannot work because Antlr 4.13.0 Dart runtime missing types. * Add Dart port for python3 grammar. This base class for Dart works, but requires changes to Antlr. antlr/antlr4#4321 * Updates, but incomplete, for Cpp. * Additional changes. * Updates to get Cpp target to link. * Changes for working Cpp target. * Add in Cpp to workflow. * Updates. * Adjust to for rebuild. * Remove bothersome tabs from source code. * Rename tests into "small" and "large" tests to reflect that "slow parsers work on the small test suite". * Fix names of test directories in desc.xml. * Update for Go target. Remove python3-cpp. * Getting Go target compiling--does not work yet. * Fixes for Go target of python3 grammar. This port works but only if the Go runtime is fixed, and "Virt" is assigned in the driver. See antlr/antlr4#4343 antlr/antlr4#4342 * Fix desc.xml
1 parent 094fb3a commit 840f7e0

File tree

105 files changed

+850
-8031
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+850
-8031
lines changed

.config/dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,4 +63,4 @@
6363
]
6464
}
6565
}
66-
}
66+
}

.config/dotnet-tools.json.save

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,64 +3,64 @@
33
"isRoot": true,
44
"tools": {
55
"trcaret": {
6-
"version": "0.20.27",
6+
"version": "0.21.0",
77
"commands": [
88
"trcaret"
99
]
1010
},
1111
"trcover": {
12-
"version": "0.20.27",
12+
"version": "0.21.0",
1313
"commands": [
1414
"trcover"
1515
]
1616
},
1717
"trgen": {
18-
"version": "0.20.27",
18+
"version": "0.21.0",
1919
"commands": [
2020
"trgen"
2121
]
2222
},
2323
"triconv": {
24-
"version": "0.20.27",
24+
"version": "0.21.0",
2525
"commands": [
2626
"triconv"
2727
]
2828
},
2929
"trparse": {
30-
"version": "0.20.27",
30+
"version": "0.21.0",
3131
"commands": [
3232
"trparse"
3333
]
3434
},
3535
"trtext": {
36-
"version": "0.20.27",
36+
"version": "0.21.0",
3737
"commands": [
3838
"trtext"
3939
]
4040
},
4141
"trwdog": {
42-
"version": "0.20.27",
42+
"version": "0.21.0",
4343
"commands": [
4444
"trwdog"
4545
]
4646
},
4747
"trxgrep": {
48-
"version": "0.20.27",
48+
"version": "0.21.0",
4949
"commands": [
5050
"trxgrep"
5151
]
5252
},
5353
"trxml": {
54-
"version": "0.20.27",
54+
"version": "0.21.0",
5555
"commands": [
5656
"trxml"
5757
]
5858
},
5959
"trxml2": {
60-
"version": "0.20.27",
60+
"version": "0.21.0",
6161
"commands": [
6262
"trxml2"
6363
]
6464
}
6565
}
66-
}
66+
}

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ jobs:
118118
fail-fast: false
119119
matrix:
120120
os: [macos-latest, ubuntu-latest]
121-
language: [ CSharp, Dart, Java, JavaScript, Go, Python3, TypeScript ]
121+
language: [ Cpp, CSharp, Dart, Java, JavaScript, Go, Python3, TypeScript ]
122122
steps:
123123
- name: Info
124124
shell: bash

_scripts/templates/CSharp/st.makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Generated from trgen <version>
2-
build:
2+
build: FORCE
33
bash build.sh
4-
clean:
4+
clean: FORCE
55
bash clean.sh
66
FORCE: ;
77
test: FORCE
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
./bin/Debug/net7.0/<if(os_win)>Test.exe<else>Test<endif> $@
1+
./bin/Debug/net7.0/<if(os_win)>Test.exe<else>Test<endif> "$@"

_scripts/templates/Cpp/st.makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Generated from trgen <version>
2-
build:
2+
build: FORCE
33
bash build.sh
4-
clean:
4+
clean: FORCE
55
bash clean.sh
66
FORCE: ;
77
test: FORCE

_scripts/templates/Cpp/st.run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
./build/<if(os_win)>Release/<endif><exec_name> $@
1+
./build/<if(os_win)>Release/<endif><exec_name> "$@"

_scripts/templates/Dart/st.makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Generated from trgen <version>
2-
build:
2+
build: FORCE
33
bash build.sh
4-
clean:
4+
clean: FORCE
55
bash clean.sh
66
FORCE: ;
77
test: FORCE

_scripts/templates/Dart/st.run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Test.exe $@
1+
./Test.exe "$@"

_scripts/templates/Go/st.makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Generated from trgen <version>
2-
build:
2+
build: FORCE
33
bash build.sh
4-
clean:
4+
clean: FORCE
55
bash clean.sh
66
FORCE: ;
77
test: FORCE

0 commit comments

Comments
 (0)