Commit Graph

2705 Commits

Author SHA1 Message Date
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
Sam Harwell 85f09126e2 Don't include the annotation processor registration in the shaded (complete) jar 2014-03-24 20:43:55 -05:00
Sam Harwell 6642a9222d Merge pull request #516 from sharwell/fix-515
Fix usage of assoc=right in Java-LR.g4 (fixes #515)
2014-03-24 20:05:21 -05:00
Sam Harwell 014785b70a Fix usage of assoc=right in Java-LR.g4 (fixes #515) 2014-03-24 20:05:19 -05:00
Terence Parr b4b91970bd Merge pull request #495 from aphyr/fix-load-string-grammar-npe
BasicSemanticChecks.checkGrammarName: allow null filenames.
2014-03-24 13:20:54 -07:00
Sam Harwell 08300b457f Merge pull request #514 from sharwell/fix-500
Add compile error 159: RESERVED_RULE_NAME (fixes #500)
2014-03-23 21:50:56 -05:00
Sam Harwell ea088eb893 Add compile error 159: RESERVED_RULE_NAME (fixes #500) 2014-03-23 21:49:27 -05:00
Terence Parr ccda6205e6 Merge pull request #513 from sharwell/fix-472
Add compiler warning 158: FRAGMENT_ACTION_IGNORED (fixes #472)
2014-03-23 17:32:54 -07:00
Sam Harwell 0ed651cbc6 Add compiler warning 158: FRAGMENT_ACTION_IGNORED (fixes #472) 2014-03-23 18:02:09 -05:00
Sam Harwell b2af59e73e Merge pull request #512 from sharwell/fix-489
Add compiler warning 157: UNRECOGNIZED_ASSOC_OPTION (fixes #489)
2014-03-23 17:59:52 -05:00
Sam Harwell 2b3ef648f8 Add compiler warning 157: UNRECOGNIZED_ASSOC_OPTION (fixes #489) 2014-03-23 17:47:40 -05:00
Terence Parr 96c22611c4 Merge pull request #511 from sharwell/fix-507
Fix 507
2014-03-23 14:38:18 -07:00
Sam Harwell 480544b4fe Improve wording in description of error 152 2014-03-23 16:31:46 -05:00
Sam Harwell 3e054df98b Do not process grammars following an error during parsing (fixes #507) 2014-03-23 16:31:14 -05:00
Sam Harwell 7daae3a89b Add compiler error 156: unterminated string literal (improves reporting for #507) 2014-03-23 16:30:49 -05:00
Terence Parr 794e4a0b7b Merge pull request #501 from sharwell/fix-433
Fix 433
2014-03-23 11:30:00 -07:00
Terence Parr dcd338cfec Merge pull request #504 from sharwell/update-xpathlexer
Update xpathlexer
2014-03-23 11:26:35 -07:00
Terence Parr e66f663618 Merge pull request #503 from sharwell/fix-469
Fix 469
2014-03-23 11:25:59 -07:00
Terence Parr 0577b4dcaa Merge pull request #510 from sharwell/fix-509
Fix 509
2014-03-23 11:23:33 -07:00
Sam Harwell 336a1197e8 Add a comment describing a possible future optimization to applyPrecedenceFilter 2014-03-23 11:34:38 -05:00
Sam Harwell 10558a7bea Make sure to consider context for the SLL precedence filter (fixes #509) 2014-03-23 11:34:37 -05:00
Sam Harwell cb0119e761 Add regression test for issue #509 2014-03-23 11:34:36 -05:00
Terence Parr c6e6ccde4c Merge pull request #502 from sharwell/fix-480
Mark Recognizer.getTokenErrorDisplay as deprecated (fixes #480)
2014-03-21 09:37:02 -07:00
Sam Harwell 78587d0c08 Fix paths to online binaries in build.xml 2014-03-20 09:32:58 -05:00
Sam Harwell 470863dcd0 Update the runtime to build XPathLexer with ANTLR 4.2 2014-03-20 09:32:42 -05:00
Sam Harwell bc646df824 Add missing @Nullable annotations 2014-03-20 09:25:59 -05:00
Sam Harwell 27270fdd05 Properly encapsulate LexerATNConfig.lexerActionExecutor, and mark as final 2014-03-20 09:25:37 -05:00
Sam Harwell 41e04a27c0 Fix lexerActionExecutor not being preserved when returning from a rule invocation in the lexer (fixes #469) 2014-03-20 09:21:28 -05:00