From: Brian Norris <banorris@uci.edu>
Date: Sat, 3 Nov 2012 19:09:47 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/master' into pldi13
X-Git-Tag: pldi2013~19
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=15fabc6f4e6591341940a8087a8dd088af59bb5c;hp=507434b53b00f7d32301050dd0ce8466ad42677b;p=model-checker.git

Merge remote-tracking branch 'origin/master' into pldi13
---

diff --git a/common.h b/common.h
index 50410ea..81b2672 100644
--- a/common.h
+++ b/common.h
@@ -20,6 +20,7 @@
 
 void assert_hook(void);
 
+#ifdef CONFIG_ASSERT
 #define ASSERT(expr) \
 do { \
 	if (!(expr)) { \
@@ -30,6 +31,10 @@ do { \
 		exit(EXIT_FAILURE); \
 	} \
 } while (0)
+#else
+#define ASSERT(expr) \
+	do { } while (0)
+#endif /* CONFIG_ASSERT */
 
 #define error_msg(...) fprintf(stderr, "Error: " __VA_ARGS__)
 
diff --git a/config.h b/config.h
index 109e8d8..227c9a9 100644
--- a/config.h
+++ b/config.h
@@ -9,6 +9,10 @@
 /*		#ifndef CONFIG_DEBUG
 		#define CONFIG_DEBUG
 		#endif
+
+		#ifndef CONFIG_ASSERT
+		#define CONFIG_ASSERT
+		#endif
 */
 
 /** Turn on support for dumping cyclegraphs as dot files at each
diff --git a/main.cc b/main.cc
index fc1b277..635b8da 100644
--- a/main.cc
+++ b/main.cc
@@ -72,8 +72,10 @@ static void parse_options(struct model_params *params, int *argc, char ***argv)
 			break;
 		}
 	}
-	(*argc) -= optind;
-	(*argv) += optind;
+	(*argv)[optind - 1] = (*argv)[0];
+	(*argc) -= (optind - 1);
+	(*argv) += (optind - 1);
+	optind = 1;
 
 	if (error)
 		print_usage(params);