summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am11
-rw-r--r--src/main/Makefile.am10
-rw-r--r--src/options/Makefile.am2
-rwxr-xr-xsrc/options/mkoptions32
-rw-r--r--src/parser/memory_mapped_input_buffer.cpp9
5 files changed, 34 insertions, 30 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 204ea63f8..40d3823e9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -44,8 +44,7 @@ libcvc4_la_LIBADD = \
@builddir@/printer/libprinter.la \
@builddir@/smt/libsmt.la \
@builddir@/theory/libtheory.la \
- @builddir@/decision/libdecision.la \
- @builddir@/lib/libreplacements.la
+ @builddir@/decision/libdecision.la
libcvc4_noinst_la_LIBADD = \
@builddir@/options/liboptions.la \
@builddir@/util/libutil.la \
@@ -58,8 +57,14 @@ libcvc4_noinst_la_LIBADD = \
@builddir@/printer/libprinter.la \
@builddir@/smt/libsmt.la \
@builddir@/theory/libtheory.la \
- @builddir@/decision/libdecision.la \
+ @builddir@/decision/libdecision.la
+
+if CVC4_NEEDS_REPLACEMENT_FUNCTIONS
+libcvc4_la_LIBADD += \
@builddir@/lib/libreplacements.la
+libcvc4_noinst_la_LIBADD += \
+ @builddir@/lib/libreplacements.la
+endif
CLEANFILES = \
subversion_versioninfo.cpp \
diff --git a/src/main/Makefile.am b/src/main/Makefile.am
index 6b09fcc27..952951655 100644
--- a/src/main/Makefile.am
+++ b/src/main/Makefile.am
@@ -31,8 +31,11 @@ pcvc4_LDADD = \
@builddir@/../parser/libcvc4parser.la \
@builddir@/../libcvc4.la \
@builddir@/../util/libstatistics.la \
- @builddir@/../lib/libreplacements.la \
$(READLINE_LIBS)
+if CVC4_NEEDS_REPLACEMENT_FUNCTIONS
+pcvc4_LDADD += \
+ @builddir@/../lib/libreplacements.la
+endif
pcvc4_CPPFLAGS = $(AM_CPPFLAGS) $(BOOST_CPPFLAGS) -DPORTFOLIO_BUILD
pcvc4_LDADD += $(BOOST_THREAD_LIBS) -lpthread
pcvc4_LDADD += $(BOOST_THREAD_LDFLAGS)
@@ -53,8 +56,11 @@ cvc4_LDADD = \
@builddir@/../parser/libcvc4parser.la \
@builddir@/../libcvc4.la \
@builddir@/../util/libstatistics.la \
- @builddir@/../lib/libreplacements.la \
$(READLINE_LIBS)
+if CVC4_NEEDS_REPLACEMENT_FUNCTIONS
+cvc4_LDADD += \
+ @builddir@/../lib/libreplacements.la
+endif
BUILT_SOURCES = \
$(TOKENS_FILES)
diff --git a/src/options/Makefile.am b/src/options/Makefile.am
index 155c1b249..7f7fe78cd 100644
--- a/src/options/Makefile.am
+++ b/src/options/Makefile.am
@@ -157,7 +157,7 @@ endif
Debug_tags.tmp Trace_tags.tmp:
$(AM_V_GEN)\
grep '\<$(@:_tags.tmp=)\(\.isOn\)* *( *\".*\" *)' \
- `find @srcdir@/../ -name "*.cpp" -or -name "*.h" -or -name "*.cc" -or -name "*.g"` | \
+ `find @srcdir@/../ -name "*.cpp" -o -name "*.h" -o -name "*.cc" -o -name "*.g"` | \
sed 's/^$(@:_tags.tmp=)\(\.isOn\)* *( *\"\([^"]*\)\".*/\2/;s/.*[^a-zA-Z0-9_]$(@:_tags.tmp=)\(\.isOn\)* *( *\"\([^"]*\)\".*/\2/' | LC_ALL=C sort | uniq >"$@"
MOSTLYCLEANFILES = \
diff --git a/src/options/mkoptions b/src/options/mkoptions
index 9ef05c1b2..0632cb3f9 100755
--- a/src/options/mkoptions
+++ b/src/options/mkoptions
@@ -253,7 +253,7 @@ function handle_option {
# scan ahead to see where the type is
type_pos=2
- while [ $(($type_pos+1)) -lt ${#args[@]} ] && ! expr "${args[$(($type_pos+1))]}" : ":" &>/dev/null; do
+ while [ $(($type_pos+1)) -lt ${#args[@]} ] && ! expr "${args[$(($type_pos+1))]}" : '\:' &>/dev/null; do
let ++type_pos
done
@@ -270,13 +270,13 @@ function handle_option {
else
i=2
while [ $i -lt $type_pos ]; do
- if expr "${args[$i]}" : '--' &>/dev/null || expr "${args[$i]}" : '/--' &>/dev/null; then
+ if expr "${args[$i]}" : '\--' &>/dev/null || expr "${args[$i]}" : '/--' &>/dev/null; then
if [ -n "$long_option" -o -n "$long_option_alternate" ]; then
ERR "malformed option line for \`$internal': unexpected \`${args[$i]}'"
fi
long_option="$(echo "${args[$i]}" | sed 's,/.*,,')"
if [ -n "$long_option" ]; then
- if ! expr "$long_option" : '--.' &>/dev/null; then
+ if ! expr "$long_option" : '\--.' &>/dev/null; then
ERR "bad long option \`$long_option': expected something like \`--foo'"
fi
long_option="$(echo "$long_option" | sed 's,^--,,')"
@@ -285,27 +285,27 @@ function handle_option {
long_option_alternate="$(echo "${args[$i]}" | sed 's,[^/]*/,,')"
long_option_alternate_set=set
if [ -n "$long_option_alternate" ]; then
- if ! expr "$long_option_alternate" : '--.' &>/dev/null; then
+ if ! expr "$long_option_alternate" : '\--.' &>/dev/null; then
ERR "bad alternate long option \`$long_option_alternate': expected something like \`--foo'"
fi
long_option_alternate="$(echo "$long_option_alternate" | sed 's,^--,,')"
fi
fi
- elif expr "${args[$i]}" : '-' &>/dev/null || expr "${args[$i]}" : '/-' &>/dev/null; then
+ elif expr "${args[$i]}" : '\-' &>/dev/null || expr "${args[$i]}" : '/-' &>/dev/null; then
if [ -n "$short_option" -o -n "$short_option_alternate" -o -n "$long_option" -o -n "$long_option_alternate" ]; then
ERR "malformed option line for \`$internal': unexpected \`${args[$i]}'"
fi
short_option="$(echo "${args[$i]}" | sed 's,/.*,,')"
if [ -n "$short_option" ]; then
- if ! expr "$short_option" : '-.$' &>/dev/null; then
+ if ! expr "$short_option" : '\-.$' &>/dev/null; then
ERR "bad short option \`$short_option': expected something like \`-x'"
fi
short_option="$(echo "$short_option" | sed 's,^-,,')"
fi
if expr "${args[$i]}" : '.*/' &>/dev/null; then
short_option_alternate="$(echo "${args[$i]}" | sed 's,[^/]*/,,')"
- if expr "$short_option_alternate" : - &>/dev/null; then
- if ! expr "$short_option_alternate" : '-.$' &>/dev/null; then
+ if expr "$short_option_alternate" : '\-' &>/dev/null; then
+ if ! expr "$short_option_alternate" : '\-.$' &>/dev/null; then
ERR "bad alternate short option \`$short_option_alternate': expected something like \`-x'"
fi
short_option_alternate="$(echo "$short_option_alternate" | sed 's,^-,,')"
@@ -396,13 +396,13 @@ function handle_option {
handlers="${args[$i]}"
;;
:predicate)
- while [ $(($i+1)) -lt ${#args[@]} ] && ! expr "${args[$(($i+1))]}" : ":" &>/dev/null; do
+ while [ $(($i+1)) -lt ${#args[@]} ] && ! expr "${args[$(($i+1))]}" : '\:' &>/dev/null; do
let ++i
predicates="${predicates} ${args[$i]}"
done
;;
:link)
- while [ $(($i+1)) -lt ${#args[@]} ] && ! expr "${args[$(($i+1))]}" : ":" &>/dev/null; do
+ while [ $(($i+1)) -lt ${#args[@]} ] && ! expr "${args[$(($i+1))]}" : '\:' &>/dev/null; do
let ++i
link="${args[$i]}"
if expr "${args[$i]}" : '.*/' &>/dev/null; then
@@ -415,7 +415,7 @@ function handle_option {
done
;;
:include)
- while [ $(($i+1)) -lt ${#args[@]} ] && ! expr "${args[$(($i+1))]}" : ":" &>/dev/null; do
+ while [ $(($i+1)) -lt ${#args[@]} ] && ! expr "${args[$(($i+1))]}" : '\:' &>/dev/null; do
let ++i
module_includes="${module_includes}
#line $lineno \"$kf\"
@@ -423,7 +423,7 @@ function handle_option {
done
;;
:handler-include|:predicate-include)
- while [ $(($i+1)) -lt ${#args[@]} ] && ! expr "${args[$(($i+1))]}" : ":" &>/dev/null; do
+ while [ $(($i+1)) -lt ${#args[@]} ] && ! expr "${args[$(($i+1))]}" : '\:' &>/dev/null; do
let ++i
option_handler_includes="${option_handler_includes}
#line $lineno \"$kf\"
@@ -831,10 +831,10 @@ function handle_alias {
ERR "malformed \"alias\" command; expected more arguments"
fi
cases=
- if ! expr "$option" : - &>/dev/null; then
+ if ! expr "$option" : '\-' &>/dev/null; then
ERR "alias for SMT options not yet supported"
fi
- if expr "$option" : -- &>/dev/null; then
+ if expr "$option" : '\--' &>/dev/null; then
if expr "$option" : '.*=' &>/dev/null; then
expect_arg_long=required_argument
arg="$(echo "$option" | sed 's,[^=]*=\(.*\),\1,')"
@@ -851,8 +851,8 @@ function handle_alias {
let ++n_long
long_option="${long_option:+$long_option | --}$option"
else
- if ! expr "$option" : '-.$' &>/dev/null; then
- if ! expr "$option" : '-.=' &>/dev/null; then
+ if ! expr "$option" : '\-.$' &>/dev/null; then
+ if ! expr "$option" : '\-.=' &>/dev/null; then
ERR "expected short option specification, got \`$option'"
fi
expect_arg=:
diff --git a/src/parser/memory_mapped_input_buffer.cpp b/src/parser/memory_mapped_input_buffer.cpp
index ff3f8b27d..9f72ac51c 100644
--- a/src/parser/memory_mapped_input_buffer.cpp
+++ b/src/parser/memory_mapped_input_buffer.cpp
@@ -18,7 +18,7 @@
#include <stdio.h>
#include <stdint.h>
-#include <sys/errno.h>
+#include <cerrno>
#include <sys/mman.h>
#include <sys/stat.h>
#include <antlr3input.h>
@@ -95,14 +95,7 @@ static ANTLR3_UINT32 MemoryMapFile(pANTLR3_INPUT_STREAM input,
return ANTLR3_ERR_NOFILE;
}
-
-#ifndef MAP_FILE
- //Tim: This is required for SunOS
input->data = mmap(0, input->sizeBuf, PROT_READ, MAP_PRIVATE, fd, 0);
-#else
- input->data = mmap(0, input->sizeBuf, PROT_READ, MAP_FILE | MAP_PRIVATE, fd, 0);
-#endif
-
errno = 0;
if(intptr_t(input->data) == -1) {
return ANTLR3_ERR_NOMEM;
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback