Commit Graph

6090 Commits

Author SHA1 Message Date
Terence Parr 304b8eb02d Merge pull request #1621 from bhamiltoncx/update-contributors
Add bhamiltoncx to contributors.txt
2017-01-24 09:52:22 -08:00
Terence Parr 5b495bfb48 Merge branch 'master' into update-contributors 2017-01-24 09:52:12 -08:00
Terence Parr 8d9e8f2d20 Merge pull request #1612 from mshockwave/master
Fix wrong include path of antlr4cpp runtime in cmake/ExternalAntlr4Cpp.cmake
2017-01-24 09:51:05 -08:00
Dong Xie 4c4fdc0f83 Merge remote-tracking branch 'upstream/master' into dotnetcore 2017-01-24 16:23:31 +00:00
Dong Xie 8a08a6ed56 [csharp] dotnet test files added, test passing 2017-01-24 16:21:13 +00:00
Ben Gertzfield cf8fba0715 Look in /usr/local/bin before /usr/bin for mono 2017-01-23 14:09:28 -08:00
Ben Gertzfield 3a2d4e49f1 Add bhamiltoncx to contributors.txt 2017-01-23 14:04:15 -08:00
bekket mcclane 4f3785a29e Merge branch 'master' into master 2017-01-23 17:52:59 +08:00
Terence Parr 449a32d4ae Merge pull request #1603 from marcelo-rocha/fix-parse-tree-property
Fix parse tree property
2017-01-22 12:43:24 -08:00
Terence Parr 7f8890bc3c Merge pull request #1596 from willfaught/format
Format Go runtime files
2017-01-22 12:43:00 -08:00
Terence Parr e1c51d367e Merge pull request #1607 from mike-lischke/master
Some deployment changes because of license file changes.
2017-01-22 12:42:33 -08:00
Terence Parr 7f0c990645 Merge pull request #1616 from ericvergnaud/fix-#1584-other-targets
fix #1584 for C#, JavaScript and Python targets
2017-01-22 12:42:02 -08:00
Dong Xie 9e590c08b7 [csharp] able to compile with dotnet cli under Linux
1, moved xproj file into Antlr4.Runtime sub-folder to keep convention
2, removed two cs files that no longer needed
3, fill in missing using directives
2017-01-20 14:16:09 +00:00
Dong Xie 5d03880079 Merge remote-tracking branch 'upstream/master' into dotnetcore 2017-01-19 16:13:03 +00:00
Eric Vergnaud f02d8c1a4b fix #1584 2017-01-19 21:44:56 +08:00
Hanzhou Shi 91d8d13b05 Fix travis build. 2017-01-18 23:40:56 -08:00
mshockwave d733016fd4 fix wrong antlr4cpp runtime include path 2017-01-18 15:09:10 +08:00
Mike Lischke 82d0e8f86a Merge branch 'master_upstream' 2017-01-16 13:15:54 +01:00
Mike Lischke 8b43f3f7e0 Some deployment changes because of license file changes. 2017-01-16 13:14:40 +01:00
Hanzhou Shi 7c24680e3c Reset fetchedEOF in BufferedTokenStream after setTokenSource is called. Fixes #1584. 2017-01-16 00:39:01 -08:00
Hanzhou Shi 893ed8449b Tweak xcodeproj 2017-01-16 00:23:26 -08:00
Hanzhou Shi 8fd99fe8d9 Adding Package.swift for SPM integration 2017-01-16 00:23:26 -08:00
Hanzhou Shi 139225f76c convert documentation to Swift style 2017-01-16 00:23:26 -08:00
Hanzhou Shi ee82046201 Reorg Swift runtime file structure. 2017-01-16 00:23:25 -08:00
Marcelo Rocha 23fd4a00f2 sign contributors.txt 2017-01-13 14:42:49 -03:00
Marcelo Rocha d53e4f248d fix incorrect std::map API 2017-01-13 14:42:34 -03:00
robert a053d908fb fix missing variable declarations 2017-01-11 15:39:04 +00:00
robert 2fe1d8333f sign contributors.txt 2017-01-11 15:39:04 +00:00
Johannes Kohnen 5e9ecae281 Change StringType to lower case for Go target.
*  See antlr/antlr4#1594
2017-01-11 22:36:17 +11:00
Gary Miller 7cbef5617c removed lower case formatting on types. Case has meaning in Go, needs preserving. 2017-01-11 22:33:35 +11:00
Gary Miller 810000c23e removed superClass import 2017-01-11 22:21:29 +11:00
Will Faught 2dd7eb1164 Format 2017-01-11 01:48:55 -08:00
Terence Parr 58b7b71731 Merge pull request #1583 from willfaught/copyright
Use single-line comments for copyright
2017-01-08 07:02:05 -08:00
Ivan Kochurkin d71c2157ce Fixed @sharwell note about comment. 2017-01-08 15:08:48 +03:00
Terence Parr 9446f5f4b1 Merge pull request #1589 from sharwell/missing-header
Add missing copyright header
2017-01-07 09:54:02 -08:00
Terence Parr b8e0d543e3 Merge pull request #1588 from sharwell/test-sources
Support using the Maven plugin to generate test sources
2017-01-07 09:53:41 -08:00
Terence Parr 01ff377d25 Merge pull request #1587 from sharwell/document-shift
Document the value shifting used in the serialized ATN
2017-01-07 09:49:00 -08:00
Terence Parr 7f352618a0 Merge pull request #1586 from sharwell/reset-fetchedeof
Reset BufferedTokenStream.fetchedEOF when calling setTokenSource
2017-01-07 09:47:18 -08:00
Sam Harwell 73cfd0592f Add missing copyright header 2017-01-07 11:20:10 -06:00
Sam Harwell 5d4efafe8e Support using the Maven plugin to generate test sources
Fixes #1579
2017-01-07 10:58:43 -06:00
Sam Harwell 633a2df710 Mark BufferedTokenStream.reset as deprecated to avoid confusion
See #895
2017-01-07 10:45:08 -06:00
Ivan Kochurkin c929469c5f Restored old testLabelsForTokensWithMixedTypesLRWithLabels & testLabelsForTokensWithMixedTypesLRWithoutLabels tests. 2017-01-07 18:47:08 +03:00
Sam Harwell ff2b2b8ba6 Document the value shifting used in the serialized ATN
Fixes #1270
2017-01-07 09:38:45 -06:00
Ivan Kochurkin 4a5717162e Fixed indents for else statements.
Fixed correct token in checkForTypeMismatch.
2017-01-07 18:37:17 +03:00
Sam Harwell bcde6f923a Reset BufferedTokenStream.fetchedEOF when calling setTokenSource
Fixes #1584
2017-01-07 09:31:11 -06:00
Ivan Kochurkin a558334a01 Code cleared, added comments. 2017-01-07 18:26:22 +03:00
Ivan Kochurkin a46db4b0b7 Updated testLabelsForTokensWithMixedTypes.
Removed excess testLabelsForTokensWithMixedTypesLRWithLabels and testLabelsForTokensWithMixedTypesLRWithoutLabels.
2017-01-07 18:17:40 +03:00
Ivan Kochurkin 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
Will Faught e093d410eb Use single-line comments for copyright 2017-01-06 23:49:34 -08:00
Terence Parr 33ac0c3611 Merge pull request #1582 from sharwell/optional-analysis
Fix multiple bugs with the new optional element analysis
2017-01-06 07:04:04 -08:00