parrt
3506dcef1d
add @Override to hush warnings. Manually did some of https://github.com/antlr/antlr4/pull/1066
2016-11-25 12:52:44 -08:00
Sam Harwell
f196971565
Fix failure to identify prefix rules that also recurse
...
Fixes #1402
2016-11-24 14:38:34 -06:00
parrt
6c2d4e6225
Fixes #1211
2016-11-22 15:04:28 -08:00
parrt
dc2c9b039e
Fixes #1188
2016-11-22 14:21:07 -08:00
parrt
4e6e7edf0d
Fixes #1317
2016-11-21 13:45:05 -08:00
Terence Parr
8ed1105290
Merge pull request #1353 from marcohu/fix_1233
...
Grammar dependency management for Maven plugin
2016-11-21 11:21:58 -08:00
parrt
d580f2184f
Use JFrame instead of JDialog to get "expand window" buttons
2016-11-21 10:42:52 -08:00
Marco Hunsicker
cfc538bfdc
Merge branch 'master' of https://github.com/antlr/antlr4 into fix_1233 to solve
...
Conflicts:
contributors.txt
2016-11-21 19:23:48 +01:00
parrt
66be087c38
merge old and new travis; improve so it runs C++ on osx; update BaseSwiftTest so it mirrors other targets; remove unneeded dep in pom to some json stuff
2016-11-20 19:50:54 -08:00
Marco Hunsicker
a077d3d072
Merge branch 'master' of https://github.com/antlr/antlr4 into fix_1233
2016-11-20 12:49:39 +01:00
hanjoes
e0b326677b
Migrating the current Swift tests to the new testing framework.
2016-11-19 18:30:48 -08:00
janyou
cddb8a6ff2
Update Swift.stg
...
add namedActions
2016-11-19 18:30:48 -08:00
janyou
abf2a1883c
Update SwiftTarget.java
...
"4.5.1"->"4.5.3"
2016-11-19 18:30:48 -08:00
janyou
fc3fa24464
Update Swift.stg
2016-11-19 18:30:48 -08:00
janyou
61248c8a4d
Update Swift.stg
2016-11-19 18:30:48 -08:00
Ewan Mellor
6d6327aa9d
Move the Token declarations into an enum.
...
This avoids the naming conflict in the tests between the use of ATN as a
token name and as a type name.
2016-11-19 18:30:48 -08:00
Ewan Mellor
869bcfe429
Mark matchWildcard call with a try, since it can throw.
2016-11-19 18:30:48 -08:00
Ewan Mellor
6d5d1f1c23
Add build system changes needed for Swift backend.
2016-11-19 18:30:48 -08:00
Ewan Mellor
c989064e32
Added (part of) a Swift backend.
...
This comes from https://github.com/janyou/ANTLR-Swift-Target and is
marked Copyright (c) 2016 janyou on top of the BSD license and Copyrights
for Terence Parr and Sam Harwell derived from the original ANTLR source.
2016-11-19 18:30:48 -08:00
Terence Parr
10ce5d2625
Merge pull request #1311 from sebkur/allow_path_in_token_vocab
...
Allow paths as tokenVocab option
2016-11-19 15:30:19 -08:00
parrt
f5d3e4cfe6
Improve robustness and correctness of two functions used by intellij antlr4 plugin to show ambig and lookahead parse trees.
2016-11-19 13:06:49 -08:00
parrt
d0620a65f5
Merge branch 'issue#1295' of git://github.com/harriman/antlr4-updates into harriman-issue#1295
2016-11-19 12:05:32 -08:00
parrt
5153154658
Merge branch 'fix_typos' of git://github.com/sebkur/antlr4 into sebkur-fix_typos
2016-11-19 11:52:17 -08:00
Marco Hunsicker
81efb0e366
Merge branch 'master' of https://github.com/antlr/antlr4 into fix_1233
2016-11-18 17:53:54 +01:00
Marco Hunsicker
7d83a3aa9c
More cleanup; use save Collection comparison
2016-11-17 23:29:27 +01:00
parrt
5adf79121f
revert Go "fix"
2016-11-17 11:16:22 -08:00
Terence Parr
cf5a79a5b2
Merge pull request #1362 from sridharxp/stgwotempvar
...
Stgwotempvar
2016-11-17 19:26:34 +01:00
Kurt Harriman
ab8d17472f
ANTLR4 generated incorrect code to access return value of recursive rule
...
Incorrect code was generated for $e.v in a rule like this one:
e returns [int v] ::=
INT {$v = $INT.int;}
| '(' e ')' {$v = $e.v;}
;
After parsing "(99)" the result would have v == 0 instead of 99.
2016-11-16 22:38:11 -08: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
sridharxp
6e09f08348
InvokeRule without Fix without Temporary variable
2016-11-16 13:14:38 +05:30
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
Marco Hunsicker
be585f6a8f
Make graph accessible to the outside
2016-11-14 00:29:51 +01:00
parrt
da342af01e
added sync() per other targets to LL(1) decisions
2016-11-07 14:48:20 -08:00
parrt
f8bec27d6d
bring Go target templates up to same args as others.
2016-11-07 11:07:46 -08:00
parrt
3d0678508b
reuse code to builld named actions. all file model objects have it now.
2016-11-07 11:07:23 -08:00
parrt
51d38110be
trying a refactoring to test if i can push back
2016-11-07 10:55:48 -08:00
Mike Lischke
1c3a5879e6
Set required runtime version to 4.6.
2016-11-07 11:22:46 +01:00
Mike Lischke
92b032820e
Merge branch 'master_upstream'
2016-11-07 11:19:12 +01:00
Mike Lischke
3b3fe3da57
Merge branch 'master_upstream'
...
Had to resolve a number of conflicts + added code required for the C++ target to generate header files, after the recent changes in the main repo.
2016-11-07 11:16:02 +01:00
parrt
ffaedd209d
Set version in code to 4.6.
2016-11-06 11:21:06 -08:00
parrt
e5ec462e22
Fixes #1337 . Add's sync() call back to LL(1) decisions; all targets updated (causing failed test in Go). Altered test for new output of errors. regen'd tests.
2016-11-06 09:45:40 -08:00
parrt
95c850e5f8
set version in prep for 4.6
2016-11-05 16:48:36 -07:00
Peter Boyer
fc35818c52
Update import statements after merge
2016-11-05 16:36:53 -04:00
parrt
0799e838bb
weird. missed a few files. these are to simplify get filename functionality.
2016-11-05 09:32:04 -07:00
parrt
abdb0b6a46
Merge branch 'model-updates-for-new-targets' of github.com:parrt/antlr4 into reduce-model-changes
2016-11-05 09:29:25 -07:00
parrt
2c98b5d325
incorporate in a single commit all changes needed to support generating header files. many fewer diffs with C++ target codegen now.
2016-11-05 09:25:51 -07:00
parrt
6d022379bc
Pull in parrt's branch 'model-updates-for-new-targets' which appears to have freshened some non Go stuff as well. Simplify Go filename construction.
2016-11-05 08:48:37 -07:00
parrt
40e19e5d37
refactor so getRecognizerFileName() etc... delegate to Target; default is same behavior. adds "is header" arg as well in prep for C++
2016-11-05 08:08:08 -07:00