Commit Graph

6859 Commits

Author SHA1 Message Date
parrt b9adef5878 set version for C# dotnet to 4.7.1.1 for publishing 2017-12-04 14:12:20 -08:00
Terence Parr 91951c1665
Merge pull request #2135 from niccroad/Issue160_import_lexer_grammars
This is one implementation addressing issue 160.
2017-12-04 09:38:46 -08:00
Nicolas d2685bf37f Add a test case for merging clashing channel names during import. 2017-12-04 17:35:08 +13:00
Nicolas 490cd7068c Make some changes to the docs for grammars to describe support for lexers
containing modes.
2017-12-04 17:25:51 +13:00
Oran Epelbaum e22fbbcce8 [JavaScript] Added atn property to generated lexers, similarly to generated parsers. 2017-12-03 12:42:33 +02:00
Nicolas 83e29ed9ca Merge branch 'Issue160_import_lexer_grammars' of https://github.com/niccroad/antlr4 into Issue160_import_lexer_grammars 2017-12-01 21:30:11 +13:00
Nicolas 0301bb946c Add a test case for importing modal lexers into a composite grammar. The
test case demonstrates an error is produced (due to importing modes into a
composite grammar).
2017-11-30 23:24:11 +13:00
Terence Parr fa7868002e
Merge branch 'master' into Issue160_import_lexer_grammars 2017-11-29 10:00:28 -08:00
Terence Parr edcf275a3c
Merge branch 'master' into Issue160_import_lexer_grammars 2017-11-29 09:59:50 -08:00
Terence Parr e8dd80523e
Merge pull request #2126 from ewanmellor/generator-access-levels
Add an accessLevel parser option.
2017-11-29 09:56:24 -08:00
Terence Parr b5e6147cd5
Merge pull request #2123 from ewanmellor/swift-fix-parse-cancellation
[Swift] Fix parse-cancellation in BailErrorStrategy.
2017-11-29 09:56:09 -08:00
Terence Parr bd4f1a9365
Merge pull request #2122 from ewanmellor/swift-remove-recognizer-caches
[Swift] Remove Recognizer.tokenTypeMapCache and .ruleIndexMapCache.
2017-11-29 09:55:53 -08:00
Terence Parr 756fcdd5ec
Merge pull request #2121 from ewanmellor/swift-fix-interpreter-dfas
[Swift] Fix initialization of {Lexer,Parser}Interpreter.decisionToDFA.
2017-11-29 09:55:38 -08:00
Terence Parr c586a592ce
Merge pull request #2120 from ewanmellor/swift-remove-arraylist
[Swift] Remove ArrayList.
2017-11-29 09:55:23 -08:00
Terence Parr 406b1816c8
Merge pull request #2119 from ewanmellor/swift-remove-triple
[Swift] Remove Triple.swift.
2017-11-29 09:55:11 -08:00
Terence Parr 633de4aeab
Merge pull request #2118 from ewanmellor/swift-let-sharedcontextcache
[Swift] Make ATNSimulator.sharedContextCache non-optional.
2017-11-29 09:54:52 -08:00
Terence Parr aec23acb24
Merge pull request #2117 from ewanmellor/swift-remove-modeNameToStartState
[Swift] Remove unused ATN.modeNameToStartState.
2017-11-29 09:54:26 -08:00
Terence Parr ed37fa23e6
Merge pull request #2115 from ewanmellor/swift-minor-tidups
[Swift] Some minor tidyups.
2017-11-29 09:54:13 -08:00
Terence Parr 3536a84b52
Merge pull request #2114 from ewanmellor/swift-let-precedencedfa
[Swift] Make DFA.precedenceDfa be a "let" rather than a "var".
2017-11-29 09:53:57 -08:00
Terence Parr aaca1b9f3c
Merge pull request #2113 from ewanmellor/swift-makereadonly
[Swift] Replace IntervalSet.setReadonly with makeReadonly.
2017-11-29 09:53:40 -08:00
Terence Parr 8c1a46d87a
Merge pull request #2112 from ewanmellor/swift-mutexes-let
[Swift] Make all the mutexes "let" rather than "var".
2017-11-29 09:53:11 -08:00
Terence Parr d691f4d086
Merge pull request #2108 from ewanmellor/swift-tidyups-parser
Tidy-ups inside the Swift runtime around ParseTree, ParserRuleContext
2017-11-29 09:52:54 -08:00
Terence Parr 84e9a46932
Merge pull request #2107 from ewanmellor/swift-fix-deprecated-string-methods
Remove use of deprecated String functions
2017-11-29 09:52:27 -08:00
Terence Parr 6bcde64abf
Merge pull request #2106 from ewanmellor/swift-open-error-strategy
Open the error strategies to subclasses.
2017-11-29 09:50:03 -08:00
Terence Parr e11e707a38
Merge pull request #2105 from gendalph/cmake
The correction for cmake depends on the demo
2017-11-29 09:49:38 -08:00
Terence Parr d7a97543ab
Merge pull request #2104 from ajaypanyala/support_intel_compiler
Support building C++ Runtime with Intel compilers
2017-11-29 09:48:35 -08:00
Terence Parr c6a8141890
Merge branch 'master' into support_intel_compiler 2017-11-29 09:48:16 -08:00
Terence Parr 14880cb3b4
Merge branch 'master' into support_intel_compiler 2017-11-29 09:47:51 -08:00
Terence Parr 9a701ef57f
Merge pull request #2103 from ewanmellor/swift-tidy-atndeserializer
Tidy ATNDeserializer.
2017-11-29 09:47:19 -08:00
Terence Parr 8b86af6654
Merge pull request #2102 from ewanmellor/swift-antlrfilestream-report-errors
Report errors in ANTLRFileStream.
2017-11-29 09:47:04 -08:00
Terence Parr a7af99b17f
Merge pull request #2101 from ewanmellor/swift-fix-uuid-extension
Implement UUID.init(mostSigBits, leastSigBits) in the Swift runtime.
2017-11-29 09:46:29 -08:00
Terence Parr afa2574862
Merge pull request #2100 from ewanmellor/swift-fix-parsetreepatternmatcher
Fix ParseTreePatternMatcher.split in the Swift runtime.
2017-11-29 09:46:03 -08:00
Nicolas 6239a640ce Merge branch 'master' into Issue160_import_lexer_grammars
Conflicts:
	contributors.txt
2017-11-28 23:15:02 +13:00
Nicolas d397b9a65a Add my name to contributions file. 2017-11-28 23:07:35 +13:00
Nicolas d02844c813 This is one implementation addressing issue 160.
Change to support import of lexer grammars containing modes into other
lexer grammars. The semantics for this are,
   * sets of channels from all grammars are merged
   * rules of modes found in an imported grammar which are in the root
     grammar are merged into the root grammar mode.
   * modes which are not in the root grammar are added to the root
     grammar, excluding modes which become empty due to a re-definition of
     rules in the root grammar.
2017-11-28 21:57:57 +13:00
Terence Parr 963d44f930
Merge pull request #2024 from kaedvann/master
[CSharp] #2021 fixes nuget packaging options to avoid missing dll exceptions
2017-11-25 12:17:15 -08:00
Terence Parr b7da445d85
Merge pull request #2124 from ewanmellor/csharp-test-diagnostics
[CSharp] Add extra diagnostics and a retry to the C# runtime tests and upgrade the macOS runtime
2017-11-25 12:15:48 -08:00
Terence Parr 1318db6d15
Merge pull request #2133 from zqlu/js-interval-fix
[JavaScript] Fix Interval usage in ErrorStrategy.js
2017-11-25 08:44:28 -08:00
Ivan Kochurkin 07a0a80992 Yes another formatting fixes. 2017-11-25 16:29:03 +03:00
Ivan Kochurkin 763eccc2a4 Added tests with escaped characters. 2017-11-25 16:24:13 +03:00
Ivan Kochurkin 5b11aed48d Restored formatting. 2017-11-25 16:24:13 +03:00
Ivan Kochurkin 64b2ced763 Added check for fragment rules. 2017-11-25 16:24:13 +03:00
Ivan Kochurkin f4c4e8b4a7 Added comments to checkForUnreachableTokens and getSingleTokenValues methods. 2017-11-25 16:24:13 +03:00
Ivan Kochurkin 58349e5ad3 } on line by themselves. 2017-11-25 16:24:13 +03:00
Ivan Kochurkin 9324d0716b Extend and fix unit tests. 2017-11-25 16:24:13 +03:00
Ivan Kochurkin 328cdf3583 Fixed TOKEN_UNREACHABLE warning checks. 2017-11-25 16:24:13 +03:00
Ivan Kochurkin 585325fe12 Added testUnreachableTokens unit-test. 2017-11-25 16:24:13 +03:00
Ivan Kochurkin da57241c1d Added checkForUnreachableTokens method, added new TOKEN_UNREACHABLE error type.
tabs normalized.
2017-11-25 16:24:13 +03:00
zqlu.cn c360a05919 update contributors.txt 2017-11-24 16:41:18 +08:00
zqlu.cn 88a7580b78 Fix interval usage
For JavaScript runtime, Interval class constructor assume start and stop
to be number.
2017-11-24 16:37:40 +08:00