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

5863 Commits

Author SHA1 Message Date
Terence Parr aa909ddcb1 Merge pull request #1563 from parrt/bump-to-4.6.1 
bump version to 4.6.1 in all files.
 2016-12-28 14:09:33 -08:00
Terence Parr c2a0ed7272 Merge pull request #1562 from parrt/fix-1556 
Fixes #1556.
 2016-12-28 12:29:33 -08:00
parrt 2629433830 bump version to 4.6.1 in all files. 2016-12-28 12:03:43 -08:00
Terence Parr 75784e0b8f update file list needed version bump 2016-12-28 12:02:55 -08:00
Terence Parr 64fd96d045 Update releasing-antlr.md 2016-12-28 11:54:27 -08:00
parrt 36ee17449f Fixes #1556. 
```
beast:/tmp $ a4.6 T.g4
org/antlr/v4/parse/GrammarTreeVisitor.g: node from line 2:7 no viable alternative at input '..'
org/antlr/v4/parse/GrammarTreeVisitor.g: node from line 2:7 no viable alternative at input '..'
org/antlr/v4/parse/GrammarTreeVisitor.g: node from line 2:7 no viable alternative at input '..'
org/antlr/v4/parse/GrammarTreeVisitor.g: node from line 2:7 no viable alternative at input '..'
org/antlr/v4/parse/GrammarTreeVisitor.g: node from line 2:7 no viable alternative at input '..'
context [/report INTERNAL_ERROR] 1:17 attribute arg isn't defined
error(20):  internal error:
beast:/tmp $ a4.6.1 T.g4
error(181): T.g4:2:4: token ranges not allowed in parser: 'A'..'Z'
```
 2016-12-28 11:47:48 -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
Sam Harwell 1d066e0a6b Fix test cases affected by recent changes 
See #1545
 2016-12-26 17:03:51 -06: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
Terence Parr 0774117889 Merge pull request #1551 from KvanTTT/master 
fix 'CommonToken' object has no attribute 'stopIndex' in Python{2|3}
 2016-12-24 10:29:31 -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
Sam Harwell 7a83cd4910 Fix code generation for LL1OptionalBlock bypass alternative 
See #1545
 2016-12-23 16:12:43 -06:00
Sam Harwell 33613657a5 Add regression tests for #1545 2016-12-23 16:09:24 -06:00
parrt df142794f6 add blank line after copyright. Fixes #1539 2016-12-23 09:50:16 -08:00
Terence Parr ab00880c05 Merge pull request #1544 from parrt/minor-internal-codegen-tweaks 
fix some typos Sam noticed.
 2016-12-22 09:45:26 -08:00
parrt 3ce00ec933 fix some typos Sam noticed. 2016-12-22 09:43:18 -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
Terence Parr bec0c36a32 Merge pull request #1528 from mike-lischke/master 
Fix for VS 2013 runtime builds (C++)
 2016-12-22 09:19:30 -08:00
Akos Kiss de9e032f1b Update contributors.txt 2016-12-22 11:30:39 +01: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 367f09dcbe Removed command line option for exportMacro. 
This is now handled via a grammar option.
 2016-12-21 09:11:31 +01:00
Mike Lischke 4dd4a676a9 Merge branch 'master_upstream' 2016-12-21 09:10:21 +01:00
Mike Lischke bc9e89ec70 Removed command line option for exportMacro. 
This is now handled via a grammar option.
 2016-12-21 09:08:25 +01:00
Terence Parr 3cd5e746de Merge pull request #1536 from ericvergnaud/missing-python-imports 
fixes #1530 and #1531
 2016-12-20 10:45:42 -08:00
Eric Vergnaud 6398a06fba fixes #1530 and #1531 2016-12-20 23:27:08 +08:00
Mike Lischke 4458950fd8 Re-added changed exportMacro documentation (got lost on revert). 2016-12-19 18:10:39 +01:00
Mike Lischke 7c4027118c Re-added changed exportMacro documentation (got lost on revert). 2016-12-19 18:08:33 +01: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
Mike Lischke a9dc3ebd86 Merge branch 'master_upstream' 2016-12-19 16:47:39 +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 a87df6f28a more js docs 2016-12-17 00:23:16 +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 b94ecc0fa5 update doc for new C# build 2016-12-15 14:58:52 -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
Terence Parr d388e6b867 Merge pull request #1522 from parrt/ericvergnaud-publish-to-nuget 
Ericvergnaud publish to nuget
 2016-12-15 13:32:21 -08:00