Commit Graph

2102 Commits

Author SHA1 Message Date
Mike Lischke 218ae73608 Make return states the same size as the parent array.
Both arrays have always the same size and after reducing common parents in a prediction context optimization we also have to update the states array.
2016-12-21 10:36:46 +01:00
Mike Lischke e1fb0b68c7 C++ implementation of the LR-loop optimization. 2016-12-21 09:26:08 +01:00
Mike Lischke d324e9a46b Merge branch 'master' into LR-loop-fix 2016-12-19 16:48:10 +01:00
Terence Parr fed8c97bda Merge pull request #1524 from ericvergnaud/improve-javascript-doc
Update npm related docs
2016-12-16 09:22:53 -08:00
Terence Parr 8df5550857 Merge pull request #1511 from mike-lischke/issue-1483
Issue 1483
2016-12-16 09:22:13 -08:00
Eric Vergnaud 14f0c7a663 also published to npm 2016-12-17 00:03:03 +08:00
parrt c4c2966dbd update doc 2016-12-15 20:42:29 -08:00
parrt 23313ee44e [maven-release-plugin] prepare for next development iteration 2016-12-15 14:25:41 -08:00
parrt aacd2a2c95 [maven-release-plugin] prepare release 4.6 2016-12-15 14:25:36 -08:00
parrt 7f95781321 update doc with more detail on building c# 2016-12-15 12:44:44 -08:00
parrt 586b36fe94 tweak doc. update assembly name to Antlr4.Runtime.Standard 2016-12-15 12:28:32 -08:00
parrt 3c1a34d005 add this to 'building a release doc' 2016-12-15 12:21:36 -08:00
Eric Vergnaud 321a6f2844 create and document NuGet packaging process 2016-12-15 12:01:10 -08:00
Eric Vergnaud 07f6e3a681 modify output paths 2016-12-15 12:01:10 -08:00
Eric Vergnaud cf87c2371e cleanup 2016-12-15 12:01:10 -08:00
Eric Vergnaud d4e1f80cab updated the page 2016-12-15 12:01:10 -08:00
parrt 484dd62a39 Merge branch 'master' of github.com:antlr/antlr4 2016-12-14 13:33:00 -08:00
Terence Parr dd2f0a964f Merge pull request #1509 from janyou/Fixes-1073
Fixes #1073 for Swift target
2016-12-14 13:25:46 -08:00
Terence Parr fd3bd91828 Merge pull request #1508 from janyou/Fixes-1298
Fixes #1298 for Swift target
2016-12-14 13:25:27 -08:00
Terence Parr 8b75e3fc5b Merge pull request #1505 from janyou/Fixes-1238-994
Swift target Fixes #1238, Fixes #994
2016-12-14 13:25:04 -08:00
Terence Parr 64a8c32138 Merge pull request #1506 from janyou/Fixes-1042
Fixes #1042 Swift target
2016-12-14 13:24:31 -08:00
Terence Parr 17bad8ae69 Merge pull request #1512 from mike-lischke/master
C++ implementation for #1484
2016-12-14 13:23:24 -08:00
parrt 8af4c38991 try appveyor with tweak to cmake config. 2016-12-14 12:54:03 -08:00
Mike Lischke 76fcb6d37e C++ implementation for #1484. 2016-12-14 17:34:03 +01:00
Mike Lischke 3b5c2a34d2 Implemented enhanced CommonToken::toString method. Fixes #1483. 2016-12-14 17:04:05 +01:00
Mike Lischke 50df59fea8 Removed obsolete macros. 2016-12-14 14:30:33 +01:00
janyou 0c835a248a Fixes #1298 2016-12-14 11:58:53 +08:00
janyou be1b070a1a Fixes #1073 2016-12-14 11:40:07 +08:00
janyou f964dd4af0 Fixes #1042 2016-12-14 11:14:02 +08:00
janyou c9508b74a4 Fixes #1238, Fixes #994 2016-12-14 09:09:40 +08:00
parrt 81aaeb199b tweak 2016-12-13 13:28:39 -08:00
Terence Parr f35576a7f2 Merge pull request #1491 from mike-lischke/master
Fix for multithreading issues
2016-12-13 11:35:11 -08:00
Terence Parr 65982518ef Merge pull request #1499 from ericvergnaud/fix-#1496
fix unicode issue in Python 2
2016-12-13 10:37:03 -08:00
Mike Lischke 7362152b7c Merge branch 'master_upstream' 2016-12-13 17:46:18 +01:00
Mike Lischke 1eeaf20aa0 Initial implementation of the LR loop optimization in the C++ target.
There is an issue with the tests. Some hang forever. Need to investigate yet.
2016-12-13 17:45:23 +01:00
parrt a69299c507 set javadoc to deploy phase. 2016-12-13 08:17:13 -08:00
Mike Lischke 0ea8ede5b9 Changed cmake target install dir to an own subfolder for antlr.
Otherwise all headers end up in the include/ root, which is a pain and very unconventional.
2016-12-13 16:28:38 +01:00
Eric Vergnaud e15e88a049 fix unicode issue 2016-12-13 21:33:19 +08:00
Mike Lischke 8bb522dd4e Unicode debug output works in VS 2015 intermediate window.
I updated the comments in the demo app about this.
2016-12-13 13:52:30 +01:00
Mike Lischke f003cce7d9 Fixed a build problem on Windows.
The import and export declspecs were wrong and lead to missing symbols when using static class members.
Additionally I added a VS2015 solution for the demo, updated the generation script to use the new ANTLR4 jar and fixed a warning.
2016-12-13 13:40:58 +01:00
Mike Lischke c1a5553afb Build fix for new multi-threading lock.
In XCode it wasn't necessary to add the condition_variable header (probably included indirectly), while for other platforms that is necessary.
2016-12-13 09:03:21 +01:00
Mike Lischke 31b259e636 Merge branch 'master_upstream' 2016-12-13 09:00:13 +01:00
parrt 2739a0c9ef Fixes #1492. only create javadoc if we use `mvn -DskipTests javadoc:jar install` 2016-12-12 17:33:39 -08:00
Terence Parr aea034cb45 Merge pull request #1493 from ericvergnaud/realign-csharp-runtime
Realign CSharp runtime with Java runtime, implements #1441
2016-12-12 16:54:36 -08:00
Eric Vergnaud edaeaadf99 Fixes #1042 2016-12-13 00:17:02 +08:00
Eric Vergnaud 9df5f3d571 Fix VS2013 project 2016-12-13 00:05:13 +08:00
Eric Vergnaud caa581a9e0 success! 2016-12-12 23:52:09 +08:00
Eric Vergnaud 39de8896f8 Merge branch 'master' into realign-csharp-runtime 2016-12-12 21:54:26 +08:00
Eric Vergnaud 2fc33d97cd all tests pass! 2016-12-12 21:36:41 +08:00
Terence Parr 2e59dc2184 Merge pull request #1469 from gaulouis/issue-1461
Fix conflict lexer command in CppTarget demo
2016-12-11 15:14:14 -08:00