diff options
author | Morgan Deters <mdeters@gmail.com> | 2009-12-16 04:25:45 +0000 |
---|---|---|
committer | Morgan Deters <mdeters@gmail.com> | 2009-12-16 04:25:45 +0000 |
commit | 79df573326e6911d3a97fcc2528105acd1c2c525 (patch) | |
tree | 70930bcdb620cdf8ff9e3e9c495f67ed8317aa2e /src/parser | |
parent | 8cb3a7b556e8b4b85745bffbd1f0246e6af29588 (diff) |
Fixes to the build system:
Makefile.am files - remove obsolete INCLUDES, incorporate into AM_CPPFLAGS
Makefile files in src/ - support "make" under src/ (current build profile)
configure.ac - updates to fix warnings
config/antlr.m4 - updates to fix warnings
autogen.sh - updates to generate warnings from autotools; also support Macs
src/include/cvc4_config.h - guard with #ifdef
total reimplementation of NodeBuilder
ExprValue => NodeValue
context_mm.{h,cpp} - fixed numerous compile errors
Diffstat (limited to 'src/parser')
-rw-r--r-- | src/parser/Makefile | 5 | ||||
-rw-r--r-- | src/parser/Makefile.am | 5 | ||||
-rw-r--r-- | src/parser/Makefile.in | 7 | ||||
-rw-r--r-- | src/parser/antlr_parser.cpp | 6 | ||||
-rw-r--r-- | src/parser/cvc/Makefile | 5 | ||||
-rw-r--r-- | src/parser/cvc/Makefile.am | 5 | ||||
-rw-r--r-- | src/parser/cvc/Makefile.in | 7 | ||||
-rw-r--r-- | src/parser/smt/Makefile | 5 | ||||
-rw-r--r-- | src/parser/smt/Makefile.am | 5 | ||||
-rw-r--r-- | src/parser/smt/Makefile.in | 7 |
10 files changed, 42 insertions, 15 deletions
diff --git a/src/parser/Makefile b/src/parser/Makefile new file mode 100644 index 000000000..1ea7edf5d --- /dev/null +++ b/src/parser/Makefile @@ -0,0 +1,5 @@ +topdir = ../.. +srcdir = src/parser +builddir = $(topdir)/builds/$(srcdir) + +include $(topdir)/Makefile.subdir diff --git a/src/parser/Makefile.am b/src/parser/Makefile.am index e54d4aa2d..7f1ddce1f 100644 --- a/src/parser/Makefile.am +++ b/src/parser/Makefile.am @@ -15,9 +15,10 @@ LIBCVC4PARSER_RELEASE = @CVC4_LIBRARY_RELEASE_CODE@ LIBCVC4PARSER_VERSION = @CVC4_PARSER_LIBRARY_VERSION@ -INCLUDES = -I@srcdir@/../include -I@srcdir@/.. $(ANTLR_INCLUDES) +AM_CPPFLAGS = \ + -D__BUILDING_CVC4PARSERLIB \ + -I@srcdir@/../include -I@srcdir@/.. $(ANTLR_INCLUDES) AM_CXXFLAGS = -Wall -fvisibility=hidden -AM_CPPFLAGS = -D__BUILDING_CVC4PARSERLIB SUBDIRS = smt cvc diff --git a/src/parser/Makefile.in b/src/parser/Makefile.in index b2e066f8d..859329834 100644 --- a/src/parser/Makefile.in +++ b/src/parser/Makefile.in @@ -168,6 +168,7 @@ CXX = @CXX@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ +CXXTEST = @CXXTEST@ CXXTESTGEN = @CXXTESTGEN@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ @@ -296,9 +297,11 @@ top_srcdir = @top_srcdir@ # LIBCVC4PARSER_RELEASE = @CVC4_LIBRARY_RELEASE_CODE@ LIBCVC4PARSER_VERSION = @CVC4_PARSER_LIBRARY_VERSION@ -INCLUDES = -I@srcdir@/../include -I@srcdir@/.. $(ANTLR_INCLUDES) +AM_CPPFLAGS = \ + -D__BUILDING_CVC4PARSERLIB \ + -I@srcdir@/../include -I@srcdir@/.. $(ANTLR_INCLUDES) + AM_CXXFLAGS = -Wall -fvisibility=hidden -AM_CPPFLAGS = -D__BUILDING_CVC4PARSERLIB SUBDIRS = smt cvc nobase_lib_LTLIBRARIES = libcvc4parser.la libcvc4parser_la_LDFLAGS = $(ANTLR_LDFLAGS) diff --git a/src/parser/antlr_parser.cpp b/src/parser/antlr_parser.cpp index 2d3033a59..1baaf2139 100644 --- a/src/parser/antlr_parser.cpp +++ b/src/parser/antlr_parser.cpp @@ -133,10 +133,10 @@ void AntlrParser::rethrow(antlr::SemanticException& e, string new_message) LT(0).get()->getColumn()); } -Expr AntlrParser::createPrecedenceExpr(const vector<Expr>& exprs, const vector< - Kind>& kinds) { +Expr AntlrParser::createPrecedenceExpr(const vector<Expr>& exprs, + const vector<Kind>& kinds) { Assert( exprs.size() > 0, "Expected non-empty vector expr"); - Assert( vectors.size() + 1 == exprs.size(), "Expected kinds to match exprs"); + Assert( kinds.size() + 1 == exprs.size(), "Expected kinds to match exprs"); return createPrecedenceExpr(exprs, kinds, 0, exprs.size() - 1); } diff --git a/src/parser/cvc/Makefile b/src/parser/cvc/Makefile new file mode 100644 index 000000000..c91554a47 --- /dev/null +++ b/src/parser/cvc/Makefile @@ -0,0 +1,5 @@ +topdir = ../../.. +srcdir = src/parser/cvc +builddir = $(topdir)/builds/$(srcdir) + +include $(topdir)/Makefile.subdir diff --git a/src/parser/cvc/Makefile.am b/src/parser/cvc/Makefile.am index 6fb9689de..666c408cf 100644 --- a/src/parser/cvc/Makefile.am +++ b/src/parser/cvc/Makefile.am @@ -1,6 +1,7 @@ -INCLUDES = -I@srcdir@/../../include -I@srcdir@/../.. +AM_CPPFLAGS = \ + -D__BUILDING_CVC4PARSERLIB \ + -I@srcdir@/../../include -I@srcdir@/../.. AM_CXXFLAGS = -Wall -fvisibility=hidden -AM_CPPFLAGS = -D__BUILDING_CVC4PARSERLIB noinst_LTLIBRARIES = libparsercvc.la diff --git a/src/parser/cvc/Makefile.in b/src/parser/cvc/Makefile.in index cbab2fd5c..57db98f0b 100644 --- a/src/parser/cvc/Makefile.in +++ b/src/parser/cvc/Makefile.in @@ -108,6 +108,7 @@ CXX = @CXX@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ +CXXTEST = @CXXTEST@ CXXTESTGEN = @CXXTESTGEN@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ @@ -219,9 +220,11 @@ target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -INCLUDES = -I@srcdir@/../../include -I@srcdir@/../.. +AM_CPPFLAGS = \ + -D__BUILDING_CVC4PARSERLIB \ + -I@srcdir@/../../include -I@srcdir@/../.. + AM_CXXFLAGS = -Wall -fvisibility=hidden -AM_CPPFLAGS = -D__BUILDING_CVC4PARSERLIB noinst_LTLIBRARIES = libparsercvc.la ANTLR_TOKEN_STUFF = \ @srcdir@/generated/CvcVocabularyTokenTypes.hpp \ diff --git a/src/parser/smt/Makefile b/src/parser/smt/Makefile new file mode 100644 index 000000000..aa3e74236 --- /dev/null +++ b/src/parser/smt/Makefile @@ -0,0 +1,5 @@ +topdir = ../../.. +srcdir = src/parser/smt +builddir = $(topdir)/builds/$(srcdir) + +include $(topdir)/Makefile.subdir diff --git a/src/parser/smt/Makefile.am b/src/parser/smt/Makefile.am index c3273f501..6f5f1bfd4 100644 --- a/src/parser/smt/Makefile.am +++ b/src/parser/smt/Makefile.am @@ -1,6 +1,7 @@ -INCLUDES = -I@srcdir@/../../include -I@srcdir@/../.. +AM_CPPFLAGS = \ + -D__BUILDING_CVC4PARSERLIB \ + -I@srcdir@/../../include -I@srcdir@/../.. AM_CXXFLAGS = -Wall -fvisibility=hidden -AM_CPPFLAGS = -D__BUILDING_CVC4PARSERLIB noinst_LTLIBRARIES = libparsersmt.la diff --git a/src/parser/smt/Makefile.in b/src/parser/smt/Makefile.in index 281d2152b..2e9350486 100644 --- a/src/parser/smt/Makefile.in +++ b/src/parser/smt/Makefile.in @@ -108,6 +108,7 @@ CXX = @CXX@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ +CXXTEST = @CXXTEST@ CXXTESTGEN = @CXXTESTGEN@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ @@ -219,9 +220,11 @@ target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -INCLUDES = -I@srcdir@/../../include -I@srcdir@/../.. +AM_CPPFLAGS = \ + -D__BUILDING_CVC4PARSERLIB \ + -I@srcdir@/../../include -I@srcdir@/../.. + AM_CXXFLAGS = -Wall -fvisibility=hidden -AM_CPPFLAGS = -D__BUILDING_CVC4PARSERLIB noinst_LTLIBRARIES = libparsersmt.la ANTLR_TOKEN_STUFF = \ @srcdir@/generated/SmtVocabularyTokenTypes.hpp \ |