Commit Graph

1472 Commits

Author SHA1 Message Date
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
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 dc445af663 Improve ParserInterpreter code simplicity 2015-06-05 16:14:20 -07:00
parrt 965a50e82e Revert "Fixes #879. only gen parse listener enterRule events in enterOuterAlt, not enterRule."
This reverts commit a8b67147c2.
2015-06-03 10:50:41 -07:00
parrt ddf7cfc401 Revert "Fixes #802. Trigger events for alt labels in parser listeners."
This reverts commit 3674d45476.
2015-06-03 10:47:22 -07:00
Terence Parr 6333674588 bild.py works to build c# now. 2015-06-02 20:06:35 -07:00
parrt 1323e30fa9 moving around templates, deleting old stuff. C# and Java runtime tests work using branch intermediate-test-generation of C#. bild doesn't quite test stuff correctly. 2015-06-02 16:00:45 -07:00
Terence Parr e3325ab606 add cmd-line interface, add map in Index.stg to targets-specific templates. 2015-06-01 18:18:44 -07:00
parrt d73e73a091 update comments, rename var. 2015-05-29 14:10:08 -07:00
parrt 181f670860 set version to 4.5.1 2015-05-29 11:16:40 -07:00
parrt 343d0f90b4 update comment 2015-05-29 11:15:56 -07:00
Terence Parr a8b67147c2 Fixes #879. only gen parse listener enterRule events in enterOuterAlt, not enterRule. 2015-05-22 12:59:23 -07:00
Terence Parr e604167abb add common to parse tree listener 2015-05-20 15:11:37 -07:00
Terence Parr b2db5d17ad Merge pull request #842 from peturingi/master
Added error checks.
2015-05-20 12:17:01 -07:00
Terence Parr 3674d45476 Fixes #802. Trigger events for alt labels in parser listeners. 2015-05-19 18:08:13 -07:00
Terence Parr 8bf053d0be Fixes #819. fix-TokenStreamRewriter-doc-getText 2015-05-19 17:41:57 -07:00
Pétur Ingi Egilsson e64dbaec86 Update IntegerList.java 2015-03-20 22:37:24 +01:00
Pétur Ingi Egilsson 0d5e471f7c Update IntegerList.java 2015-03-20 22:36:24 +01:00
Pétur Ingi Egilsson bae2ba5e3e Added error checks. 2015-03-20 21:31:49 +01:00
Terence Parr 4369626e82 Merge pull request #812 from pavlo/master
Makes TestRig's dialog to save and restore its state
2015-02-15 13:17:39 -08:00
Terence Parr 5e70f94628 Somehow I missed a bunch of imports for @NotNull. Fixes #815. 2015-02-14 16:29:37 -08:00
Terence Parr d4a43684be squash all commits for this branch 2015-02-14 13:51:31 -08:00
Pavlo V. Lysov 255cb56da5 minor constant rename 2015-02-02 20:59:32 +02:00
Pavlo V. Lysov f56a27bb4b makes the UI dialog to save/restore its state - width, height, location on screen, the placement of splitter as well as viewer scale 2015-02-02 20:56:18 +02:00
Terence Parr 822d61ad47 Fixes #809. 2015-01-31 14:36:46 -08:00
Sam Harwell bc98e5b687 Initialize DFA.precedenceDfa when the DFA instance is created 2015-01-31 16:10:03 -06:00
Sam Harwell 84fb456aac Fix potential misuse of the DFA start state when initializing a decision from multiple threads
Fixes #804
2015-01-26 15:50:12 -06:00
Terence Parr 4cc275ab52 I did not have project URL in pom and the maven deploy failed again. 2015-01-23 15:33:01 -08:00
Terence Parr 3a4d53adea had license to the pom files and make sure that they use the jar packaging. 2015-01-23 14:39:36 -08:00
Terence Parr 4dcc65d452 make all 4.5 2015-01-22 17:08:19 -08:00
Terence Parr be03964df3 rm @NotNull and @Nullable from codebase to simplify 2015-01-22 14:34:51 -08:00
Terence Parr 0ee58d9295 rm JavaAnnotations 2015-01-22 13:28:22 -08:00
Terence Parr 353235ccf4 Merge pull request #797 from michaelpj/fix-recovery
Fix excess token consumption after `recoverInline`
2015-01-21 10:03:34 -08:00
Terence Parr 34cc04bf6a rm annotations dir from project 2015-01-20 16:59:04 -08:00
Michael Peyton Jones 3d71fc99d6 Update the documentation for recoverInline to advise against
consumption.
2015-01-20 14:19:47 +00:00
ericvergnaud 1926a1636a maven cleanup
- added note for maven developers
 - removed maven plugins
 - updated maven dependencies for dev only
 - added antlr4 annotations
2015-01-19 23:04:46 +08:00
Terence Parr b9ef67f91e remove redundant dependency 2015-01-14 17:19:34 -08:00
Terence Parr 254ddd4be7 rm unneeded pom file 2015-01-14 11:38:19 -08:00
Terence Parr 8af4afc058 add intellij project files 2015-01-14 11:20:08 -08:00
Terence Parr 6d9d60ccda Copy stuff from the root pom to the individual poms and remove the root. Remove dependency on the annotations artifact which no longer exists. hardcode the version number everywhere to make sure I don't use a variable that doesn't exist. update bild so that it uses a new maven_deploy() function I put into bilder.py 2015-01-13 17:29:38 -08:00
Terence Parr f923aa26be fix doc 2015-01-11 10:33:21 -08:00
Terence Parr 8c05364099 set versions to 4.5 2015-01-10 10:12:02 -08:00
Terence Parr 2a28a9b4f3 simplify. no need for listeners as System.err can be reset. 2014-12-17 10:57:20 -08:00
Terence Parr 49a8029985 allow 4.4-generated parsers to work with new 4.5 runtime. 2014-12-16 19:09:17 -08:00
Terence Parr f70b358c75 Merge pull request #743 from michaelpj/doc/parserrulecontext-start-end
Add a little bit of documentation to ParserRuleContext
2014-11-15 18:24:52 -08:00
Terence Parr 876906d2d0 Merge pull request #741 from fabioramponi/master
added Serializable interface to Pair class
2014-11-15 17:01:35 -08:00
Michael Peyton Jones a38f5a0941 Be a little bit more precise - it might not be the direct successor 2014-10-27 17:43:07 +00:00
Michael Peyton Jones 6acb8e7e46 Add a little bit of documentation to ParserRuleContext 2014-10-27 17:43:07 +00:00
Michael Peyton Jones f3abfb79b7 Remove special offset handling for EOFs.
They can just use the position provided by the lexer.
2014-10-27 17:38:25 +00:00
Sam Harwell e0cf581d40 Fix handling of lexer accept positions for zero-length tokens and at EOF 2014-10-26 15:45:43 -05:00
Fabio Ramponi 5f1759cc54 added Serializable interface to Pair class
In order to serialize an ArrayList of CommonTokens without errors
2014-10-16 13:57:22 +02:00
Terence Parr 11aed36aa4 Merge pull request #722 from sharwell/fix-667
Fix multiple issues with getSourceName
2014-09-29 09:36:41 -07:00
Terence Parr b960d4b39d Merge pull request #712 from sharwell/fix-711
Improve runtime vocabulary information
2014-09-29 09:32:51 -07:00
Sam Harwell 065c3e68b8 Add additional NotNull and Nullable annotations 2014-09-28 12:12:16 -05:00
Sam Harwell 90071c69b8 Fix getSourceName returning null (fixes #667) 2014-09-28 12:12:15 -05:00
Petr Bělohlávek 78c24f0588 indentation fix 2014-09-27 11:47:13 +02:00
Sam Harwell 35bbdfb65c Allow XPath matching by literal or symbolic name (fixes #579) 2014-09-26 21:37:13 -05:00
Sam Harwell d476d3e5d9 Implement token vocabulary (fixes #711) 2014-09-26 21:37:11 -05:00
Terence Parr e3f2e5a7d0 Merge pull request #715 from sharwell/fix-487
NullUsageProcessor supports Java 6 through 8
2014-09-26 14:31:41 -07:00
Sam Harwell 4f56bb7ab0 Add Parser.isTrace() (fixes #701) 2014-09-25 22:11:32 -05:00
Sam Harwell fbe762374c NullUsageProcessor supports Java 6 through 8 (fixes #487) 2014-09-25 22:05:58 -05:00
Terence Parr 6e581b3be6 Merge pull request #691 from sharwell/fix-688
Improved support for zero-length lexer tokens
2014-09-02 13:25:14 -07:00
Terence Parr 6e869b3e80 Merge pull request #695 from parrt/prec-filter-comments
add parrt summary of conversation with Sam about precedence DFA optimization
2014-09-01 13:16:23 -07:00
Terence Parr fd194f073b add parrt summary of conversation with Sam about precedence DFA optimization 2014-09-01 13:15:21 -07:00
Terence Parr 7bf47e1670 Merge pull request #694 from sharwell/fix-309
Implement channels{} block
2014-09-01 12:56:57 -07:00
Sam Harwell cacd317d02 Implement support for defining custom channels in the channels{} construct in lexer grammars (fixes #309) 2014-09-01 13:28:08 -05:00
Sam Harwell 6790b25e5b Support zero-length tokens in the lexer (fixes #688) 2014-08-28 23:45:07 -05:00
Sam Harwell b62408067e Update precedence filter to properly handle stepping out of left-recursive rules (fixes #679) 2014-08-28 23:21:32 -05:00
Terence Parr 70dd5227c1 prepare for changes beyond 4.4 2014-07-16 19:45:59 -07:00
Terence Parr 775aaa6494 got javadoc DOT images in; updated font names to avoid warnings 2014-07-02 19:10:36 -07:00
Terence Parr 2bcf5c6b63 use 1.6 to compile 2014-07-02 12:19:21 -07:00
Terence Parr 2e352e2697 add unit tests for -o and -lib; improve BaseTest: refactor writeFile to Utils. -o options and others not accepted by antlr(). 2014-06-29 12:21:39 -05:00
Terence Parr 31aa7bf5c9 Re-factor loading profile in the streams so that I can reuse that load elsewhere. handy function. 2014-06-29 12:03:29 -05:00
Sam Harwell 91206869c5 Prepare for next development iteration 2014-06-28 22:40:33 -05:00
Terence Parr 4acb1091de refactor for reuse, make target check majorminor only. 2014-06-28 14:55:34 -07:00
Sam Harwell 7d88b0106a [maven-release-plugin] prepare for next development iteration 2014-06-18 21:25:44 -05:00
Sam Harwell 201eeb147d [maven-release-plugin] prepare release 4.3 2014-06-18 21:24:24 -05:00
Sam Harwell bbac283ba2 Add @since documentation to key new exposed API types/methods 2014-06-18 19:48:07 -05:00
Sam Harwell a72058bc67 Update dependency versions 2014-06-18 19:37:30 -05:00
Sam Harwell 3378be9c79 Update all version numbers for consistency prior to the 4.3 release 2014-06-18 19:37:29 -05:00
Sam Harwell 6949e832d9 Updated comments to clarify recent changes in code 2014-06-18 19:12:26 -05:00
Sam Harwell 2be522f009 Relax the default version mismatch listener to only throw an exception if the major or minor version components do not match 2014-06-18 17:41:28 -05:00
Sam Harwell f7a840c764 Move RuntimeMetaData.VERSION field to the top of the source file 2014-06-18 17:07:43 -05:00
Sam Harwell 8809cc4950 Fix documentation errors reported during the build 2014-06-17 06:35:11 -05:00
Terence Parr 91752af88d Merge pull request #623 from parrt/fix-set-subtract
getMinElement now supports values < 0.  Checked and shouldn't affect any...
2014-06-16 12:41:50 -07:00
Sam Harwell 2920ad0d1a * Updated documentation for IntSet
* Reimplemented IntervalSet.subtract and IntervalSet.complement to operate over the complete range of supported values
* Expanded several methods in IntervalSet to operate on any IntSet
* Mark COMPLETE_CHAR_SET and EMPTY_SET as read-only
2014-06-16 14:23:52 -05:00
Terence Parr 8f08802716 Merge pull request #626 from sharwell/fix-622
Fix edge case behavior of nextTokenOnChannel and previousTokenOnChannel
2014-06-16 09:59:51 -07:00
Sam Harwell e311ec63b4 Fix edge case behavior of nextTokenOnChannel and previousTokenOnChannel (fixes #622, fixes #544) 2014-06-16 11:39:16 -05:00
Sam Harwell 3574cbd94b Add an additional note about the relation between reportContextSensitivity and reportAmbiguity 2014-06-16 00:01:42 -05:00
Sam Harwell 64b6408e4a Update documentation for ANTLRErrorListener (fixes #603) 2014-06-15 23:56:50 -05:00
Terence Parr 51430018d0 getMinElement now supports values < 0. Checked and shouldn't affect any uses. subtract() from set with EOF, wiped out all negative values. added tests. 2014-06-14 13:14:32 -07:00
Terence Parr 358a1025d2 tweaks per Sam's comments. Just pushing straight to master. 2014-06-10 11:28:43 -07:00
Terence Parr cc36281ce2 new definition of context sensitivity required change in test code. Updated profiler per Sam's comments. 2014-06-03 22:04:02 -07:00