forgetest1
/
antlr
forked from jasder/antlr
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity
6,090 Commits 4 Branches 0 Tags 82 MiB
Commit Graph

2238 Commits

Author SHA1 Message Date
Will Faught 2dd7eb1164 Format 2017-01-11 01:48:55 -08:00
Terence Parr 58b7b71731 Merge pull request #1583 from willfaught/copyright 
Use single-line comments for copyright
 2017-01-08 07:02:05 -08:00
Terence Parr 01ff377d25 Merge pull request #1587 from sharwell/document-shift 
Document the value shifting used in the serialized ATN
 2017-01-07 09:49:00 -08:00
Sam Harwell 633a2df710 Mark BufferedTokenStream.reset as deprecated to avoid confusion 
See #895
 2017-01-07 10:45:08 -06:00
Sam Harwell ff2b2b8ba6 Document the value shifting used in the serialized ATN 
Fixes #1270
 2017-01-07 09:38:45 -06:00
Sam Harwell bcde6f923a Reset BufferedTokenStream.fetchedEOF when calling setTokenSource 
Fixes #1584
 2017-01-07 09:31:11 -06:00
Will Faught e093d410eb Use single-line comments for copyright 2017-01-06 23:49:34 -08:00
Terence Parr 040e40ec58 Merge pull request #1565 from ericvergnaud/fix-javascript-typo 
fix typo in javascript visitor
 2017-01-03 17:05:50 -08:00
Eric Vergnaud d5dcfc42c4 fix an issue where loading antlr from an IE web worker would fail 2017-01-04 01:56:02 +08:00
Eric Vergnaud 5bc40faebb fix typo 2016-12-29 23:24:09 +08:00
parrt 2629433830 bump version to 4.6.1 in all files. 2016-12-28 12:03:43 -08:00
Terence Parr b57843d983 Merge pull request #1546 from sharwell/fix-1545 
Fix multiple problems with optional block bypass at end of rule
 2016-12-27 21:47:12 -08:00
Sam Harwell 24b20e236f Remove redundant isExpectedToken check 
We know by the time this check was reached that neither EPSILON nor the LL(1)
symbol are in the lookahead set from the current state. Since EPSILON is not
included, the state cannot see to the end of the rule and thus nextTokens
contains the complete set of valid LL(1) symbols from the current state. It is
therefore impossible for the LL(1) symbol to be "expected" when considering
lookahead with full context.
 2016-12-27 17:21:25 -06:00
Terence Parr 644478a015 Merge pull request #1558 from mike-lischke/master 
No static libs anymore for Windows C++ runtime.
 2016-12-27 13:00:01 -08:00
Terence Parr f79a34aa3a Merge pull request #1557 from mike-lischke/LR-loop-fix 
Lr loop fix
 2016-12-27 12:57:26 -08:00
Mike Lischke 189d390481 Merge branch 'master_upstream' 2016-12-27 13:12:21 +01:00
Mike Lischke ad31b44009 Removed static libraries from deployment script (Windows). 
Static libs are huge, so they put quite some burden on download management. They are easy to create from source, however.
 2016-12-27 13:11:54 +01:00
Terence Parr 1c987e77ea Merge pull request #1548 from adrpo/FixMsys2MinGWBuild 
adapt code to compile with msys2 mingw compiler
 2016-12-25 09:03:04 -08:00
Ivan Kochurkin 03a75a5ce6 fix error "'CommonToken' object has no attribute 'stopIndex' in Python{2|3}" #1529. 2016-12-24 18:22:48 +03:00
Adrian Pop 8ab5f02f7d adapt code to compile with msys2 mingw compiler 
- add required extra flags to the C++ compiler in CMakeLists.txt
- guard some code with _MSC_VER instead of WIN32
 2016-12-24 01:38:28 +01:00
Sam Harwell 8b21cc3dfb Fix DefaultErrorStrategy.sync handling of end of rule 
This change updates the default sync() strategy to match the strategy used
for selecting an alternative when prediction leaves the decision rule prior
to reaching a syntax error.

Closes #1545
 2016-12-23 16:28:46 -06:00
parrt df142794f6 add blank line after copyright. Fixes #1539 2016-12-23 09:50:16 -08:00
Terence Parr 58600d29b8 Merge pull request #1542 from akosthekiss/fix-doc-hidden-tokens-right 
Fix documentation of getHiddenTokensToRight in BufferedTokenStream
 2016-12-22 09:20:33 -08:00
Terence Parr abf16b08b9 Merge pull request #1541 from ericvergnaud/fix-#1538 
Fix a Python 2 typo
 2016-12-22 09:19:58 -08:00
Dong Xie 0123d874e6 Merge remote-tracking branch 'upstream/master' into dotnetcore 2016-12-22 15:24:25 +00:00
Akos Kiss cbac45e6ed Fix documentation of getHiddenTokensToRight in BufferedTokenStream 2016-12-22 11:24:26 +01:00
Eric Vergnaud 4125fbad8a grr... 2016-12-21 19:28:38 +08:00
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 4dd4a676a9 Merge branch 'master_upstream' 2016-12-21 09:10:21 +01:00
Eric Vergnaud 6398a06fba fixes #1530 and #1531 2016-12-20 23:27:08 +08:00
Mike Lischke 56d1e2f2cc Added new file to VS 2013 ANTLR project for correct building. 2016-12-19 17:48:27 +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
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
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
Eric Vergnaud 19d70cd777 TestLexerExec tests pass 2016-12-12 00:52:09 +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
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
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 9b758cb668 update versions 2016-12-10 16:07:35 -08:00
Renata Hodovan 3a4c8d8bc6 Implement the fix in #1471 for JavaScript target. 2016-12-11 00:59:24 +01:00
parrt 87fbc682e3 strip more stuff we don't need 2016-12-10 15:58:28 -08:00
parrt f13b09eb3d Fixes #1042 2016-12-10 14:51:17 -08:00
parrt e65154c161 Fix #1073. Better token output. 2016-12-10 14:34:50 -08:00
parrt 0a7e90fe8e fix #1177 (LB(k) stops at index 0) @antlr/antlr-targets might care about this 2016-12-10 14:05:31 -08:00
parrt 9ef75603ce improve comment 2016-12-10 10:45:04 -08:00
Terence Parr 9f51ec1e6b Merge pull request #1477 from parrt/fix-1203 
fix LL1 analyzer
 2016-12-10 09:52:48 -08:00
parrt 0eb27279de fix LL1 analyzer 2016-12-09 18:07:47 -08:00
Renata Hodovan 58d51450d4 Implement the fix of #1298 for Python targets. 
The patch adapts the fix in PR #1472 for Python targets.
 2016-12-10 02:41:08 +01:00
Terence Parr 82372aae2c Merge pull request #1460 from renatahodovan/intervalset-range-fix 
Fix AttributeError when trying to write an immutable variable in Python.
 2016-12-09 16:05:11 -08:00
Dong Xie 7fcf8ab074 pull in pr1229 into branch: dotnetcore 2016-12-09 23:59:20 +00:00
parrt eb8e2890c3 copyFrom copies error nodes over. Fixes #1298 2016-12-09 11:10:26 -08:00
Renata Hodovan bd09023209 Call visitErrorNodes properly in Python targets. 
The consume method of the Parser class calls visitTerminal on both
TerminalNodes and ErrorNodes even if the comment above states that
ErrorNodes should be visited by visitErrorNodes. This behaviour
is also inconsitent with the Java target. The patch fixes this in
both Python targets.
 2016-12-09 19:41:23 +01:00
parrt 661c87b47c update comment 2016-12-09 09:49:56 -08:00
gaulouis af95045362 Fix conflict lexer command in CppTarget demo 2016-12-09 17:32:28 +01:00
gaulouis 9c70b3b4ac Fix compilation error 2016-12-09 16:09:30 +01:00
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 03925a2753 add copyrights on go 2016-12-08 11:40:30 -08:00
parrt 03c2426e9c add/update copyrights on swift. @janyou, I removed your jlabs copyright notice, replacing with antlr project copyright per contributors.txt 2016-12-08 11:40:30 -08:00
parrt 43370a6e12 add copyrights on csharp 2016-12-08 11:40:30 -08:00
parrt ca144945ac update copyrights on csharp 2016-12-08 11:40:30 -08:00
parrt adadf567cc add copyrights on js 2016-12-08 11:40:30 -08:00
parrt 0b7c7f1333 update copyrights on js 2016-12-08 11:40:30 -08:00
parrt 422ce92931 add copyrights on Cpp 2016-12-08 11:40:30 -08:00
parrt e6b2e1916b update copyrights on Cpp 2016-12-08 11:40:30 -08:00
parrt c0e4f07602 add copyrights on Python3 2016-12-08 11:40:30 -08:00
parrt fed78dbd28 update copyrights on Python3 2016-12-08 11:40:30 -08:00
parrt 06973a8ea9 fix typo in copyright 2016-12-08 11:40:30 -08:00
parrt 76d421a89e add copyrights on Python2 2016-12-08 11:40:30 -08:00
parrt f597069728 Update copyright on Python2 2016-12-08 11:40:30 -08:00
parrt 2bad631cce fix typo in copyright 2016-12-08 11:40:30 -08:00
parrt efc3f82f38 rm redundant license files 2016-12-08 11:40:30 -08:00
parrt 891915de84 Update copyright on java, xml files. Make BSD license conform to standard. 2016-12-08 11:40:30 -08:00
Renata Hodovan a7227b4499 Fix AttributeError when trying to write an immutable variable in Python. 
The `removeOne` function of IntervalSet tries to directly
rewrite the start field of an immutable range variable when
splitting an existing interval. This causes AttributeError which
is fixed by the patch.
 2016-12-08 11:05:00 +01:00
Mike Lischke 1751fac496 Merge branch 'master_upstream' 2016-12-07 16:11:08 +00:00
Terence Parr 7f4bb06adf Merge pull request #1448 from ericvergnaud/optimize-javascript-runtime 
Optimize javascript runtime
 2016-12-05 18:41:08 -08:00
Eric Vergnaud 5ce735f56f cleanup 2016-12-04 18:58:49 +08:00
Eric Vergnaud 67a93b3f36 refine debug info 2016-12-04 16:51:46 +08:00
Eric Vergnaud 185f8e9635 Merge branch 'master' of https://github.com/antlr/antlr4 into optimize-javascript-runtime 2016-12-04 14:29:40 +08:00
Eric Vergnaud 7332c1eb02 fix various hashing issues 2016-12-04 14:23:30 +08:00
Sam Bloomberg 21c528cd06 Updated vs2015 project for cpp runtime 2016-12-03 15:48:01 -05:00
Terence Parr 2c63e95359 Merge pull request #1438 from ewanmellor/swift-playground 
Create a new Xcode playground for Swift.
 2016-12-03 10:48:03 -08:00
parrt 814b0488ee Merge branch 'lygav-master' into fixes-550-python 2016-12-03 10:32:13 -08:00
Terence Parr 30dddbb84d Merge pull request #1445 from parrt/fixes-550-java 
Fixes #550 by @lygav, which tweaks and more tests by me.
 2016-12-03 10:25:55 -08:00
parrt c959bf649b Fixes #550 by @lygav, which tweaks and more tests by me. 2016-12-03 10:25:02 -08:00
parrt 2dd96f3220 Merge branch 'master' of git://github.com/lygav/antlr4 into lygav-master 2016-12-03 09:19:57 -08:00
Terence Parr 53b6153060 Merge pull request #1437 from ewanmellor/swift-xcode-project-tidyups 
Swift Xcode project tidyups
 2016-12-03 09:11:55 -08:00
Terence Parr 95dc3f673f Merge pull request #1440 from samtatasurya/cpp-get-text 
Fix to Issue #1434
 2016-12-03 09:10:51 -08:00
Terence Parr 1f953da0ac Merge pull request #1441 from ericvergnaud/poor-left-recursive-rule-performance 
Poor left recursive rule performance
 2016-12-03 09:08:40 -08:00
Eric Vergnaud e850b4d97f use hashCode instead of hashString - Lexer seems to work but not Parser 2016-12-03 01:13:24 +08:00