jasder
/
antlr
1
0
Fork 1
Code Issues Pull Requests Releases 1 Wiki Activity
1,416 Commits 3 Branches 45 Tags 83 MiB
Commit Graph

755 Commits

Author SHA1 Message Date
Terence Parr 79f204ff94 Merge commit 'fa9ec19' 2012-03-12 13:22:55 -07:00
Terence Parr 754408da27 Merge commit '86671d3' 2012-03-12 13:19:35 -07:00
Sam Harwell 3f1f76df7d Move reportAmbiguity, reportContextSensitivity, reportAttemptingFullContext, reportInsufficientPredicates from ANTLRErrorStrategy to ANTLRErrorListener. 
Add BaseErrorListener to allow implementing ANTLRErrorListener without implementing every method (e.g. ConsoleErrorListener).
DiagnosticErrorStrategy is now DiagnosticErrorListener, updated tests.
 2012-03-12 15:07:48 -05:00
Sam Harwell 768bfc0cf2 Add ProxyErrorListener to allow dispatching error reporting to multiple listeners without manually iterating over the list of listeners. 2012-03-12 15:07:48 -05:00
Sam Harwell dce72dcbfb * Recognizer._listeners initialized to have a single ConsoleErrorListener 
* Use CopyOnWriteArrayList so listeners can be added/removed in callbacks
* Remove special handling for _listeners null or empty (never null, ConsoleErrorListener will be present if feature is desired)
 2012-03-12 15:01:21 -05:00
Sam Harwell 50180825d9 Add boolean field ParserATNSimulator.reportAmbiguities (default true). When false, ambiguous alts aren't reported which allows usage of (the faster) incomplete semantic predicate evaluation even within execATN. 2012-03-10 16:41:57 -06:00
Sam Harwell 04cd48e88d No need to fully evaluate predicates when called from execDFA because ambiguous alts aren't reported anyway. 2012-03-10 16:32:10 -06:00
Sam Harwell 2cc39c2f9b Evaluate predicates for all ambiguous alternatives and report if still ambiguous after predicate evaluation. Remove misleading message insufficient predicates. Fixes antlr/antlr4#31. Partially addresses antlr/antlr4#39. 2012-03-10 16:16:39 -06:00
Sam Harwell 86671d30fb Tweak comments 2012-03-10 13:23:02 -06:00
Sam Harwell 7525bb6e1d Semantic predicates now evaluate with standard min-alt selection 2012-03-08 13:53:45 -06:00
Terence Parr a9e74ce399 Merge branch 'failed-predicate-message' of git://github.com/sharwell/antlr4 2012-03-06 13:28:47 -08:00
Sam Harwell 5deab167a1 ParseTreeVisitor.visit takes a ParseTree... only visitChildren takes a RuleNode 2012-03-04 12:52:43 -06:00
Sam Harwell b570641e2b Simplify ParseTree.visitChildren; ParseTree.visit and visitChildren take a RuleNode parameter; update comments 2012-03-04 12:17:43 -06:00
Sam Harwell a948736729 TerminalNodeImpl.isErrorNode now tests for ErrorNode interface instead of ErrorNodeImpl implementation 2012-03-03 21:57:49 -06:00
Sam Harwell 80b3ec8c62 Dispatch accept() for terminal nodes to visitor 2012-03-03 21:57:08 -06:00
Terence Parr 0375f8318a rename a parameter 2012-03-01 18:01:27 -08:00
Terence Parr 2ba5a1f12a Made the parse tree visitor walk ParseTree objects not ParserRuleContext objects. This necessitated pulling up the accept() and toStringTree(Parser) methods into ParseTree. 2012-03-01 17:57:49 -08:00
Sam Harwell fa9ec191bd Add TrimToSizeListener and Parser.get/setTrimParseTrees 2012-02-29 11:22:54 -06:00
Sam Harwell c3cd99858c Reduce size of generated code by emitting predicate text instead of full failed predicate message 2012-02-29 08:14:42 -06:00
Terence Parr dd69a7532d getToken/s returns TerminalNode now per Sam's suggestion. altered tests. seems correct. 2012-02-27 21:39:30 -08:00
Terence Parr 9ae92a5cef reformat 2012-02-27 21:32:25 -08:00
Terence Parr 67b2e6d7c1 forgot to move Pair etc... 2012-02-26 21:55:23 -08:00
Terence Parr e9a3de645a add useful method to get a->b pairs out 2012-02-26 15:55:46 -08:00
Terence Parr 41be88dcd5 mv to runtime 2012-02-26 15:49:45 -08:00
Sam Harwell bedc502d33 Set the listeners list back to null if all listeners are removed from it 2012-02-26 17:33:52 -06:00
Terence Parr 1e438746be added interface for error nodes, method in terminalnode. 2012-02-26 15:32:18 -08:00
Terence Parr db1b86af91 alter visitTerminal interface, add visitErrorNode. 2012-02-25 17:03:41 -08:00
Terence Parr 528e9c7b86 fix cut/paste error 2012-02-25 16:09:29 -08:00
Terence Parr 600c4bbd91 crap. sun already made IdentityHashMap; rm'ing my version 2012-02-25 16:07:34 -08:00
Terence Parr 73ae2b0bfc Added ParseTreeProperty and added generically useful Map that ignores key.hashCode and equals() and simply uses key identity instead. In particular, this is useful for ANTLR because parse trees are actually interfaces laid on top of the rule context objects used by ANTLR's grammar analysis. These context objects use special equals methods and so on. Plus, when we want to annotate trees with values, we want a specific note to have a value. Identity is what we intend. 2012-02-25 13:43:32 -08:00
Sam Harwell a74da2df60 Use ==ParserRuleContext.EMPTY instead of .isEmpty() 2012-02-24 15:57:43 -06:00
Sam Harwell 9bf6f284df Code cleanup (little things like using .isEmpty() and StringBuilder, and specify some small-scale generic arguments) 2012-02-23 16:42:36 -06:00
Sam Harwell 1e3e092326 Fix unchecked warnings in clone() 2012-02-23 16:13:15 -06:00
Sam Harwell e400f5b1a1 Move Recognizer._errHandler to Parser class 2012-02-23 16:13:14 -06:00
Sam Harwell 1c8efd6a48 Allow contravariant error listeners 2012-02-23 16:13:13 -06:00
Sam Harwell 6c26917b90 Use generic List instead of generic array for listeners 2012-02-23 16:13:12 -06:00
Sam Harwell 7dcb148d73 CommonTokenStream now extends BufferedTokenStream<Token> instead of BufferedTokenStream<CommonToken>. Token interface provides the same information and the change helps the work on improving generics. 2012-02-23 16:13:11 -06:00
Sam Harwell d7dbef2782 Can get token start and stop index from Token interface now 2012-02-23 16:13:11 -06:00
Sam Harwell 1492648d26 Add missing @Override annotations 2012-02-23 16:13:06 -06:00
Sam Harwell 96c08bec52 Remove unused imports 2012-02-23 16:12:02 -06:00
Terence Parr b459dafeb9 empty alternatives didn't trigger listener events. overrode getParent in ParserRuleContext to make type more specific. 2012-02-23 12:16:14 -08:00
Terence Parr 8a34176d82 added listener unit tests. fixed bug that didn't create ctx getters properly for recursive rules. added Symbol extends Token to parse tree stuff. added visitTerminal to Visitor. recursive alts now track their original, unedited AltAST subtree so we can properly count rule refs etc... later. dup of RuleRefAST was making wrong node. don't gen dispatch methods if no listener. 2012-02-22 12:44:33 -08:00
Terence Parr 58ef729be5 renamed next to target. factored out to methods, commented code. 2012-02-21 12:47:34 -08:00
Terence Parr 0e23c7e2a3 Merge commit '611728a3806d6a8c9fe44a538d34b448784986c1' 2012-02-21 12:14:11 -08:00
Sam Harwell 5fb389b6e4 Improve lexer performance during warm-up by tracking DFA states within exec (ATN) and using existing edges when available 2012-02-20 19:20:50 -06:00
Sam Harwell 611728a380 Update testPerformance to show information about DFA states in the lexer 2012-02-20 18:51:26 -06:00
Sam Harwell a81b1a17eb Extract abstract method in Recognizer for Parser.getGrammarFileName() and generated lexer's getGrammarFileName(). Make Recognizer.getTokenNames(), getRuleNames(), and getATN() abstract - implementations are always generated. 2012-02-20 17:18:57 -06:00
Sam Harwell 2982f4b5a6 Add comments describing the semantics of an ATNConfig set with partially predicated alts in ParserATNSimulator 2012-02-20 15:43:02 -06:00
Sam Harwell 16fa8ba4f4 Add comments describing the context depth latch in ParserATNSimulator.closure 2012-02-20 15:25:58 -06:00
Terence Parr e9122cafa3 Merge commit '46d5458' 2012-02-20 12:22:37 -08:00
Terence Parr 1a2094b2dd merging Sam\'s fix to full ctx pred etc...; effectively did pull parrt/antlr4#15, includes fixes antlr/antlr4#14, includes fixes antlr/antlr4#15 2012-02-20 11:48:03 -08:00
Terence Parr 4e8931519c added -parse-listener option and generated code if option on. parse listener differs from tree listener 2012-02-18 16:49:05 -08:00
Terence Parr 725b105135 Added visitor gen mechanism, runtime support 2012-02-16 17:49:57 -08:00
Sam Harwell 27806dc490 Merge remote-tracking branch 'parrt/master' 2012-02-15 14:58:16 -06:00
Sam Harwell 28919bbdc5 Fix ParserATNSimulator.execDFA consuming an unnecessary symbol after an accept or context-sensitive state is reached 2012-02-15 14:02:50 -06:00
Sam Harwell 685cf7b7d5 Further improvements to auto-label generic usage, return Collections.emptyList() instead of null when no children are found 2012-02-15 12:31:43 -06:00
Sam Harwell 0bbb7101ba Include input character in LexerNoViableAltException.toString() 2012-02-15 12:02:44 -06:00
Sam Harwell bc87562aff Remove unused exception LexerRecognitionExeption [sic] 2012-02-15 11:01:01 -06:00
Sam Harwell 5ab082967f Fix generic usage 2012-02-15 10:50:37 -06:00
Terence Parr fa3a664696 got some good examples working that play around with the getter methods. 2012-02-14 16:33:12 -08:00
Terence Parr cdb420fdde got implementation of getters in! Fixes #8 2012-02-14 15:01:03 -08:00
Sam Harwell 9600a70724 Fix NPE in CommonToken when TokenSource is not available 2012-02-13 08:41:57 -06:00
Terence Parr 6e4cba131a Allow var args in ctor of IntervalSet 2012-02-11 15:30:54 -08:00
Terence Parr f278d3b453 add unit test for left-recur grammars 2012-02-11 11:35:27 -08:00
Sam Harwell cd3adb140d Fix ParserATNSimulator.execDFA adding incorrect error edges in the DFA 2012-02-10 00:52:24 -06:00
Sam Harwell 30c58bf8eb Specify <?> type parameter on raw types 2012-02-10 00:51:23 -06:00
Sam Harwell 99ce3cba5c Fix ParserATNSimulator.closure not tracking proper context for context-sensitive predicates during full-context parsing 2012-02-09 19:47:56 -06:00
Sam Harwell 467797785f Fix generics in ParserATNSimulator 2012-02-09 15:37:56 -06:00
Sam Harwell ddf946b067 Token.EOF instead of -1, add <?> to generic type usage, make getUniqueAlt an instance method (need to override it for some apps), @NotNull annotations 2012-02-09 15:33:03 -06:00
Sam Harwell 7fb73a3849 Construct DFA instances with the decision number 2012-02-09 13:29:14 -06:00
Sam Harwell bf5df30708 Remove unnecessary initializations, use isEmpty() instead of size()==0 2012-02-09 12:45:46 -06:00
sharwell 46d5458617 Fix handling of alts with some configs predicated and some configs unpredicated (should be treated as always true) 2012-02-09 01:11:09 -06:00
sharwell 9c554a002b Add LexerATNSimulator.copyState (allows copying state information from another simulator instance) 2012-02-09 00:15:30 -06:00
sharwell 40a8759276 Add LexerATNSimulator.getTraceStream 2012-02-09 00:14:37 -06:00
sharwell 3b4ae2a742 Use trivial implementation of mark/release for BufferedTokenStream 2012-02-08 18:58:57 -06:00
sharwell f43f9f2218 Override CommonTokenStream.reset() to make sure the stream is left on an on-channel token 2012-02-08 18:58:19 -06:00
sharwell a34fd6330b Use isEmpty() instead of size()==0 2012-02-08 18:57:32 -06:00
sharwell a9e44f3aab Use isEmpty() instead of size()==0, use StringBuilder instead of StringBuffer, use chained append() calls instead of string concatenation, add @Override annotations 2012-02-08 18:57:05 -06:00
sharwell d181b230dc Specify generic type parameter 2012-02-08 18:55:57 -06:00
sharwell 64203312ac Improved SemanticContext.hashCode(), add @Override annotations 2012-02-08 18:54:40 -06:00
sharwell 773e9e1c7e Add generic type argument 2012-02-08 18:12:01 -06:00
sharwell dcdfac4bcd Improved implementation of equals() and hashCode() for ATNConfig 2012-02-08 18:09:32 -06:00
sharwell 64210f4b72 Add @NotNull annotations, make ATNConfig.semanticContext field final 2012-02-08 17:21:09 -06:00
sharwell 71e0c66477 Rename NUM_EDGES to MAX_DFA_EDGE, reduce max value to 127 2012-02-08 17:15:34 -06:00
sharwell 2249135c21 Specify generic type parameters 2012-02-08 17:12:22 -06:00
sharwell 1df70924f5 Use ATNConfigSet instead of OrderedHashSet<ATNConfig> 2012-02-08 17:06:41 -06:00
sharwell 52256044a9 Use for each instead of indexed for; use isEmpty() instead of size()==0 2012-02-08 17:06:03 -06:00
sharwell 326cb259a0 Construct Parser with TokenStream (restriction from IntStream) 2012-02-08 16:34:04 -06:00
sharwell 18a6414fb3 Use ATNConfigSet for parameter instead of OrderedHashSet<ATNConfig> 2012-02-08 16:26:14 -06:00
sharwell a6524d8b38 Add pom.xml to support maven builds 2012-02-08 15:07:06 -06:00
Terence Parr 894a77168d rename atn sim, add error message to TestRig 2012-02-05 10:14:04 -08:00
Terence Parr 1cc7ac3410 added -trace to TestRig. fixed code gen issue for trace listener 2012-01-30 16:51:55 -08:00
parrt e90b322dd4 ~[] stuff is allowed and works inside sets etc... 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9926]
 2012-01-28 14:36:46 -08:00
parrt 09da63cfd4 rollback and do a real fix for whitespace escaping 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9911]
 2012-01-27 12:00:30 -08:00
parrt 7498908d62 rollback and do a real fix for whitespace escaping 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9906]
 2012-01-26 14:18:57 -08:00
parrt adcf72b9a2 whitespace was being escaped to special characters even when printing to string should only do so when doing GUI tree 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9904]
 2012-01-26 14:11:30 -08:00
parrt 9fd280b30e Lexer fields mv from x to _x 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9883]
 2012-01-21 15:36:20 -08:00
parrt 6013c4c97d Added modeNames to gen'd lexers 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9878]
 2012-01-21 15:10:46 -08:00
parrt dc82edad02 Summary: we can have lexer commands like -> skip now. 
moved model.actions package to chunk
type(foo) didn't match.
ATNBuilder.g now tracks the outer alternative number and calls new factory commands on the lexer commands.
Removed unnecessary resolveWithPredicate field from ATNConfig
Added lexerActionIndex field to ATNConfig since we need to track whether we passed an action in an alternative will rule in the lexer.
Renamed ruleIndex in DFAState and added the lexer action index so that we can execute lexer actions from the DFA.
added functions to the grammar tree visitor for the lexer commands.
Added templates for the lexer commands.
Augmented the lexer ATN factory so that it constructs plain old actions from the lexer commands it finds. That way, the code generator doesn't know any different and generates an action.
Augmented the lexer ATN simulator so that it fires a proper action index now. previously it only used the rule index, which of course doesn't work when you have more than one action in a rule.
rm'd dup code from OutputModelController
altered the epsilon edge removal optimization so that it could not remove actions in lexer rules.
Added list of valid lexer commands in Rule.

[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9877]
 2012-01-21 15:01:05 -08:00
parrt 093a4f951b leave start/stop char index alone in CommonTokenFactory; refers to original text. 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9867]
 2012-01-14 11:18:23 -08:00
parrt 5bd780c235 in tree views, spaces/newlines were blanks. I converted to \n and middle dot 
for space.

[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9857]
 2012-01-11 17:25:44 -08:00
parrt 848c6e4313 This change is a major restructuring of how left recursive rules are transformed. Previously I simply rewrote the grammar and ANTLR was none the wiser. However, it quickly became apparent that ANTLR needed to do many different things for recursive rules so I had to insert transformation later in the pipeline. Specifically, I needed it after Rule object creation. I made a special LeftRecursiveRule object that track information collected during transformation so that I could use it later. I made major changes to the left recursion templates as well as the little code snippets in Java.stg. I created a new template called LeftRecursiveRuleFunction an accompanying model object that handles the special case, even though there is some duplication. the biggest difference in the grammar is the introduction of => ID notation on any outermost alternative. This information is not added to the tree, instead the ALT node is annotated with the ID. Rule.getAltLabels() now looks also in the LeftRecursiveRuleAltInfo objects. I have moved to the left recursion transformation to its own object and have moved some objects into the analysis package. Further, I have split out the Rule object creation into its own RuleCollector. I renamed discoverAlt in the grammar tree visitor to be discoverOuterAlt an added discoverAlt so we can get information about individual alts even inside subrules. Listeners always get an event for the generic rule context, which is used if there is no specific label for an alternative. Added a list of iteration operations for LL(*) subrules. Split buildRuleFunction into buildLeftRecursiveRuleFunction and one for normal rule function creation. I have to insert lots of extra code to manage the contexts, but of course it's all done using the templates. As long as those templates are correct, this code generation mechanism will work. I removed the st field from the parser rule context. I injected the left recursion transformation inside the SemanticPipeline. Visitor dispatch methods are always added to the generated context structures. Fixed some unit tests. About 24 fail. 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9854]
 2012-01-11 11:00:05 -08:00
sharwell 742a08862f Merging dev changes to main 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9853]
 2012-01-09 10:26:23 -08:00
parrt 4ae23f4a64 * 1+2*3 now gives new parse tree: (e (e 1) + (e (e 2) * (e 3))) See CHANGES.txt now too 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9833]
 2012-01-05 12:27:14 -08:00
parrt cab41e41e3 had non-ascii char 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9812]
 2012-01-04 09:05:31 -08:00
parrt 963ccd2700 added comment 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9797]
 2012-01-03 12:46:51 -08:00
parrt 224a4bc9e1 changed formatting 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9796]
 2012-01-03 12:46:39 -08:00
parrt 8099cec3bd Added ctx to visitTerminal in parse tree listener. That should be useful information. made commensurate change in the parse tree walker to make sure I have a proper context to send to the visitTerminal method. renamed a few fields of parser/lexer to have _ in front to avoid name collisions with user actions. change the name of the listener method so that they're more explicit using the terms Error and Parser to identify what kind of listener we are adding or removing. Added a default TraceListener to Parser so that we can call setTrace(true) to have it start dumping out information as a first step in the debugging process. there are now multiple parse tree listeners possible because I made a list. we may want to pass in multiple actions to the parser. 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9795]
 2012-01-03 12:46:18 -08:00
parrt 5c328c7e3f Bug: didn't stop at end of stream during consume() 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9794]
 2012-01-03 12:40:42 -08:00
parrt 5d60e85617 rm trace ATN state stuff. Will think about when we do debugging. 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9792]
 2012-01-03 11:07:49 -08:00
parrt c716a87544 move method down in file 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9791]
 2012-01-03 11:05:40 -08:00
parrt 5c3c8d6e7a Added TokenFactory, CommonTokenFactory. Update the parser in the lexer with methods to set the factory. Alter the default error strategy and the lexer to use the factory. The parser's set token factory method updates the token source, usually the lexer, and the error handling strategy. I had to add the set token factory method to token source as well to make all of this work. 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9789]
 2012-01-03 10:58:01 -08:00
parrt 3aeeb2b277 rename BaseREcognizer as Parser 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9781]
 2012-01-02 18:36:59 -08:00
parrt 1b04195a2f removed all template / AST rewrite stuff; massive change; added -encoding tool option 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9780]
 2012-01-02 18:13:16 -08:00
parrt 8846b98ee7 fix compile error 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9765]
 2011-12-29 17:05:34 -08:00
parrt a923ad8765 Major update to v4. I backed out a change I made on Christmas then mistakenly prevented any lexer DFA creation. Per http://www.antlr.org/wiki/display/~admin/2011/12/29/Flaw+in+ANTLR+v3+LL%28*%29+analysis+algorithm I fixed a major flaw in ANTLR's notion of context. To do that, I needed to create a new LoopEndState, with all of its fanout to the serialization and parser ATN construction. got a very good start on ParserATNPathFinder, which uses basic recursion to find all possible paths and return a tree with the possibilities. I left it in the condition where he would sometimes loop forever; it needs to track sets of configurations in the busy set; it using states at the moment. added a new signal from the interpreter: reportAttemptingFullContext. I fixed a bug where configuration sets derived from a configuration that had reachesIntoOuterContext>0 were not being considered as dipping into the outer context. The ambiguity checker needed to switch so that a check for exact matches not suffixes when doing full context. It's faster at the very least for full context. added some more support routines to DFA. Added TraceTree in support of the new ParserATNPathFinder. 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9764]
 2011-12-29 17:04:40 -08:00
parrt 3b51bb478d rm unneeded field 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9761]
 2011-12-27 15:52:47 -08:00
parrt d01bde9125 added new reportAttemptingFullContext to strategy 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9760]
 2011-12-27 15:25:01 -08:00
parrt bb960e3c37 improved data to report insuff. preds. also, it was detecting it improperly 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9758]
 2011-12-27 14:11:41 -08:00
parrt 638969bed9 add '...' to diagnostics input 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9757]
 2011-12-27 13:37:47 -08:00
parrt c1e199d77f added -tokens flag 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9756]
 2011-12-26 18:10:29 -08:00
parrt bf8473e0fd add cmt 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9755]
 2011-12-26 17:57:00 -08:00
parrt ce9638e59c was still creating dfa with sempreds 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9752]
 2011-12-26 17:07:45 -08:00
parrt c1923a107e -tree => -print option 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9748]
 2011-12-26 14:05:58 -08:00
parrt db655f8f2c add -gui option to view in gui window 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9747]
 2011-12-26 13:06:05 -08:00
parrt 5c50e5f049 Wasn't using Udo's lib correctly 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9746]
 2011-12-26 13:05:46 -08:00
parrt c6bde7e1e8 -ps arg wrong 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9745]
 2011-12-26 11:13:46 -08:00
parrt adb91a9bde rm print 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9744]
 2011-12-26 11:10:30 -08:00
parrt 494f519b05 add java org.antlr.v4.runtime.misc.TestRig GrammarName startRuleName [-tree | -ps file.ps] [input-filename] 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9743]
 2011-12-26 11:03:51 -08:00
parrt 6daa66f83f no more resolved bit in config. use ATNConfigSet all over. final clean up of ATN sim. 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9741]
 2011-12-25 12:01:24 -08:00
sharwell 79d1c40427 Integrate CL9648 to main (getAncestors returns Collections.emptyList() instead of null) 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9649]
 2011-12-17 11:42:26 -08:00
sharwell c59cf36f88 Integrate CL9646 to main (fix forward seek) 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9647]
 2011-12-17 09:51:18 -08:00
parrt 6b673a3b2e track stats properly 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9643]
 2011-12-16 16:00:11 -08:00
parrt ebd1fbb63d within 2 or 3 unit test of where I was before I got it the ATN simulator 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9642]
 2011-12-16 15:07:28 -08:00
parrt 3d133e9417 broke out fullctx tests, some fixes. 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9636]
 2011-12-16 09:43:29 -08:00
parrt 1e8548297e mv comment over and make sure that the tree parsers use the new ATN engine 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9635]
 2011-12-15 16:14:49 -08:00
parrt 5ad1505fdb almost got new ATN engine working; separated .* nongreedy tests, reorg args on reporting methods 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9627]
 2011-12-15 11:03:41 -08:00
sharwell fa3483a7fc Merge CL9619 to main (fix CommonTokenStream.seek) 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9620]
 2011-12-15 07:27:52 -08:00
parrt 92279bd6db almost got prediction working 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9600]
 2011-12-13 18:10:04 -08:00
parrt 8d73f53775 check in start of new ATN sim engine; rm traversedPred in DFAState. 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9598]
 2011-12-13 14:38:30 -08:00
parrt 8f7fb98e16 added big comments 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9565]
 2011-12-12 16:33:10 -08:00
parrt b9afdf6e07 rename var; add missing return 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9564]
 2011-12-11 14:45:25 -08:00
parrt 3fb7466a80 another big reorg and fixed unit test. lots more sharing and splitting into methods; same 21/807 tests fail; java works. 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9563]
 2011-12-11 14:34:32 -08:00
parrt 8615fc26da rm dead code 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9562]
 2011-12-11 13:03:34 -08:00
parrt 18ff004d83 playing; nop 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9560]
 2011-12-11 12:29:27 -08:00
parrt d372d761d5 interim refactoring. much smaller execATN; removed prevAccept fields. useless. 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9559]
 2011-12-11 12:09:29 -08:00
parrt c3630843d2 add convenience method 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9558]
 2011-12-11 11:23:42 -08:00
parrt 1923242b37 clean up comment 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9553]
 2011-12-10 18:54:52 -08:00
parrt b89d7c0932 rm dead code 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9552]
 2011-12-10 18:51:46 -08:00
parrt 12aa6c2404 fix unit tests, bug in collecting preds and testing in DFA state 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9550]
 2011-12-10 17:28:17 -08:00
parrt b1c7edb8d8 moved empty context chk for retry 
altered args on reporting methods
reporting methods moved from parser to error strategy
fixed full ctx retry in DFA (used to only work in ATN)
i record conflictSet not just boolean in DFA
added debugging support to BaseRecognizer
added DiagnosticErrorStrategy

[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9549]
 2011-12-10 16:24:41 -08:00
parrt b682450e29 add clone() 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9548]
 2011-12-10 15:43:06 -08:00
parrt 131e9f7686 added comments, working on parser interpreter (not prediction) reorg. adding ParserInterpreter. adding unit tests. 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9546]
 2011-12-09 16:35:21 -08:00
parrt 63168c5577 added more dbg prints, turned on context sensitivity in test java lr. 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9545]
 2011-12-07 17:47:08 -08:00
parrt 946c59da14 added Sam's fix for def of ambiguous DFA state; added unit test but not working yet. rule ctx conflictsWith() consistent with v3 now; replaced some Set<Integer> with IntervalSet (for alt sets) and sped things up. 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9541]
 2011-12-06 17:10:53 -08:00
parrt 28696fe2ff add toSet() 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9540]
 2011-12-06 15:58:47 -08:00
parrt cc00494e9d add null chk 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9535]
 2011-12-06 11:41:08 -08:00
parrt 27aca5a66e rm prints 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9533]
 2011-12-06 11:24:33 -08:00
parrt cab803d5f3 tweak comment 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9528]
 2011-12-05 09:44:40 -08:00
parrt 2ddb8100e9 shrunk serialized ATN a bit 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9526]
 2011-12-04 18:39:20 -08:00
parrt b09077209c fixed hideous bug found by sam in getAmbigAlts 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9525]
 2011-12-04 18:21:24 -08:00
parrt 110fafde5a change name 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9524]
 2011-12-04 16:02:40 -08:00
parrt 80fd90d363 rm'd epsilon transition in ATN after rule refs. 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9518]
 2011-12-03 14:52:24 -08:00
parrt 2b8a821c21 turn off dbg print 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9517]
 2011-12-03 14:16:47 -08:00
parrt f08e8fc098 predTransition was not passing along predicate properly. rm'd unneeded parameter. pass null if ctx independent pred. added 2 unit tests for non outer ctx check. 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9516]
 2011-12-03 14:12:06 -08:00
parrt cabe808c7f trivial change, gets small speed bump 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9514]
 2011-12-02 12:22:35 -08:00
sharwell beec4ab721 v4: Back out changelist 9511 (change DFAState.configs to ATNConfig[]) 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9513]
 2011-12-02 10:04:34 -08:00
parrt ae74881de6 strip epsilons between alternative elements and also stripped the final epsilons before block ends. added an ATN visitor for general use. updated all of the unit tests so they pass new smaller ATNs. had to do some work in the serialization and deserialization to handle state numbers without state information. did not want to reorder state numbers during optimization. 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9512]
 2011-12-01 17:46:12 -08:00
sharwell 682e60b065 v4: DFAState.configs now ATNConfig[] instead of OrderedHashSet<ATNConfig> 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9511]
 2011-12-01 17:04:25 -08:00
parrt 4d942c37c8 use RuleContext not ParserRuleContext during prediction 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9510]
 2011-12-01 14:24:57 -08:00
parrt 4400ba169f refactored RuleContext to move all noncritical fields down into ParserRuleContext. Widespread but minor changes. Using the more specific ParserRuleContext where appropriate. 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9509]
 2011-12-01 14:01:00 -08:00
sharwell 38c69af805 v4: Back out changelist 9507 (PredictionContext optimization) 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9508]
 2011-12-01 13:14:37 -08:00
sharwell 11b6fa13f9 v4: PredictionContext optimization 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9507]
 2011-12-01 13:13:24 -08:00
parrt a8219d943e got java LR parser working :) allows e A B C e type LR alts now 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9506]
 2011-11-30 18:57:45 -08:00
parrt b6b4583b92 let it build DFA again. 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9505]
 2011-11-30 18:31:20 -08:00
parrt 8d7a97fb68 fixing some pred bugs. fixed unit testSimple in pred eval. optimized sem ctx. 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9503]
 2011-11-30 17:44:49 -08:00
Udo Borkowski 1bc3997930 add "useCurvedEdges" feature 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9502]
 2011-11-30 17:10:46 -08:00
Udo Borkowski ef57f44240 add "useCurvedEdges" feature 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9501]
 2011-11-30 16:12:35 -08:00
sharwell 8c3e8272d8 v4: System.out.format instead of System.out.println 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9496]
 2011-11-30 08:50:25 -08:00
sharwell 583668746f v4: Optimize ATNState.onlyHasEpsilonTransitions (5-15% improvement during warmup) 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9495]
 2011-11-30 08:42:54 -08:00
sharwell 8096b3b4c4 v4: Check for early return conditions during DFA updates 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9494]
 2011-11-30 07:05:38 -08:00
sharwell 83a5f592d0 v4: Convert do{...}while(true) to while(true){...} 
Use CharStream.EOF instead of Token.EOF when referencing results of CharStream.LA

[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9493]
 2011-11-30 07:03:40 -08:00
sharwell befd9ba483 v4: Combine calls to Set.contains and Set.add 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9492]
 2011-11-30 06:32:33 -08:00
sharwell 2bbb1ca132 v4: Fix Parser.reset (side effect fixes Parser.setInputStream) 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9491]
 2011-11-29 20:25:51 -08:00
sharwell 1be2e2c556 v4: Initial tracing support in the lexer 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9490]
 2011-11-29 20:13:06 -08:00
sharwell fb3de170d1 v4: Add BaseRecognizer.isExpectedToken - *massive* performance improvement in DefaultErrorStrategy.sync() 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9489]
 2011-11-29 19:43:33 -08:00
sharwell 07bbf42f8b v4: Add <?> to generic instance 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9488]
 2011-11-29 19:31:25 -08:00
sharwell 99cf07cc3c v4: check for null 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9487]
 2011-11-29 19:01:35 -08:00
sharwell a71a9f04ea v4: check for null before evaluating sempreds in the lexer (issue a warning if no recognizer is available for evaluation) 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9486]
 2011-11-29 18:59:32 -08:00
sharwell c25f3ff3d8 Add type parameter to BailErrorStrategy since the class may safely be used with any type of recognizer 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9485]
 2011-11-29 17:50:03 -08:00
parrt 2243cc2e81 wasn't seeing thru some preds. 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9484]
 2011-11-29 17:31:18 -08:00
parrt e00fa44996 Got validating and disambiguating predicates the way I want; widespread changes. DFAStates now have a list of predicate/alt pairs that they can test at except states. renamed Java.g4 to JavaLR.g4. LL(1) analysis did not fail when it's all predicates, which it must. 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9482]
 2011-11-29 15:46:51 -08:00
Udo Borkowski 4e30119ab6 fix various issues in TreeViewer 
1) Issue: The tree "jumps" from a larger scale to a much smaller scale when starting dragging the scale slider.

Cause: Initially the slider was not correctly positioned. It always assumed a scale of 1. 

Solution: I now calculate the initial slider position using the current scale (was 1.5).

---

2) Issue: NullPointerException when the scale slider is dragged to the very left.

Cause: The formula "v / 1000.0 + 1.0" results in a scale of 0.0 when using -1000 (left position). A scale of 0 is not supported.

Solution: in setScale I now check for "<= 0.0". In the case I use scale 1. In addition I changed the lower bound of the slider to -999, i.e. the left position represents the scale "0.001".

---

3) Issue: when scaling the scrollbars are not added/updated/removed

Cause: when scaling the preferred size of the TreeViewer must be updated as the ScrollPane refers to the preferredSize for scrolling.

Solution: now calling "updatePreferredSize" in setScale. This will set the preferred size to the "scaled tree size". It also ensures parents will be notified and the view is repainted.

---

4) Issue: only an upper left part of the tree is painted.

Cause: the TreeViewer overwrote the getWidth/Height and returned unchanged values (800x600). Only this area in painted. If the preferred size exceeded this size the remaining area was not painted.

Solution: Removed the overwrite of getWidth/Height. As one consequence the dialog will start at maximum size for large tree layouts.

[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9481]
 2011-11-29 07:40:09 -08:00
parrt 9a1a8428b5 got ambig pred thing working i think; unit tests. missing validating pred thing. 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9480]
 2011-11-28 19:16:45 -08:00
parrt e288ff3039 interim pred overhaul 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9479]
 2011-11-28 09:37:29 -08:00
parrt eb6443b32b add TODO 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9478]
 2011-11-27 14:39:29 -08:00
parrt 3b7e984d5f mv join to runtime Utils 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9477]
 2011-11-27 14:28:59 -08:00
sharwell fc2b4cad07 v4: Call mark() from match instead of matchATN 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9476]
 2011-11-27 13:45:36 -08:00
parrt c0262d569b pull v3 pred ctx tree stuff 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9475]
 2011-11-26 20:57:20 -08:00
parrt dc4ce0cd16 update cmt in ctx and make out of ctx preds see through 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9473]
 2011-11-26 14:19:03 -08:00
parrt 181611da94 rounded line edges, no border if color==null; 1.0.1 abego 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9468]
 2011-11-26 11:28:50 -08:00
parrt b83da61f52 Left EPSILON in expected set; rm'd 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9466]
 2011-11-26 11:02:45 -08:00
parrt 9b924d0348 fix toString for EPS 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9465]
 2011-11-26 11:00:38 -08:00
parrt a6be7ddb9c fixed enter/exit. "every" done first/last now. 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9463]
 2011-11-26 10:27:01 -08:00
parrt 30d89abc4a rm type param 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9462]
 2011-11-25 18:16:46 -08:00
parrt fe1691da78 update comment 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9461]
 2011-11-25 16:25:30 -08:00
parrt d2b24da47f remove incidentTransition from ATNState, add computation for next tokens within rule, add nextTokenWithinRule to ATNState, add EPSILON as -2 token type 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9459]
 2011-11-25 16:09:00 -08:00
parrt 6898dc6f5e add readonly bit to sets 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9458]
 2011-11-25 14:39:05 -08:00
parrt d35560583c add remove() to IntervalSet 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9456]
 2011-11-25 14:25:08 -08:00
parrt 5dfc4aed1d add on-the-fly listeners; augment enter/exit rule, consume(). playground/U.g and MyUListener.java are test. added human-readable toInfoString to ParserRuleContext such as 
RuleParserRuleContext[s, a]{altNum=0, start=[@0,0:0='a',<6>,1:0], stop=null, st=null}

[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9453]
 2011-11-25 10:38:36 -08:00
parrt 4af8a7ac61 rm bad comment 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9452]
 2011-11-25 10:00:02 -08:00
sharwell 7a52d4e304 Back out changelist 9448 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9449]
 2011-11-23 12:25:06 -08:00
sharwell 898138a5e2 v4: Reusable ATN simulator objects 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9448]
 2011-11-23 06:42:31 -08:00
sharwell 89ebd369f9 v4: @Override annotations, update equals to check parameter type 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9447]
 2011-11-23 06:41:45 -08:00
sharwell ed7377dfd4 v4: remove TODO - situation was already addressed 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9446]
 2011-11-23 06:31:08 -08:00
parrt bf1e306bae rm commented out code 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9445]
 2011-11-22 18:29:14 -08:00
sharwell 22edf77263 v4: specify generic type 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9439]
 2011-11-22 16:38:42 -08:00
sharwell cf0d47c8fe v4: Parser.setInputStream calls Parser.setTokenStream 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9438]
 2011-11-22 16:36:39 -08:00
sharwell 1495ba5bd7 v4: use getInterpreter() instead of directly accessing the _interp field 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9437]
 2011-11-22 16:33:19 -08:00
parrt 72684907bc add -Xlog, add .ctx to rule refs. parse tree test pass. 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9436]
 2011-11-22 16:30:50 -08:00
parrt 95f3afa562 rm ANTLRStringStream. combined with ANTLRInputStream. causes name change in lots of files. rm encoding ability. 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9435]
 2011-11-22 15:50:19 -08:00
parrt 7d5c69842b BufferedTokenStream gets generic type. CommonTokenStream extends BufferedTokenStream<CommonToken>, rename unbuff'd stream. add unbuff token stream 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9428]
 2011-11-22 15:21:09 -08:00
parrt 4b393cf448 rm QStack and use ArrayDeque 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9427]
 2011-11-22 14:33:35 -08:00
parrt 31c24292cd unbuff char stream working 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9425]
 2011-11-22 12:32:15 -08:00
parrt 45dc683a91 tweak 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9424]
 2011-11-22 12:30:53 -08:00
parrt f3b0ffb8b2 almost working 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9423]
 2011-11-21 17:55:39 -08:00
parrt 0fe415e227 checking in but doesn't work yet; just so i can pull at work 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9421]
 2011-11-20 16:07:45 -08:00
parrt f8a8aadca2 tweak 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9420]
 2011-11-20 15:14:19 -08:00
parrt 3e216a258d combine Reader/InputStream into InputStream 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9419]
 2011-11-20 15:13:16 -08:00
parrt 6abc73cba3 tweak 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9418]
 2011-11-20 15:04:48 -08:00
parrt 2c98cae751 no more line/col in string stream 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9417]
 2011-11-20 15:03:15 -08:00
parrt 4cc8a8e501 tweak 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9416]
 2011-11-20 14:46:47 -08:00
parrt e71440b9cb tweak 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9415]
 2011-11-20 14:40:26 -08:00
parrt 4b4a7d9c7a add LogManager, add InputSymbolType() 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9413]
 2011-11-20 14:27:58 -08:00
parrt 01a71c5b02 fixing a lot of little thingsTo make my examples work 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9410]
 2011-11-19 17:27:19 -08:00
parrt b61603e98a A rename of TSymbol->Symbol and a few of T to Symbol. Also changed name of the default error handler 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9406]
 2011-11-19 13:44:53 -08:00
sharwell 5c7ff2cf9d v4: Use IntStream.mark to ensure that CharStream.substring works within the bounds necessary for Lexer.getText 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9405]
 2011-11-19 13:39:55 -08:00
parrt 6b1c367d54 tweak 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9404]
 2011-11-19 13:28:50 -08:00
parrt 4476cbf22b else format 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9403]
 2011-11-19 13:09:48 -08:00
parrt c1b77ac6a8 format else 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9401]
 2011-11-19 12:48:15 -08:00
parrt 7f042393d2 tweak 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9400]
 2011-11-19 12:47:41 -08:00
parrt 06ed597d29 tweak 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9399]
 2011-11-19 12:42:54 -08:00
parrt ac7913e67f tweak 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9398]
 2011-11-19 12:40:48 -08:00
sharwell 0092b421b5 v4: Fix Lexer.reset (and as a side effect fixes Lexer.setInputStream) 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9396]
 2011-11-18 22:58:11 -08:00
sharwell f64ecebd34 v4: Fix LookaheadStream ability to seek forward past the current location (via consume()) 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9395]
 2011-11-18 22:54:07 -08:00
sharwell 7774405ee3 v4: Can't use the @NotNull and @Nullable from com.sun.istack.internal. Adding our own until we settle on a final library. 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9394]
 2011-11-18 22:48:08 -08:00
sharwell ca141afc28 v4: @NotNull and @Nullable annotations for fields and methods 
mark fields final
no behavior changes

[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9389]
 2011-11-18 11:29:58 -08:00
sharwell 6060b6c288 v4: visitToken->visitTerminal 
TokenNode->TerminalNode

[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9384]
 2011-11-17 20:09:24 -08:00
sharwell ff97c91ef2 v4: ObjectStream -> SymbolStream 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9381]
 2011-11-17 19:45:35 -08:00
sharwell f999b5c3d0 v4: TODO comments 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9380]
 2011-11-17 19:40:56 -08:00
sharwell 65f8b9f124 v4: Add TSymbol generic type parameter to Recognizer, BaseRecognizer, ParserATNSimulator, ParserRuleContext, ParseTreeListener, ANTLRErrorStrategy, ANTLRErrorListener, TreeParserRuleContext 
Move ParserRuleContext.tree/getTree to the generated contexts, implement ASTContext<T> for strongly typed getTree() method

[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9379]
 2011-11-17 19:40:48 -08:00
sharwell 73907aacd3 v4: Unnecessary semi in {;} 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9377]
 2011-11-17 19:07:17 -08:00
sharwell b441dc226a v4: Specify @Override 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9376]
 2011-11-17 19:06:20 -08:00
sharwell 5f6b463174 v4: StringBuilder instead of StringBuffer 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9375]
 2011-11-17 19:00:49 -08:00
sharwell 0e587759c1 v4: Specify @Override 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9374]
 2011-11-17 19:00:00 -08:00
sharwell 8d92e55e49 v4: Specify @Override 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9373]
 2011-11-17 18:58:24 -08:00
sharwell 9ce0968a5e v4: Specify @Override 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9372]
 2011-11-17 18:55:47 -08:00
sharwell d9c0ce2f0c v4: Specify @Override 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9371]
 2011-11-17 18:45:18 -08:00
sharwell 1581c54ff6 v4: Specify generic arguments for ASTAdaptor usage, remove unnecessary casts 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9370]
 2011-11-17 18:43:01 -08:00
sharwell c4bb346f9a v4: Specify @Override 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9369]
 2011-11-17 18:42:18 -08:00
sharwell afebb6138e v4: Specify generic argument for ASTAdaptor usage 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9368]
 2011-11-17 18:40:35 -08:00
sharwell e2dbb085ac v4: Specify @Override 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9367]
 2011-11-17 18:40:00 -08:00
sharwell 88b4c7572f v4: Remove unnecessary casts 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9366]
 2011-11-17 18:38:51 -08:00
sharwell 77aeca8174 v4: Specify @Override 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9365]
 2011-11-17 18:38:13 -08:00
sharwell 845d1f913c v4: Specify generic argument for ASTAdaptor usage, remove unnecessary casts 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9364]
 2011-11-17 18:36:39 -08:00
sharwell 66f0e01520 v4: Specify @Override 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9363]
 2011-11-17 18:34:52 -08:00
sharwell 1da1fe8002 v4: remove unnecessary casts 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9362]
 2011-11-17 18:33:20 -08:00
sharwell d01c583e36 v4: Class<?> instead of Class 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9361]
 2011-11-17 18:30:27 -08:00
sharwell 5e567eacc9 v4: Specify @Override 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9359]
 2011-11-17 18:28:54 -08:00
sharwell bac9c543ba v4: Fix _LOOK for NotSetTransition 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9358]
 2011-11-17 18:27:50 -08:00
sharwell 57eb76aab3 v4: StringBuilder instead of StringBuffer 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9357]
 2011-11-17 18:26:46 -08:00
sharwell 24b354e0a5 v4: Return List<String> instead of List 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9353]
 2011-11-17 18:22:59 -08:00
sharwell f356cd42d1 v4: Remove unnecessary casts 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9345]
 2011-11-17 16:59:49 -08:00
sharwell 5ccf0526aa v4: StringBuilder instead of StringBuffer 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9344]
 2011-11-17 16:59:38 -08:00
sharwell 818be0bfb7 v4: Simple use of generics 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9343]
 2011-11-17 16:59:28 -08:00
sharwell 36a9af8b29 v4: Specify @Nullable 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9342]
 2011-11-17 16:59:19 -08:00
sharwell 3526198105 v4: Specify @Override 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9341]
 2011-11-17 16:58:10 -08:00
sharwell 0d41d48d6e v4: Remove unnecessary cast 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9340]
 2011-11-17 16:52:41 -08:00
sharwell 41ed240850 v4: Return List<Token> instead of List 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9339]
 2011-11-17 16:50:39 -08:00
sharwell f9396907bd v4: Clean up impl with generic List<T> field 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9338]
 2011-11-17 16:48:30 -08:00
sharwell 421a261ddb v4: Specify @Override 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9337]
 2011-11-17 16:06:30 -08:00
sharwell 79da4c7386 v4: Specify @Override, add <?> for local generic instance 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9335]
 2011-11-17 16:04:09 -08:00
sharwell 2fce2b0f2d v4: Fix mark/seek/release for LookaheadStream 
LookaheadStream.LB can see back to the earliest mark
Specify @Override

[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9334]
 2011-11-17 16:02:58 -08:00
sharwell 66c53e18dc v4: Expose generic List<Integer> 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9333]
 2011-11-17 16:01:13 -08:00
sharwell ed32646f52 v4: Simple use of generics to clean up local impl code 
Specify @Override

[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9332]
 2011-11-17 16:00:40 -08:00
sharwell ddf4cadf06 v4: TokenStream extends ObjectStream<Token> (specified Token as the type parameter) 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9327]
 2011-11-17 15:52:21 -08:00
sharwell 29ec107b24 v4: Remove explicit boxing/unboxing 
Add @Override and @Nullable annotations

[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9326]
 2011-11-17 15:49:34 -08:00
sharwell 92bbdfbaea v4: Use generics for List and Map fields/locals to clean up several casts 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9325]
 2011-11-17 15:48:23 -08:00
sharwell ee4a70cf16 v4: StringBuilder instead of StringBuffer 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9324]
 2011-11-17 15:44:49 -08:00
parrt 8792fe19ff rm 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9314]
 2011-11-17 11:16:51 -08:00
parrt 6e38497b11 change name 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9313]
 2011-11-17 11:07:33 -08:00
sharwell fe16bc3f1f v4: Add ParseTreeWalker.DEFAULT to make basic listener usage easier 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9312]
 2011-11-15 12:31:11 -08:00
parrt d597de1792 tweak 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9311]
 2011-11-13 18:26:27 -08:00
parrt 27cbd249ac Added lots of little stuff 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9310]
 2011-11-13 18:04:35 -08:00
parrt c8e9e12a74 add <T> to ast stuff 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9309]
 2011-11-13 12:57:15 -08:00
parrt 60817a180a tweak 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9308]
 2011-11-13 11:52:29 -08:00
parrt 1d29898f1b tweak 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9307]
 2011-11-13 11:35:25 -08:00
parrt 324884585b add slider 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9306]
 2011-11-13 11:35:11 -08:00
parrt f420f4c327 add OK button, set size, add scale 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9305]
 2011-11-13 11:06:40 -08:00
parrt 61e9eade6a added {...}?<msg="foo"> option 
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9300]
 2011-11-10 14:08:16 -08:00