f2638b290d
Fix the -message-format command line option.
...
ErrorManager.setFormat was being called before the command line options
were parsed in handleArgs. This meant that setFormat was always called
with the default, and so the command line option never took effect.
This option apparently only worked for 2.5 hours on Sep 6 2012 ;-)
Closes #992 .
2017-10-29 11:58:16 -07:00
c8c577c332
Very minor fix in error handling path for the -o command line option.
...
If the specified output path was a file and not a directory, the error
handling intended to invalidate outputDirectory, but due to an apparent
copy-paste error, it invalidated libDirectory instead.
2017-10-29 11:49:06 -07:00
fbe8c0d2a6
Tidy up the exception handling around RecognitionException.
...
This removes the generic parameter on RecognitionException, to make it
easier to handle them. This means that we no longer need to store them as
AnyObject and cast them back again. To do this, we add RecognizerProtocol,
which is a non-generic equivalent of the Recognizer interface (at least, the
parts of it that we need for error handling).
Remove all paths where the RecognitionException subclasses were throwing
exceptions in their initializers. This is just insane.
2017-10-25 13:30:08 -07:00
6c11160b51
Remove tokenNames / getTokenNames from the Recognizer interface.
...
This has been ported over from the Java code, but it was deprecated there.
There's no point having it in the Swift runtime because we don't have the
legacy code to support. Also, it wasn't implemented properly, so it
never worked.
Remove {DFA,IntervalSet}.toString(_:[String?]?)
and the inits in ParserInterpreter and DFASerializer for the same reason.
Switch the unit tests to use the alternate toString(_:Vocabulary).
2017-10-25 13:28:40 -07:00
23f532ddbd
Minor tidyups in the Swift runtime.
...
This fixes some hangovers from the port from Java:
* unnecessary type annotations;
* failure to use "if let" for nil checks;
* comments with Java code in them;
* a couple of fields that should have been declared private;
* some whitespace issues.
No semantic change.
2017-10-25 13:28:40 -07:00
639a6995f1
added SVG export to the TestRig
2017-10-22 15:48:54 +02:00
16242e43c0
Merge branch 'master' into interpreter2
2017-10-22 13:48:10 +02:00
593da3df5e
Reapplied changes that got lost during merge.
2017-10-22 12:27:49 +02:00
8778ad65c4
Merge pull request #2047 from bramp/commonsetstuff
...
[Go] Placed the CommonSetStuff code inside a scope
2017-10-12 09:42:32 -07:00
2b529d8529
Merge branch 'master' into fragment_only_grammar
2017-10-10 12:55:01 -07:00
2938e7a3ab
Merge pull request #1870 from KvanTTT/master
...
All error codes distinct
2017-10-10 12:41:50 -07:00
f6b3571e97
Merge branch 'master' into master
2017-10-10 12:39:18 -07:00
9f90d51442
Placed the CommonSetStuff code inside a scope, this is to avoid two _lt variables in the same scope. This happens with the mysql grammar: `build: previous declaration at mysql/mysql_parser.go:12215:6`
2017-10-06 08:06:56 -07:00
99d32dc861
Add some version numbers to pom.xml.
...
This silences warnings from Maven.
2017-09-28 16:10:26 -07:00
f8b272a721
Merge pull request #1950 from ericvergnaud/fix-naming-issue
...
fix inconsistent naming in target stg
2017-09-17 11:18:44 -07:00
dc77aacfcd
Fix codegen error (Java) when a lexer has only fragment tokens
...
Solves issue #1999 .
2017-09-09 12:02:42 -03:00
e123bb8cea
removed proto level stuff (one more)
2017-07-24 15:11:00 -04:00
caa5e46def
removed proto level stuff
2017-07-24 15:09:43 -04:00
e01af374d2
'requires' SUPERclass for Lexers in split mode, symbols/modes/channels available on Lexer prototype for use in lexer actions (this.SOME_MODE) like in Java actions, Utils.escapeWhiteSpace uses regex for global replace (was replacing only first occurnce of \n etc).
2017-07-22 18:11:37 -04:00
0930095207
fix inconsistent naming in target stg
2017-07-15 12:19:54 +08:00
aa2d34bdfd
Merge branch 'master' into interpreter2
2017-06-30 13:44:11 +02:00
49b462f960
Go file header complies with standardised Go 'generated code' header
2017-06-28 11:43:50 +03:00
916a872529
Merge pull request #1918 from renatahodovan/indent-with-spaces
...
Use spaces consistently to indent the generated Python code.
2017-06-27 08:16:02 -07:00
3a7c6a662a
Merge pull request #1910 from mike-lischke/optimizations
...
Reverted removal of namespace.
2017-06-25 08:36:02 -07:00
96d42d833a
Use spaces consistently to indent the generated Python code.
2017-06-15 18:29:53 +02:00
2b3dd222bd
Reverted removal of namespace.
2017-06-12 09:26:11 +02:00
35cf1ba4ff
Merge pull request #1907 from mike-lischke/optimizations
...
[C++] Small optimizations
2017-06-11 08:54:21 -07:00
7dc17ace6e
Distinct error codes, added unit-test. fixes #1865 .
2017-05-14 13:23:53 +03:00
25eeb94498
Rule names are now always written to interpreter data file.
...
Updated loaders for Java and C++.
2017-05-05 17:00:41 +02:00
126eec7092
2 corrections (C++ runtime and interpreter data writer)
...
- A wrong check for EOF has been corrected in the UnbufferedTokenStream (now using the correct data type for the cast to avoid warnings).
- The interpreter data write function no longer implicitly writes out imported grammars. Grammars are merged and hence contain everything from imported grammars already. If interpreter data for an imported grammar is required pass that grammar explicitly to the ANTLR tool.
2017-04-23 13:05:27 +02:00
3bffb070b2
Final touches on Java part.
2017-04-21 17:32:44 +02:00
3f7c67106b
Interpreter is now always generated. Doc updated.
2017-04-21 17:15:51 +02:00
8995f0559f
Adds a new option to allow ANTLR to generate interpreter data.
...
Especially when you want to use LexerInterpreter and/or ParserInterpreter in any of the non-Java targets you have to provide the ATN and other data. The classes to generate these values are not in the runtime, however. Hence we need a way to tell ANTLR to produce that in a way that can be consumed by all targets.
This patch adds a new command line parameter (-interpreter) which causes ANTLR to parse the given grammars as usual and then let it generated a file for each grammar with the required interpreter values. A new InterpreterDataReader class has been added to the Java + C++ runtimes. This class can load the data file (a plain text file) and generate the structures that can directly be fed to the interpreters.
2017-04-15 16:55:49 +02:00
f858cd5948
Fixes #1815 (for real this time!). Fix text set for erroneous escapes so tool doesn't fail later. Remove some duplicate error messages. Add test for #1815 .
2017-04-06 14:34:37 -07:00
80aa7907a4
Fixes #1815 . Add info on what the invalid escape is. Match \x for any x but give error. This prevents \x from appearing like a sequence of 2 char. Updated unit tests.
2017-04-06 10:26:03 -07:00
1fd2d1b434
Python 3 codegen probably didn't mean to limit ATN segment size to 2 XOR 31
2017-03-31 09:27:23 -07:00
62baf4bd0a
[maven-release-plugin] prepare for next development iteration
2017-03-30 14:11:59 -07:00
d4d7e3d3bc
[maven-release-plugin] prepare release 4.7
2017-03-30 14:11:49 -07:00
b5648f405b
tweak documentation about various targets
2017-03-30 10:44:28 -07:00
53641c552c
fix build issue in C#. some weird changes snuck in.
2017-03-16 17:13:47 -07:00
1f6a329692
Merge pull request #1765 from bhamiltoncx/unicode-cleanup-and-doc
...
Tidy up CharStreams and add new doc/unicode.md
2017-03-16 17:03:06 -07:00
4f2168600d
Tidy up CharStreams API. Add new doc/unicode.md
2017-03-16 17:01:46 -06:00
b2e51e20b7
add C# keyword
2017-03-16 09:49:40 -07:00
4c1dc90064
tweak wildcard. Fixes #1213
2017-03-15 09:04:47 -07:00
c71b7d2f18
EmojiDefault and TextDefault
2017-03-14 13:27:01 -06:00
60f70e778c
Fixes #1604
2017-03-14 11:09:37 -07:00
e2a19e5a85
Merge pull request #1754 from bhamiltoncx/extended-pictographic
...
Add new \p{Extended_Pictographic} and related Unicode property escapes
2017-03-14 10:10:53 -07:00
3219f1c77d
Extended Pictographic
2017-03-13 15:40:51 -06:00
39b3a35b48
Initialize decisionToDFA in init
2017-03-11 14:47:28 -05:00
cf422bb107
exclude icu4j from the final jar
2017-03-09 18:36:25 -07:00
2c0ef5529d
remove tool-codegen
...
tool-codegen is now part of tool
2017-03-09 17:43:33 -07:00
3ae7aba765
fix for compile error
...
Currently the project tool-codegen generates the file UnicodeData.java into the /target directory of the project tool. Running “mvn clean package” in tool erases this file and generates a compile error since UnicodeData.java can’t be found.
This patch changes tool-codegen to generate UnicodeData.java into the /src directory of tool.
2017-03-08 20:10:33 -07:00
6007132e2e
Also support Unicode enumerated properties via \p{East_Asian_Width=Ambiguous} escape
2017-03-08 09:43:50 -08:00
1cf28851c2
Merge branch 'master_upstream' into optimizations
2017-03-04 14:58:41 +01:00
e3f85774a4
Reverted unterminated ranges: [+-], [-+].
2017-03-03 21:35:31 +03:00
fbc49f2f00
Moved and simplified getIntervalSetEscapedString to CharSupport.
2017-03-03 21:01:00 +03:00
b3e667c619
Fixed escaped charactes in error messages.
2017-03-03 16:44:41 +03:00
d59d193252
CharSupport code improved and cleared.
...
Tests fixed.
2017-03-03 16:44:41 +03:00
9b5f039e46
Handle INVALID_CHAR_SET error.
2017-03-03 13:40:40 +03:00
f6cda7f0ea
Added new error INVALID_CHAR_SET.
2017-03-03 13:39:19 +03:00
3df19fbcc8
make format consistent with most of antlr project
2017-03-02 10:38:48 -08:00
c5f9d5e2a1
More accurate escaping (different symbols for string literals (') and char sets(]-)).
...
Improved testInvalidCharSetsAndStringLiterals test.
2017-03-02 18:16:05 +03:00
77f7fd135d
Fixed incorrect "used multiple times" warning.
...
Improved warning output in ATNOptimizer.
2017-03-02 14:56:50 +03:00
d9ae13fc1a
we left invalid escapes in string literals which was causing an error. This is related to #1537 . All tool errors pass now.
2017-03-01 17:32:44 -08:00
8d1df4c9e4
Merge pull request #1688 from bhamiltoncx/unicode-property-escape
...
New \p{Letter} Unicode property escape
2017-03-01 15:24:52 -08:00
070849698a
error-> warnings. Fixes #1537
2017-03-01 15:10:44 -08:00
ca03e6ab5e
New \p{Letter} Unicode property escape
2017-03-01 14:50:02 -08:00
3557f48386
EscapeSequenceParsing
2017-03-01 14:06:04 -08:00
6215f18ec3
rename 4.6.1 to 4.7 everywhere
2017-02-23 14:48:58 -08:00
fd4246cf3f
Implement new extended Unicode escape \u{10ABCD}. Bump UUID. Add lots more tests.
2017-02-23 09:39:44 -08:00
5c5f52ab83
Use code generation in new tool-codegen build step instead of making tool depend on ICU at runtime
2017-02-22 11:09:02 -08:00
f384ef5fb4
New utility class Unicode
2017-02-21 12:40:31 -08:00
291638ca2d
CodePointTransitions
2017-02-17 13:30:22 -08:00
2b3508d57e
Merge pull request #1662 from bhamiltoncx/no-more-char-casts
...
Get rid of all (char) casts
2017-02-17 13:21:16 -08:00
fab6172749
Added "action" to badWords set for Go runtime.
...
Some spaced replaced with tabs.
2017-02-17 23:31:51 +03:00
88ecb3d9fa
Get rid of all (char) casts
2017-02-16 09:55:08 -08:00
c35bbabc16
PR #1658 : Also write stderr to file
2017-02-16 09:44:40 -08:00
6c878b0709
Merge pull request #1653 from bhamiltoncx/codegen-unicode-escapes
...
Emit language-specific Unicode escapes in codegen
2017-02-15 16:48:50 -08:00
287f17b796
Merge pull request #1652 from bhamiltoncx/csharp-lexer-parser-output-file
...
C# support for lexer and parser output to a file
2017-02-13 15:10:54 -08:00
9b7e2a81ce
Merge pull request #1651 from bhamiltoncx/python-lexer-parser-output-file
...
Python 2 and Python 3 support for lexer and parser output to a file
2017-02-13 15:10:19 -08:00
c7e7550a12
Fix CSharpTarget.java
2017-02-13 08:56:57 -08:00
0049d6d9ae
Emit language-specific Unicode escapes when generating code containing non-ASCII Unicode values
2017-02-10 14:31:56 -08:00
ae5250685d
Merge pull request #1637 from bhamiltoncx/char-streams
...
Make BaseJavaTest and TestRig work with Unicode values > U+FFFF
2017-02-10 14:11:34 -08:00
6611c1ae27
C# runtime and test harness support for writing test output to file
2017-02-10 13:37:44 -08:00
2c447a2b75
Python 2 and Python 3 support for lexer and parser output to a file instead of stdout
2017-02-10 13:11:24 -08:00
23f59ad99d
Removed trailing comma in channelNames for Python 2 & 3, JavaScript.
2017-01-31 00:34:10 +03:00
7b8ba3550b
channelNames support in LexerInterpreter (C#, C++, Java, Swift).
2017-01-31 00:34:10 +03:00
ccb325db42
Removed trailing comma in channel names.
2017-01-31 00:32:21 +03:00
9998db82ce
Added channel constants to Go runtime.
2017-01-31 00:32:21 +03:00
f9fa84213c
Swift: mode constants written to file as tokens and channels.
2017-01-31 00:32:21 +03:00
956dc0547f
C++: mode constants written to file as tokens and channels.
2017-01-31 00:32:21 +03:00
1fe1216e26
C#: mode constants written to file as tokens and channels.
2017-01-31 00:32:21 +03:00
00d0ba129b
Mode constants written to file as tokens and channels.
...
I mean:
```Java
public static final int M1=1, M2=2;
```
instead of
```Java
public static final int M1=1;
public static final int M2=2;
```
2017-01-31 00:32:21 +03:00
e9e83a69e7
Added channel constants to Python 2 & 3 runtimes.
...
Improved indentation.
2017-01-31 00:32:21 +03:00
def7e6afc8
Added channel constants to JavaScript runtime.
...
Improved indentation.
2017-01-31 00:32:21 +03:00
c3d96eb5d7
Added channelNames to all runtimes.
2017-01-31 00:32:21 +03:00
0f52b7c0d9
CharStreams
2017-01-30 10:09:56 -08:00
0901851719
Merge pull request #1585 from KvanTTT/left-recursive-rule-labels
...
The final fix (hopefully) for alternative labels check in left recursive rules
2017-01-29 13:34:32 -08:00
7cbef5617c
removed lower case formatting on types. Case has meaning in Go, needs preserving.
2017-01-11 22:33:35 +11:00
810000c23e
removed superClass import
2017-01-11 22:21:29 +11:00
d71c2157ce
Fixed @sharwell note about comment.
2017-01-08 15:08:48 +03:00
4a5717162e
Fixed indents for else statements.
...
Fixed correct token in checkForTypeMismatch.
2017-01-07 18:37:17 +03:00
a558334a01
Code cleared, added comments.
2017-01-07 18:26:22 +03:00
385e96784d
Initial fix for labels in left recursive rules: https://github.com/antlr/antlr4/pull/1570 & https://github.com/antlr/antlr4/issues/1543
2017-01-07 18:16:22 +03:00
587ea3646c
Don't use list labels for elements that appear twice in a block set
2017-01-06 00:21:42 -06:00
204c281772
Fix optional element analysis
...
* Properly handle elements that are optional in some alts but not others
* Properly handle block sets (a group of terminals producing a SetTransition)
* Properly handle OPTIONAL subrule
2017-01-06 00:19:43 -06:00
9009a1b989
Simplify logic leaving a subrule in ElementFrequenciesVisitor
2017-01-04 11:46:47 -06:00
eb53e70e39
Implement support for optional getters
...
This analysis is required for proper code generation in the TypeScript target
when strict null checks are enabled. It also applies to targets intending to
differentiate optional values from required values.
2017-01-04 09:43:20 -06:00
6b007b445c
Disable label checks for left recursive rules
...
See #1543
2017-01-02 14:14:06 -06:00
c874ab68fb
Merge branch 'master' into optimizations
2017-01-01 17:40:48 +01:00
a60fcfed0f
Removed the need of a shadow s0 copy in the DFA class.
2017-01-01 17:39:44 +01:00
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
2629433830
bump version to 4.6.1 in all files.
2016-12-28 12:03:43 -08:00
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
7a83cd4910
Fix code generation for LL1OptionalBlock bypass alternative
...
See #1545
2016-12-23 16:12:43 -06:00
3ce00ec933
fix some typos Sam noticed.
2016-12-22 09:43:18 -08:00
367f09dcbe
Removed command line option for exportMacro.
...
This is now handled via a grammar option.
2016-12-21 09:11:31 +01:00
a9dc3ebd86
Merge branch 'master_upstream'
2016-12-19 16:47:39 +01:00
23313ee44e
[maven-release-plugin] prepare for next development iteration
2016-12-15 14:25:41 -08:00
aacd2a2c95
[maven-release-plugin] prepare release 4.6
2016-12-15 14:25:36 -08:00
31726311a8
add exportMacro to list of valid grammar options. verified it works in grammar and -D on command line.
2016-12-15 13:25:02 -08:00
d1b429d94c
Added a new setting required by the C++ runtime.
...
In order to export generated classes in DLLs we need a way to specify the __declspec setting. This is is usually done via a macro that takes the import or export value. The new parameter (`-export-macro`) allows to specify this, which increases the flexibility of the generated classes.
The C++ target documentation has been extended to describe build specific things, includig this new parameter.
2016-12-15 13:11:10 -08:00
160825a86f
minor reformatting.
2016-12-15 11:41:56 -08:00
e0460f103b
simplify; reduce indentation.
2016-12-15 11:32:48 -08:00
b503838a59
simplify
2016-12-15 11:22:42 -08:00
642d06ebb2
fix typo
2016-12-15 11:15:56 -08:00
5d3b99b2ee
Fixed error message for EMPTY_STRINGS_AND_SETS_NOT_ALLOWED.
2016-12-15 11:08:09 -08:00
75d5db5941
Implemented CHARACTERS_COLLISION_IN_SET handling.
...
Implemented EMPTY_STRINGS_AND_SETS_NOT_ALLOWED for empty sets.
Improved INVALID_ESCAPE_SEQUENCE, fixes #1077
2016-12-15 11:08:09 -08:00
37148ff7fa
Added CHARACTERS_COLLISION_IN_SET warning.
...
EMPTY_STRINGS_NOT_ALLOWED rename to EMPTY_STRINGS_AND_SETS_NOT_ALLOWED.
2016-12-15 11:08:09 -08:00
428ff28f35
Added a new setting required by the C++ runtime.
...
In order to export generated classes in DLLs we need a way to specify the __declspec setting. This is is usually done via a macro that takes the import or export value. The new parameter (`-export-macro`) allows to specify this, which increases the flexibility of the generated classes.
The C++ target documentation has been extended to describe build specific things, includig this new parameter.
2016-12-15 16:44:26 +01:00
f38ccba94a
Fixes #1514
2016-12-14 12:26:32 -08:00
a3aa610e3d
get recognizer name properly. Fixes #958
2016-12-13 11:05:39 -08:00
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
a69299c507
set javadoc to deploy phase.
2016-12-13 08:17:13 -08:00
068a13e0f8
Update all other targets
2016-12-12 18:09:55 -08:00
b11ff9636a
Fixes #1299 . matching a set didn't properly notify error strategy of a successful match.
2016-12-12 17:54:53 -08:00
2739a0c9ef
Fixes #1492 . only create javadoc if we use `mvn -DskipTests javadoc:jar install`
2016-12-12 17:33:39 -08:00
39de8896f8
Merge branch 'master' into realign-csharp-runtime
2016-12-12 21:54:26 +08:00
08a8e30864
Merge pull request #1470 from gaulouis/issue-1457
...
Issue 1457
2016-12-11 15:14:36 -08:00
42086eff6e
Fix #980
2016-12-11 14:56:11 -08:00
0170c9a064
Good progress with parser
2016-12-12 02:00:09 +08:00
19d70cd777
TestLexerExec tests pass
2016-12-12 00:52:09 +08:00
0dae6359ec
Fixes #1007 .
2016-12-10 18:29:09 -08:00
52cecbe9e1
generates tool javadoc jar now
2016-12-10 18:21:10 -08:00
98900144b2
attempting to get src/javadoc back.
2016-12-10 18:09:37 -08:00
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
c0e7c49a9e
update jar version, add implementation manifest entries. Fixes #1036
2016-12-10 16:43:10 -08:00
9b758cb668
update versions
2016-12-10 16:07:35 -08:00
0de8a9c414
simplify tool pom
2016-12-10 15:32:39 -08:00
e65154c161
Fix #1073 . Better token output.
2016-12-10 14:34:50 -08:00
0eb27279de
fix LL1 analyzer
2016-12-09 18:07:47 -08:00
258b1a4a38
Redo dynamic cast
2016-12-09 21:37:52 +01:00
e9859bcd2f
Fix unnecessary cast
2016-12-09 18:43:07 +01:00
ea53dac7b7
Fix antlr4:: namespace pollution in Lexer/Parser headers
2016-12-09 18:35:55 +01:00
2dddd007e4
Merge pull request #1462 from pboyer/lafix
...
Fix for #1459
2016-12-08 12:19:14 -08:00
11117e02d4
Merge pull request #1458 from KvanTTT/mixed_type_labels_1409
...
Check labels for tokens with different types
2016-12-08 11:47:09 -08:00
2c99f187a0
make it read "Copyright (c) 2012-2016 The ANTLR Project"
2016-12-08 11:43:06 -08:00
1b1a9862c4
contributors->authors
2016-12-08 11:43:06 -08:00
61e8eba4fc
fix typo
2016-12-08 11:43:06 -08:00
891915de84
Update copyright on java, xml files. Make BSD license conform to standard.
2016-12-08 11:40:30 -08:00
0cb32c0620
Fix for repeat declaration of la_
2016-12-07 21:03:03 -05:00
bdc1911e6e
Removed not used LabelType.
2016-12-07 22:40:27 +03:00
d5dda9f998
Added check for labels with different token types.
...
Spaces -> Tabs.
2016-12-07 22:39:27 +03:00
abed9e733a
Merge pull request #1449 from KvanTTT/duplicated_and_nonsensical_commands_1388
...
Duplicated and incompatible commands
2016-12-05 13:40:10 -08:00
e4c765aa27
Added comment.
2016-12-04 15:11:25 +03:00
bf3bff16e4
Misprints fixed, code style improved (removed unnecessary else).
2016-12-04 15:06:07 +03:00
cb16e369fe
Misprint in comment.
2016-12-04 04:05:55 +03:00
0e1b5d9d7a
Merge branch 'command_wrong_id_1411' into duplicated_and_nonsensical_commands_1388
...
# Conflicts:
# tool/src/org/antlr/v4/tool/ErrorType.java
2016-12-04 03:57:11 +03:00
f11a380609
Merge pull request #1417 from KvanTTT/command_wrong_id_1411
...
ANTLR generates a wrong lexer code if type, channel or mode commands use inproper identifier
2016-12-03 16:55:23 -08:00
4e2f50aef8
Added new error types for not recognized token, mode or channel name.
2016-12-04 03:47:28 +03:00
b8585b7eb5
Fixed some missed cases for checkCommands.
2016-12-04 02:32:39 +03:00
8ead51d8ff
Merge pull request #1423 from wxio/master
...
Fix for redeclared error is generated Go code.
2016-12-01 10:51:40 -08:00
f00e346ccd
Add additional _alt decl
2016-11-30 11:18:26 -05:00
ced8fba5bc
Update Go.stg
2016-11-29 23:50:39 -05:00
39c77ca20f
Potential fix for antlr/antlr4 #1397
2016-11-29 23:45:29 -05:00
c8279a1d89
Fix a dangerous c-cast in the cpp codegen
2016-11-29 17:14:02 +01:00
9aab338021
Reverted old error types and numbers.
2016-11-29 19:12:43 +03:00
44aab113f3
Added method checkCommands.
...
commands check micro optimization and code clearing.
2016-11-29 18:48:03 +03:00
f76ca22763
MODE_CONFLICTS_WITH_TOKEN error restored.
2016-11-29 18:13:57 +03:00
8fe4def4ed
Warnings for incompatible commands, added unit-test, fixes #1388 .
...
Improved test for duplicated commands (added pushMode, popMode).
2016-11-29 16:03:33 +03:00
ed7f6f70da
pushMode and popMode commands are not duplicated.
2016-11-29 16:00:41 +03:00
763669ffc7
Fix for redeclared error is generated Go code. Create block so _x and _m var are created in a local scope.
2016-11-29 12:35:48 +11:00
bd1111ffa3
Fixed issue with duplicated commands in lexer rule.
2016-11-28 19:48:35 +03:00
a1def96500
getConstantValue replaced with getModeConstantValue, getTokenConstantValue and getChannelConstantValue methods.
...
ErrorType simplified, tests fixed.
Fixes #1411 , added unit-test.
2016-11-28 14:41:04 +03:00
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
f196971565
Fix failure to identify prefix rules that also recurse
...
Fixes #1402
2016-11-24 14:38:34 -06:00
6c2d4e6225
Fixes #1211
2016-11-22 15:04:28 -08:00
dc2c9b039e
Fixes #1188
2016-11-22 14:21:07 -08:00
4e6e7edf0d
Fixes #1317
2016-11-21 13:45:05 -08:00
8ed1105290
Merge pull request #1353 from marcohu/fix_1233
...
Grammar dependency management for Maven plugin
2016-11-21 11:21:58 -08:00
d580f2184f
Use JFrame instead of JDialog to get "expand window" buttons
2016-11-21 10:42:52 -08:00
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
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
a077d3d072
Merge branch 'master' of https://github.com/antlr/antlr4 into fix_1233
2016-11-20 12:49:39 +01:00
e0b326677b
Migrating the current Swift tests to the new testing framework.
2016-11-19 18:30:48 -08:00
cddb8a6ff2
Update Swift.stg
...
add namedActions
2016-11-19 18:30:48 -08:00
abf2a1883c
Update SwiftTarget.java
...
"4.5.1"->"4.5.3"
2016-11-19 18:30:48 -08:00
fc3fa24464
Update Swift.stg
2016-11-19 18:30:48 -08:00
61248c8a4d
Update Swift.stg
2016-11-19 18:30:48 -08:00
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
rlfnb
Mike Lischke
Terence Parr
Andrew Brampton
Bráulio Bezerra
Venkat Peri
Eric Vergnaud
Sergey Parshukov
Renata Hodovan
Ivan Kochurkin
Ben Hamilton
Peter Boyer
Tom Everett
Gary Miller
Sam Harwell
gaulouis
Denis Blank
Marco Hunsicker
hanjoes
janyou