parrt
2c99f187a0
make it read "Copyright (c) 2012-2016 The ANTLR Project"
2016-12-08 11:43:06 -08:00
parrt
1b1a9862c4
contributors->authors
2016-12-08 11:43:06 -08:00
parrt
61e8eba4fc
fix typo
2016-12-08 11:43:06 -08:00
parrt
891915de84
Update copyright on java, xml files. Make BSD license conform to standard.
2016-12-08 11:40:30 -08:00
Ivan Kochurkin
4e4b902c20
Added test testLabelsForTokensWithMixedTypes.
2016-12-07 22:40:07 +03:00
Terence Parr
abed9e733a
Merge pull request #1449 from KvanTTT/duplicated_and_nonsensical_commands_1388
...
Duplicated and incompatible commands
2016-12-05 13:40:10 -08:00
Ivan Kochurkin
0e1b5d9d7a
Merge branch 'command_wrong_id_1411' into duplicated_and_nonsensical_commands_1388
...
# Conflicts:
# tool/src/org/antlr/v4/tool/ErrorType.java
2016-12-04 03:57:11 +03:00
Terence Parr
f11a380609
Merge pull request #1417 from KvanTTT/command_wrong_id_1411
...
ANTLR generates a wrong lexer code if type, channel or mode commands use inproper identifier
2016-12-03 16:55:23 -08:00
Ivan Kochurkin
4e2f50aef8
Added new error types for not recognized token, mode or channel name.
2016-12-04 03:47:28 +03:00
parrt
c959bf649b
Fixes #550 by @lygav, which tweaks and more tests by me.
2016-12-03 10:25:02 -08:00
Ivan Kochurkin
9aab338021
Reverted old error types and numbers.
2016-11-29 19:12:43 +03:00
Ivan Kochurkin
f76ca22763
MODE_CONFLICTS_WITH_TOKEN error restored.
2016-11-29 18:13:57 +03:00
Ivan Kochurkin
8fe4def4ed
Warnings for incompatible commands, added unit-test, fixes #1388 .
...
Improved test for duplicated commands (added pushMode, popMode).
2016-11-29 16:03:33 +03:00
Ivan Kochurkin
bd1111ffa3
Fixed issue with duplicated commands in lexer rule.
2016-11-28 19:48:35 +03:00
Ivan Kochurkin
a1def96500
getConstantValue replaced with getModeConstantValue, getTokenConstantValue and getChannelConstantValue methods.
...
ErrorType simplified, tests fixed.
Fixes #1411 , added unit-test.
2016-11-28 14:41:04 +03:00
parrt
6c2d4e6225
Fixes #1211
2016-11-22 15:04:28 -08:00
parrt
dc2c9b039e
Fixes #1188
2016-11-22 14:21:07 -08:00
parrt
007a445be4
factor antlr() out of target test files into single spot
2016-11-22 11:58:23 -08:00
parrt
4e6e7edf0d
Fixes #1317
2016-11-21 13:45:05 -08:00
parrt
d0620a65f5
Merge branch 'issue#1295' of git://github.com/harriman/antlr4-updates into harriman-issue#1295
2016-11-19 12:05:32 -08:00
parrt
5153154658
Merge branch 'fix_typos' of git://github.com/sebkur/antlr4 into sebkur-fix_typos
2016-11-19 11:52:17 -08:00
parrt
78155af499
add test to verify https://github.com/antlr/antlr4/issues/1369 doesn't drop two empty alts.
2016-11-17 13:25:41 -08:00
parrt
c5acec19db
Move what used to be AfterGrammar template from a test in legacy runtime tests to tool test and remove from runtime test functionality.
2016-11-17 13:05:34 -08:00
parrt
1aa3c957eb
add test for extra atn issues. currently failing.
2016-11-17 12:27:32 -08:00
Kurt Harriman
ab8d17472f
ANTLR4 generated incorrect code to access return value of recursive rule
...
Incorrect code was generated for $e.v in a rule like this one:
e returns [int v] ::=
INT {$v = $INT.int;}
| '(' e ')' {$v = $e.v;}
;
After parsing "(99)" the result would have v == 0 instead of 99.
2016-11-16 22:38:11 -08:00
parrt
9675c822a9
update doc, add lock so antlr used atomically in unit tests so we can run in parallel.
2016-11-16 15:42:45 -08:00
parrt
4f3c7738f3
ignore :: in C++ arg declarations; add test.
2016-11-16 12:34:14 -08:00
parrt
5aae2edb24
support x:T notation in rule arguments, update documentation, improve [...] scope parsing testing
2016-11-16 11:54:23 -08:00
parrt
08e9776a4a
shift template-based runtime test to legacy, new mechanism uses annotation to get multi-line strings into java. all tests pass minus about 15 in C#
2016-11-15 11:08:19 -08:00
Mike Lischke
3b3fe3da57
Merge branch 'master_upstream'
...
Had to resolve a number of conflicts + added code required for the C++ target to generate header files, after the recent changes in the main repo.
2016-11-07 11:16:02 +01:00
parrt
95c850e5f8
set version in prep for 4.6
2016-11-05 16:48:36 -07:00
Sebastian Kürten
f134ef930f
Fix the expected error message in test
2016-11-01 13:02:14 +01:00
David Sisson
cbe9c2f1f7
Returned other tests to active duty.
2016-05-06 20:19:48 -07:00
David Sisson
f018236ad7
Added minimum set of files.
2016-05-05 21:56:13 -07:00
parrt
b92f22769e
[maven-release-plugin] prepare for next development iteration
2016-03-30 16:25:49 -07:00
parrt
567fcc6311
[maven-release-plugin] prepare release antlr4-master-4.5.3
2016-03-30 16:25:45 -07:00
parrt
b78e0e9c1e
add test and a guard in action translator. minor. Relates to https://github.com/antlr/antlr4/issues/1143
2016-03-30 11:17:57 -07:00
parrt
9e98714a1d
Add ability to set parse tree internal node super class with option contextSuperClass. Provide impl in Java target that has altNum backing field. Add test across targets to set/get alt num. Fixes #1152 .
2016-03-30 11:00:47 -07:00
parrt
08f3ad798e
[maven-release-plugin] prepare for next development iteration
2016-01-29 15:29:01 -08:00
parrt
c5a296596d
[maven-release-plugin] prepare release 4.5.2
2016-01-29 15:28:57 -08:00
parrt
fa6f674e33
[maven-release-plugin] rollback the release of 4.5.2
2016-01-29 15:27:40 -08:00
parrt
009f3cac3a
[maven-release-plugin] prepare release 4.5.2
2016-01-29 15:27:19 -08:00
parrt
6b31ceaa9d
[maven-release-plugin] rollback the release of 4.5.2
2016-01-29 15:26:02 -08:00
parrt
6b3f9816cb
[maven-release-plugin] prepare for next development iteration
2016-01-29 14:13:15 -08:00
parrt
b446c50722
[maven-release-plugin] prepare release 4.5.2
2016-01-29 14:13:11 -08:00
Terence Parr
99563b116e
merging KvanTTT changes.
2015-12-08 11:38:08 -08:00
Ivan Kochurkin
d692e1f0d9
Fixed @sharwell remarks: typos and etc.
2015-10-28 13:22:21 +03:00
Ivan Kochurkin
8bf480dcc5
Fixed non-informative NullPointerException. Empty strings now not allowed. fixed #959 .
2015-10-12 16:33:32 +03:00
Ivan Kochurkin
a7a9804ecd
Restrict certain token, channel, mode names. fixed #1015
...
Clear error (can not use or declare mode with reserved name) instead of "Serialized ATN data element out of range." exception from #967 .
2015-10-07 23:15:21 +03:00
Ivan Kochurkin
935c25b110
Removed wildcard imports.
...
Fixed test with equal mode and token name.
2015-10-07 17:57:16 +03:00
Ivan Kochurkin
a87ac8664b
Error in case of mode conflicts with token. fixed #996
2015-10-06 17:39:01 +03:00
HSorensen
417c208787
Merge pull request #1 from antlr/master
...
Update to origin head
2015-09-24 21:12:17 -07:00
Eric Vergnaud
95578de8c6
fix maven warning
2015-09-19 00:02:32 +08:00
parrt
c07aa4ede1
[maven-release-plugin] prepare for next development iteration
2015-08-20 12:11:58 -07:00
parrt
3611fde621
[maven-release-plugin] prepare release 4.5.1-1
2015-08-20 12:11:55 -07:00
nttdatahenriksorensen
1072ace723
remove uncessary sourceName variable
2015-08-14 21:02:55 -07:00
nttdatahenriksorensen
63200907d6
Fix whitespace damage
2015-08-14 21:01:42 -07:00
nttdatahenriksorensen
86980fae90
Proper check of JavaLR vs Java grammar
2015-08-14 17:36:46 -07:00
nttdatahenriksorensen
c158777c60
Rename tool-testsuite/test/org.antlr.v4.test.tool.Java-LR.g4 to
...
JavaLR.g4
2015-08-14 16:52:09 -07:00
parrt
3d181af904
[maven-release-plugin] prepare for next development iteration
2015-07-15 14:45:48 -07:00
parrt
79dae1e6f6
[maven-release-plugin] prepare release 4.5.1
2015-07-15 14:45:45 -07:00
Terence Parr
b395127e73
move swing related stuff out of runtime package into org.antlr.v4.gui
2015-07-14 14:29:41 -07:00
Jason van Zyl
fd13f137f2
All projects are now building and tests passing from Maven
2015-06-29 18:09:39 -07:00
Terence Parr
8c255b9a12
trying to get tests to run
2015-06-29 18:09:38 -07:00
Terence Parr
e921ba69c8
tweak java version
2015-06-29 18:09:38 -07:00
Terence Parr
dec5d26a3d
tweak pom so it compiles in `compile` phase and `install` phase but doesn't run tests correctly.
2015-06-29 18:09:37 -07:00
parrt
1cd4ad125c
add import for BaseTest so tool tests compile. it all appears to compile and tool tests pass.
2015-06-29 18:09:33 -07:00
parrt
0430833450
move ErrorQueue, used by BaseTest, to the runtime test area.
2015-06-29 18:09:32 -07:00
parrt
8ae7f22f86
move BaseTest to be in the runtime test area to be consistent with other targets.
2015-06-29 18:09:32 -07:00
parrt
fdcfe5482f
mv tool tests into their own top level directory; mv test template support .stg into the runtime-testsuite area
2015-06-29 18:09:32 -07:00