Commit Graph

5344 Commits

Author SHA1 Message Date
parrt b4d8982e95 Merge branch 'master' of git://github.com/NoodleOfDeath/antlr4 2016-11-17 10:31:43 -08:00
Terence Parr cf5a79a5b2 Merge pull request #1362 from sridharxp/stgwotempvar
Stgwotempvar
2016-11-17 19:26:34 +01:00
parrt ba4cf0677b run tests in parallel on travis 2016-11-17 10:21:40 -08:00
Terence Parr c37848cfc5 Merge pull request #1366 from parrt/multi-threaded-tests
update doc, add lock so antlr used atomically in unit tests so we can run in parallel
2016-11-17 00:45:13 +01: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
Terence Parr 30fbe07b2b Merge pull request #1365 from parrt/add-postfix-types-in-args
Add postfix types in args like x:T for Swift target
2016-11-16 21:42:40 +01: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
hanjoes 03fa75efba differentiate prefix/postfix type decl. 2016-11-16 11:44:39 -08:00
Terence Parr 3abb193257 Merge pull request #1363 from DanMcLaughlin/master
Some fixes in the C++ runtime
2016-11-16 19:38:15 +01:00
Terence Parr 7efb6c240a Merge pull request #1364 from ericvergnaud/fix-c#-tests
enable target specific assertXxx behaviour
2016-11-16 19:37:23 +01:00
Eric Vergnaud 04a3401655 disabling legacy tests because the overall build process is too long for travis 2016-11-17 02:12:29 +08:00
Eric Vergnaud c35aec6ffe optionally delegate assertEquals to RuntimeTestSupport delegate, to enable target specific assertXxx behaviour 2016-11-17 01:11:24 +08:00
Mike Lischke 3062d09e92 Merge pull request #48 from FloorGoddijn/master
using new preprocessor macro ANTLR4CPP_DLL instead of _WINDLL
2016-11-16 15:27:11 +01:00
Mike Lischke 9ac9c1c79a Overhaul of the TokenStreamRewriter class.
Fixes bug #49.
2016-11-16 15:17:46 +01:00
Mike Lischke e5aa03c0b0 Merge branch 'master_upstream' 2016-11-16 13:31:06 +01:00
Mike Lischke af0ac9e2bb Fixed a number of mem leaks in TokenStreamRewriter.
Also added a workaround for duplicate ATN state transitions. Looks there is a problem in the ATN generation by ANTLR which needs investigation.
2016-11-16 13:27:58 +01:00
sridharxp 13fbdbb840 Sign CLA 2016-11-16 13:24:16 +05:30
sridharxp 6e09f08348 InvokeRule without Fix without Temporary variable 2016-11-16 13:14:38 +05:30
Terence Parr 56c5508a37 Merge pull request #1358 from hanjoes/master
Adding hanjoes to contributors.txt.
2016-11-16 02:22:25 +01:00
hanjoes 35782f59ad Adding hanjoes to contributors.txt. 2016-11-15 14:59:21 -08:00
Terence Parr 4290bdbaa0 Merge pull request #1357 from parrt/doc-runtimetests
Update doc on runtime tests
2016-11-15 23:26:11 +01:00
parrt d534efdf9a update doc on the runtime test mechanism. change the name of BaseDebugParserTestDescriptor to BaseDiagnosticParserTestDescriptor. 2016-11-15 14:25:28 -08:00
parrt a7ecf0332f rename the SingleTest class and and Java doc. make errors="" actually set to null to be more clear. 2016-11-15 13:42:57 -08:00
parrt ccad5bd9bc merge in new runtime test mechanism 2016-11-15 11:19:55 -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
Terence Parr 253cd172a4 Merge pull request #1351 from DanMcLaughlin/master
Fixes to make the C++ target run on Travis
2016-11-15 02:22:41 +01:00
parrt ef29c1db71 travis updated to use jdk7 not 6 2016-11-14 12:36:32 -08:00
parrt ea7a61c483 Fixes #1327, Fixes #1352 2016-11-14 11:02:04 -08:00
Mike Lischke 8450599e75 Enable tests for all targets. 2016-11-12 22:40:11 +01:00
Mike Lischke 74d094bee7 Merge branch 'master_upstream' 2016-11-10 20:35:10 +01:00
Mike Lischke bed38c6b08 Cleaning up for production use. Tests succeed now.
Also re-enabled all tests, so we can merge upstream.
2016-11-10 11:40:22 +01:00
Mike Lischke e6703267d9 Don't let compiler warnings make the tests fail.
Added debug print for better error recognition.
2016-11-10 11:13:20 +01:00
Mike Lischke da57be191a Avoid warnings when building on Linux. 2016-11-10 10:28:13 +01:00
Mike Lischke 0a6717596f Preload the antlr runtime for tests on Linux (e.g. Travis). 2016-11-10 10:08:03 +01:00
Mike Lischke 90b3698157 Simplified running commands on command line from Java. 2016-11-09 17:51:43 +01:00
Mike Lischke d3d5126774 Need the test folder content. 2016-11-09 16:22:03 +01:00
Mike Lischke dec5aae9ec Bring back the sym-linked lib but use the correct one. 2016-11-09 16:01:51 +01:00
Mike Lischke 510a895a08 Need to see the lib folder. 2016-11-09 15:13:01 +01:00
Mike Lischke ea17830f32 Link failed with sym-linked library in local dir, so link directly. 2016-11-09 14:40:22 +01:00
Mike Lischke 2593b1a20d Trying to find linker error. 2016-11-09 14:04:22 +01:00
Floor 916d602561 Merge remote-tracking branch 'refs/remotes/DanMcLaughlin/master' 2016-11-09 13:46:22 +01:00
Floor e0090254aa using new preprocessor macro ANTLR4CPP_DLL in stead of the windows defined _WINDLL to define ANTLR4CPP_PUBLIC and EXPIMP_TEMPLATE for dll configurations.
There was a problem when the static lib was used at a client dll ( which itself defines the _WINDLL)
2016-11-09 13:45:37 +01:00
Mike Lischke 0da507aa1d Let's try clang++. 2016-11-09 13:29:28 +01:00
Mike Lischke 490604b102 Focus on a single compiler to ease debugging. 2016-11-09 13:17:44 +01:00
Mike Lischke 57f2a157ee Search explicitly for clang-3.6++
When installing a different clang version in Travis the original clang++ binary is no longer available.
2016-11-09 11:54:45 +01:00
Mike Lischke 6535df81c8 sudo is required 2016-11-09 11:32:22 +01:00
Mike Lischke ca9ee65da9 Enabled docker builds in Travis + require a more modern clang compiler. 2016-11-09 11:29:32 +01:00
Mike Lischke b9307b548f g++5 couldn't be found, so try clang++ instead. 2016-11-09 11:04:28 +01:00
Mike Lischke dbaf5189bc We need g++5 for C++11 with codecvt. 2016-11-09 10:54:00 +01:00