Commit Graph

723 Commits

Author SHA1 Message Date
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 0bf1aca47f cleaned up a bit so that TestToolSyntaxErrors works. added some cast checks and some bailout upon error before semantic processing
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9483]
2011-11-29 15:59:23 -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 d9a499f8f7 got left-recur java grammar working w/o generics
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9474]
2011-11-26 14:23:57 -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 00365ac511 add test
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9472]
2011-11-26 13:24:10 -08:00
parrt 21e9f67927 rm print
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9471]
2011-11-26 13:07:08 -08:00
parrt c2145a4120 didn't store parser::members in combined grammar
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9470]
2011-11-26 13:04:15 -08:00
parrt bb73ad341b tweak
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9469]
2011-11-26 12:48:57 -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 36a7597bcf adding left-recursive parser
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9467]
2011-11-26 11:05:02 -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 a81ab4cc64 rm more invalid options
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9464]
2011-11-26 10:46:54 -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 2c52166dd0 removing sync() in front of (...) and (...)?
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9460]
2011-11-25 16:24:40 -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 c69814515b add unit tests for remove()
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9457]
2011-11-25 14:26:54 -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 06b27b8244 added stub for ID*[','] if we want that syntax
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9455]
2011-11-25 12:13:29 -08:00
parrt 3b543098aa refactor grammar transform pipeline
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9454]
2011-11-25 11:55:13 -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
parrt d0230aba5b rm legacy options from grammar, rule, block
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9444]
2011-11-22 18:23:08 -08:00
sharwell ec5593709e v4: Specify generic types
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9443]
2011-11-22 16:48:32 -08:00
parrt 2b36a19739 rm Rule.scope field. not doing scope {...} anymore
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9442]
2011-11-22 16:48:20 -08:00
sharwell 83e5e3fe7f v4: Mark @Override for generated action and sempred methods. Don't emit the DEFAULT_MODE constant in lexers because it's already defined in Lexer
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9440]
2011-11-22 16:46:27 -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
sharwell ed12c072e9 v4: Update BaseTest with @Override annotations, remove obsolete rewind methods, and use List<T> instead of List
[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9432]
2011-11-22 15:37:12 -08:00