diff options
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/Makefile.am | 6 | ||||
-rw-r--r-- | contrib/alttheoryskel/Makefile | 4 | ||||
-rw-r--r-- | contrib/alttheoryskel/Makefile.am | 14 | ||||
-rw-r--r-- | contrib/alttheoryskel/README.WHATS-NEXT | 25 | ||||
-rw-r--r-- | contrib/alttheoryskel/kinds | 8 | ||||
-rw-r--r-- | contrib/alttheoryskel/options | 8 | ||||
-rw-r--r-- | contrib/alttheoryskel/options_handlers.h | 14 | ||||
-rw-r--r-- | contrib/alttheoryskel/theory_DIR.cpp | 42 | ||||
-rw-r--r-- | contrib/alttheoryskel/theory_DIR.h | 35 | ||||
-rwxr-xr-x | contrib/new-theory | 86 | ||||
-rw-r--r-- | contrib/theoryskel/Makefile.am | 5 | ||||
-rw-r--r-- | contrib/theoryskel/README.WHATS-NEXT | 10 | ||||
-rw-r--r-- | contrib/theoryskel/options | 8 | ||||
-rw-r--r-- | contrib/theoryskel/options_handlers.h | 14 | ||||
-rw-r--r-- | contrib/theoryskel/theory_DIR.cpp | 6 | ||||
-rw-r--r-- | contrib/theoryskel/theory_DIR.h | 6 |
16 files changed, 268 insertions, 23 deletions
diff --git a/contrib/Makefile.am b/contrib/Makefile.am index b2147b19a..702bfe7fa 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -22,3 +22,9 @@ EXTRA_DIST = \ theoryskel/theory_DIR.h \ theoryskel/theory_DIR_rewriter.h \ theoryskel/theory_DIR_type_rules.h + alttheoryskel/kinds \ + alttheoryskel/Makefile \ + alttheoryskel/Makefile.am \ + alttheoryskel/README.WHATS-NEXT \ + alttheoryskel/theory_DIR.cpp \ + alttheoryskel/theory_DIR.h diff --git a/contrib/alttheoryskel/Makefile b/contrib/alttheoryskel/Makefile new file mode 100644 index 000000000..2aeda0cf8 --- /dev/null +++ b/contrib/alttheoryskel/Makefile @@ -0,0 +1,4 @@ +topdir = ../../.. +srcdir = src/theory/$dir + +include $(topdir)/Makefile.subdir diff --git a/contrib/alttheoryskel/Makefile.am b/contrib/alttheoryskel/Makefile.am new file mode 100644 index 000000000..2f36e8fc1 --- /dev/null +++ b/contrib/alttheoryskel/Makefile.am @@ -0,0 +1,14 @@ +AM_CPPFLAGS = \ + -D__BUILDING_CVC4LIB \ + -I@builddir@/../.. -I@srcdir@/../../include -I@srcdir@/../.. +AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) + +noinst_LTLIBRARIES = lib$dir.la + +lib$dir_la_SOURCES = \ + theory_$dir.h \ + theory_$dir.cpp + +EXTRA_DIST = \ + kinds \ + options_handlers.h diff --git a/contrib/alttheoryskel/README.WHATS-NEXT b/contrib/alttheoryskel/README.WHATS-NEXT new file mode 100644 index 000000000..c6ad91c3f --- /dev/null +++ b/contrib/alttheoryskel/README.WHATS-NEXT @@ -0,0 +1,25 @@ +Congratulations, you now have a new theory of $dir ! + +Your next steps will likely be: + +* to implement a decision procedure for your theory by implementing + Theory$camel::check() in theory_$dir.cpp. Before writing the actual + code, you will need : + + * to determine which data structures are context dependent and use for + them context-dependent data structures (context/cd*.h) + * to choose which work will be done at QUICK_CHECK, STANDARD or at + FULL_EFFORT. + +You'll probably find the Developer's wiki useful: + + http://cvc4.cs.nyu.edu/wiki/ + +...and in particular the Developer's Guide: + + http://cvc4.cs.nyu.edu/wiki/Developer%27s_Guide + +which contains coding guidelines for the CVC4 project. + +Good luck, and please contact cvc4-devel@cs.nyu.edu for assistance +should you need it! diff --git a/contrib/alttheoryskel/kinds b/contrib/alttheoryskel/kinds new file mode 100644 index 000000000..44efe1698 --- /dev/null +++ b/contrib/alttheoryskel/kinds @@ -0,0 +1,8 @@ +# kinds -*- sh -*- +# +# For documentation on this file format, please refer to +# src/theory/builtin/kinds. +# + +alternate THEORY_$alt_id "$dir" ::CVC4::theory::$dir::Theory$camel "theory/$dir/theory_$dir.h" + diff --git a/contrib/alttheoryskel/options b/contrib/alttheoryskel/options new file mode 100644 index 000000000..f627dc4a0 --- /dev/null +++ b/contrib/alttheoryskel/options @@ -0,0 +1,8 @@ +# +# Option specification file for CVC4 +# See src/options/base_options for a description of this file format +# + +module $id "theory/$dir/options.h" $camel + +endmodule diff --git a/contrib/alttheoryskel/options_handlers.h b/contrib/alttheoryskel/options_handlers.h new file mode 100644 index 000000000..d384e84d9 --- /dev/null +++ b/contrib/alttheoryskel/options_handlers.h @@ -0,0 +1,14 @@ +#include "cvc4_private.h" + +#ifndef __CVC4__THEORY__$id__OPTIONS_HANDLERS_H +#define __CVC4__THEORY__$id__OPTIONS_HANDLERS_H + +namespace CVC4 { +namespace theory { +namespace $dir { + +}/* CVC4::theory::$dir namespace */ +}/* CVC4::theory namespace */ +}/* CVC4 namespace */ + +#endif /* __CVC4__THEORY__$id__OPTIONS_HANDLERS_H */ diff --git a/contrib/alttheoryskel/theory_DIR.cpp b/contrib/alttheoryskel/theory_DIR.cpp new file mode 100644 index 000000000..eca07e909 --- /dev/null +++ b/contrib/alttheoryskel/theory_DIR.cpp @@ -0,0 +1,42 @@ +#include "theory/$dir/theory_$dir.h" + +using namespace std; + +namespace CVC4 { +namespace theory { +namespace $dir { + +/** Constructs a new instance of Theory$camel w.r.t. the provided contexts. */ +Theory$camel::Theory$camel(context::Context* c, + context::UserContext* u, + OutputChannel& out, + Valuation valuation, + const LogicInfo& logicInfo, + QuantifiersEngine* qe) : + Theory(THEORY_$alt_id, c, u, out, valuation, logicInfo, qe) { +}/* Theory$camel::Theory$camel() */ + +void Theory$camel::check(Effort level) { + + while(!done()) { + // Get all the assertions + Assertion assertion = get(); + TNode fact = assertion.assertion; + + Debug("$dir") << "Theory$camel::check(): processing " << fact << std::endl; + + // Do the work + switch(fact.getKind()) { + + /* cases for all the theory's kinds go here... */ + + default: + Unhandled(fact.getKind()); + } + } + +}/* Theory$camel::check() */ + +}/* CVC4::theory::$dir namespace */ +}/* CVC4::theory namespace */ +}/* CVC4 namespace */ diff --git a/contrib/alttheoryskel/theory_DIR.h b/contrib/alttheoryskel/theory_DIR.h new file mode 100644 index 000000000..9dfb3e614 --- /dev/null +++ b/contrib/alttheoryskel/theory_DIR.h @@ -0,0 +1,35 @@ +#include "cvc4_private.h" + +#ifndef __CVC4__THEORY__$id__THEORY_$id_H +#define __CVC4__THEORY__$id__THEORY_$id_H + +#include "theory/theory.h" + +namespace CVC4 { +namespace theory { +namespace $dir { + +class Theory$camel : public Theory { +public: + + /** Constructs a new instance of Theory$camel w.r.t. the provided contexts. */ + Theory$camel(context::Context* c, + context::UserContext* u, + OutputChannel& out, + Valuation valuation, + const LogicInfo& logicInfo, + QuantifiersEngine* qe); + + void check(Effort); + + std::string identify() const { + return "THEORY_$id"; + } + +};/* class Theory$camel */ + +}/* CVC4::theory::$dir namespace */ +}/* CVC4::theory namespace */ +}/* CVC4 namespace */ + +#endif /* __CVC4__THEORY__$id__THEORY_$id_H */ diff --git a/contrib/new-theory b/contrib/new-theory index 4aedd7c0f..4649e5943 100755 --- a/contrib/new-theory +++ b/contrib/new-theory @@ -1,6 +1,6 @@ #!/bin/bash # -# usage: new-theory theory-directory-name +# usage: new-theory [--alternate existing-theory] new-theory-dir-name # cd "`dirname "$0"`/.." @@ -11,23 +11,39 @@ if [ ! -e src/theory/theory_engine.h ]; then exit 1 fi +if [ $# -ge 1 -a "$1" = --alternate ]; then + shift + alternate=true + alttheory="$1" + shift +else + alternate=false +fi + if [ $# -ne 1 ]; then - echo "usage: new-theory theory-directory-name" >&2 - echo "e.g.: new-theory arith" >&2 + echo "usage: new-theory [--alternate existing-theory] new-theory-dir-name" >&2 echo "e.g.: new-theory arrays" >&2 echo "e.g.: new-theory sets" >&2 echo "e.g.: new-theory rewrite_rules" >&2 + echo "e.g.: new-theory --alternate arith difference-logic" >&2 echo >&2 - echo "This tool will create a new src/theory/<theory-directory-name>" >&2 + echo "This tool will create a new src/theory/<new-theory-dir-name>" >&2 echo "directory and fill in some infrastructural files in that directory." >&2 echo "It also will incorporate that directory into the build process." >&2 echo "Please refer to the file README.WHATS-NEXT file created in that" >&2 - echo "directory for tips on what to do next." - echo + echo "directory for tips on what to do next." >&2 + echo >&2 echo "Theories with multiple words (e.g. \"rewrite_rules\") should have" >&2 echo "directories and namespaces separated by an underscore (_). The" >&2 echo "resulting class names created by this script will be in CamelCase" >&2 echo "(e.g. RewriteRules) if that convention is followed." >&2 + echo >&2 + echo "With --alternate, create a new theory directory that is declared as" >&2 + echo "an alternate implementation of an existing host theory. Such" >&2 + echo "\"alternates\" share preprocessing, typechecking, rewriting (i.e.," >&2 + echo "normal form), and expression kinds with their host theories, but" >&2 + echo "differ in decision procedure implementation. They are selectable" >&2 + echo "at runtime with --use-theory." >&2 exit 1 fi @@ -36,6 +52,9 @@ dir="$1" if [ -e "src/theory/$dir" ]; then echo "ERROR: Theory \"$dir\" already exists." >&2 echo "ERROR: Please choose a new directory name (or move that one aside)." >&2 + echo "ERROR: Or, if you'd like to create an alternate implementation of" >&2 + echo "ERROR: $dir, use this program this way:" >&2 + echo "ERROR: new-theory --alternate $dir new-implementation-name" >&2 exit 1 fi @@ -49,6 +68,17 @@ if ! expr "$dir" : '[a-zA-Z][a-zA-Z0-9_]*$' &>/dev/null || exit 1 fi +if $alternate; then + if ! [ -d "src/theory/$alttheory" -a -f "src/theory/$alttheory/kinds" ]; then + echo "ERROR: Theory \"$alttheory\" doesn't exist, or cannot read its kinds file." >&2 + exit 1 + fi + alt_id="$( + function theory() { echo $1 | sed 's,^THEORY_,,'; exit; } + source "src/theory/$alttheory/kinds" + )" +fi + id="`echo "$dir" | tr a-z A-Z`" # convoluted, but should be relatively portable and give a CamelCase # representation for a string. (e.g. "foo_bar" becomes "FooBar") @@ -62,6 +92,7 @@ fi echo "Theory of $dir" echo "Theory directory: src/theory/$dir" echo "Theory id: THEORY_$id" +$alternate && echo "Alternate for theory id: THEORY_$alt_id" echo "Theory class: CVC4::theory::$dir::Theory$camel" echo @@ -74,13 +105,28 @@ function copyskel { > "src/theory/$dir/$dest" } +function copyaltskel { + src="$1" + dest="`echo "$src" | sed "s/DIR/$dir/g"`" + echo "Creating src/theory/$dir/$dest..." + sed "s/\$dir/$dir/g;s/\$camel/$camel/g;s/\$id/$id/g;s/\$alt_id/$alt_id/g" \ + contrib/alttheoryskel/$src \ + > "src/theory/$dir/$dest" +} + # copy files from the skeleton, with proper replacements -for file in `ls contrib/theoryskel`; do - copyskel "$file" -done +if $alternate; then + for file in `ls contrib/alttheoryskel`; do + copyaltskel "$file" + done +else + for file in `ls contrib/theoryskel`; do + copyskel "$file" + done +fi echo -echo "Adding $dir to SUBDIRS in src/theory/Makefile.am..." +echo "Adding $dir to SUBDIRS to src/theory/Makefile.am..." if grep -q '^SUBDIRS = .*[^a-zA-Z0-9_]'"$dir"'\([^a-zA-Z0-9_]\|$\)' src/theory/Makefile.am &>/dev/null; then echo "NOTE: src/theory/Makefile.am already descends into dir $dir" else @@ -95,9 +141,9 @@ else fi fi -echo "Adding lib$theory.la to LIBADD in src/theory/Makefile.am..." +echo "Adding lib$dir.la to LIBADD to src/theory/Makefile.am..." if grep -q '^ @builddir@/'"$dir"'/lib'"$dir"'\.la\>' src/theory/Makefile.am &>/dev/null; then - echo "NOTE: src/theory/Makefile.am already seems to include lib$theory.la" + echo "NOTE: src/theory/Makefile.am already seems to include lib$dir.la" else awk '!/^libtheory_la_LIBADD = / {print$0} /^libtheory_la_LIBADD = / {while(/\\ *$/){print $0;getline} print $0,"\\";print "\t@builddir@/'"$dir"'/lib'"$dir"'.la"}' src/theory/Makefile.am > src/theory/Makefile.am.new-theory if ! cp -f src/theory/Makefile.am src/theory/Makefile.am~; then @@ -110,6 +156,22 @@ else fi fi +echo "Adding ../theory/$dir/options.cpp to OPTIONS_FILES_SRCS" +echo " and nodist_liboptions_la_SOURCES to src/options/Makefile.am..." +if grep -q '^ \.\./theory/'"$dir"'/options\.cpp\>' src/options/Makefile.am &>/dev/null; then + echo "NOTE: src/options/Makefile.am already seems to link to $dir option files" +else + awk '!/^OPTIONS_FILES_SRCS = \\|^nodist_liboptions_la_SOURCES = / {print$0} /^OPTIONS_FILES_SRCS = \\|^nodist_liboptions_la_SOURCES = / {while(/\\ *$/){print $0;getline} print $0,"\\";print "\t../theory/'"$dir"'/options.cpp","\\";print "\t../theory/'"$dir"'/options.h";}' src/options/Makefile.am > src/options/Makefile.am.new-theory + if ! cp -f src/options/Makefile.am src/options/Makefile.am~; then + echo "ERROR: cannot copy src/options/Makefile.am !" >&2 + exit 1 + fi + if ! mv -f src/options/Makefile.am.new-theory src/options/Makefile.am; then + echo "ERROR: cannot replace src/options/Makefile.am !" >&2 + exit 1 + fi +fi + echo echo "Rerunning autogen.sh..." ./autogen.sh diff --git a/contrib/theoryskel/Makefile.am b/contrib/theoryskel/Makefile.am index d6b41ac03..000544d98 100644 --- a/contrib/theoryskel/Makefile.am +++ b/contrib/theoryskel/Makefile.am @@ -1,6 +1,6 @@ AM_CPPFLAGS = \ -D__BUILDING_CVC4LIB \ - -I@srcdir@/../../include -I@srcdir@/../.. -I@builddir@/../.. + -I@builddir@/../.. -I@srcdir@/../../include -I@srcdir@/../.. AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) noinst_LTLIBRARIES = lib$dir.la @@ -12,4 +12,5 @@ lib$dir_la_SOURCES = \ theory_$dir_type_rules.h EXTRA_DIST = \ - kinds + kinds \ + options_handlers.h diff --git a/contrib/theoryskel/README.WHATS-NEXT b/contrib/theoryskel/README.WHATS-NEXT index 6e090b984..ede8054ed 100644 --- a/contrib/theoryskel/README.WHATS-NEXT +++ b/contrib/theoryskel/README.WHATS-NEXT @@ -19,18 +19,18 @@ and finally: Theory$camel::check() in theory_$dir.cpp. Before writing the actual code, you will need : - * to determine which datastructures are context dependent and use for them - context dependent datastructures (context/cd*.h) + * to determine which data structures are context dependent and use for + them context-dependent data structures (context/cd*.h) * to choose which work will be done at QUICK_CHECK, STANDARD or at FULL_EFFORT. You'll probably find the Developer's wiki useful: - http://church.cims.nyu.edu/wiki/CVC_Portal + http://cvc4.cs.nyu.edu/wiki/ -...and in particular the Deverloper's Guide: +...and in particular the Developer's Guide: - http://church.cims.nyu.edu/wiki/Developer%27s_Guide + http://cvc4.cs.nyu.edu/wiki/Developer%27s_Guide which contains coding guidelines for the CVC4 project. diff --git a/contrib/theoryskel/options b/contrib/theoryskel/options new file mode 100644 index 000000000..f627dc4a0 --- /dev/null +++ b/contrib/theoryskel/options @@ -0,0 +1,8 @@ +# +# Option specification file for CVC4 +# See src/options/base_options for a description of this file format +# + +module $id "theory/$dir/options.h" $camel + +endmodule diff --git a/contrib/theoryskel/options_handlers.h b/contrib/theoryskel/options_handlers.h new file mode 100644 index 000000000..d384e84d9 --- /dev/null +++ b/contrib/theoryskel/options_handlers.h @@ -0,0 +1,14 @@ +#include "cvc4_private.h" + +#ifndef __CVC4__THEORY__$id__OPTIONS_HANDLERS_H +#define __CVC4__THEORY__$id__OPTIONS_HANDLERS_H + +namespace CVC4 { +namespace theory { +namespace $dir { + +}/* CVC4::theory::$dir namespace */ +}/* CVC4::theory namespace */ +}/* CVC4 namespace */ + +#endif /* __CVC4__THEORY__$id__OPTIONS_HANDLERS_H */ diff --git a/contrib/theoryskel/theory_DIR.cpp b/contrib/theoryskel/theory_DIR.cpp index e885cb9c7..aefa0a2af 100644 --- a/contrib/theoryskel/theory_DIR.cpp +++ b/contrib/theoryskel/theory_DIR.cpp @@ -10,8 +10,10 @@ namespace $dir { Theory$camel::Theory$camel(context::Context* c, context::UserContext* u, OutputChannel& out, - Valuation valuation) : - Theory(THEORY_$id, c, u, out, valuation) { + Valuation valuation, + const LogicInfo& logicInfo, + QuantifiersEngine* qe) : + Theory(THEORY_$id, c, u, out, valuation, logicInfo, qe) { }/* Theory$camel::Theory$camel() */ void Theory$camel::check(Effort level) { diff --git a/contrib/theoryskel/theory_DIR.h b/contrib/theoryskel/theory_DIR.h index f8151ae42..9dfb3e614 100644 --- a/contrib/theoryskel/theory_DIR.h +++ b/contrib/theoryskel/theory_DIR.h @@ -12,11 +12,13 @@ namespace $dir { class Theory$camel : public Theory { public: - /** Constructs a new instance of Theory$camel w.r.t. the provided context.*/ + /** Constructs a new instance of Theory$camel w.r.t. the provided contexts. */ Theory$camel(context::Context* c, context::UserContext* u, OutputChannel& out, - Valuation valuation); + Valuation valuation, + const LogicInfo& logicInfo, + QuantifiersEngine* qe); void check(Effort); |