Commit Graph

1053 Commits

Author SHA1 Message Date
Terence Parr 2c6738041b Merge pull request #52 from parrt/master
more changes to merge
2012-03-31 10:39:33 -07:00
Terence Parr 9fbe9b6e21 op=(x|y) works as left-recur binary op now. 2012-03-30 13:00:31 -07:00
Sam Harwell f166df7b94 Updated unit tests to use .g4 as the preferred grammar extension 2012-03-30 11:44:34 -05:00
Sam Harwell e5d7c27b09 Updated comments to indicate preference of .g4 over .g 2012-03-30 11:37:22 -05:00
Sam Harwell cfcb2a1a55 Add Tool.GRAMMAR_EXTENSION (.g4) and Tool.LEGACY_GRAMMAR_EXTENSION (.g), allow imported grammars to use either extension (favoring .g4 over .g). 2012-03-30 11:36:20 -05:00
Terence Parr 11cd720cc6 added failing test so i go back and fix issue with op=('+'|'-') in LR rules 2012-03-29 21:37:56 -07:00
Terence Parr 1b1ff9915d tweak to Gen.java so it looks in correct templates area. 2012-03-29 15:51:57 -07:00
Terence Parr 42706485e9 was looking for imports with .g not .g4 2012-03-29 14:59:43 -07:00
Terence Parr 447a5620f0 add -diagnostics option to test rig. 2012-03-28 11:07:23 -07:00
Terence Parr e2d9ffc767 Merge pull request #51 from parrt/master
a bunch of new updates
2012-03-28 10:37:43 -07:00
Terence Parr 48b2e237d1 Merge branch 'no-rules-npe' of https://github.com/sharwell/antlr4 2012-03-27 21:23:47 -07:00
Sam Harwell cc7e9c1b0c Don't strip error numbers from lines because the numbers are constants of the public API 2012-03-27 21:52:34 -05:00
Sam Harwell 8d16912fb9 Fix expected output for testAmbigLR 2012-03-27 21:51:55 -05:00
Sam Harwell 2ff9c12848 Fix expected error/warning numbers 2012-03-27 21:51:31 -05:00
Sam Harwell 95b6cd58c4 Fix NPE when a grammar contains no rules (instead of appropriate error message) 2012-03-27 21:25:23 -05:00
Sam Harwell eb48cdf55b Fix test affected by 9c1e58db7c (add {} in primary alt block of LR rule) 2012-03-27 21:22:04 -05:00
Sam Harwell 4b0040f2a1 Fix test affected by bdda174af6 (set stop token even if exception occurs) 2012-03-27 21:20:29 -05:00
Terence Parr 9c1e58db7c add {} in primary alt block to prevent ID|INT from becoming SET, which breaks code gen needs. 2012-03-27 16:21:01 -07:00
Terence Parr bd51907c5e Merge branch 'abstract-parser' of github.com:sharwell/antlr4 2012-03-27 15:18:06 -07:00
Terence Parr bf07f7907f Merge branch 'override-ruleindex' of github.com:sharwell/antlr4 2012-03-27 15:09:50 -07:00
Terence Parr 41e97791bb Merge branch 'set-stop-token' of github.com:sharwell/antlr4 2012-03-27 15:08:57 -07:00
Terence Parr 580ec1f7d7 Merge branch 'fix-tests' of github.com:sharwell/antlr4 2012-03-27 15:07:05 -07:00
Terence Parr f307945d2a Merge branch 'lexer-npe' of github.com:sharwell/antlr4 2012-03-27 15:06:17 -07:00
Terence Parr 8465920343 Merge branch 'atnstate-reachability-test' of github.com:sharwell/antlr4 2012-03-27 15:05:39 -07:00
Sam Harwell 9b42e7dfe6 Implement support for abstract grammars via the "abstract" grammar option and "-abstract" command line option. Resolves antlr/antlr4#36. 2012-03-26 18:00:16 -05:00
Terence Parr 169f58a3ff fix def of EMPTY->INVALID 2012-03-25 21:19:39 -07:00
Sam Harwell df2e24a228 Override getRuleIndex() in generated context objects so ParserRuleContext.ruleIndex field can be removed 2012-03-25 21:50:55 -05:00
Sam Harwell fdb92ccf6d Fix tests affected by 9a0aaacbee and 2232ea5101 2012-03-25 21:50:31 -05:00
Sam Harwell be4caa3d11 Fix tests affected by c6365fb5e2 2012-03-25 21:50:30 -05:00
Sam Harwell bdda174af6 Set stop token even when RecognitionException occurs. Add ParserRuleContext.exception field to hold exception if one occurs. Resolves antlr/antlr4#49. 2012-03-25 21:50:12 -05:00
Terence Parr 542e700644 fix antlr/antlr4/#48 (getText from parse tree node). Don't NPE when start/stop null in getSourceInterval. 2012-03-25 10:01:27 -07:00
Terence Parr 4ea3c73d1f cleaned up interval stuff. moved getSourceInterval to ParserRuleContext; renamed create to of() in Interval. 2012-03-24 18:17:35 -07:00
Terence Parr c6365fb5e2 removed config list (huge) from default message. 2012-03-24 16:56:36 -07:00
Terence Parr e228e88ac5 tweak to remove insuff pred method 2012-03-24 16:48:26 -07:00
Terence Parr 6791bf60cf Merge commit '3f1f76d' into parrt-default-error-listener
Conflicts:
	runtime/Java/src/org/antlr/v4/runtime/ANTLRErrorStrategy.java
	runtime/Java/src/org/antlr/v4/runtime/DefaultErrorStrategy.java
	runtime/Java/src/org/antlr/v4/runtime/DiagnosticErrorListener.java
	runtime/Java/src/org/antlr/v4/runtime/atn/ParserATNSimulator.java
2012-03-24 16:44:47 -07:00
Terence Parr b1bcde76b7 Merge commit '768bfc0' into parrt-default-error-listener 2012-03-24 16:40:09 -07:00
Terence Parr 05ea1bc65f Merge pull request #47 from parrt/master
Lots of fixes; just pushing from active repo parrt/antlr4
2012-03-21 10:14:12 -07:00
Terence Parr 2232ea5101 was not computing lookahead correctly in _LOOK. It assumed all epsilons were predicates. 2012-03-19 17:50:51 -07:00
Sam Harwell bd7796544d Update comments 2012-03-19 08:33:55 -05:00
Sam Harwell 5e0f9a4490 Ensure target non-null in Transition constructor (additional runtime-side consistency check). 2012-03-19 08:33:36 -05:00
Sam Harwell 4bc615d72f Ensure that serialized transitions only point to states which weren't removed. Add unit test for a current failure case (will be a regression test once fixed). 2012-03-19 08:32:34 -05:00
Sam Harwell a70cb6f36a Fix NPE in LexerATNSimulator.execDFA error recovery 2012-03-19 08:17:59 -05:00
Terence Parr ea7037dd2d missing semicolon 2012-03-16 14:29:07 -07:00
Terence Parr 9a0aaacbee rm k=1 chk to report early ambiguity. 2012-03-16 14:11:21 -07:00
Terence Parr 102980dffd make T.g same 2012-03-14 13:20:24 -07:00
Terence Parr 28ee391c81 Merge remote-tracking branch 'sharwell/loops-recursion-test' 2012-03-14 13:09:19 -07:00
Sam Harwell 0ec7f1528c Clean up testLoopsSimulateTailRecursion, move to TestFullContextParsing. 2012-03-14 15:04:01 -05:00
Sam Harwell ee0bc39b53 Add unit test for loopsSimulateTailRecursion 2012-03-14 14:08:22 -05:00
Terence Parr 6887c86d5e shelve 2012-03-14 12:04:18 -07:00
Sam Harwell ae871dcc07 Rename exec/exec to execDFA/execATN 2012-03-13 19:27:52 -05:00