summaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorMorgan Deters <mdeters@gmail.com>2010-01-26 07:29:41 +0000
committerMorgan Deters <mdeters@gmail.com>2010-01-26 07:29:41 +0000
commit21e01d42ed4c0b6d9fa5855c2e0cfc1a3765d14f (patch)
treeec785ced868a294e72cc751a293c618488743c8b /src/main
parentf2d38a8522579f9b3e434f76a9426fa8d2f06d07 (diff)
fixes to build structure, util classes, lots of fixes to Node and NodeBuilder. outstanding SEGVs fixed
Diffstat (limited to 'src/main')
-rw-r--r--src/main/Makefile.in2
-rw-r--r--src/main/getopt.cpp9
2 files changed, 7 insertions, 4 deletions
diff --git a/src/main/Makefile.in b/src/main/Makefile.in
index 8e2c49989..6a2677109 100644
--- a/src/main/Makefile.in
+++ b/src/main/Makefile.in
@@ -94,6 +94,8 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILDING_SHARED = @BUILDING_SHARED@
+BUILDING_STATIC = @BUILDING_STATIC@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
diff --git a/src/main/getopt.cpp b/src/main/getopt.cpp
index 81cbc2df8..123bc3204 100644
--- a/src/main/getopt.cpp
+++ b/src/main/getopt.cpp
@@ -110,7 +110,8 @@ int parseOptions(int argc, char** argv, CVC4::Options* opts) throw(OptionExcepti
}
if(strcmp(optarg, "help")) {
- throw OptionException(string("unknown language for --lang: `") + argv[optind] + "'. Try --lang help.");
+ throw OptionException(string("unknown language for --lang: `") +
+ optarg + "'. Try --lang help.");
}
fputs(lang_help, stdout);
@@ -132,13 +133,13 @@ int parseOptions(int argc, char** argv, CVC4::Options* opts) throw(OptionExcepti
break;
case '?':
- throw OptionException(string("can't understand option: `") + argv[optind] + "'");
+ throw OptionException(string("can't understand option"));// + argv[optind - 1] + "'");
case ':':
- throw OptionException(string("option `") + argv[optind] + "' missing its required argument");
+ throw OptionException(string("option missing its required argument"));// + argv[optind - 1] + "' missing its required argument");
default:
- throw OptionException(string("can't understand option: `") + argv[optind] + "'");
+ throw OptionException(string("can't understand option"));//: `") + argv[optind - 1] + "'");
}
}
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback