Commit Graph

2155 Commits

Author SHA1 Message Date
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
Ivan Kochurkin 4e2f50aef8 Added new error types for not recognized token, mode or channel name. 2016-12-04 03:47:28 +03:00
Ivan Kochurkin b8585b7eb5 Fixed some missed cases for checkCommands. 2016-12-04 02:32:39 +03:00
Terence Parr 8ead51d8ff Merge pull request #1423 from wxio/master
Fix for redeclared error is generated Go code.
2016-12-01 10:51:40 -08:00
Peter Boyer f00e346ccd Add additional _alt decl 2016-11-30 11:18:26 -05:00
Peter Boyer ced8fba5bc Update Go.stg 2016-11-29 23:50:39 -05:00
Peter Boyer 39c77ca20f Potential fix for antlr/antlr4 #1397 2016-11-29 23:45:29 -05:00
Denis Blank c8279a1d89 Fix a dangerous c-cast in the cpp codegen 2016-11-29 17:14:02 +01:00
Ivan Kochurkin 9aab338021 Reverted old error types and numbers. 2016-11-29 19:12:43 +03:00
Ivan Kochurkin 44aab113f3 Added method checkCommands.
commands check micro optimization and code clearing.
2016-11-29 18:48:03 +03:00
Ivan Kochurkin f76ca22763 MODE_CONFLICTS_WITH_TOKEN error restored. 2016-11-29 18:13:57 +03:00
Ivan Kochurkin 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
Ivan Kochurkin ed7f6f70da pushMode and popMode commands are not duplicated. 2016-11-29 16:00:41 +03:00
Gary Miller 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
Ivan Kochurkin bd1111ffa3 Fixed issue with duplicated commands in lexer rule. 2016-11-28 19:48:35 +03:00
Ivan Kochurkin 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
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