From 88b52c971b43248e6ceacf1c8140a06427d0418d Mon Sep 17 00:00:00 2001 From: Morgan Deters Date: Fri, 5 Mar 2010 08:26:37 +0000 Subject: * public/private code untangled (smt/smt_engine.h no longer #includes expr/node.h). This removes the warnings we had during compilation, and heads off a number of potential linking errors due to improper inlining of private (library-only) stuff in client (out-of-library) code. * "configure" now takes some options as part of a "bare-option" build type (e.g., "./configure debug-coverage" or "./configure production-muzzle"). * split cdo.h, cdlist.h, cdmap.h, and cdset.h from context.h * split cdlist_black unit test from context_black * implement CDMap<>. * give ExprManagers ownership of the context (and have SmtEngine share that one) * fix main driver to properly report file-not-found * fix MemoryMappedInputBuffer class to report reasons for "errno"-returned system errors * src/expr/attribute.h: context-dependent attribute kinds now supported * test/unit/expr/node_white.h: context-dependent attribute tests * src/prop/cnf_conversion.h and associated parts of src/util/options.h and src/main/getopt.cpp: obsolete command-line option, removed. * src/util/Assert.h: assertions are now somewhat more useful (in debug builds, anyway) during stack unwinding. * test/unit/theory/theory_black.h: test context-dependent behavior of registerTerm() attribute for theories * src/expr/node_builder.h: formatting, fixes for arithmetic convenience node builders, check memory allocations * test/unit/expr/node_builder_black.h: add tessts for addition, subtraction, unary minus, and multiplication convenience node builders * src/expr/attribute.h: more comments * (various) code formatting, comment cleanup, added throws specifier to some destructors * contrib/code-checker: prototype perl script to test (some) code policy * contrib/indent-settings: command line for GNU indent to indent using CVC4 style (sort of; this is a work in progress) * COPYING: legal stuff * DESIGN_QUESTIONS: obsolete, removed --- src/parser/parser.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/parser/parser.cpp') diff --git a/src/parser/parser.cpp b/src/parser/parser.cpp index 852eda595..a129d97ee 100644 --- a/src/parser/parser.cpp +++ b/src/parser/parser.cpp @@ -18,12 +18,12 @@ #include #include -#include "parser.h" -#include "memory_mapped_input_buffer.h" +#include "parser/parser.h" +#include "parser/memory_mapped_input_buffer.h" #include "expr/command.h" #include "util/output.h" #include "util/Assert.h" -#include "parser_exception.h" +#include "parser/parser_exception.h" #include "parser/antlr_parser.h" #include "parser/smt/generated/AntlrSmtParser.hpp" #include "parser/smt/generated/AntlrSmtLexer.hpp" @@ -125,7 +125,7 @@ Parser* Parser::getNewParser(ExprManager* em, InputLanguage lang, Parser* Parser::getMemoryMappedParser(ExprManager* em, InputLanguage lang, string filename) { MemoryMappedInputBuffer* inputBuffer = new MemoryMappedInputBuffer(filename); - return getNewParser(em,lang,inputBuffer,filename); + return getNewParser(em, lang, inputBuffer, filename); } Parser* Parser::getNewParser(ExprManager* em, InputLanguage lang, -- cgit v1.2.3