Commit Graph

252 Commits

Author SHA1 Message Date
sharwell 783c3b2e50 v4:
* Use mark->seek->release instead of mark->release->seek
* mark() returns a marker. must pass the result of index() to seek(), and the result of mark() to release().

[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9268]
2011-11-09 10:16:51 -08:00
parrt 2767530a47 name change
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9267]
2011-11-06 12:36:24 -08:00
parrt e0fc8fe087 was consuming too much in recover
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9266]
2011-11-06 11:22:25 -08:00
parrt ca17a4ce5b ooops; wrong version
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9265]
2011-11-06 10:32:01 -08:00
parrt ddb7ae218d useError recovery said notThe set that follows a loop for sync()
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9264]
2011-11-06 10:31:13 -08:00
parrt 8237c2f0fb tweak
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9263]
2011-11-06 08:30:43 -08:00
parrt 64b4cbd2c8 added auto highlight to tree views
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9262]
2011-11-05 08:56:12 -08:00
parrt c17aab708f tweak
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9261]
2011-11-03 13:40:16 -08:00
parrt b23c093b68 no longer drawing background of nodes in tree unless you set a color
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9255]
2011-11-03 09:33:08 -08:00
parrt ffc4f9b126 added Cay Horstmann's printing code for postscript.
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9254]
2011-11-03 09:10:30 -08:00
parrt 647cb6d0ad tweak
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9237]
2011-11-01 11:06:39 -08:00
parrt 8eb2e62fea tweak
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9236]
2011-11-01 10:46:34 -08:00
parrt 2efba8b39d it was sending null to postscript generation
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9235]
2011-11-01 09:32:40 -08:00
parrt 5cf4cba9c7 fix bug in modes
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9231]
2011-10-31 16:27:34 -08:00
parrt 947a11a3e4 start lexical error unit tests
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9228]
2011-10-30 13:48:09 -08:00
parrt 800564e1d6 made DFA sim loop smaller; refactored
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9227]
2011-10-30 13:23:52 -08:00
parrt 2d43a22e27 reorg'd lexer
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9226]
2011-10-30 10:39:17 -08:00
parrt 95bc423669 more tests and made EOF always appear even if DONE : EOF ; in lexer
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9225]
2011-10-29 13:59:17 -08:00
parrt bc5577307c more tests
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9224]
2011-10-29 12:08:34 -08:00
parrt 6e2bbcdb42 got EOF in lexer
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9223]
2011-10-29 11:08:40 -08:00
parrt 6576abf65f reorg'd lexer ATN sim to fix bug
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9221]
2011-10-27 19:33:45 -08:00
parrt f44d03343a push to grab at work...lexer might be hosed
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9220]
2011-10-27 11:29:20 -08:00
sharwell bedb935bde v4: Fix IndexOutOfBoundsException when token type < -1
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9211]
2011-10-27 08:55:08 -08:00
parrt ad468ee29b added tree node highlighting in treeviewer
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9206]
2011-10-25 15:53:46 -08:00
parrt 7f867ec9d6 tweak padding
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9191]
2011-10-25 08:57:09 -08:00
parrt fc85072851 add ArialNarrow, update to 255 max char
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9190]
2011-10-25 08:52:14 -08:00
parrt 490cec9af6 antialias lines
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9181]
2011-10-24 14:41:37 -08:00
parrt 2cbd522320 clean up, added tree parser err handler
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9178]
2011-10-23 14:04:58 -08:00
parrt 11b61d979d refactored sync/recoverInLine. figured out exactly what sync does at start of alt. setState goes to loopBack now in loops
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9177]
2011-10-23 11:07:07 -08:00
parrt 4920bb2c9e _errHandler.sync(this);
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9176]
2011-10-22 13:25:28 -08:00
parrt 39314b8d74 added PS support routines
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9154]
2011-10-22 11:46:13 -08:00
parrt 78bc92d81b compiile error
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9153]
2011-10-22 11:39:16 -08:00
parrt 72906f5910 add font metrics to gen PS properly
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9152]
2011-10-22 11:22:22 -08:00
parrt 89d4b31ef6 rm treelayout, add jar
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9150]
2011-10-21 11:22:00 -08:00
parrt 542a57b49a reworked udo's tree viewer
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9149]
2011-10-21 10:58:00 -08:00
parrt 6c104b7724 pull apart treeviewer; rename ANTLRParserListener
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9148]
2011-10-20 19:12:32 -08:00
parrt 688f69541c sync for use at home
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9146]
2011-10-15 08:58:13 -08:00
parrt 9eb19cf929 added start/stop methods.
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9145]
2011-10-12 15:09:14 -08:00
parrt 3bbcfa5d25 change name of method
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9144]
2011-10-11 16:16:29 -08:00
parrt 547d58514d bug fixes in error handling part deux
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9112]
2011-10-06 13:28:36 -08:00
parrt 251a42ddbb bug fixes in error handling
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9111]
2011-10-06 10:40:07 -08:00
parrt 1efa316de9 added ctx stack test
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9110]
2011-10-05 15:15:58 -08:00
parrt 6179d7586b tweak tests
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9108]
2011-10-04 13:26:18 -08:00
parrt e293cbbdf5 UnsupportedOperationException
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9107]
2011-10-04 11:50:57 -08:00
parrt d56e8c3a18 reorg error and add parse tree tests
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9106]
2011-10-04 10:19:04 -08:00
parrt 2707837bc8 factored out node construction for parse trees into a consume() method. added a start to the test parse trees. added the notion of an error node to the parse tree.
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9104]
2011-10-03 17:30:55 -08:00
parrt 473e56d59f more tests
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9103]
2011-10-03 11:04:01 -08:00
parrt 8508dd6da0 got sync in
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9101]
2011-10-02 20:31:26 -08:00
parrt bf48ca5b73 test for conjured token
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9097]
2011-10-02 16:19:03 -08:00
parrt 1556d076bd got token insertion working
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9096]
2011-10-02 16:15:02 -08:00
parrt c33b06fdde bug fix; no lexer if no lex rules
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9095]
2011-10-02 15:21:32 -08:00
parrt 2a34d00d09 tweak
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9094]
2011-10-02 13:18:10 -08:00
parrt 05360be562 more cleanup
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9093]
2011-10-02 13:17:06 -08:00
parrt 02d424a92b tweak
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9092]
2011-10-02 12:58:53 -08:00
parrt 49571e386f err clean up
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9091]
2011-10-02 12:51:33 -08:00
parrt 298a15e017 Parse error systemTweaks, removing the debug API since we won't use it
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9090]
2011-10-02 12:01:35 -08:00
parrt 9894221249 rename test. tweak errs
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9089]
2011-10-01 10:31:36 -08:00
parrt 6b4e9905fb rename member, tweak output. new chk for inf loop from error sync works
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9088]
2011-09-30 20:40:14 -08:00
parrt 60c9fe76c0 almost got new error mech in
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9087]
2011-09-30 20:22:09 -08:00
parrt 9e69640bc1 added more unit tests
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9086]
2011-09-27 17:09:17 -08:00
parrt 82360bfaa8 clean up
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9085]
2011-09-27 16:23:15 -08:00
parrt fd3f482375 fixed regression in atn interp
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9083]
2011-09-25 15:10:21 -08:00
parrt e3d6db0478 more unit tests
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9081]
2011-09-25 14:10:30 -08:00
parrt f02db87c02 got nullable kids tree parsing working. got $rule.text in tree parsing working
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9077]
2011-09-24 17:12:22 -08:00
parrt e8a2a738cf rename TreeNodeStream
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9075]
2011-09-24 09:33:04 -08:00
parrt 93581cfa98 got v3 tests working in v4
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9074]
2011-09-24 09:14:22 -08:00
parrt b63b271815 got basic tree parser working.
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9071]
2011-09-22 17:16:22 -08:00
parrt a1c682434d removes the individual stacks to track rule invocations. $a::x now looks up the context stack for rule index RULE_a. they're not done very often and so it's better to say all of the overhead pushing and popping the contexts.
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9066]
2011-09-11 16:12:01 -08:00
parrt 64ccba4168 rebuilt the code generator so that I generate a separate class for each labeled alternative and modify the listener so that it's always enter and exit rule; the type of the argument that distinguishes between them. I now create the overall rule context and then copy it into the alternative context if they have a label.
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9064]
2011-09-11 15:09:55 -08:00
parrt bf19465437 Got a rule labels added to the tree and also altered code generation so that it pays attention to the labels. fairly major surgery but it's a nice refactoring.
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9062]
2011-09-09 17:08:13 -08:00
parrt f13fd1973e mv ruleIndex, add alt
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9061]
2011-09-09 13:00:58 -08:00
parrt 62937ca639 rename visit->walk
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9060]
2011-09-08 16:52:30 -08:00
parrt 2d234ee28c Got the visitor thing cleaned up enough for a small example
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9059]
2011-09-08 13:45:05 -08:00
parrt da7e7c8813 clean up tree output, rename _ctx to context
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9058]
2011-09-08 12:12:51 -08:00
Udo Borkowski b671cb1fba add treeTextProvider and various "visual" properties to TreeViewer
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9057]
2011-09-08 10:05:23 -08:00
Udo Borkowski a440d4e988 add TreeViewer
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9051]
2011-09-06 08:45:28 -08:00
parrt 1e595a486a add
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9050]
2011-09-06 06:31:44 -08:00
parrt 730794128e parse tree visiting; now, we ALWAYS generate a return struct definition: rule_ctx.
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9049]
2011-09-05 17:08:26 -08:00
parrt 0f74909c8c mv ruleIndex
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9045]
2011-09-05 12:49:54 -08:00
Udo Borkowski f93bc7aa7a add org.abego.treelayout
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9044]
2011-09-05 10:50:57 -08:00
parrt 528d6df1e3 added list of rule consts; parser ctx tracks rule index
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9043]
2011-09-05 08:28:24 -08:00
parrt 01020ee1bb more cleanup
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9042]
2011-09-04 15:55:45 -08:00
parrt 5c35165873 update the comment
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9041]
2011-09-04 13:49:40 -08:00
parrt 32a375bbf7 I split the tree interface into multiple simpler ones and removed the methods that can modify a node. Either you should use the adapter or, you know the concrete type and then you can call those methods directly not through the interface. The whole point of the interface is to be flexible but then for consistency users must use the adapters. I'm also starting to pull helper methods into a Trees "module". I also renamed CommonTree to be CommonAST. I also renamed the adapters appropriately.
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9040]
2011-09-04 12:02:07 -08:00
parrt 783f1bc38f Split token into read-only and writable portions. added release method. moved the methods around that get input streams and token streams between interfaces. simplify the character stream interface by moving the gas line and get characterization methods to the lexer.
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9039]
2011-09-03 17:36:14 -08:00
parrt 5c6f35abef did some reorganization
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9038]
2011-09-03 11:52:23 -08:00
parrt c1aa0fcd10 New parse tree mechanism
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9037]
2011-09-03 09:18:26 -08:00
parrt 104f39acde working on parse trees
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9036]
2011-09-02 17:15:36 -08:00
parrt 7aad57fe49 add
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9035]
2011-09-02 16:18:25 -08:00
parrt 62549b65bf add dbg classes. add mark/rewind
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9034]
2011-09-02 16:17:37 -08:00
parrt 085dd05bf1 got parser nongreedy loops going
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9032]
2011-08-12 19:51:12 -08:00
parrt f44c49a8b8 got lexer nongreedy loops going
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9018]
2011-08-07 11:19:34 -08:00
parrt d926ec9661 WOOT! all left-recursive tests pass
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 8972]
2011-07-31 18:14:47 -08:00
parrt ec5d74c83e removed all traces of FORCED_ACTION
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 8971]
2011-07-31 12:36:07 -08:00
parrt a7f2bc31ac ok, got new simple semantics in for sempreds; no forced actions and preds always eval unless ctx dependent, in which case they need to bein original rule.
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 8970]
2011-07-31 11:58:59 -08:00
parrt 328444244f backing out changes; tried 2 stacks; too complicated
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 8969]
2011-07-31 10:38:48 -08:00
parrt d2651a50a6 backing out changes; tried 2 stacks; too complicated
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 8968]
2011-07-31 10:38:23 -08:00
parrt e32bae3276 rebuilt ATN structure for ()* and ()+; two decisions each now unless single alt.
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 8966]
2011-07-30 17:20:57 -08:00
parrt 64e12dbfa5 add method
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 8961]
2011-07-30 11:49:49 -08:00
parrt b90b073450 getting more unit tests in
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 8924]
2011-07-29 14:05:19 -08:00