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
Terence Parr
ec5f2ecf31
Merge pull request #1498 from parrt/fix-1299
...
Fixes #1299 . matching a set didn't properly notify error strategy of a successful match
2016-12-13 08:30:49 -08: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
068a13e0f8
Update all other targets
2016-12-12 18:09:55 -08:00
parrt
b11ff9636a
Fixes #1299 . matching a set didn't properly notify error strategy of a successful match.
2016-12-12 17:54:53 -08: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
Terence Parr
e279cd699e
Merge pull request #1494 from ericvergnaud/fix-#1298-for-JavaScript
...
Fix #1298 for JavaScript
2016-12-12 16:08:47 -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
parrt
b2d67261f2
fix contributor
2016-12-11 15:15:23 -08:00
Terence Parr
08a8e30864
Merge pull request #1470 from gaulouis/issue-1457
...
Issue 1457
2016-12-11 15:14:36 -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
Terence Parr
7cf5688760
Merge pull request #1468 from gaulouis/issue-1443
...
Fix compilation error for CppTarget demo on Linux
2016-12-11 15:13:45 -08:00
gaulouis
fac04c8b79
Update contributors.txt
2016-12-12 00:07:03 +01:00
gaulouis
2d3377c94e
Update contributors.txt
2016-12-12 00:03:58 +01:00
gaulouis
5ff27de71c
Update contributors.txt
2016-12-12 00:01:54 +01:00
parrt
de39b929e1
tweak github templates
2016-12-11 14:57:50 -08:00
parrt
42086eff6e
Fix #980
2016-12-11 14:56:11 -08:00
Terence Parr
6a20919cb7
Merge pull request #1476 from renatahodovan/python-target-1472
...
Implement the fix of #1298 for Python targets.
2016-12-11 14:49:28 -08:00
Terence Parr
c7e27664c2
Merge pull request #1471 from renatahodovan/visit-error-node
...
Call visitErrorNodes properly in Python targets.
2016-12-11 14:48:21 -08:00
Terence Parr
2b99487335
Merge pull request #1487 from renatahodovan/js-errornode
...
Implement the fix in #1471 for JavaScript target.
2016-12-11 14:47:53 -08:00
Eric Vergnaud
0170c9a064
Good progress with parser
2016-12-12 02:00:09 +08:00
parrt
bc62f9f3a7
get proper manifest into runtime jar
2016-12-11 09:51:21 -08:00
parrt
aa5f782bdb
update doc
2016-12-11 09:48:24 -08:00
Eric Vergnaud
19d70cd777
TestLexerExec tests pass
2016-12-12 00:52:09 +08:00
Eric Vergnaud
612e3399ff
Merge remote-tracking branch 'forked/master' into realign-csharp-runtime
2016-12-11 20:30:14 +08:00
Eric Vergnaud
10a1580448
compiles
2016-12-11 20:29:05 +08:00
Mike Lischke
31a6cc84a9
Merge branch 'master_upstream'
2016-12-11 12:57:02 +01:00
Mike Lischke
4aaa0bfb5a
Better synchronization for multithreading - fixes issue #1435
...
- The shared mutexes were defined as normal instance variables in a simulator, so the locks didn't work (multiple instances of simulators active). By making them static (which is more appropriate anyway, since we are protecting static data) the synchroniation now works.
- For better performance an own class for multiple read/single write locks was added and used instead of the shared mutexes.
- Made the static wstring_covvert instance local variables in ws2s and s2ws. Otherwise we would also need a mutext to protect it.
- Some other minor changes.
2016-12-11 12:53:24 +01:00
Terence Parr
951bc0861b
Merge pull request #1488 from parrt/add-src-javadoc-jars
...
Add src javadoc jars
2016-12-10 18:30:33 -08:00
parrt
0dae6359ec
Fixes #1007 .
2016-12-10 18:29:09 -08:00
parrt
fc20027da3
generates runtime javadoc jar now with dot generation for PredictionContext
2016-12-10 18:26:19 -08:00
parrt
52cecbe9e1
generates tool javadoc jar now
2016-12-10 18:21:10 -08:00
parrt
98900144b2
attempting to get src/javadoc back.
2016-12-10 18:09:37 -08:00
Terence Parr
b6b3895792
Merge pull request #1486 from parrt/tidy-poms
...
Tidy poms
2016-12-10 17:33:01 -08:00
parrt
731603b489
maven shade and bundle don't work together so i dropped bundle for main complete jar.
2016-12-10 17:31:03 -08:00
parrt
c0e7c49a9e
update jar version, add implementation manifest entries. Fixes #1036
2016-12-10 16:43:10 -08:00
parrt
33bce0d8a8
oops. tool tests need actual tool jar
2016-12-10 16:21:40 -08:00
parrt
9b758cb668
update versions
2016-12-10 16:07:35 -08:00