Commit Graph

2882 Commits

Author SHA1 Message Date
Terence Parr 038fa850ed Merge pull request #575 from sharwell/fix-561
Qualify references to ATN class in generated code if it would alias a token
2014-05-24 14:48:35 -07:00
Sam Harwell 938a39c057 Qualify references to the ATN class to avoid symbol conflicts with tokens named ATN (fixes #561) 2014-05-24 16:49:38 -05:00
Sam Harwell e0937a6322 Add regression test for #561 (token named ATN breaks reference to ATN.INVALID_ALT_NUMBER) 2014-05-24 13:14:08 -05:00
Sam Harwell 4ae0161f1a Merge pull request #566 from parrt/args-as-templates
Args as templates
2014-05-24 12:36:30 -05:00
Terence Parr 813fefdbb7 Fixes #554 2014-05-24 12:13:31 -05:00
Terence Parr 4aec5aeac2 add basic code generation testing rig and 1st test. 2014-05-24 12:10:47 -05:00
ericvergnaud 77defbdc70 Git hygiene
Marked .DS_Store files as ignored
2014-05-21 00:19:35 +08:00
Terence Parr a3d4ba53a3 add tool-template and generatedcode-runtime version compatibility check. Target authors add a VERSION template and supply a RuntimeMetaData.checkVersion() method. 2014-05-19 17:25:01 -07:00
Terence Parr 3111db7a76 Merge pull request #548 from sharwell/invalid-names
Improve consistency of Grammar methods for names of rules and tokens
2014-04-13 16:50:51 -07:00
Sam Harwell 65b176a36d Return predefined values instead of null for Grammar methods getTokenNames, getTokenDisplayNames, and getRuleNames
Improve consistency of Grammar methods for names of rules and tokens
2014-04-13 18:46:28 -05:00
Sam Harwell 747fb0ba2e Merge pull request #541 from sharwell/release/4.2.2
Release/4.2.2
2014-04-06 21:20:55 -05:00
Sam Harwell 7e2bf4a2d5 [maven-release-plugin] prepare for next development iteration 2014-04-06 21:19:40 -05:00
Sam Harwell 736a5f5905 [maven-release-plugin] prepare release 4.2.2 2014-04-06 21:18:12 -05:00
Sam Harwell 9c6023b385 Merge pull request #540 from sharwell/fix-528
Updated documentation for ParserATNSimulator.getConflictingAlts
2014-04-06 16:51:21 -05:00
Sam Harwell faf011ce8a Updated documentation for ParserATNSimulator.getConflictingAlts (fixes #528) 2014-04-06 16:51:34 -05:00
Sam Harwell 857c40318f Merge pull request #539 from sharwell/quick-fix
Remove comment that was only meant for testing
2014-04-06 16:34:10 -05:00
Sam Harwell d209bd0ef0 Remove comment that was only meant for testing 2014-04-06 16:34:32 -05:00
Sam Harwell b175d7b223 Merge pull request #537 from sharwell/multiple-eof
Multiple EOF
2014-04-06 16:29:24 -05:00
Sam Harwell d9ec5c02fb Merge pull request #538 from sharwell/polish
Polish
2014-04-06 16:29:06 -05:00
Sam Harwell fb66202820 Improved documentation for Transition.isEpsilon 2014-04-06 16:27:09 -05:00
Sam Harwell f233f6eaae Fix build warning due to use of generics 2014-04-06 16:27:09 -05:00
Sam Harwell f9e9a6ab38 Fix handling of multiple EOF symbols in parser rules 2014-04-06 16:25:14 -05:00
Sam Harwell 88c7d09c24 Add unit tests for grammars with multiple EOF transitions 2014-04-06 16:23:57 -05:00
Terence Parr 14f446f3f8 Update the comment to reflect the new method I put it on. 2014-04-02 09:56:19 -07:00
Terence Parr da9186ed63 Merge pull request #134 from parrt/eval-preds-when-delaying-errors
When delaying error reporting because prediction escapes the decision en...
2014-04-02 09:41:09 -07:00
Terence Parr 8f000d273d If there is no syntactically and semantically valid alternative that reaches the end of the decision entry rule upon no viable alt, choose the first alternative that is syntactically valid but semantically invalid. Refactor into separate method for clarity. 2014-04-02 09:38:26 -07:00
Terence Parr 9652d0059c add Sam's comment. 2014-04-02 08:26:38 -07:00
Terence Parr 8e8a2dc303 Merge pull request #532 from sharwell/codegen-fixes
Codegen fixes
2014-04-01 20:53:43 -07:00
Terence Parr 2a0857b7d5 Merge pull request #531 from sharwell/eof-transitions
Treat EOF transitions in the ATN as epsilon transitions...
2014-04-01 20:52:34 -07:00
Sam Harwell ea4676b18a adaptivePredict never returns -1; it could return ATN.INVALID_ALT_NUMBER 2014-04-01 21:26:48 -05:00
Sam Harwell 8c8d4d754e Remove incorrectly generated call to adaptivePredict
This particular call to adaptivePredict did not correctly match the decision number to the preceding setState() call. In addition, since this code is generated only for a positive closure, the only possible alternative is the one that enters the loop; error handling is deferred to the alternative(s) within the body of the closure.
2014-04-01 21:26:47 -05:00
Sam Harwell bbbf5e34db Treat EOF transitions in the ATN as epsilon transitions after the first EOF transition is traversed 2014-04-01 21:03:07 -05:00
Terence Parr 69d4b423e1 When delaying error reporting because prediction escapes the decision entry rule, we should evaluate predicates to turn off any configurations that are invalid semantically. After that, we can collect the list of alternatives that are satisfied with the input thus far and then choose the minimum as before. Fixes #529 2014-04-01 16:49:30 -07:00
Sam Harwell 6de95c15e7 Merge pull request #526 from sharwell/def-undef
defineRule and undefineRule
2014-03-29 16:35:50 -05:00
Sam Harwell f34adc916a Added Grammar.undefineRule to support undefining rules prior to AST construction 2014-03-29 16:13:36 -05:00
Sam Harwell 5a56cc1147 Documented Grammar.defineRule, and updated it to return true if the rule was added to the Grammar 2014-03-29 16:13:35 -05:00
Terence Parr a3a9d727b3 Merge pull request #525 from sharwell/tuple-features
Implement hashCode, equals, and toString for Pair and Triple
2014-03-29 11:32:35 -07:00
Sam Harwell 557e9448f8 Merge pull request #524 from sharwell/report-retry
Add option TestPerformance.REPORT_SECOND_STAGE_RETRY
2014-03-29 13:21:16 -05:00
Sam Harwell c0d158294a Implement hashCode, equals, and toString for Pair and Triple 2014-03-29 13:19:40 -05:00
Sam Harwell 2729f176b2 Add option TestPerformance.REPORT_SECOND_STAGE_RETRY 2014-03-29 13:12:35 -05:00
Terence Parr afb3390dab add link to the releases 2014-03-25 09:48:43 -07:00
Terence Parr c973567a48 update for 4.2.1 2014-03-25 09:46:58 -07:00
Terence Parr 8e5caa272f Update CHANGES.txt 2014-03-25 09:20:41 -07:00
Sam Harwell b25067b904 Merge pull request #519 from sharwell/release/4.2.1
Release/4.2.1
2014-03-25 11:06:03 -05:00
Sam Harwell 5be18445cd [maven-release-plugin] prepare for next development iteration 2014-03-25 10:57:46 -05:00
Sam Harwell 943aaa5d24 [maven-release-plugin] prepare release 4.2.1 2014-03-25 10:57:44 -05:00
Sam Harwell 32adae763d Merge pull request #518 from sharwell/build-updates
Build updates
2014-03-25 10:52:37 -05:00
Sam Harwell d8efb4ad44 Updated build to use latest releases of ANTLR 3 and ST 4 2014-03-25 10:48:00 -05:00
Sam Harwell dcff40df90 Generate complete documentation with the Tool 2014-03-25 10:43:59 -05:00
Sam Harwell 829b5c78cc Merge pull request #517 from sharwell/rm-processor
Don't include the annotation processor registration in the shaded jar
2014-03-24 20:44:05 -05:00