Commit Graph

2173 Commits

Author SHA1 Message Date
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 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
Mike Lischke 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
parrt 160825a86f minor reformatting. 2016-12-15 11:41:56 -08:00
parrt e0460f103b simplify; reduce indentation. 2016-12-15 11:32:48 -08:00
parrt b503838a59 simplify 2016-12-15 11:22:42 -08:00
parrt 642d06ebb2 fix typo 2016-12-15 11:15:56 -08:00
Ivan Kochurkin 5d3b99b2ee Fixed error message for EMPTY_STRINGS_AND_SETS_NOT_ALLOWED. 2016-12-15 11:08:09 -08:00
Ivan Kochurkin 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
Ivan Kochurkin 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
parrt f38ccba94a Fixes #1514 2016-12-14 12:26:32 -08:00
parrt a3aa610e3d get recognizer name properly. Fixes #958 2016-12-13 11:05:39 -08: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
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
Eric Vergnaud 39de8896f8 Merge branch 'master' into realign-csharp-runtime 2016-12-12 21:54:26 +08:00
Terence Parr 08a8e30864 Merge pull request #1470 from gaulouis/issue-1457
Issue 1457
2016-12-11 15:14:36 -08:00
parrt 42086eff6e Fix #980 2016-12-11 14:56:11 -08:00
Eric Vergnaud 0170c9a064 Good progress with parser 2016-12-12 02:00:09 +08:00
Eric Vergnaud 19d70cd777 TestLexerExec tests pass 2016-12-12 00:52:09 +08:00
parrt 0dae6359ec Fixes #1007. 2016-12-10 18:29:09 -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
parrt 0de8a9c414 simplify tool pom 2016-12-10 15:32:39 -08:00
parrt e65154c161 Fix #1073. Better token output. 2016-12-10 14:34:50 -08:00
parrt 0eb27279de fix LL1 analyzer 2016-12-09 18:07:47 -08:00
gaulouis 258b1a4a38 Redo dynamic cast 2016-12-09 21:37:52 +01:00
gaulouis e9859bcd2f Fix unnecessary cast 2016-12-09 18:43:07 +01:00
gaulouis ea53dac7b7 Fix antlr4:: namespace pollution in Lexer/Parser headers 2016-12-09 18:35:55 +01:00
Terence Parr 2dddd007e4 Merge pull request #1462 from pboyer/lafix
Fix for #1459
2016-12-08 12:19:14 -08:00
Terence Parr 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
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 891915de84 Update copyright on java, xml files. Make BSD license conform to standard. 2016-12-08 11:40:30 -08:00
Peter Boyer 0cb32c0620 Fix for repeat declaration of la_ 2016-12-07 21:03:03 -05:00
Ivan Kochurkin bdc1911e6e Removed not used LabelType. 2016-12-07 22:40:27 +03:00
Ivan Kochurkin d5dda9f998 Added check for labels with different token types.
Spaces -> Tabs.
2016-12-07 22:39:27 +03:00
Terence Parr abed9e733a Merge pull request #1449 from KvanTTT/duplicated_and_nonsensical_commands_1388
Duplicated and incompatible commands
2016-12-05 13:40:10 -08:00
Ivan Kochurkin e4c765aa27 Added comment. 2016-12-04 15:11:25 +03:00
Ivan Kochurkin bf3bff16e4 Misprints fixed, code style improved (removed unnecessary else). 2016-12-04 15:06:07 +03:00
Ivan Kochurkin cb16e369fe Misprint in comment. 2016-12-04 04:05:55 +03:00
Ivan Kochurkin 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
Terence Parr 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