b56cd0f587
simplified delete configs algorithm.
2012-09-29 12:48:20 -07:00
166231b5e1
no greedy option in lexer either.
2012-09-29 12:34:08 -07:00
e78ecd418a
rm isGreedy from DecisionState, but allow ATN construction for lexer to be nongreedy. error if '.' in parser. rm unit tests for parser nongreedy
2012-09-29 12:33:00 -07:00
d3d5bebf9f
add to unit test.
2012-09-29 11:47:06 -07:00
ea652962ea
allow "tokens {}"
2012-09-28 16:39:36 -07:00
c8a51ccfad
got wildcard working properly with recursion now!!! new unit test.
2012-09-27 12:22:16 -07:00
4d8158c6f3
mixed this up in branch, but fixing $attr refs in a grammar.
2012-09-27 11:45:59 -07:00
19782e6d77
first wack at fixing nongreedy (ACTION | .)* for recursive rules.
2012-09-27 11:44:51 -07:00
332c9f4452
push
2012-09-25 16:39:08 -07:00
faff63366c
tweak
2012-09-25 16:33:50 -07:00
4bde79a666
playing with tests.
2012-09-24 08:54:32 -07:00
f43cd15dd9
rm'd $foo references from lexer actions and added a good error message.
2012-09-23 18:20:04 -07:00
262a331a5b
recursive rule bug in lexer; the lexer ATN simulator was not checking for empty stack at rule stop states.
2012-09-23 18:04:46 -07:00
1b60543207
Merge branch 'lexer-properties' of github.com:sharwell/antlr4
2012-09-23 11:09:04 -07:00
56c4e0e8b0
Add back support for properties $type, $text, $channel, $mode in lexer actions
2012-09-22 22:01:35 -05:00
fed03ea664
Generate hard tabs instead of spaces to reduce generated file sizes
2012-09-22 21:47:09 -05:00
8e3b85d868
The -package command line option shouldn't suppress the @header{} block in a grammar
2012-09-22 21:47:03 -05:00
62e005c841
Add nb-configuration.xml files
2012-09-22 19:49:11 -05:00
71276f7df8
generate package for the listener and visitor files too
2012-09-22 17:47:01 -07:00
913bb717bd
added -package option.
2012-09-22 17:36:14 -07:00
1909fb3f85
fix unit tests
2012-09-22 15:02:16 -07:00
91bad33f57
comment out attributes for lexical rule references.
2012-09-22 15:01:54 -07:00
2241b3ea51
comment out attributes for lexical rule references.
2012-09-22 13:07:12 -07:00
01b5510be1
Exceptions now work on rules. If you specify at least one catch, then it overrides all catches that ANTLR generates. Otherwise, there would be no way to override the generic recognition exception clause.
2012-09-22 11:58:41 -07:00
8a928d4326
working on fix for rule exceptions
2012-09-21 18:26:09 -07:00
e9656e35f9
Fix codegen problem where notset and wildcard transitions could match invalid tokens and/or EOF
2012-09-16 12:56:10 -05:00
0ac781aebf
was processing grammar after syntax error.
2012-09-09 11:50:30 -07:00
c581faafc7
removing public/private rule modifiers.
2012-09-09 10:52:03 -07:00
4bbbff4e8e
comments and a rename
2012-09-08 15:23:33 -07:00
22e3f4f85f
use v4 not v3 ordered hash
2012-09-08 13:26:34 -07:00
8908641dca
use v4 not v3 Graph.
2012-09-08 13:21:03 -07:00
0a961645be
fix comments; fix unit test
2012-09-08 13:13:00 -07:00
1f529e45b1
fix unit test
2012-09-08 12:48:07 -07:00
0bb154957a
version to method.
2012-09-08 12:40:49 -07:00
3638073efe
*.g cmdline works now to topologically sort by tokenVocab dependencies.
2012-09-08 12:26:32 -07:00
fcb67d8d93
ensure 3 literal redefs don't leave literal around.
2012-09-08 10:52:41 -07:00
4b31da9e7c
VERSION back to nonstatic
2012-09-08 10:25:21 -07:00
bbfc441438
put range back in for parsers as error alt.
2012-09-08 10:21:08 -07:00
dfeca1b9d9
rm abstract option
2012-09-07 17:01:16 -07:00
5403d9bae9
pay attention to the TokenLabelType
2012-09-07 16:58:28 -07:00
e63e9774d8
ooops; it did not do the right thing for lexers. fixed
2012-09-06 18:29:53 -07:00
4e68b4d3eb
superClass capitalization consistent now with option in grammar; lexer was not letting me set the superclass.
2012-09-06 18:10:21 -07:00
c5ade128fd
made a better error message when they target was not available and also I bail out of the code generation process.
2012-09-06 17:09:47 -07:00
1504c2f8f3
was not paying attention to the encoding from the command line when generating output files.
2012-09-06 16:49:00 -07:00
b1277c5081
mv order in which I create the error manager
2012-09-06 16:30:44 -07:00
b3b02a5449
rm T='literal' in tokens { }. Also it's comma-separated not ';' terminated now. tokens { A,B }
2012-09-06 14:50:44 -07:00
2d324058d6
set version
2012-09-06 14:07:49 -07:00
d31378229c
set help msg
2012-09-06 14:06:56 -07:00
26bf5acf19
made "a4 -message-format antlr T.g" work; deactivated the options that don't work yet.
2012-09-06 13:55:02 -07:00
60a17f3157
fix help
2012-09-05 18:38:37 -07:00
cd35a53fc8
rm print
2012-09-05 18:37:53 -07:00
e4a9a44671
grammar option cleanup. was a mess. -Doption=value works to override grammar options on cmd-line now.
2012-09-05 18:37:28 -07:00
ab64b1c62d
update / shuffle legal options
2012-09-05 17:56:30 -07:00
c7603c24ea
fix atn decode
2012-09-04 21:35:37 -07:00
7c955e3cae
fixed for new atn serialization
2012-09-04 20:04:50 -07:00
5c70d5072a
fixed for new atn structure
2012-09-04 19:44:33 -07:00
c277f445e7
rip out remainder of parselistener in code gen
2012-09-04 19:34:55 -07:00
8dd215f4b4
Merge branch 'deserialize' of github.com:sharwell/antlr4 into main
2012-09-04 18:59:38 -07:00
201db8b6d0
merge sam's pulls
2012-09-04 18:59:20 -07:00
a0563656f7
Merge branch 'closure-labels' of github.com:sharwell/antlr4 into main
2012-09-04 18:40:25 -07:00
11e6bdaef6
Merge branch 'main' of github.com:parrt/antlr4 into main
2012-09-02 14:22:37 -07:00
cdf3454bc5
tweaks; mostly comments.
2012-09-02 14:21:26 -07:00
1eb258b8f8
tweak test
2012-08-27 11:25:54 -07:00
60d99e62dc
rm ParseListener; tested the tracer with left recursive rules; weird but deterministic for entry events.
2012-08-27 11:22:42 -07:00
e33e355d66
tweak comment
2012-08-26 16:32:28 -07:00
ad737ebdf6
tweak
2012-08-26 16:03:59 -07:00
17f7efca0a
Never serialize edges for rule stop states since they can be trivially derived during ATN deserialization
2012-08-17 10:51:44 -05:00
1d92b311ce
Merge branch 'master' into main
2012-08-13 12:38:00 -07:00
2975c90fac
Serialize/deserialize the value of BlockStartState.endState
2012-08-12 11:58:26 -05:00
5dacfc9554
Automatic context accessors detect closures
2012-08-09 16:38:49 -05:00
2d62b73a14
Merge branch 'master' into main
2012-08-06 17:11:38 -07:00
cb09dd6d09
Move RuleNode, TerminalNode, ErrorNode, TerminalNodeImpl, and ErrorNodeImpl to top-level types
2012-08-06 15:01:00 -05:00
64c050f233
sets at top level work now: s : A | B ; in lexer and parser.
2012-08-05 10:17:00 -07:00
799b7afc1c
playwith grammar
2012-08-05 09:51:52 -07:00
717af9c371
remove useless code
2012-08-05 09:34:20 -07:00
8637f31837
rm prints
2012-08-05 09:21:59 -07:00
78d8002303
allow atn state optimization; sam fixed.
2012-08-04 21:34:42 -07:00
492980de71
Merge branch 'master' into main
2012-08-04 21:31:37 -07:00
2947fe6a2a
Fix ATN optimizer leaving loop back state numbers in an inconsistent state
2012-08-04 22:22:51 -05:00
1bec176eaa
Impl Sam's no viable alt avoidance idea that chooses min alt that dips into outer context. unit test
2012-08-04 14:18:57 -07:00
4090621beb
same literal different modes gens no literal in .tokens, rm warning
2012-08-04 13:51:18 -07:00
aed26c690e
Merge branch 'master' into main
2012-08-04 13:35:36 -07:00
1e88980db5
Merge remote-tracking branch 'sharwell/aliased-tokens'
2012-08-04 13:33:58 -07:00
c2b49bd94e
pull in Sam's ATN alt collapsing optimizations with optimizeStates off as it causes a class cast exception.
2012-08-04 13:32:07 -07:00
c7d1ea7e23
Merge remote-tracking branch 'sharwell/atn-optimization'
2012-08-04 12:08:43 -07:00
d504d21010
Do not emit token types for lexer rules with a 'type(...)' or 'more' command
2012-08-04 14:05:17 -05:00
20d96b0a86
Merge remote-tracking branch 'sharwell/automata-cleanup'
2012-08-04 12:04:09 -07:00
88dedbd1e0
added mergeArray cache, which didnt help java much but made massive diff to Go grammar. a file, nat.go, went from 2min to 3s in speed. Fixed bug where SLL had preds but they ORd to NONE. made it resolve to min alt. DoubleKeyMap moved to runtime.
2012-08-03 20:27:23 -07:00
e7b65057a6
added var for sll loop tail recursion default value; updated unit tests
2012-08-03 18:12:52 -07:00
674471c090
Add NotNull annotations, null check, tweak documentation
2012-08-03 08:46:07 -05:00
43da92e117
Remove old tree parser code
2012-08-03 08:45:36 -05:00
5019278204
Add ATN optimization to collapse multiple alternatives to a single SetTransition where possible. Currently disabled for parser grammars since the code generator doesn't support set transitions.
2012-08-03 08:33:11 -05:00
1f4df2ea5a
Add ATN optimization to remove null state entries and renumber the remaining states
2012-08-03 08:33:10 -05:00
f9bacf5060
Add ATN optimizer (currently doesn't provide optimizations)
2012-08-03 08:33:10 -05:00
eff9e0c47f
Move TailEpsilonRemover to top-level class
2012-08-03 08:33:09 -05:00
0cfe3b4206
tweak to leave code for printing DFA DOT
2012-08-01 14:36:19 -07:00
feb41eee15
fix a few unit tests.
2012-07-31 19:09:40 -07:00
abb268416e
Merge branch 'master' into main
2012-07-31 18:34:33 -07:00
170a8347bb
Emit a RangeTransition instead of SetTransition if a set has only one interval
2012-07-31 09:07:04 -05:00
c893f2af08
Pulled Sam's new IntegerList
2012-07-30 15:20:43 -07:00
7d4f71d829
Use IntegerList in the tool
2012-07-30 15:18:07 -05:00
489f3d17cb
tweak
2012-07-29 17:04:05 -07:00
8836e13954
use ReentrantReadWriteLock to sync. works much better but still occasional illegal monitor state :(
2012-07-29 17:01:41 -07:00
4fe9efeb85
tweak tester
2012-07-29 14:28:59 -07:00
c97f36bd89
reorg workers
2012-07-29 13:45:41 -07:00
230b687b03
add barrier
2012-07-29 13:03:10 -07:00
5712424156
create 2 worker threads for testjavalr
2012-07-29 12:28:29 -07:00
7181483bbf
test javalr does -2x now
2012-07-29 10:57:51 -07:00
510c1c0dd9
clean up
2012-07-29 10:50:14 -07:00
79594a942e
synchronized lexer. just as fast now to build new parser/lexer each iter in TestJavaLR
2012-07-29 10:48:08 -07:00
e3e739dfc7
The lexer and parser ATN simulators' adaptivePredict now synchronize on the specific DFA of the decision to be simulated. This should prevent a lot of contention that would occur if we synchronize the entire adaptivePredict method. When the individual DFA are created, we also synchronize on the shared DFA[] table quickly to create a DFA and insert it into the array. Code generation modified to have _decisionToDFA generated at the top of both the parser and the lexer. Simulators created now with the recognizer, ATN, DFA[]. Not sure the LexerInterp/ParserInterp work but pushing ahead anyway for the moment.
2012-07-29 09:49:35 -07:00
109880b7ab
added ALIAS_REASSIGNMENT warning so redef of string literal among rules caught. First literal goes to .tokens.
2012-07-28 14:24:39 -07:00
680df17280
rm transient context cache for closure computations; slight speed improvement maybe. less complex.
2012-07-28 10:51:07 -07:00
26165c5d54
atnconfigsets can be readonly now. no copying to put into new DFA state, set readonly instead. made atnconfigset.equals() more accurate. add -notree option to test java lr
2012-07-27 10:34:59 -07:00
3c7b4c2a33
big cleanup.
2012-07-26 17:28:10 -07:00
48ddc0bcee
add gc()
2012-07-26 12:42:10 -07:00
86a4f26596
still has dfa and local predict ctx cache, but doesn't help much, and takes time. Eval preds as we pass them in full ctx mode; no sempred ctx in configs then. removed LANDMINE!!!!!!!!! some lame code that uses fields like _startIndex; fix that. added bail option to testjavalr. 18s to parse java.* with javalr full ctx now.
2012-07-25 18:47:34 -07:00
3774c5752b
add more tracking var
2012-07-25 10:30:19 -07:00
3cec976f7e
Don't pursue the closure if there is just one state or it's predicting unique alt. Fixed up computeReachSet() to do this. Dropped from 6s to 4.5s for TestJavaLR -SLL on java.* with 45M max footprint.
2012-07-24 18:45:23 -07:00
2495ce6b20
add SLL option to the ATN simulator and use in TestJavaLR.
2012-07-24 17:42:47 -07:00
2ae4d4eebd
add ctx cache to merge op. now i get optimal graph it seems. doesn't seem longer for java.* with JavaLR. still landmine in Pattern.java, Foo.java. Made toDOTString sort predctx nodes by id for repeatable tests. updated unit tests.
2012-07-24 16:26:01 -07:00
ac4f00524e
add ctx cache.
2012-07-24 14:19:43 -07:00
320868d661
added code chking size of ctxs. changed configsets -> configs. added recur getallnodes.
2012-07-24 10:04:51 -07:00
00c4f98134
add test file that kills antlr
2012-07-23 10:35:02 -07:00
d8a9207041
improve combine common parents, return a or b in merge array of merged is a or b; new unit test.
2012-07-22 20:07:46 -07:00
e18b9132d9
cleanup and merge common parents for array merge; fixes unit test
2012-07-22 16:39:53 -07:00
f7eeca274f
reorg closure and fix bug where $ in arrayctx wouldn't perform global follow. fix case in array merge that didn't check both a[i], b[i] as $ (only matters in full ctx). unit tests for graph show fewer ctx's created.
2012-07-22 16:09:45 -07:00
eb78593469
rm comment
2012-07-22 15:43:01 -07:00
44ae1dad0b
if merged array is 1 node, return singleton. more unit tests
2012-07-22 15:05:12 -07:00
829ad9191c
didn't join a$ + bx as [a,b]$ for local ctx. new unit test to chk
2012-07-22 12:57:30 -07:00
43424cd5df
do check for a==b in merge(); improve DOT output
2012-07-22 12:10:40 -07:00
93945d47f5
Merge branch 'master' into stack-graphs-integration
2012-07-21 16:27:36 -07:00
9539572ee7
simplify test.
2012-07-21 16:27:00 -07:00
7a4a269615
fix test so no error due to EOF.
2012-07-21 15:36:56 -07:00
8c03dbacf8
Resolves #41 . EOF cannot follow s. would need s' : s EOF ; for that. updating unit test TestParserExec.testOptional
2012-07-21 15:29:07 -07:00
991014d3f2
clean up, add comments, fix graph unit tests, updated toDotString().
2012-07-21 15:10:15 -07:00
0141bc058a
merge from master,In preparation for continuing on this experiment branch.
2012-07-21 10:38:55 -07:00
885f6530ad
Use chained calls to append instead of string concatenation
2012-07-20 14:52:49 -05:00
6259ab5c9e
Use StringBuilder instead of StringBuffer
2012-07-20 14:52:48 -05:00
2056e019a5
Use HashMap instead of Hashtable
2012-07-20 14:52:47 -05:00
44ef41ff29
Remove unnecessary variable initializations
2012-07-20 14:52:46 -05:00
6045bd4eb5
Add null check
2012-07-20 14:52:45 -05:00
84e1025801
Remove extraneous ';' (empty statement), remove unnecessary null checks and dead code
2012-07-20 14:52:44 -05:00
3b9940b02a
Use isEmpty() instead of comparing size() with 0
2012-07-20 14:52:43 -05:00
4c4f767d17
Prevent NPE after reporting error
2012-07-20 14:52:13 -05:00
4c1e9b4119
Improve performance of equals
2012-07-20 14:51:55 -05:00
3a35f3cb08
Check object type in equals
2012-07-20 14:51:53 -05:00
8b4a461262
Merge branch 'ModelElement'
2012-07-18 16:14:14 -05:00
29d71acef9
Update documentation
2012-07-18 16:12:37 -05:00
589d6bf187
Remove field which hides another field with the same name; add check for this condition to OutputModelWalker
2012-07-18 16:06:33 -05:00
45815d97f7
Specifically test for the ModelElement annotation on fields (not just any annotation will do)
2012-07-18 16:06:32 -05:00
a37f8cf4f1
Add missing license notices
2012-07-18 15:57:48 -05:00
f220212a95
couldn't get Horstmann's routine to do EPS not PS so had to backtrack.
2012-07-14 16:32:04 -07:00
96654531b7
Use isEmpty() instead of size()==0, specify generic arguments
2012-07-13 14:33:42 -05:00
683b915507
rm prints
2012-07-12 13:25:41 -07:00
4923cb3874
reorg r : '...' ; matching. deals with -> cmds better (and more of em)
2012-07-12 13:25:18 -07:00
de744f912a
allow A : '<' -> skip ; style token name/literal aliases.
2012-07-12 12:25:12 -07:00
9738658126
rm unneeded code to set line/charpos
2012-07-09 17:32:03 -07:00
3b2c0a6177
fix bug in get hidden channel stuff. rewrote. update test.
2012-07-07 18:48:48 -07:00
00808ef11f
off by 1 error.
2012-07-03 13:44:44 -07:00
d0e7e79b2b
make sure tokenNames puts tokens at right spot; didn't handle wholes in token type sequence.
2012-07-03 13:37:43 -07:00
9455f5cd30
bug fix; .tokens didn't allow ' ' or 'a b'.
2012-07-03 13:15:35 -07:00
2e9c449ec4
fix a few tests
2012-07-03 12:42:10 -07:00
1d9aef0a5e
replace .tokens file parser with regex to avoid \t becoming tab char.
2012-07-03 12:40:36 -07:00
3ad87ba12c
rm generic parameter from ANTLRErrorListener, ripple effect.
2012-07-01 22:34:35 -07:00
6053ac5269
rm gunit; hmm...my commits are wacked on this/last one. sorry!
2012-07-01 09:45:35 -07:00
5c69d31e88
CommonTokenFactory now knows how to copy the text out of the character stream buffer before they disappear in unbuffered character strengths; added ctor.
...
Lexer now guarantees that the text of the current token is always available to the emit() method even if the character stream is unbuffered.
Added some hooks to see some of the internal data in the unbuffered character stream so that I can test it better.
Updated LexerInterpreter so that it uses the token factory.
Improved/added unit tests for the unbuffered character string.
Updated various comments
2012-06-30 16:40:16 -07:00
44355d6ff6
oops; don't need these afterall
2012-06-30 16:36:25 -07:00
0c22d12870
updated comments, remove duplicate code, add new functionality.
2012-06-29 13:02:44 -07:00
f396b4dc82
error->syntaxError in listener
2012-06-25 13:25:13 -07:00
740208ee4d
test code.
2012-06-17 16:56:26 -07:00
b18475113b
Merge branch 'master' into interactive
2012-06-16 17:20:04 -07:00
bfc90d473c
fix help msg slightly.
2012-06-13 12:42:21 -07:00
3ece2c8640
merge from master; this pulls in the cleanup and bug fix in the lexer related to semantic predicates.
2012-06-08 10:18:49 -07:00
abc0e2ef87
add getSpeculativeText(); text matched so far in a lexer rule. Use this in predicates not actions. add unit tests.
2012-06-07 18:31:36 -07:00
b255509e96
fix a bug related to semantic predicates in the lexer and generally cleaned up variable and method names in the simulator. I moved all of the predicates to the right side of lexer rules in the unit tests. Later, we should ensure that predicates only occur on the right edge of lexer rules. We should state that the rule is not been accepted so we can't test things like getText(), we have to use more raw indexes into the character stream. In the lexer simulator, the addDFAState() method now does not try to compute whether there is a predicate in the configurations. That information has already been set into the ATNConfigSet by the getEpsilonTarget() method. [I should also point out that I have not tested the Java parsing in a while and now it hits a landmine on a number of common Java files in jdk :(. I'm not sure where that crept in]
2012-06-07 17:31:18 -07:00
d3c238569f
fix unit test.
2012-06-06 15:44:10 -07:00
5a2197a74d
fix bug where X : 'x' {pred}? ; wasn't seen as alias from X to 'x'.
2012-06-02 11:44:27 -07:00
7192cc9a68
rm deadcode
2012-06-02 11:44:01 -07:00
e1524fe86c
add test
2012-06-02 11:28:25 -07:00
0e9bcfbeca
change in token type broke many tests; fixed. says 5 failures now.
2012-06-02 11:26:18 -07:00
5a2fe297e3
ack. more cleanup work will be required for change of token types from 3..n to 1..n
2012-06-01 18:08:00 -07:00
8481979f69
rename method
2012-06-01 18:06:48 -07:00
94071d7d82
prevent negative indexes
2012-06-01 17:36:21 -07:00
de83aacb65
add unit test
2012-05-31 17:02:15 -07:00
3b1d91e010
fix unit tests
2012-05-24 13:08:15 -07:00
6539c5f464
remove inappropriate attributes of lexer rules
2012-05-24 13:07:43 -07:00
cd82465830
updated [...] parser so it handles < > and [ ] properly. no escapes now.
2012-05-23 12:48:07 -07:00
bc236a6e0b
no tree attribute
2012-05-22 16:54:45 -07:00
8078d39053
rm "st" attribute
2012-05-22 16:42:05 -07:00
868ca7ca6d
named actions in combined get copied to lexer now, but lexer::{...} are MOVED to lexer grammar.
2012-05-22 16:21:06 -07:00
ed879ab4e3
working towards interactive lexer
2012-05-21 10:16:37 -07:00
d378469c9c
rename
2012-05-20 18:06:43 -07:00
990da7d1d8
add unit test
2012-05-19 18:08:56 -07:00
c590ba8fd8
don't look backwards for err msg if EOF is entire input. make sure we don't use -1 rule index for ruleNames[]
2012-04-29 12:12:42 -07:00
3ea6a5cb2f
Merge branch 'master' into stack-graphs-integration
...
Conflicts:
tool/playground/T.g
2012-04-26 12:01:28 -07:00
6314b7d31b
-> becomes # for alt labels
2012-04-26 11:59:57 -07:00
f4abc84054
MutableInt's compare method was messed up.
2012-04-10 10:51:51 -07:00
95f5cc6b8b
Support specifying the inputDirectory in code
2012-04-10 09:49:31 -05:00
d22eb34fe7
Merge branch 'master' into stack-graphs-integration
2012-04-05 16:35:56 -07:00
9d92446125
Merge remote-tracking branch 'parrt/master' into basetest-error-reporting
2012-04-04 15:38:03 -05:00
08e3ddefc0
Merge branch 'master' into stack-graphs-integration
2012-04-04 13:22:00 -07:00
585aa0a14b
Merge branch 'tokenstreamrewriter' of git://github.com/sharwell/antlr4
2012-04-04 13:20:58 -07:00
ff2655d379
Rename getSource() to getTokenStream()
2012-04-04 15:20:45 -05:00
8155b1138e
Merge branch 'implicit-tokens' of git://github.com/sharwell/antlr4
2012-04-04 13:11:02 -07:00
8658be69ba
Merge branch 'test-reporting' of git://github.com/sharwell/antlr4
2012-04-04 13:08:07 -07:00
bbd61dca35
Remove TokenStreamRewriter.getOriginalText() (use rewriter.getSource().getText() instead)
2012-04-04 10:15:29 -05:00
d054a358a4
Don't run compiler if tool reported error(s)
2012-04-04 09:57:38 -05:00
7082590240
Allow tests to use the default tool listener for error reporting (prints formatted error messages). Use this in TestPerformance.
2012-04-04 09:56:32 -05:00
64e0a8734f
Report warnings as well as errors
2012-04-04 09:53:10 -05:00
2c1f673f62
Mark ErrorType fields final
2012-04-04 09:51:23 -05:00
1c9e52b5d6
Use CopyOnWriteArrayList instead of Collections.synchronizedList
2012-04-04 09:50:51 -05:00
4304ba251f
Treat warnings as errors in TestPerformance
2012-04-04 09:49:16 -05:00
9fd02cfd00
Add the -Werror command line option - upon warning emits new error 9: warning treated as error
2012-04-04 09:45:20 -05:00
251490cfc9
Fix unit tests which included implicitly defined string literal tokens
2012-04-04 09:39:44 -05:00
9ce85cc6e4
Add error 126: implicit definition of string literal token in non-combined grammar
2012-04-04 09:38:28 -05:00
c3e5c42c51
Fix (broken) unit tests which included implicitly defined tokens
2012-04-03 16:42:22 -05:00
b433c2ae34
Add warning 125: implicit definition of token in parser
2012-04-03 16:40:52 -05:00
bf9c7c3a28
Remove old TokenRewriteStream in favor of new TokenStreamRewriter that is not a stream; it feeds off of the stream to provide transformations of that original stream. Updated the comment at the top of the file. Instead of toString() we use getText(). Altered the unit tests to create a buffered stream and then create the rewriter attached to that.
2012-04-02 18:10:32 -07:00
3849cd572d
rm SymbolStream<T>, change all to TokenStream. all but 5 tests pass.
2012-04-02 16:49:04 -07:00
78fcc134cd
Fix error codes in unit tests
2012-04-02 18:22:05 -05:00
5fd8b223b6
Fix ErrorManager ignoring error code in messages
2012-04-02 18:13:47 -05:00
186293ae86
tweak
2012-04-02 10:13:13 -07:00
9ef6127982
merging from master
2012-04-01 18:13:40 -07:00
adad53ee18
Fix unit tests that called TokenStream.toString (now TokenStream.getText)
2012-04-01 18:33:49 -05:00
e1870d16e9
added convenience getText(ctx) method to TokenStream. unlikley to need in CharStream and can get another way
2012-04-01 12:23:45 -07:00
588e30bfe1
getText(...) moved to CharStream and TokenStream; cleaned up names. removed getInputString from parser.
2012-04-01 12:12:49 -07:00
c9aef6fdbe
Merge branch 'master' into stack-graphs-integration
2012-03-31 10:33:22 -07:00
9fbe9b6e21
op=(x|y) works as left-recur binary op now.
2012-03-30 13:00:31 -07:00
f166df7b94
Updated unit tests to use .g4 as the preferred grammar extension
2012-03-30 11:44:34 -05:00
e5d7c27b09
Updated comments to indicate preference of .g4 over .g
2012-03-30 11:37:22 -05:00
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
11cd720cc6
added failing test so i go back and fix issue with op=('+'|'-') in LR rules
2012-03-29 21:37:56 -07:00
42706485e9
was looking for imports with .g not .g4
2012-03-29 14:59:43 -07:00
48b2e237d1
Merge branch 'no-rules-npe' of https://github.com/sharwell/antlr4
2012-03-27 21:23:47 -07:00
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
8d16912fb9
Fix expected output for testAmbigLR
2012-03-27 21:51:55 -05:00
2ff9c12848
Fix expected error/warning numbers
2012-03-27 21:51:31 -05:00
95b6cd58c4
Fix NPE when a grammar contains no rules (instead of appropriate error message)
2012-03-27 21:25:23 -05:00
eb48cdf55b
Fix test affected by 9c1e58db7c (add {} in primary alt block of LR rule)
2012-03-27 21:22:04 -05:00
4b0040f2a1
Fix test affected by bdda174af6 (set stop token even if exception occurs)
2012-03-27 21:20:29 -05:00
a363e70582
pull from master
2012-03-27 16:22:01 -07:00
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
bd51907c5e
Merge branch 'abstract-parser' of github.com:sharwell/antlr4
2012-03-27 15:18:06 -07:00
bf07f7907f
Merge branch 'override-ruleindex' of github.com:sharwell/antlr4
2012-03-27 15:09:50 -07:00
41e97791bb
Merge branch 'set-stop-token' of github.com:sharwell/antlr4
2012-03-27 15:08:57 -07:00
580ec1f7d7
Merge branch 'fix-tests' of github.com:sharwell/antlr4
2012-03-27 15:07:05 -07:00
f307945d2a
Merge branch 'lexer-npe' of github.com:sharwell/antlr4
2012-03-27 15:06:17 -07:00
8465920343
Merge branch 'atnstate-reachability-test' of github.com:sharwell/antlr4
2012-03-27 15:05:39 -07:00
e8765ef241
Fix errors tracking current state on rule return
2012-03-26 23:29:53 -05:00
Terence Parr
Terence Parr
Sam Harwell