Commit Graph

2851 Commits

Author SHA1 Message Date
Terence Parr 677cc279ad include annot in javadoc 2014-07-16 12:07:17 -07:00
Terence Parr 7d19889ab2 add comment to describe build 2014-07-16 10:28:38 -07:00
Terence Parr 1f797853bb make tests build in their own classpath 2014-07-16 10:20:54 -07:00
Terence Parr 7865142f9e improve bild 2014-07-12 17:03:23 -07:00
Terence Parr f86fc71128 Merge pull request #662 from parrt/fix-661
Fix 661
2014-07-11 12:10:41 -07:00
Terence Parr bb389782da Fixes #661. A parser rule reference within a lexer rule would get a bad error message and then an exception. Further, errors within the grammar tree visitor would go to standard error instead of to an error manager because none of the subclasses implemented getErrorManager(). Introduced an error type for this error PARSER_RULE_REF_IN_LEXER_RULE. Added to unit test. 2014-07-11 12:09:47 -07:00
Terence Parr b4a53d56d4 Merge branch 'master' into fix-661 2014-07-10 21:45:33 -07:00
Terence Parr ee0345c1e2 After gen of antlr 4.4 jar, rebuild XPathLexer with 4.4 then remake jars. 2014-07-10 21:44:54 -07:00
Terence Parr 87852c7757 Merge branch 'master' into fix-661 2014-07-10 18:15:55 -07:00
Terence Parr c22706135d fix build. separate antlr3,4 gen dirs 2014-07-10 18:07:24 -07:00
Terence Parr 83411ef056 add test 2014-07-10 18:00:16 -07:00
Terence Parr 94ddde2dbc c# target dir renamed. 2014-07-09 15:53:57 -07:00
Terence Parr a578dba415 arg was renamed in bild script 2014-07-09 15:53:03 -07:00
Terence Parr 065d6733ae make bild bootstrap 2014-07-09 12:00:36 -07:00
Terence Parr 08a1dc77f5 can't make minimal runtime jar for this release; unfix #576 2014-07-06 09:34:43 -07:00
Terence Parr 74573c2eed make runtime jar and minimal runtime jar, improve manifests. Fixes #576 2014-07-06 09:21:46 -07:00
Terence Parr d6c1fa152d correctly add target templates 2014-07-06 08:46:47 -07:00
Terence Parr 2b7c32e8cf expand path to jar. 2014-07-05 19:15:36 -07:00
Terence Parr ad069c9e08 got unit tests working finally. 2014-07-05 19:13:05 -07:00
Terence Parr 9b76e6423c refine error type 2014-07-05 19:08:31 -07:00
Terence Parr 1f8c124fa7 got junit tests in for Java target 2014-07-04 18:39:12 -07:00
Terence Parr 809e9ee145 make target javac simpler 2014-07-03 11:58:57 -07:00
Terence Parr 543936eefa bring in Target.java and template files. 2014-07-03 11:46:28 -07:00
Terence Parr 2ea9d0789a Merge pull request #657 from parrt/factor-target
Factor target
2014-07-03 10:55:40 -07:00
Terence Parr e1ba264d93 move common char encoding up to Target; same works for Python. 2014-07-03 10:54:49 -07:00
Terence Parr 0b59fd5f33 zip javadoc 2014-07-03 10:27:28 -07:00
Terence Parr 5e5efc3f4f Merge pull request #656 from jimidle/master
Add Sir Jim Idle to the contributors list
2014-07-02 20:50:09 -07:00
Jim Idle 914a61eae4 Correct the email address of Jim Idle 2014-07-03 11:35:11 +08:00
Jim Idle 5c43d2105d Add Jim Idle to the list of contributors 2014-07-03 11:31:02 +08:00
Terence Parr 5b0120f6e5 Merge pull request #655 from parrt/add-bild
Add bild script, set version to 4.4
2014-07-02 19:11:49 -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 4bc3284412 add javadoc 2014-07-02 18:31:38 -07:00
Terence Parr 2bcf5c6b63 use 1.6 to compile 2014-07-02 12:19:21 -07:00
Terence Parr 9c7563646f add jars to final jar 2014-07-02 10:01:15 -07:00
Terence Parr c2154188b0 makes a jar now 2014-07-01 21:33:26 -07:00
Terence Parr 8c9d1c45ee got an initial build script. 2014-07-01 18:18:17 -07:00
Terence Parr 07b7a4b334 I messed up the merge a bit in ErrorType. Made something into a grammar error not tool error. changed tool error back so it does not accept a token in the grammar. 2014-06-30 16:24:43 -07:00
Terence Parr d85ea0649a Merge branch 'err-msgs-upgrade'
Conflicts:
	tool/src/org/antlr/v4/tool/ErrorType.java
2014-06-30 15:59:19 -07:00
Terence Parr 163ec98afc Merge pull request #650 from parrt/null-ptr-unknown-target
add new panic() method, though not yet used. revert to java target if ca...
2014-06-30 15:40:37 -07:00
Terence Parr 1b7cdc4328 move templatesExist to Target 2014-06-30 15:38:15 -07:00
Terence Parr e3fc04bda1 put good quotes back in. rm unneeded arg to left-recur msg. 2014-06-30 15:16:20 -07:00
Terence Parr f1d782ffe1 Add convenience methods for detecting missing targets. At a few bail out points so that we don't try anything that will need code generator if we get an improper target. 2014-06-30 11:49:30 -07:00
Terence Parr f0ab9b1415 use assoc value's token. 2014-06-30 09:26:02 -07:00
Terence Parr 36425dd59c Big change to error messages themselves by removing single quotes for non input text stuff. Made cannot_find_tokens_file more specific (split it). Added offending token information to a lot of the messages. It now only prints the file name and not the full path to the file in error messages. Re-factored the ANTLRMessage hierarchy to share fields. Getting the offending token required number of methods to take different arguments. removed the default ST listener in the error manager as it is apparently unused. Cannot find imported grammar is now a grammar error not a tool error. 2014-06-29 21:39:15 -07:00
Terence Parr 4f7f8538ac add new panic() method, though not yet used. revert to java target if cannot find specified target 2014-06-29 13:02:34 -07:00
Sam Harwell 5bd415b195 Merge pull request #645 from parrt/test-tokens-and-imports-dir
More tests of -o and -lib for .tokens files and imports, some useful refactoring.
2014-06-29 12:23:20 -05: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
Terence Parr a07d523c81 add comment 2014-06-29 09:43:24 -07:00
Sam Harwell fef1dd5d8d Merge pull request #647 from sharwell/4.4-dev
Prepare for next development iteration
2014-06-28 22:38:21 -05:00