Commit Graph

4329 Commits

Author SHA1 Message Date
Terence Parr fcae921e61 Merge pull request #916 from parrt/master
small improvements for trees
2015-06-18 10:35:52 -07:00
Terence Parr 5f2ce89ea3 improve robustness 2015-06-18 10:34:03 -07:00
Terence Parr 7e8a7bac84 Improve tree highlighting 2015-06-18 10:33:33 -07:00
Terence Parr 4c063ee769 Merge pull request #915 from parrt/master
Small refactoring for flexibility of subclasses (token stream, tree view)
2015-06-18 10:25:07 -07:00
parrt dc150f4aa2 refactor tokens.size() to be size() 2015-06-18 10:23:12 -07:00
parrt 0e692ed436 allow users to override the TreeLayoutAdaptor 2015-06-18 10:23:12 -07:00
Terence Parr a319ea4b3e Merge pull request #914 from parrt/add-heavy-parser-interpreter
add new interpreter that knows how to track alternatives in rule nodes
2015-06-18 10:01:27 -07:00
Terence Parr 1c19c70307 convert map to int[][] 2015-06-18 10:00:32 -07:00
Terence Parr 204cf12e86 mv latch check for speed. 2015-06-18 09:56:53 -07:00
parrt 11726e072e update the comments. 2015-06-17 18:30:29 -07:00
parrt 94bef386cb add new interpreter that knows how to track alternatives in rule nodes; some cleanup and improvement to other interpreter 2015-06-17 18:06:22 -07:00
parrt 4bee04f114 I do not properly add the unit test 2015-06-17 17:45:14 -07:00
ericvergnaud 849cb09c39 duplicate 2015-06-18 00:08:07 +08:00
ericvergnaud 1c2d71f623 Merge remote-tracking branch 'origin/master'
Conflicts:
	tool/test/org/antlr/v4/test/rt/csharp/BaseTest.java
	tool/test/org/antlr/v4/test/runtime/csharp/CSharp.test.stg
2015-06-18 00:05:10 +08:00
ericvergnaud fece2e1fa2 Fix tests generation 2015-06-17 23:59:31 +08:00
Sam Harwell 3c9aabfb80 Move TestPerformance.testExpressionGrammar to the runtime test suite
Fixes #909
2015-06-16 20:23:44 -05:00
Terence Parr 591dca76af Merge pull request #912 from parrt/add-TokenMismatch2-test-using-new-mechanism
add new unit test TokenMismatch2
2015-06-16 16:45:01 -07:00
parrt 441587e859 add new unit test corresponding to 2e06ed8360 2015-06-16 16:44:02 -07:00
Terence Parr 0ff58068f7 Merge pull request #911 from parrt/mv-javascript-to-new-test-gen
got all tests passing for js and changed order of test gen templates
2015-06-16 16:25:40 -07:00
parrt 228eae58f5 reorder templates a bit 2015-06-16 16:18:31 -07:00
parrt 1068dffb00 reorder templates a bit 2015-06-16 16:18:17 -07:00
parrt 871b0eb88f reorder templates a bit 2015-06-16 16:18:03 -07:00
parrt 16f2e168da copying old support code and templates to new test area; corresponds to https://github.com/antlr/antlr4/pull/911 in main repo 2015-06-16 16:17:08 -07:00
parrt ad0239fb32 got all tests passing for js and changed order of test gen templates 2015-06-16 16:16:16 -07:00
parrt 92c57d9139 copying old support code and templates to new test area; corresponds to https://github.com/antlr/antlr4/pull/910 in main repo 2015-06-16 14:54:01 -07:00
Terence Parr 21740a48b6 Merge pull request #910 from parrt/mv-python2-to-new-test-gen
got all but 2 tests passing for py2!
2015-06-16 14:53:48 -07:00
parrt 3ddb25919d got all but 2 tests passing for py2! 2015-06-16 14:52:08 -07:00
parrt b933496d97 rename python dir to python2 for consistency 2015-06-16 14:13:06 -07:00
parrt 775237b01d copying old support code and templates to new test area; corresponds to https://github.com/antlr/antlr4/pull/906 in main repo 2015-06-16 13:35:56 -07:00
Terence Parr 7d36891c82 Merge pull request #906 from parrt/mv-python3-to-new-test-gen
got all but 4 tests passing for py3!
2015-06-16 13:34:49 -07:00
parrt fcc15905cc got all but 4 tests passing for py3! 2015-06-16 13:33:58 -07:00
parrt cd4d6b85e4 dont throw away exceptions and add more error messages 2015-06-16 10:27:14 -07:00
Terence Parr e3dded6ffc Merge pull request #893 from sharwell/test-generation
Completed test generation review
2015-06-16 09:59:24 -07:00
Terence Parr 235d1a9216 Merge pull request #902 from parrt/add-error-nodes
Add error nodes
2015-06-12 17:45:07 -07:00
Terence Parr d2b86997d1 Merge pull request #901 from parrt/master
LookaheadEventInfo now tracks alt taken by decision.
2015-06-12 17:44:58 -07:00
parrt 12a36946e8 actually just show text of erroneous token in red in treeviewer. 2015-06-12 17:42:06 -07:00
parrt 8524630c03 show <mismatched actualtokentext> not one of the expected. 2015-06-12 17:42:06 -07:00
Terence Parr 4c132b8a31 Fixes #899. Add error nodes to interpret or parse trees.
Conflicts:
	runtime/Java/src/org/antlr/v4/runtime/ParserInterpreter.java
2015-06-12 17:41:55 -07:00
parrt dfeaadaa26 LookaheadEventInfo now tracks alt taken by decision. 2015-06-12 17:17:12 -07:00
Terence Parr a3ddd82950 Merge pull request #898 from parrt/check-eof-in-tree
Check eof in tree
2015-06-11 13:13:19 -07:00
parrt ed41558dc4 comment tweak. 2015-06-11 13:12:25 -07:00
parrt b8035d36d0 small speed tweak 2015-06-11 12:56:29 -07:00
parrt a28b299dd4 reset new boolean 2015-06-11 12:54:13 -07:00
parrt 81e2a654d7 clean up per Sam 2015-06-11 12:52:48 -07:00
parrt 94bb7c0af3 Fixes #897. An empty rule matched at the start got an improper interval. updated documentation for getSourceInterval(), added unit tests. fixed logic for special cases. 2015-06-11 12:39:21 -07:00
parrt 9e5cda85ed Fixes #896. EOF was not counted in source interval. 2015-06-11 10:56:59 -07:00
parrt 2da28ee5b2 add test showing EOF leaf not in source interval of tree 2015-06-11 10:37:36 -07:00
ericvergnaud 738ee067b7 Revert "fix #39"
This reverts commit cd8daa335f.
2015-06-10 08:28:29 +08:00
ericvergnaud 87cb0995e1 Revert "fix python3 #39"
This reverts commit 84b54f72b8.
2015-06-10 08:28:18 +08:00
ericvergnaud 3be06edc41 Revert "fix "java-escape" bug in generated parser"
This reverts commit 2527290cca.
2015-06-10 08:27:58 +08:00