Commit Graph

1212 Commits

Author SHA1 Message Date
Sam Harwell 9d3c763470 Add ATNSimulator.SERIALIZED_VERSION, resolved antlr/antlr4#95 2012-12-06 13:07:32 -06:00
Sam Harwell 886baaf773 Use separate lists in the serialized ATN for non-greedy states (cleaner, allows ATNs with twice as many states), resolves antlr/antlr4#96 2012-12-06 13:07:11 -06:00
Sam Harwell 064501967e Construct GrammarASTAdaptor with CharStream from lexer 2012-12-06 13:05:21 -06:00
Sam Harwell ee8344703b Fix inconsistency in elementOption syntax in tree grammars 2012-12-06 13:05:20 -06:00
Sam Harwell 3946c05eec Update dependencies now that ANTLR 3.5 RC 1 and ST 4.0.7 RC 1 are synced with Maven Central 2012-12-04 12:59:44 -06:00
Sam Harwell b2ab7ab5ac Rename master artifact to antlr4-master 2012-12-04 12:57:56 -06:00
Sam Harwell 9d47ac7169 Shaded output file is antlr4-4.0-complete.jar, includes all files from v4 runtime 2012-12-02 18:10:14 -06:00
Sam Harwell 380d3dadde Create a ParseTreeVisitor interface, rename current abstract base class to AbstractParseTreeVisitor 2012-12-02 17:57:28 -06:00
Terence Parr cda9afdf55 update license everywhere. 2012-12-02 12:58:02 -08:00
Terence Parr 84306fa385 Remove -Xverbose-dfa option. Fixes antlr/antlr4#92 2012-12-02 10:31:58 -08:00
Terence Parr 346da8b863 remove -Xsave-lexer option; log file as implicit lexer AST. Fixes antlr/antlr4#82 2012-12-01 17:30:12 -08:00
Terence Parr 9e3907d573 tokens now have token and char source to draw from. fix and close antlr/antlr4#88 2012-12-01 17:23:50 -08:00
Terence Parr 35202df715 label+='foo' wasn't generating good code. It was generating token type as variable name. Now, I gen "s<ttype>" for implicit labels on string literals. Augmented unit test. Fixes antlr/antlr4#90 2012-12-01 16:26:06 -08:00
Terence Parr 84c34d2391 make code slightly more obvious. 2012-12-01 16:23:44 -08:00
Terence Parr 6d6389eef2 added error for bad sets in lexer. some tests in TestSets appeared to allow ~('a'|B) but it was randomly working. ('a'|B) works without the ~, though doesn't collapse to a set. fixes antlr/antlr4#70 2012-12-01 15:44:23 -08:00
Terence Parr fc79752748 Merge branch 'master' of github.com:antlr/antlr4 2012-12-01 14:38:33 -08:00
Sam Harwell 66bdbb7abd Remove unused options from Tool 2012-12-01 12:27:10 -06:00
Sam Harwell 6de4570964 Explicitly specify the compile scope 2012-11-30 12:28:58 -06:00
Sam Harwell 8a3298e075 Configure the maven-compiler-plugin in the parent POM, including the use of a bootstrap classpath to build a Java 6-compatible jar even when Java 7 is used to build it 2012-11-30 12:28:39 -06:00
Sam Harwell af76d3294e Configure the maven-source-plugin and maven-javadoc-plugin in the parent POM 2012-11-30 12:26:25 -06:00
Sam Harwell 6e6201a341 Build uber-jar of the tool to make it easier to generate code on the command line 2012-11-28 11:43:09 -06:00
Sam Harwell f264609453 Updated POMs for deploying to sonotype 2012-11-27 23:34:36 -06:00
Sam Harwell 11385f7920 Use a zero offset for the first bitset as long as it doesn't force the creation of additional sets 2012-11-27 08:46:16 -06:00
Sam Harwell ad242a0c7a No need to offset the shift value when the offset is 0 2012-11-27 08:39:22 -06:00
Sam Harwell 7c5ec45054 Restrict bitwise comparisons to sets with at least 3 elements (direct equality is cheaper for 1-2 elements) 2012-11-27 08:39:21 -06:00
Sam Harwell 88dbee6352 TestSetInline uses bitwise operators for testing blocks of 64 input values at a time 2012-11-27 08:39:12 -06:00
Sam Harwell 1bc15c5926 Remove unnecessary casts 2012-11-27 08:11:14 -06:00
Sam Harwell d68f75067d Updated library and plugin references 2012-11-26 20:24:35 -06:00
Sam Harwell 5b4809deb6 Include source and javadoc jars in maven builds 2012-11-26 20:21:38 -06:00
Sam Harwell 769e0a418e Updated javadoc 2012-11-26 20:19:09 -06:00
Sam Harwell 60cf71a564 RuleActionFunction and RuleSempredFunction templates generate private methods 2012-11-26 14:21:56 -06:00
Sam Harwell fa5332926b Don't create action functions for lexer rules with no specified actions 2012-11-26 14:21:54 -06:00
Sam Harwell cd5192dd1a Remove inherited and default properties from POMs 2012-11-23 13:46:13 -06:00
Sam Harwell 85f01bcce2 Updated module display names in POMs 2012-11-23 13:37:36 -06:00
Sam Harwell 121044d3b9 Remove inherited property from POMs 2012-11-23 13:36:27 -06:00
Sam Harwell 94803fa9f7 Specify parent POMs 2012-11-23 13:28:52 -06:00
Alan D. Cabrera 0696d3a943 Fixed POMs so everything builds nicely from the root. 2012-11-23 09:47:40 -08:00
Terence Parr 355eb42898 This misidentified scope lexer/parser: @lexer::members { } @parser::members { } 2012-11-22 15:50:21 -08:00
Terence Parr 3c0883e9c3 fix: actions like @after in imported rules caused inf loop. added unit test. 2012-11-22 15:43:21 -08:00
Terence Parr 6bf7bf26fd rename tokens->tokenStream; make sure left-recur rule translation uses token stream from correct imported file. 2012-11-22 12:26:08 -08:00
Terence Parr 4e84ae28a2 fix so tokens { A, B } Actually defines them. 2012-11-22 11:32:45 -08:00
Terence Parr 670b20a5cb factor out isTokenName. 2012-11-22 11:15:48 -08:00
Terence Parr 7eaccbc757 revert tokens{} ids to id not just TOKEN_REF. semantic error comes later. 2012-11-22 10:57:18 -08:00
Terence Parr be3a95e8a7 fix unit test. 2012-11-22 10:56:53 -08:00
Sam Harwell 038d3ad44f Make sure to check rules in modes while checking for undefined rules 2012-11-21 18:37:02 -06:00
Sam Harwell 0742b49c1b Fix USE_OF_BAD_WORD getting reported for elements that never appear in the generated code 2012-11-18 22:30:25 -06:00
Terence Parr 80f7c35a7c Merge branch 'fix-several-bugs' of git://github.com/sharwell/antlr4 2012-11-18 16:19:30 -08:00
Sam Harwell 7fe48dfebf Remove erroneous lexer command placement error message for rules with more than 1 command 2012-11-18 18:17:21 -06:00
Sam Harwell e610f26998 Fix support for the special token reference `EOF` 2012-11-18 18:13:49 -06:00
Sam Harwell d6e1ca2b61 Fix NPE when the grammar has no rules 2012-11-18 18:13:27 -06:00
Sam Harwell 16ace4b429 Fix token definitions: tokens in a tokens{...} block now have type TOKEN_REF (was ID before commit 38214f6312) 2012-11-18 18:03:06 -06:00
Sam Harwell 178df68183 Whitespace can appear between {...}? and => in v3 gated semantic predicates 2012-11-18 18:01:07 -06:00
Sam Harwell aace1ce399 V3 semantic predicate gate (=>) can only appear after a predicate {...}?, not an action {...} 2012-11-18 18:00:19 -06:00
Terence Parr ffbdf8a36c tweak to compile. strange 2012-11-18 15:04:42 -08:00
Terence Parr 133b00aef9 Revert "tweak to compile. strange"
This reverts commit 44cfedc5e6.
2012-11-18 15:01:59 -08:00
Terence Parr 44cfedc5e6 tweak to compile. strange 2012-11-18 14:59:56 -08:00
Terence Parr 3e91065824 Detect EOF in lexer rule 2012-11-18 14:24:18 -08:00
Terence Parr 060343f027 * added check for v3 backward incompatibilities:
** (...)=> syntactic predicates
2012-11-18 14:10:28 -08:00
Terence Parr c5bf2ba0bd * added check for v3 backward incompatibilities:
** {...}?=> gate semantic predicates
2012-11-18 13:59:43 -08:00
Terence Parr 405a447ada warn->err 2012-11-18 13:46:10 -08:00
Terence Parr 38214f6312 * added check for v3 backward incompatibilities:
** tokens {A;B;} syntax
** tokens {A='C';} syntax
2012-11-18 13:39:09 -08:00
Terence Parr 52d3e7ac71 err->warning 2012-11-18 13:04:43 -08:00
Terence Parr ae111eddbd * added check for v3 backward incompatibilities:
** labels in lexer rules
2012-11-18 13:03:37 -08:00
Terence Parr 397f28d12c added check for v3 backward incompatibility: tree grammars 2012-11-18 12:53:48 -08:00
Sam Harwell aba4034051 Evaluate preds in SLL before falling back to full context, avoid full context prediction if unique alternative results 2012-11-18 14:16:28 -06:00
Terence Parr b214f36044 cleanup, rm dead etypes, add check for ids that cause code gen issues; added notion of one-off error 2012-11-18 11:00:06 -08:00
Terence Parr 3e5a976599 playground stuff 2012-11-18 09:57:05 -08:00
Terence Parr 468c791267 cleanup ErrorType a bit, split an error msg. 2012-11-18 09:56:41 -08:00
Terence Parr 0a8e7220f8 fixed: undefined rule refs caused exception 2012-11-18 09:33:11 -08:00
Terence Parr 1916ed0626 rm extra newline 2012-11-18 09:18:41 -08:00
Terence Parr fb63c9927e tweak comment 2012-11-18 09:12:30 -08:00
Terence Parr afe2224881 wasn't checking soon enough for rule redef; now it sets a dead flag in
AST so no more walking dup.
  error(51): T.g:7:0: rule s redefinition (ignoring); previous at line 3
2012-11-18 09:07:30 -08:00
Terence Parr 6a345316df if labels, don't allow set collapse for
a : A # X | B ;
2012-11-17 18:06:23 -08:00
Terence Parr 80b1fa7acb properly check for grammar/filename difference 2012-11-17 17:24:13 -08:00
Terence Parr 8631c143da add check for command placement in lexer rules 2012-11-17 17:03:29 -08:00
Terence Parr 9d34d4d3c9 forgot a case for actions in lexer rules. 2012-11-17 17:00:11 -08:00
Terence Parr e86f89724f added check: action in lexer rules must be last element of outermost alt 2012-11-17 16:50:38 -08:00
Terence Parr 5e519d0063 playground tweaks 2012-11-17 16:27:10 -08:00
Terence Parr b1a3370934 .tokens files goes in output dir like parser file. 2012-11-17 16:25:51 -08:00
Terence Parr 78c75ee5e4 add comment showing snippet to fix unit test, allowing SLL to avoid LL with preds. 2012-11-17 13:44:33 -08:00
Terence Parr 40e95ea5e9 Merge branch 'lexer-block-ref' of git://github.com/sharwell/antlr4 2012-11-15 13:01:41 -08:00
Terence Parr a69ccb3c70 Merge branch 'token-stream-bugs' of git://github.com/sharwell/antlr4 2012-11-15 12:55:32 -08:00
Sam Harwell 18f5354d1b Merge branch 'master' into token-stream-bugs 2012-11-14 15:07:33 -06:00
Sam Harwell 92ae0f0fa6 Merge branch 'recognizer-local-state' 2012-11-14 14:40:56 -06:00
Sam Harwell 9fe197e5b8 Fix rule reference should have been to lexerBlock 2012-11-14 13:06:35 -06:00
Terence Parr fdf3a86969 Merge branch 'implicit-labels' of https://github.com/sharwell/antlr4 2012-11-13 17:08:43 -08:00
Sam Harwell 5db5c3393d TestPositionAdjustingLexer 2012-11-13 13:31:46 -06:00
Sam Harwell 751b063cae Improved accuracy of implicit label analysis within alternatives 2012-11-12 13:50:15 -06:00
Sam Harwell 1b08a014d2 Update GrammarTreeVisitor to include an ANTLR 4-style listener interface 2012-11-12 13:47:46 -06:00
Sam Harwell 05fb538304 Since ASTLabelType=GrammarAST, construct CommonTreeNodeStream with GrammarASTAdaptor to make sure UP/DOWN nodes cannot result in a ClassCastException 2012-11-12 13:41:26 -06:00
Sam Harwell 669f676c55 Updated NetBeans code style for ANTLR and StringTemplate file types 2012-11-12 13:37:50 -06:00
Terence Parr 328dedd778 change version 2012-11-11 10:41:04 -08:00
Sam Harwell 94c33074be Avoid unnecessary call to TokenStream.LT 2012-11-11 11:37:28 -06:00
Terence Parr 64a5be0675 nongreedy decisions can't be LL(1) 2012-11-04 12:06:36 -08:00
Sam Harwell ead9258da3 Fix test name 2012-11-04 13:35:10 -06:00
Sam Harwell a62775c4ba Updated unit tests to reflect new expectations for parser EOF handling 2012-11-04 13:25:26 -06:00
Terence Parr a5016b60f9 nongreedy decisions can't be LL(1) 2012-11-04 10:37:25 -08:00
Terence Parr c073835186 Merge branch 'lexer-recover-eof' of github.com:sharwell/antlr4 2012-11-04 09:35:28 -08:00
Terence Parr f8ec86edd7 rm err 'no wildcard in parser' 2012-11-04 09:34:14 -08:00
Sam Harwell 0903370117 Add unit tests where lexer error recovery consumes to EOF 2012-11-04 11:30:03 -06:00