diff options
| author | Morgan Deters <mdeters@gmail.com> | 2011-12-02 00:35:32 +0000 |
|---|---|---|
| committer | Morgan Deters <mdeters@gmail.com> | 2011-12-02 00:35:32 +0000 |
| commit | 9468dec9f3c041e4996df2f703f2c2ba4ba8dd91 (patch) | |
| tree | 783145908d58141b11dc4b6aa5374ce63397df2e /src/parser | |
| parent | 221b4d34bac36eb6427c2f3de2fa908f6af110b2 (diff) | |
Error detection is different now---with new Command infrastructure, exceptions are not thrown outside the library. Reflect this in the exit code of the driver. Fixes a bug found by Tim among the nightly regressions.
Also improved error reporting if antlr is unavailable and the parsers need to be generated.
Diffstat (limited to 'src/parser')
| -rw-r--r-- | src/parser/cvc/Makefile.am | 1 | ||||
| -rw-r--r-- | src/parser/smt/Makefile.am | 1 | ||||
| -rw-r--r-- | src/parser/smt2/Makefile.am | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/src/parser/cvc/Makefile.am b/src/parser/cvc/Makefile.am index c5dab0cd2..15a572745 100644 --- a/src/parser/cvc/Makefile.am +++ b/src/parser/cvc/Makefile.am @@ -51,6 +51,7 @@ maintainer-clean-local: # antlr doesn't overwrite output files, it just leaves them. So we have to delete them first. @srcdir@/generated/CvcLexer.h: Cvc.g @srcdir@/stamp-generated -$(AM_V_at)rm -f $(ANTLR_STUFF) + @if test -z "$(ANTLR)"; then echo "ERROR: antlr parser generator cannot be found, cannot generate the parser" >&2; exit 1; fi $(AM_V_GEN)$(ANTLR) $(ANTLR_OPTS) -fo "@srcdir@/generated" "@srcdir@/Cvc.g" # These don't actually depend on CvcLexer.h, but if we're doing parallel diff --git a/src/parser/smt/Makefile.am b/src/parser/smt/Makefile.am index 46926da8f..975a90b72 100644 --- a/src/parser/smt/Makefile.am +++ b/src/parser/smt/Makefile.am @@ -51,6 +51,7 @@ maintainer-clean-local: # antlr doesn't overwrite output files, it just leaves them. So we have to delete them first. @srcdir@/generated/SmtLexer.h: Smt.g @srcdir@/stamp-generated -$(AM_V_at)rm -f $(ANTLR_STUFF) + @if test -z "$(ANTLR)"; then echo "ERROR: antlr parser generator cannot be found, cannot generate the parser" >&2; exit 1; fi $(AM_V_GEN)$(ANTLR) $(ANTLR_OPTS) -fo "@srcdir@/generated" "@srcdir@/Smt.g" # These don't actually depend on SmtLexer.h, but if we're doing parallel diff --git a/src/parser/smt2/Makefile.am b/src/parser/smt2/Makefile.am index 9def4c85b..75ceec43a 100644 --- a/src/parser/smt2/Makefile.am +++ b/src/parser/smt2/Makefile.am @@ -51,6 +51,7 @@ maintainer-clean-local: # antlr doesn't overwrite output files, it just leaves them. So we have to delete them first. @srcdir@/generated/Smt2Lexer.h: Smt2.g @srcdir@/stamp-generated -$(AM_V_at)rm -f $(ANTLR_STUFF) + @if test -z "$(ANTLR)"; then echo "ERROR: antlr parser generator cannot be found, cannot generate the parser" >&2; exit 1; fi $(AM_V_GEN)$(ANTLR) $(ANTLR_OPTS) -fo "@srcdir@/generated" "@srcdir@/Smt2.g" # These don't actually depend on SmtLexer.h, but if we're doing parallel |