Merge branch 'static_analysis' of https://github.com/daniel-j-h/z3

# Conflicts:
#	src/ast/ast.h
#	src/interp/iz3foci.cpp
#	src/muz/duality/duality_dl_interface.cpp
#	src/util/hwf.h

src/api/z3_api.h

@@ -184,7 +184,7 @@ typedef enum
     Z3_PARAMETER_SYMBOL,
     Z3_PARAMETER_SORT,
     Z3_PARAMETER_AST,
-    Z3_PARAMETER_FUNC_DECL,
+    Z3_PARAMETER_FUNC_DECL
 } Z3_parameter_kind;
 
 /**

src/ast/ast.h

@@ -1146,7 +1146,7 @@ typedef app proof; /* a proof is just an applicaton */
 
 enum label_op_kind {
     OP_LABEL,
-    OP_LABEL_LIT,
+    OP_LABEL_LIT
 };
 
 /**

src/ast/pattern/expr_pattern_match.h

@@ -37,7 +37,7 @@ class expr_pattern_match {
         CHECK_TERM,
         SET_BOUND,
         CHECK_BOUND,        
-        YIELD,
+        YIELD
     };
 
     struct instr {

src/smt/params/smt_params.h

@@ -66,7 +66,7 @@ enum case_split_strategy {
     CS_ACTIVITY_WITH_CACHE, // case split based on activity and cache the activity
     CS_RELEVANCY, // case split based on relevancy
     CS_RELEVANCY_ACTIVITY, // case split based on relevancy and activity
-    CS_RELEVANCY_GOAL, // based on relevancy and the current goal
+    CS_RELEVANCY_GOAL // based on relevancy and the current goal
 };
 
 struct smt_params : public preprocessor_params, 

src/smt/smt_setup.h

@@ -28,7 +28,7 @@ namespace smt {
     enum config_mode {
         CFG_BASIC,   // install theories based on user options
         CFG_LOGIC,   // install theories and configure Z3 based on the value of the parameter set-logic.
-        CFG_AUTO,    // install theories based on static features of the input formula
+        CFG_AUTO    // install theories based on static features of the input formula
     };
 
     class context;