Commit Graph

5804 Commits

Author SHA1 Message Date
parrt edd5bdd093 tweak PR template 2016-12-08 11:54:07 -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
Terence Parr 9e2c0f76f9 Merge pull request #1450 from parrt/update-copyright
Update/add copyright notices on all files for all targets
2016-12-08 11:43:37 -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 03925a2753 add copyrights on go 2016-12-08 11:40:30 -08:00
parrt 03c2426e9c add/update copyrights on swift. @janyou, I removed your jlabs copyright notice, replacing with antlr project copyright per contributors.txt 2016-12-08 11:40:30 -08:00
parrt 43370a6e12 add copyrights on csharp 2016-12-08 11:40:30 -08:00
parrt ca144945ac update copyrights on csharp 2016-12-08 11:40:30 -08:00
parrt adadf567cc add copyrights on js 2016-12-08 11:40:30 -08:00
parrt 0b7c7f1333 update copyrights on js 2016-12-08 11:40:30 -08:00
parrt 422ce92931 add copyrights on Cpp 2016-12-08 11:40:30 -08:00
parrt e6b2e1916b update copyrights on Cpp 2016-12-08 11:40:30 -08:00
parrt c0e4f07602 add copyrights on Python3 2016-12-08 11:40:30 -08:00
parrt fed78dbd28 update copyrights on Python3 2016-12-08 11:40:30 -08:00
parrt 06973a8ea9 fix typo in copyright 2016-12-08 11:40:30 -08:00
parrt 76d421a89e add copyrights on Python2 2016-12-08 11:40:30 -08:00
parrt f597069728 Update copyright on Python2 2016-12-08 11:40:30 -08:00
parrt 2bad631cce fix typo in copyright 2016-12-08 11:40:30 -08:00
parrt efc3f82f38 rm redundant license files 2016-12-08 11:40:30 -08:00
parrt cc62675573 Update legacy test stuff too. 2016-12-08 11:40:30 -08:00
parrt 891915de84 Update copyright on java, xml files. Make BSD license conform to standard. 2016-12-08 11:40:30 -08:00
Renata Hodovan a7227b4499 Fix AttributeError when trying to write an immutable variable in Python.
The `removeOne` function of IntervalSet tries to directly
rewrite the start field of an immutable range variable when
splitting an existing interval. This causes AttributeError which
is fixed by the patch.
2016-12-08 11:05:00 +01: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 4e4b902c20 Added test testLabelsForTokensWithMixedTypes. 2016-12-07 22:40:07 +03:00
Ivan Kochurkin d5dda9f998 Added check for labels with different token types.
Spaces -> Tabs.
2016-12-07 22:39:27 +03:00
Mike Lischke 1751fac496 Merge branch 'master_upstream' 2016-12-07 16:11:08 +00:00
Terence Parr 50646a6da8 Merge pull request #1453 from KvanTTT/patch-1
Correct link for AppVeyor build
2016-12-05 18:41:26 -08:00
Terence Parr 7f4bb06adf Merge pull request #1448 from ericvergnaud/optimize-javascript-runtime
Optimize javascript runtime
2016-12-05 18:41:08 -08:00
Ivan Kochurkin 09dced9149 Correct link for AppVeyor build 2016-12-06 01:44:41 +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
Terence Parr 838089fe58 Merge pull request #1447 from redxdev/master
Update VS2015 cpp runtime project
2016-12-04 09:20:49 -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
Eric Vergnaud 5ce735f56f cleanup 2016-12-04 18:58:49 +08:00
Eric Vergnaud 67a93b3f36 refine debug info 2016-12-04 16:51:46 +08:00
Eric Vergnaud 185f8e9635 Merge branch 'master' of https://github.com/antlr/antlr4 into optimize-javascript-runtime 2016-12-04 14:29:40 +08:00
Eric Vergnaud 7332c1eb02 fix various hashing issues 2016-12-04 14:23:30 +08: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
Sam Bloomberg 2f6421cfc1 added redxdev to contributors.txt 2016-12-03 15:50:19 -05:00
Sam Bloomberg 21c528cd06 Updated vs2015 project for cpp runtime 2016-12-03 15:48:01 -05:00
Terence Parr 2c63e95359 Merge pull request #1438 from ewanmellor/swift-playground
Create a new Xcode playground for Swift.
2016-12-03 10:48:03 -08:00
Terence Parr c89bc8440a Merge pull request #1446 from parrt/fixes-550-python
Fixes 550 python
2016-12-03 10:38:20 -08:00
parrt 814b0488ee Merge branch 'lygav-master' into fixes-550-python 2016-12-03 10:32:13 -08:00