Removing the generated directory from the parsers.

diff --git a/src/parser/cvc/Makefile.am b/src/parser/cvc/Makefile.am
index b7066dd7e64e9be926e2897e107e757c9e892808..8f084ba3444748fa438385d67a40b221bc3e7cd5 100644 (file)
--- a/src/parser/cvc/Makefile.am
+++ b/src/parser/cvc/Makefile.am
@@ -15,14 +15,14 @@ ANTLR_OPTS =
 noinst_LTLIBRARIES = libparsercvc.la
 
 ANTLR_TOKEN_STUFF = \
-       generated/Cvc.tokens
+       @builddir@/Cvc.tokens
 ANTLR_LEXER_STUFF = \
-       generated/CvcLexer.h \
-       generated/CvcLexer.c \
+       @builddir@/CvcLexer.h \
+       @builddir@/CvcLexer.c \
        $(ANTLR_TOKEN_STUFF)
 ANTLR_PARSER_STUFF = \
-       generated/CvcParser.h \
-       generated/CvcParser.c
+       @builddir@/CvcParser.h \
+       @builddir@/CvcParser.c
 ANTLR_STUFF = \
        $(ANTLR_LEXER_STUFF) \
        $(ANTLR_PARSER_STUFF)
@@ -34,11 +34,11 @@ libparsercvc_la_SOURCES = \
        $(ANTLR_STUFF)
 
 BUILT_SOURCES = \
-       generated/Cvc.tokens \
-       generated/CvcLexer.h \
-       generated/CvcLexer.c \
-       generated/CvcParser.h \
-       generated/CvcParser.c \
+       @builddir@/Cvc.tokens \
+       @builddir@/CvcLexer.h \
+       @builddir@/CvcLexer.c \
+       @builddir@/CvcParser.h \
+       @builddir@/CvcParser.c \
        stamp-generated
 
 EXTRA_DIST = \
@@ -55,13 +55,13 @@ stamp-generated:
        $(AM_V_at)touch stamp-generated
 
 # antlr doesn't overwrite output files, it just leaves them.  So we have to delete them first.
-generated/CvcLexer.h: Cvc.g stamp-generated
+@builddir@/CvcLexer.h: Cvc.g 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 "generated" "@srcdir@/Cvc.g"
+       $(AM_V_GEN)$(ANTLR) $(ANTLR_OPTS) -fo "@builddir@" "@srcdir@/Cvc.g"
 
 # These don't actually depend on CvcLexer.h, but if we're doing parallel
 # make and the lexer needs to be rebuilt, we have to keep the rules
 # from running in parallel (since the token files will be deleted &
 # recreated)
-generated/CvcLexer.c generated/CvcParser.h generated/CvcParser.c $(ANTLR_TOKEN_STUFF): generated/CvcLexer.h
+@builddir@/CvcLexer.c @builddir@/CvcParser.h @builddir@/CvcParser.c $(ANTLR_TOKEN_STUFF): @builddir@/CvcLexer.h

diff --git a/src/parser/cvc/cvc_input.cpp b/src/parser/cvc/cvc_input.cpp
index 38c33d007a8fc1355245af980d97e12640c06698..69920403fe8b586e25381fb0d32edb25dab3f952 100644 (file)
--- a/src/parser/cvc/cvc_input.cpp
+++ b/src/parser/cvc/cvc_input.cpp
@@ -20,8 +20,8 @@
 #include "parser/antlr_input.h"
 #include "parser/parser_exception.h"
 #include "parser/cvc/cvc_input.h"
-#include "parser/cvc/generated/CvcLexer.h"
-#include "parser/cvc/generated/CvcParser.h"
+#include "parser/cvc/CvcLexer.h"
+#include "parser/cvc/CvcParser.h"
 
 namespace CVC4 {
 namespace parser {

diff --git a/src/parser/cvc/cvc_input.h b/src/parser/cvc/cvc_input.h
index 46851bfd3df0d217d594f4b555a98d0fbc4f9a43..a88fd7223a99baea79847c0b41e4e8a09bd5a112 100644 (file)
--- a/src/parser/cvc/cvc_input.h
+++ b/src/parser/cvc/cvc_input.h
@@ -20,8 +20,8 @@
 #define __CVC4__PARSER__CVC_INPUT_H
 
 #include "parser/antlr_input.h"
-#include "parser/cvc/generated/CvcLexer.h"
-#include "parser/cvc/generated/CvcParser.h"
+#include "parser/cvc/CvcLexer.h"
+#include "parser/cvc/CvcParser.h"
 
 // extern void CvcParserSetAntlrParser(CVC4::parser::AntlrParser* newAntlrParser);
 

diff --git a/src/parser/smt1/Makefile.am b/src/parser/smt1/Makefile.am
index 90ee7eb316cff26da0c0558411a6df3c5fb3feb2..ae49d06592a3fbd05cfc44f74df8d312e575f93c 100644 (file)
--- a/src/parser/smt1/Makefile.am
+++ b/src/parser/smt1/Makefile.am
@@ -15,14 +15,14 @@ ANTLR_OPTS =
 noinst_LTLIBRARIES = libparsersmt1.la
 
 ANTLR_TOKEN_STUFF = \
-       generated/Smt1.tokens
+       @builddir@/Smt1.tokens
 ANTLR_LEXER_STUFF = \
-       generated/Smt1Lexer.h \
-       generated/Smt1Lexer.c \
+       @builddir@/Smt1Lexer.h \
+       @builddir@/Smt1Lexer.c \
        $(ANTLR_TOKEN_STUFF)
 ANTLR_PARSER_STUFF = \
-       generated/Smt1Parser.h \
-       generated/Smt1Parser.c
+       @builddir@/Smt1Parser.h \
+       @builddir@/Smt1Parser.c
 ANTLR_STUFF = \
        $(ANTLR_LEXER_STUFF) \
        $(ANTLR_PARSER_STUFF)
@@ -36,11 +36,11 @@ libparsersmt1_la_SOURCES = \
        $(ANTLR_STUFF)
 
 BUILT_SOURCES = \
-       generated/Smt1.tokens \
-       generated/Smt1Lexer.h \
-       generated/Smt1Lexer.c \
-       generated/Smt1Parser.h \
-       generated/Smt1Parser.c \
+       @builddir@/Smt1.tokens \
+       @builddir@/Smt1Lexer.h \
+       @builddir@/Smt1Lexer.c \
+       @builddir@/Smt1Parser.h \
+       @builddir@/Smt1Parser.c \
        stamp-generated
 
 EXTRA_DIST = \
@@ -56,13 +56,13 @@ stamp-generated:
        $(AM_V_at)touch stamp-generated
 
 # antlr doesn't overwrite output files, it just leaves them.  So we have to delete them first.
-generated/Smt1Lexer.h: Smt1.g stamp-generated
+@builddir@/Smt1Lexer.h: Smt1.g 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 "generated" "@srcdir@/Smt1.g"
+       $(AM_V_GEN)$(ANTLR) $(ANTLR_OPTS) -fo "@builddir@" "@srcdir@/Smt1.g"
 
 # These don't actually depend on Smt1Lexer.h, but if we're doing parallel
 # make and the lexer needs to be rebuilt, we have to keep the rules
 # from running in parallel (since the token files will be deleted &
 # recreated)
-generated/Smt1Lexer.c generated/Smt1Parser.h generated/Smt1Parser.c $(ANTLR_TOKEN_STUFF): generated/Smt1Lexer.h
+@builddir@/Smt1Lexer.c @builddir@/Smt1Parser.h @builddir@/Smt1Parser.c $(ANTLR_TOKEN_STUFF): @builddir@/Smt1Lexer.h

diff --git a/src/parser/smt1/smt1_input.cpp b/src/parser/smt1/smt1_input.cpp
index 6ac897078ca0215365c7ea257ac8b7421d36cc60..1391c7e8551fdd76553aba79d73cfb3cc41f3210 100644 (file)
--- a/src/parser/smt1/smt1_input.cpp
+++ b/src/parser/smt1/smt1_input.cpp
@@ -21,8 +21,8 @@
 #include "parser/input.h"
 #include "parser/parser.h"
 #include "parser/parser_exception.h"
-#include "parser/smt1/generated/Smt1Lexer.h"
-#include "parser/smt1/generated/Smt1Parser.h"
+#include "parser/smt1/Smt1Lexer.h"
+#include "parser/smt1/Smt1Parser.h"
 
 namespace CVC4 {
 namespace parser {

diff --git a/src/parser/smt1/smt1_input.h b/src/parser/smt1/smt1_input.h
index 0e95c192ac6376e6663bcdd12076a1a143de3752..de21036c0e8486cc7e8a36c60499caaacacf0ca3 100644 (file)
--- a/src/parser/smt1/smt1_input.h
+++ b/src/parser/smt1/smt1_input.h
@@ -20,8 +20,8 @@
 #define __CVC4__PARSER__SMT1_INPUT_H
 
 #include "parser/antlr_input.h"
-#include "parser/smt1/generated/Smt1Lexer.h"
-#include "parser/smt1/generated/Smt1Parser.h"
+#include "parser/smt1/Smt1Lexer.h"
+#include "parser/smt1/Smt1Parser.h"
 
 // extern void Smt1ParserSetAntlrParser(CVC4::parser::AntlrParser* newAntlrParser);
 

diff --git a/src/parser/smt2/Makefile.am b/src/parser/smt2/Makefile.am
index 38de258cc2fdf50b41614dd27fe73ab55f741fd9..fece5e5e8f015c0f88337948459a3336d122e75d 100644 (file)
--- a/src/parser/smt2/Makefile.am
+++ b/src/parser/smt2/Makefile.am
@@ -15,14 +15,14 @@ ANTLR_OPTS =
 noinst_LTLIBRARIES = libparsersmt2.la
 
 ANTLR_TOKEN_STUFF = \
-       generated/Smt2.tokens
+       @builddir@/Smt2.tokens
 ANTLR_LEXER_STUFF = \
-       generated/Smt2Lexer.h \
-       generated/Smt2Lexer.c \
+       @builddir@/Smt2Lexer.h \
+       @builddir@/Smt2Lexer.c \
        $(ANTLR_TOKEN_STUFF)
 ANTLR_PARSER_STUFF = \
-       generated/Smt2Parser.h \
-       generated/Smt2Parser.c
+       @builddir@/Smt2Parser.h \
+       @builddir@/Smt2Parser.c
 ANTLR_STUFF = \
        $(ANTLR_LEXER_STUFF) \
        $(ANTLR_PARSER_STUFF)
@@ -38,11 +38,11 @@ libparsersmt2_la_SOURCES = \
        $(ANTLR_STUFF)
 
 BUILT_SOURCES = \
-       generated/Smt2.tokens \
-       generated/Smt2Lexer.h \
-       generated/Smt2Lexer.c \
-       generated/Smt2Parser.h \
-       generated/Smt2Parser.c \
+       @builddir@/Smt2.tokens \
+       @builddir@/Smt2Lexer.h \
+       @builddir@/Smt2Lexer.c \
+       @builddir@/Smt2Parser.h \
+       @builddir@/Smt2Parser.c \
        stamp-generated
 
 EXTRA_DIST = \
@@ -58,13 +58,13 @@ stamp-generated:
        $(AM_V_at)touch stamp-generated
 
 # antlr doesn't overwrite output files, it just leaves them.  So we have to delete them first.
-generated/Smt2Lexer.h: Smt2.g stamp-generated
+@builddir@/Smt2Lexer.h: Smt2.g 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 "generated" "@srcdir@/Smt2.g"
+       $(AM_V_GEN)$(ANTLR) $(ANTLR_OPTS) -fo "@builddir@" "@srcdir@/Smt2.g"
 
 # These don't actually depend on SmtLexer.h, but if we're doing parallel
 # make and the lexer needs to be rebuilt, we have to keep the rules
 # from running in parallel (since the token files will be deleted &
 # recreated)
-generated/Smt2Lexer.c generated/Smt2Parser.h generated/Smt2Parser.c $(ANTLR_TOKEN_STUFF): generated/Smt2Lexer.h
+@builddir@/Smt2Lexer.c @builddir@/Smt2Parser.h @builddir@/Smt2Parser.c $(ANTLR_TOKEN_STUFF): @builddir@/Smt2Lexer.h

diff --git a/src/parser/smt2/smt2_input.cpp b/src/parser/smt2/smt2_input.cpp
index 22c2fd9a7a43ba721dcefa1e85c077610bb4d8a1..9f1fae16f54a19e4e82294c93800b11bef951743 100644 (file)
--- a/src/parser/smt2/smt2_input.cpp
+++ b/src/parser/smt2/smt2_input.cpp
@@ -22,8 +22,8 @@
 #include "parser/parser.h"
 #include "parser/parser_exception.h"
 #include "parser/smt2/smt2.h"
-#include "parser/smt2/generated/Smt2Lexer.h"
-#include "parser/smt2/generated/Smt2Parser.h"
+#include "parser/smt2/Smt2Lexer.h"
+#include "parser/smt2/Smt2Parser.h"
 
 namespace CVC4 {
 namespace parser {

diff --git a/src/parser/smt2/smt2_input.h b/src/parser/smt2/smt2_input.h
index a1baa98cbbb67f894d388b0cd5f85b78d5cf9b4d..0eb4a504bfa0d597741283909582a81c642d3ed5 100644 (file)
--- a/src/parser/smt2/smt2_input.h
+++ b/src/parser/smt2/smt2_input.h
@@ -20,8 +20,8 @@
 #define __CVC4__PARSER__SMT2_INPUT_H
 
 #include "parser/antlr_input.h"
-#include "parser/smt2/generated/Smt2Lexer.h"
-#include "parser/smt2/generated/Smt2Parser.h"
+#include "parser/smt2/Smt2Lexer.h"
+#include "parser/smt2/Smt2Parser.h"
 
 // extern void Smt2ParserSetAntlrParser(CVC4::parser::AntlrParser* newAntlrParser);
 

diff --git a/src/parser/smt2/sygus_input.cpp b/src/parser/smt2/sygus_input.cpp
index 8bd02485bda7b647f00400c551732148c8ca08d9..086a04d27347868b826be87301688c16d29bb207 100644 (file)
--- a/src/parser/smt2/sygus_input.cpp
+++ b/src/parser/smt2/sygus_input.cpp
@@ -22,8 +22,8 @@
 #include "parser/parser.h"
 #include "parser/parser_exception.h"
 #include "parser/smt2/sygus_input.h"
-#include "parser/smt2/generated/Smt2Lexer.h"
-#include "parser/smt2/generated/Smt2Parser.h"
+#include "parser/smt2/Smt2Lexer.h"
+#include "parser/smt2/Smt2Parser.h"
 
 namespace CVC4 {
 namespace parser {

diff --git a/src/parser/smt2/sygus_input.h b/src/parser/smt2/sygus_input.h
index d5e6b8b87e4ab65e7c3a191b13de6d60efbae4cc..1f00780763f2c7e346678e665ea01bf5722e44a1 100644 (file)
--- a/src/parser/smt2/sygus_input.h
+++ b/src/parser/smt2/sygus_input.h
@@ -20,8 +20,8 @@
 #define __CVC4__PARSER__SYGUS_INPUT_H
 
 #include "parser/antlr_input.h"
-#include "parser/smt2/generated/Smt2Lexer.h"
-#include "parser/smt2/generated/Smt2Parser.h"
+#include "parser/smt2/Smt2Lexer.h"
+#include "parser/smt2/Smt2Parser.h"
 
 // extern void Smt2ParserSetAntlrParser(CVC4::parser::AntlrParser* newAntlrParser);
 

diff --git a/src/parser/tptp/Makefile.am b/src/parser/tptp/Makefile.am
index b5ac965e875e87bafb4139ad8aca2759940e3c93..eab01103fddd1ad546c0a9cbe28df5a779c99549 100644 (file)
--- a/src/parser/tptp/Makefile.am
+++ b/src/parser/tptp/Makefile.am
@@ -15,14 +15,14 @@ ANTLR_OPTS =
 noinst_LTLIBRARIES = libparsertptp.la
 
 ANTLR_TOKEN_STUFF = \
-       generated/Tptp.tokens
+       @builddir@/Tptp.tokens
 ANTLR_LEXER_STUFF = \
-       generated/TptpLexer.h \
-       generated/TptpLexer.c \
+       @builddir@/TptpLexer.h \
+       @builddir@/TptpLexer.c \
        $(ANTLR_TOKEN_STUFF)
 ANTLR_PARSER_STUFF = \
-       generated/TptpParser.h \
-       generated/TptpParser.c
+       @builddir@/TptpParser.h \
+       @builddir@/TptpParser.c
 ANTLR_STUFF = \
        $(ANTLR_LEXER_STUFF) \
        $(ANTLR_PARSER_STUFF)
@@ -36,11 +36,11 @@ libparsertptp_la_SOURCES = \
        $(ANTLR_STUFF)
 
 BUILT_SOURCES = \
-       generated/Tptp.tokens \
-       generated/TptpLexer.h \
-       generated/TptpLexer.c \
-       generated/TptpParser.h \
-       generated/TptpParser.c \
+       @builddir@/Tptp.tokens \
+       @builddir@/TptpLexer.h \
+       @builddir@/TptpLexer.c \
+       @builddir@/TptpParser.h \
+       @builddir@/TptpParser.c \
        stamp-generated
 
 EXTRA_DIST = \
@@ -56,13 +56,13 @@ stamp-generated:
        $(AM_V_at)touch stamp-generated
 
 # antlr doesn't overwrite output files, it just leaves them.  So we have to delete them first.
-generated/TptpLexer.h: Tptp.g stamp-generated
+@builddir@/TptpLexer.h: Tptp.g 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 "generated" "@srcdir@/Tptp.g"
+       $(AM_V_GEN)$(ANTLR) $(ANTLR_OPTS) -fo "@builddir@" "@srcdir@/Tptp.g"
 
 # These don't actually depend on TptpLexer.h, but if we're doing parallel
 # make and the lexer needs to be rebuilt, we have to keep the rules
 # from running in parallel (since the token files will be deleted &
 # recreated)
-generated/TptpLexer.c generated/TptpParser.h generated/TptpParser.c $(ANTLR_TOKEN_STUFF): generated/TptpLexer.h
+@builddir@/TptpLexer.c @builddir@/TptpParser.h @builddir@/TptpParser.c $(ANTLR_TOKEN_STUFF): @builddir@/TptpLexer.h

diff --git a/src/parser/tptp/tptp_input.cpp b/src/parser/tptp/tptp_input.cpp
index 9274d1904db70f1ce283a90417831c51bca64da3..e41a539bb8be002209fe7be4d1f7eb2f5a0beed6 100644 (file)
--- a/src/parser/tptp/tptp_input.cpp
+++ b/src/parser/tptp/tptp_input.cpp
@@ -22,8 +22,8 @@
 #include "parser/parser.h"
 #include "parser/parser_exception.h"
 #include "parser/tptp/tptp.h"
-#include "parser/tptp/generated/TptpLexer.h"
-#include "parser/tptp/generated/TptpParser.h"
+#include "parser/tptp/TptpLexer.h"
+#include "parser/tptp/TptpParser.h"
 
 namespace CVC4 {
 namespace parser {

diff --git a/src/parser/tptp/tptp_input.h b/src/parser/tptp/tptp_input.h
index 280a60536822bc7ab5884534297ee183e2789a5f..6357beae199056d3348bb325387d1cdce04241e7 100644 (file)
--- a/src/parser/tptp/tptp_input.h
+++ b/src/parser/tptp/tptp_input.h
@@ -20,8 +20,8 @@
 #define __CVC4__PARSER__TPTP_INPUT_H
 
 #include "parser/antlr_input.h"
-#include "parser/tptp/generated/TptpLexer.h"
-#include "parser/tptp/generated/TptpParser.h"
+#include "parser/tptp/TptpLexer.h"
+#include "parser/tptp/TptpParser.h"
 
 // extern void TptpParserSetAntlrParser(CVC4::parser::AntlrParser* newAntlrParser);