update header guards to be C++ style. Fixes issue #9

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

scripts/update_header_guards.py

@@ -0,0 +1,60 @@
+# Copyright (c) 2015 Microsoft Corporation
+
+import os
+import re
+
+ifndef = re.compile("#ifndef \_(.*)\_H\_")
+defn   = re.compile("#define \_(.*)\_H\_")
+endif  = re.compile("#endif /\* \_(.*)\_H\_")
+
+
+def fix_hdr(file):
+    print file
+    tmp = "%s.tmp" % file
+    ins = open(file)
+    ous = open(tmp,'w')
+    line = ins.readline()
+    found = False
+    while line:
+	m = ifndef.search(line)
+	if m:
+	    print m.group(1)
+	    ous.write("#ifndef ")
+	    ous.write(m.group(1))
+	    ous.write("_H_\n")
+	    line = ins.readline()
+	    found = True
+	    continue
+	m = defn.search(line)
+	if m:
+	    ous.write("#define ")
+	    ous.write(m.group(1))
+	    ous.write("_H_\n")
+	    line = ins.readline()
+	    found = True
+	    continue
+	m = endif.search(line)
+	if m:
+	    ous.write("#endif /* ")
+	    ous.write(m.group(1))
+	    ous.write("_H_ */\n")
+	    line = ins.readline()
+	    found = True
+	    continue
+	ous.write(line)
+	line = ins.readline()
+    ins.close()
+    ous.close()
+    if found:
+	os.system("move %s %s" % (tmp, file))
+    else:
+	os.system("del %s" % tmp)
+    
+def fixup(dir):
+    for root, dirs, files in os.walk(dir):
+	for f in files:
+	    if f.endswith('.h'):
+		path = "%s\\%s" % (root, f)
+		fix_hdr(path)
+
+fixup('src')

src/api/api_ast_map.h

@@ -15,8 +15,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _API_AST_MAP_H_
+#ifndef API_AST_MAP_H_
-#define _API_AST_MAP_H_
+#define API_AST_MAP_H_
 
 #include"api_util.h"
 #include"obj_hashtable.h"

src/api/api_ast_vector.h

@@ -15,8 +15,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _API_AST_VECTOR_H_
+#ifndef API_AST_VECTOR_H_
-#define _API_AST_VECTOR_H_
+#define API_AST_VECTOR_H_
 
 #include"api_util.h"
 

src/api/api_context.h

@@ -17,8 +17,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _API_CONTEXT_H_
+#ifndef API_CONTEXT_H_
-#define _API_CONTEXT_H_
+#define API_CONTEXT_H_
 
 #include"z3.h"
 #include"ast.h"

src/api/api_datalog.h

@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _API_DATALOG_H_
+#ifndef API_DATALOG_H_
-#define _API_DATALOG_H_
+#define API_DATALOG_H_
 
 #include"z3.h"
 #include"ast.h"

src/api/api_goal.h

@@ -15,8 +15,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _API_GOAL_H_
+#ifndef API_GOAL_H_
-#define _API_GOAL_H_
+#define API_GOAL_H_
 
 #include"api_util.h"
 #include"goal.h"

src/api/api_model.h

@@ -15,8 +15,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _API_MODEL_H_
+#ifndef API_MODEL_H_
-#define _API_MODEL_H_
+#define API_MODEL_H_
 
 #include"api_util.h"
 #include"model.h"

src/api/api_polynomial.h

@@ -16,8 +16,8 @@ Author:
 Notes:
     
 --*/
-#ifndef _API_POLYNOMIAL_H_
+#ifndef API_POLYNOMIAL_H_
-#define _API_POLYNOMIAL_H_
+#define API_POLYNOMIAL_H_
 
 #include"polynomial.h"
 

src/api/api_solver.h

@@ -15,8 +15,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _API_SOLVER_H_
+#ifndef API_SOLVER_H_
-#define _API_SOLVER_H_
+#define API_SOLVER_H_
 
 #include"api_util.h"
 #include"solver.h"

src/api/api_stats.h

@@ -15,8 +15,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _API_STATS_H_
+#ifndef API_STATS_H_
-#define _API_STATS_H_
+#define API_STATS_H_
 
 #include"api_util.h"
 #include"statistics.h"

src/api/api_tactic.h

@@ -15,8 +15,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _API_TACTIC_H_
+#ifndef API_TACTIC_H_
-#define _API_TACTIC_H_
+#define API_TACTIC_H_
 
 #include"api_goal.h"
 #include"tactical.h"

src/api/api_util.h

@@ -15,8 +15,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _API_UTIL_H_
+#ifndef API_UTIL_H_
-#define _API_UTIL_H_
+#define API_UTIL_H_
 
 #include"params.h"
 #include"lbool.h"

src/api/c++/z3++.h

@@ -18,8 +18,8 @@ Author:
 Notes:
 
 --*/
-#ifndef __Z3PP_H_
+#ifndef Z3PP_H_
-#define __Z3PP_H_
+#define Z3PP_H_
 
 #include<cassert>
 #include<iostream>

src/api/z3.h

@@ -18,8 +18,8 @@ Notes:
     
 --*/
 
-#ifndef _Z3__H_
+#ifndef Z3__H_
-#define _Z3__H_
+#define Z3__H_
 
 #include<stdio.h>
 #include"z3_macros.h"

src/api/z3_algebraic.h

@@ -18,8 +18,8 @@ Notes:
     
 --*/
 
-#ifndef _Z3_ALGEBRAIC_H_
+#ifndef Z3_ALGEBRAIC_H_
-#define _Z3_ALGEBRAIC_H_
+#define Z3_ALGEBRAIC_H_
 
 #ifdef __cplusplus
 extern "C" {

src/api/z3_api.h

@@ -4,8 +4,8 @@ Copyright (c) 2015 Microsoft Corporation
 
 --*/
 
-#ifndef _Z3_API_H_
+#ifndef Z3_API_H_
-#define _Z3_API_H_
+#define Z3_API_H_
 
 #ifdef CAMLIDL
   #ifdef MLAPIV3

src/api/z3_fpa.h

@@ -16,8 +16,8 @@ Author:
 Notes:
     
 --*/
-#ifndef _Z3_FPA_H_
+#ifndef Z3_FPA_H_
-#define _Z3_FPA_H_
+#define Z3_FPA_H_
 
 #ifdef __cplusplus
 extern "C" {

src/api/z3_interp.h

@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _Z3_INTERPOLATION_H_
+#ifndef Z3_INTERPOLATION_H_
-#define _Z3_INTERPOLATION_H_
+#define Z3_INTERPOLATION_H_
 
 #ifdef __cplusplus
 extern "C" {

src/api/z3_polynomial.h

@@ -17,8 +17,8 @@ Notes:
     
 --*/
 
-#ifndef _Z3_POLYNOMIAL_H_
+#ifndef Z3_POLYNOMIAL_H_
-#define _Z3_POLYNOMIAL_H_
+#define Z3_POLYNOMIAL_H_
 
 #ifdef __cplusplus
 extern "C" {

src/api/z3_private.h

@@ -22,8 +22,8 @@ Notes:
 #include"rational.h"
 #include"z3_macros.h"
 
-#ifndef _Z3_PRIVATE__H_
+#ifndef Z3_PRIVATE__H_
-#define _Z3_PRIVATE__H_
+#define Z3_PRIVATE__H_
 
 
 #ifndef CAMLIDL

src/api/z3_rcf.h

@@ -19,8 +19,8 @@ Author:
 Notes:
     
 --*/
-#ifndef _Z3_RCF_H_
+#ifndef Z3_RCF_H_
-#define _Z3_RCF_H_
+#define Z3_RCF_H_
 
 #ifdef __cplusplus
 extern "C" {

src/api/z3_replayer.h

@@ -16,8 +16,8 @@ Author:
 Notes:
     
 --*/
-#ifndef _Z3_REPLAYER_H_
+#ifndef Z3_REPLAYER_H_
-#define _Z3_REPLAYER_H_
+#define Z3_REPLAYER_H_
 
 #include<iostream>
 #include"z3.h"

src/api/z3_v1.h

@@ -18,8 +18,8 @@ Author:
 Notes:
     
 --*/
-#ifndef _Z3_V1_H_
+#ifndef Z3_V1_H_
-#define _Z3_V1_H_
+#define Z3_V1_H_
 
 #include"z3.h"
 

src/ast/act_cache.h

@@ -17,8 +17,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _ACT_CACHE_H_
+#ifndef ACT_CACHE_H_
-#define _ACT_CACHE_H_
+#define ACT_CACHE_H_
 
 #include"ast.h"
 #include"obj_hashtable.h"

src/ast/arith_decl_plugin.h

@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _ARITH_DECL_PLUGIN_H_
+#ifndef ARITH_DECL_PLUGIN_H_
-#define _ARITH_DECL_PLUGIN_H_
+#define ARITH_DECL_PLUGIN_H_
 
 #include"ast.h"
 class sexpr;
@@ -399,5 +399,5 @@ public:
     }
 };
 
-#endif /* _ARITH_DECL_PLUGIN_H_ */
+#endif /* ARITH_DECL_PLUGIN_H_ */
 

src/ast/array_decl_plugin.h

@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _ARRAY_DECL_PLUGIN_H_
+#ifndef ARRAY_DECL_PLUGIN_H_
-#define _ARRAY_DECL_PLUGIN_H_
+#define ARRAY_DECL_PLUGIN_H_
 
 #include"ast.h"
 
@@ -187,5 +187,5 @@ public:
 };
 
 
-#endif /* _ARRAY_DECL_PLUGIN_H_ */
+#endif /* ARRAY_DECL_PLUGIN_H_ */
 

src/ast/ast.h

@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _AST_H_
+#ifndef AST_H_
-#define _AST_H_
+#define AST_H_
 
 #include"vector.h"
 #include"hashtable.h"
@@ -2450,6 +2450,6 @@ public:
     void operator()(AST * n) { m_manager.inc_ref(n); }
 };
 
-#endif /* _AST_H_ */
+#endif /* AST_H_ */
 
         

src/ast/ast_ll_pp.h

@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _AST_LL_PP_H_
+#ifndef AST_LL_PP_H_
-#define _AST_LL_PP_H_
+#define AST_LL_PP_H_
 
 #include"ast.h"
 #include<iostream>
@@ -53,5 +53,5 @@ inline std::ostream & operator<<(std::ostream & out, mk_bounded_pp const & p) {
 }
 
 
-#endif /* _AST_LL_PP_H_ */
+#endif /* AST_LL_PP_H_ */
 

src/ast/ast_lt.h

@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _AST_LT_H_
+#ifndef AST_LT_H_
-#define _AST_LT_H_
+#define AST_LT_H_
 
 class ast;
 

src/ast/ast_pp.h

@@ -18,8 +18,8 @@ Revision History:
     2012-11-17 - ast_smt2_pp is the official pretty printer in Z3
 
 --*/
-#ifndef _AST_PP_H_
+#ifndef AST_PP_H_
-#define _AST_PP_H_
+#define AST_PP_H_
 
 #include"ast_smt2_pp.h"
 

src/ast/ast_printer.h

@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _AST_PRINTER_H_
+#ifndef AST_PRINTER_H_
-#define _AST_PRINTER_H_
+#define AST_PRINTER_H_
 
 #include"ast.h"
 #include"ast_smt2_pp.h"

src/ast/ast_smt2_pp.h

@@ -19,8 +19,8 @@ Revision History:
 
 
 --*/
-#ifndef _AST_SMT2_PP_H_
+#ifndef AST_SMT2_PP_H_
-#define _AST_SMT2_PP_H_
+#define AST_SMT2_PP_H_
 
 #include"format.h"
 #include"params.h"

src/ast/ast_smt_pp.h

@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _AST_SMT_PP_H_
+#ifndef AST_SMT_PP_H_
-#define _AST_SMT_PP_H_
+#define AST_SMT_PP_H_
 
 #include"ast.h"
 #include<string>

src/ast/ast_trail.h

@@ -19,8 +19,8 @@ Revision History:
     nbjorner 2014-9-28
 
 --*/
-#ifndef _AST_TRAIL_H_
+#ifndef AST_TRAIL_H_
-#define _AST_TRAIL_H_
+#define AST_TRAIL_H_
 
 #include"ast.h"
 #include"trail.h"
@@ -72,5 +72,5 @@ public:
 };
 
 
-#endif /* _AST_TRAIL_H_ */
+#endif /* AST_TRAIL_H_ */
 

src/ast/ast_translation.h

@@ -18,8 +18,8 @@ Revision History:
     2011-05-26: New local translation class.
 
 --*/
-#ifndef _AST_TRANSLATION_H_
+#ifndef AST_TRANSLATION_H_
-#define _AST_TRANSLATION_H_
+#define AST_TRANSLATION_H_
 
 #include"ast.h"
 

src/ast/ast_util.h

@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _AST_UTIL_H_
+#ifndef AST_UTIL_H_
-#define _AST_UTIL_H_
+#define AST_UTIL_H_
 
 #include"ast.h"
 #include"obj_hashtable.h"
@@ -139,5 +139,5 @@ void flatten_or(expr_ref_vector& result);
 void flatten_or(expr* fml, expr_ref_vector& result);
 
 
-#endif /* _AST_UTIL_H_ */
+#endif /* AST_UTIL_H_ */
 

src/ast/bv_decl_plugin.h

@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _BV_DECL_PLUGIN_H_
+#ifndef BV_DECL_PLUGIN_H_
-#define _BV_DECL_PLUGIN_H_
+#define BV_DECL_PLUGIN_H_
 
 #include"ast.h"
 
@@ -389,5 +389,5 @@ public:
     app * mk_bv(unsigned n, expr* const* es) { return m_manager.mk_app(get_fid(), OP_MKBV, n, es); }
 };
     
-#endif /* _BV_DECL_PLUGIN_H_ */
+#endif /* BV_DECL_PLUGIN_H_ */
 

src/ast/datatype_decl_plugin.h

@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _DATATYPE_DECL_PLUGIN_H_
+#ifndef DATATYPE_DECL_PLUGIN_H_
-#define _DATATYPE_DECL_PLUGIN_H_
+#define DATATYPE_DECL_PLUGIN_H_
 
 #include"ast.h"
 #include"tptr.h"
@@ -214,5 +214,5 @@ public:
 
 };
 
-#endif /* _DATATYPE_DECL_PLUGIN_H_ */
+#endif /* DATATYPE_DECL_PLUGIN_H_ */
 

src/ast/decl_collector.h

@@ -17,8 +17,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SMT_DECL_COLLECTOR_H_
+#ifndef SMT_DECL_COLLECTOR_H_
-#define _SMT_DECL_COLLECTOR_H_
+#define SMT_DECL_COLLECTOR_H_
 
 #include"ast.h"
 

src/ast/dl_decl_plugin.h

@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _DL_DECL_PLUGIN_H_
+#ifndef DL_DECL_PLUGIN_H_
-#define _DL_DECL_PLUGIN_H_
+#define DL_DECL_PLUGIN_H_
 
 #include"ast.h"
 #include "arith_decl_plugin.h"
@@ -273,5 +273,5 @@ namespace datalog {
     };
     
 };
-#endif /* _DL_DECL_PLUGIN_H_ */
+#endif /* DL_DECL_PLUGIN_H_ */
 

src/ast/expr2polynomial.h

@@ -17,8 +17,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _EXPR2POLYNOMIAL_H_
+#ifndef EXPR2POLYNOMIAL_H_
-#define _EXPR2POLYNOMIAL_H_
+#define EXPR2POLYNOMIAL_H_
 
 #include"ast.h"
 #include"polynomial.h"

src/ast/expr2var.h

@@ -20,8 +20,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _EXPR2VAR_H_
+#ifndef EXPR2VAR_H_
-#define _EXPR2VAR_H_
+#define EXPR2VAR_H_
 
 #include"ast.h"
 #include"obj_hashtable.h"

src/ast/expr_abstract.h

@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _EXPR_ABSTRACT_H_
+#ifndef EXPR_ABSTRACT_H_
-#define _EXPR_ABSTRACT_H_
+#define EXPR_ABSTRACT_H_
 
 #include"ast.h"
 

src/ast/expr_delta_pair.h

@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _EXPR_DELTA_PAIR_H_
+#ifndef EXPR_DELTA_PAIR_H_
-#define _EXPR_DELTA_PAIR_H_
+#define EXPR_DELTA_PAIR_H_
 
 /**
    \brief Auxiliary structure used to cache the intermediate results of the variable substitution procedure.
@@ -32,5 +32,5 @@ struct expr_delta_pair {
     bool operator==(const expr_delta_pair & e) const { return m_node == e.m_node && m_delta == e.m_delta; }
 };
 
-#endif /* _EXPR_DELTA_PAIR_H_ */
+#endif /* EXPR_DELTA_PAIR_H_ */
 

src/ast/expr_functors.h

@@ -19,8 +19,8 @@ Revision History:
 
 --*/
 
-#ifndef __EXPR_FUNCTORS_H__
+#ifndef EXPR_FUNCTORS_H_
-#define __EXPR_FUNCTORS_H__
+#define EXPR_FUNCTORS_H_
 
 #include "ast.h"
 #include "expr_map.h"

src/ast/expr_map.h

@@ -18,8 +18,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _EXPR_MAP_H_
+#ifndef EXPR_MAP_H_
-#define _EXPR_MAP_H_
+#define EXPR_MAP_H_
 
 #include"ast.h"
 #include"obj_hashtable.h"

src/ast/expr_stat.h

@@ -19,8 +19,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _EXPR_STAT_H_
+#ifndef EXPR_STAT_H_
-#define _EXPR_STAT_H_
+#define EXPR_STAT_H_
 
 class expr;
 
@@ -47,4 +47,4 @@ void get_expr_stat(expr * n, expr_stat & r);
 */
 unsigned get_symbol_count(expr * n);
 
-#endif /* _EXPR_STAT_H_ */
+#endif /* EXPR_STAT_H_ */

src/ast/expr_substitution.h

@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _EXPR_SUBSTITUTION_H_
+#ifndef EXPR_SUBSTITUTION_H_
-#define _EXPR_SUBSTITUTION_H_
+#define EXPR_SUBSTITUTION_H_
 
 #include"ast.h"
 

src/ast/for_each_ast.h

@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _FOR_EACH_AST_H_
+#ifndef FOR_EACH_AST_H_
-#define _FOR_EACH_AST_H_
+#define FOR_EACH_AST_H_
 
 #include"ast.h"
 #include"trace.h"
@@ -270,5 +270,5 @@ private:
     }        
 };
 
-#endif /* _FOR_EACH_AST_H_ */
+#endif /* FOR_EACH_AST_H_ */
 

src/ast/for_each_expr.h

@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _FOR_EACH_EXPR_H_
+#ifndef FOR_EACH_EXPR_H_
-#define _FOR_EACH_EXPR_H_
+#define FOR_EACH_EXPR_H_
 
 #include"ast.h"
 #include"trace.h"
@@ -153,5 +153,5 @@ unsigned get_num_exprs(expr * n, expr_fast_mark1 & visited);
 
 bool has_skolem_functions(expr * n);
 
-#endif /* _FOR_EACH_EXPR_H_ */
+#endif /* FOR_EACH_EXPR_H_ */
 

src/ast/format.h

@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _FORMAT_H_
+#ifndef FORMAT_H_
-#define _FORMAT_H_
+#define FORMAT_H_
 
 #include"ast.h"
 
@@ -193,5 +193,5 @@ namespace format_ns {
   
 };
 
-#endif /* _FORMAT_H_ */
+#endif /* FORMAT_H_ */
 

src/ast/fpa/fpa2bv_converter.h

@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _FPA2BV_CONVERTER_
+#ifndef FPA2BV_CONVERTER_H_
-#define _FPA2BV_CONVERTER_
+#define FPA2BV_CONVERTER_H_
 
 #include"ast.h"
 #include"obj_hashtable.h"

src/ast/fpa/fpa2bv_rewriter.h

@@ -17,8 +17,8 @@ Notes:
 
 --*/
 
-#ifndef _FPA2BV_REWRITER_H_
+#ifndef FPA2BV_REWRITER_H_
-#define _FPA2BV_REWRITER_H_
+#define FPA2BV_REWRITER_H_
 
 #include"cooperate.h"
 #include"rewriter_def.h"

src/ast/fpa_decl_plugin.h

@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _fpa_decl_plugin_H_
+#ifndef fpa_decl_plugin_H_
-#define _fpa_decl_plugin_H_
+#define fpa_decl_plugin_H_
 
 #include"ast.h"
 #include"id_gen.h"

src/ast/func_decl_dependencies.h

@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _FUNC_DECL_DEPENDENCIES_H_
+#ifndef FUNC_DECL_DEPENDENCIES_H_
-#define _FUNC_DECL_DEPENDENCIES_H_
+#define FUNC_DECL_DEPENDENCIES_H_
 
 #include"ast.h"
 #include"obj_hashtable.h"

src/ast/has_free_vars.h

@@ -16,12 +16,12 @@ Author:
 Revision History:
 
 --*/
-#ifndef _HAS_FREE_VARS_H_
+#ifndef HAS_FREE_VARS_H_
-#define _HAS_FREE_VARS_H_
+#define HAS_FREE_VARS_H_
 
 class expr;
 
 bool has_free_vars(expr * n);
 
-#endif /* _HAS_FREE_VARS_H_ */
+#endif /* HAS_FREE_VARS_H_ */
 

src/ast/macro_substitution.h

@@ -18,8 +18,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _MACRO_SUBSTITUTION_H_
+#ifndef MACRO_SUBSTITUTION_H_
-#define _MACRO_SUBSTITUTION_H_
+#define MACRO_SUBSTITUTION_H_
 
 #include"ast.h"
 

src/ast/macros/macro_finder.h

@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _MACRO_FINDER_H_
+#ifndef MACRO_FINDER_H_
-#define _MACRO_FINDER_H_
+#define MACRO_FINDER_H_
 
 #include"macro_manager.h"
 #include"arith_simplifier_plugin.h"
@@ -51,5 +51,5 @@ public:
     void operator()(unsigned n, expr * const * exprs, proof * const * prs, expr_ref_vector & new_exprs, proof_ref_vector & new_prs);
 };
 
-#endif /* _MACRO_FINDER_H_ */
+#endif /* MACRO_FINDER_H_ */
 

src/ast/macros/macro_manager.h

@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _MACRO_MANAGER_H_
+#ifndef MACRO_MANAGER_H_
-#define _MACRO_MANAGER_H_
+#define MACRO_MANAGER_H_
 
 #include"ast_util.h"
 #include"obj_hashtable.h"
@@ -95,5 +95,5 @@ public:
     
 };
 
-#endif /* _MACRO_MANAGER_H_ */
+#endif /* MACRO_MANAGER_H_ */
 

src/ast/macros/macro_util.h

@@ -17,8 +17,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _MACRO_UTIL_H_
+#ifndef MACRO_UTIL_H_
-#define _MACRO_UTIL_H_
+#define MACRO_UTIL_H_
 
 #include"ast.h"
 #include"obj_hashtable.h"

src/ast/macros/quasi_macros.h

@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _QUASI_MACROS_H_
+#ifndef QUASI_MACROS_H_
-#define _QUASI_MACROS_H_
+#define QUASI_MACROS_H_
 
 #include<sstream>
 #include"macro_manager.h"

src/ast/normal_forms/defined_names.h

@@ -17,8 +17,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _DEFINED_NAMES_H_
+#ifndef DEFINED_NAMES_H_
-#define _DEFINED_NAMES_H_
+#define DEFINED_NAMES_H_
 
 #include"ast.h"
 
@@ -85,5 +85,5 @@ public:
     func_decl * get_name_decl(unsigned i) const;
 };
 
-#endif /* _DEFINED_NAMES_H_ */
+#endif /* DEFINED_NAMES_H_ */
 

src/ast/normal_forms/name_exprs.h

@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _NAME_EXPRS_H_
+#ifndef NAME_EXPRS_H_
-#define _NAME_EXPRS_H_
+#define NAME_EXPRS_H_
 
 #include"ast.h"
 #include"defined_names.h"

src/ast/normal_forms/nnf.h

@@ -17,8 +17,8 @@ Notes:
     Major revision on 2011-10-06
 
 --*/
-#ifndef _NNF_H_
+#ifndef NNF_H_
-#define _NNF_H_
+#define NNF_H_
 
 #include"ast.h"
 #include"params.h"
@@ -52,4 +52,4 @@ public:
     void reset_cache();
 };
 
-#endif /* _NNF_H_ */
+#endif /* NNF_H_ */

src/ast/normal_forms/pull_quant.h

@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _PULL_QUANT_H_
+#ifndef PULL_QUANT_H_
-#define _PULL_QUANT_H_
+#define PULL_QUANT_H_
 
 #include"ast.h"
 
@@ -56,4 +56,4 @@ public:
     void reset();
 };
 
-#endif /* _PULL_QUANT_H_ */
+#endif /* PULL_QUANT_H_ */

src/ast/num_occurs.h

@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _NUM_OCCURS_H_
+#ifndef NUM_OCCURS_H_
-#define _NUM_OCCURS_H_
+#define NUM_OCCURS_H_
 
 #include"ast.h"
 #include"obj_hashtable.h"
@@ -51,5 +51,5 @@ public:
     }
 };
 
-#endif /* _NUM_OCCURS_H_ */
+#endif /* NUM_OCCURS_H_ */
 

src/ast/occurs.h

@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _OCCURS_H_
+#ifndef OCCURS_H_
-#define _OCCURS_H_
+#define OCCURS_H_
 
 class expr; 
 class func_decl;
@@ -32,5 +32,5 @@ bool occurs(expr * n1, expr * n2);
 */
 bool occurs(func_decl * d, expr * n);
 
-#endif /* _OCCURS_H_ */
+#endif /* OCCURS_H_ */
 

src/ast/pattern/expr_pattern_match.h

@@ -17,8 +17,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _EXPR_PATTERN_MATCH_H_
+#ifndef EXPR_PATTERN_MATCH_H_
-#define _EXPR_PATTERN_MATCH_H_
+#define EXPR_PATTERN_MATCH_H_
 
 #include"ast.h"
 #include"map.h"

src/ast/pattern/pattern_inference.h

@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _PATTERN_INFERENCE_H_
+#ifndef PATTERN_INFERENCE_H_
-#define _PATTERN_INFERENCE_H_
+#define PATTERN_INFERENCE_H_
 
 #include"ast.h"
 #include"simplifier.h"
@@ -244,5 +244,5 @@ public:
     bool is_forbidden(app * n) const;
 };
 
-#endif /* _PATTERN_INFERENCE_H_ */
+#endif /* PATTERN_INFERENCE_H_ */
 

src/ast/pattern/pattern_inference_params.h

@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _PATTERN_INFERENCE_PARAMS_H_
+#ifndef PATTERN_INFERENCE_PARAMS_H_
-#define _PATTERN_INFERENCE_PARAMS_H_
+#define PATTERN_INFERENCE_PARAMS_H_
 
 #include"params.h"
 
@@ -48,5 +48,5 @@ struct pattern_inference_params {
     void updt_params(params_ref const & _p);
 };
 
-#endif /* _PATTERN_INFERENCE_PARAMS_H_ */
+#endif /* PATTERN_INFERENCE_PARAMS_H_ */
 

src/ast/pb_decl_plugin.h

@@ -24,8 +24,8 @@ hence:
 
 
 --*/
-#ifndef _PB_DECL_PLUGIN_H_
+#ifndef PB_DECL_PLUGIN_H_
-#define _PB_DECL_PLUGIN_H_
+#define PB_DECL_PLUGIN_H_
 
 #include"ast.h"
  
@@ -119,5 +119,5 @@ private:
 
 
 
-#endif /* _PB_DECL_PLUGIN_H_ */
+#endif /* PB_DECL_PLUGIN_H_ */
 

src/ast/pp.h

@@ -16,13 +16,13 @@ Author:
 Revision History:
 
 --*/
-#ifndef _PP_H_
+#ifndef PP_H_
-#define _PP_H_
+#define PP_H_
 
 #include"format.h"
 #include"params.h"
 
 void pp(std::ostream & out, format_ns::format * f, ast_manager & m, params_ref const & p = params_ref());
 
-#endif /* _PP_H_ */
+#endif /* PP_H_ */
 

src/ast/proof_checker/proof_checker.h

@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _PROOF_CHECKER_H_
+#ifndef PROOF_CHECKER_H_
-#define _PROOF_CHECKER_H_
+#define PROOF_CHECKER_H_
 
 #include "ast.h"
 #include "map.h"

src/ast/recurse_expr.h

@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _RECURSE_EXPR_H_
+#ifndef RECURSE_EXPR_H_
-#define _RECURSE_EXPR_H_
+#define RECURSE_EXPR_H_
 
 #include"ast.h"
 #include"obj_hashtable.h"
@@ -44,4 +44,4 @@ public:
     void finalize() { m_cache.finalize(); m_todo.finalize(); }
 };
 
-#endif /* _RECURSE_EXPR_H_ */
+#endif /* RECURSE_EXPR_H_ */

src/ast/recurse_expr_def.h

@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _RECURSE_EXPR_DEF_H_
+#ifndef RECURSE_EXPR_DEF_H_
-#define _RECURSE_EXPR_DEF_H_
+#define RECURSE_EXPR_DEF_H_
 
 #include"recurse_expr.h"
 
@@ -106,4 +106,4 @@ T recurse_expr<T, Visitor, IgnorePatterns, CallDestructors>::operator()(expr * r
     return get_cached(r);
 }
 
-#endif /* _RECURSE_EXPR_DEF_H_ */
+#endif /* RECURSE_EXPR_DEF_H_ */

src/ast/reg_decl_plugins.h

@@ -17,8 +17,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _REG_DECL_PLUGINS_H_
+#ifndef REG_DECL_PLUGINS_H_
-#define _REG_DECL_PLUGINS_H_
+#define REG_DECL_PLUGINS_H_
 
 class ast_manager;
 

src/ast/rewriter/arith_rewriter.h

@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _ARITH_REWRITER_H_
+#ifndef ARITH_REWRITER_H_
-#define _ARITH_REWRITER_H_
+#define ARITH_REWRITER_H_
 
 #include"poly_rewriter.h"
 #include"arith_decl_plugin.h"

src/ast/rewriter/array_rewriter.h

@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _ARRAY_REWRITER_H_
+#ifndef ARRAY_REWRITER_H_
-#define _ARRAY_REWRITER_H_
+#define ARRAY_REWRITER_H_
 
 #include"array_decl_plugin.h"
 #include"rewriter_types.h"

src/ast/rewriter/ast_counter.h

@@ -21,8 +21,8 @@ Revision History:
 --*/
 
 
-#ifndef _AST_COUNTER_H_
+#ifndef AST_COUNTER_H_
-#define _AST_COUNTER_H_
+#define AST_COUNTER_H_
 
 #include "ast.h"
 #include "map.h"

src/ast/rewriter/bit_blaster/bit_blaster.h

@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _BIT_BLASTER_H_
+#ifndef BIT_BLASTER_H_
-#define _BIT_BLASTER_H_
+#define BIT_BLASTER_H_
 
 #include"basic_simplifier_plugin.h"
 #include"bit_blaster_params.h"
@@ -61,5 +61,5 @@ public:
     bit_blaster_params const & get_params() const { return this->m_params; }
 };
 
-#endif /* _BIT_BLASTER_H_ */
+#endif /* BIT_BLASTER_H_ */
 

src/ast/rewriter/bit_blaster/bit_blaster_params.h

@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _BIT_BLASTER_PARAMS_H_
+#ifndef BIT_BLASTER_PARAMS_H_
-#define _BIT_BLASTER_PARAMS_H_
+#define BIT_BLASTER_PARAMS_H_
 
 struct bit_blaster_params {
     bool  m_bb_ext_gates;
@@ -34,5 +34,5 @@ struct bit_blaster_params {
 #endif
 };
 
-#endif /* _BIT_BLASTER_PARAMS_H_ */
+#endif /* BIT_BLASTER_PARAMS_H_ */
 

src/ast/rewriter/bit_blaster/bit_blaster_rewriter.h

@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _BIT_BLASTER_REWRITER_H_
+#ifndef BIT_BLASTER_REWRITER_H_
-#define _BIT_BLASTER_REWRITER_H_
+#define BIT_BLASTER_REWRITER_H_
 
 #include"ast.h"
 #include"obj_hashtable.h"

src/ast/rewriter/bit_blaster/bit_blaster_tpl.h

@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _BIT_BLASTER_TPL_H_
+#ifndef BIT_BLASTER_TPL_H_
-#define _BIT_BLASTER_TPL_H_
+#define BIT_BLASTER_TPL_H_
 
 #include"rational.h"
 

src/ast/rewriter/bool_rewriter.h

@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _BOOL_REWRITER_H_
+#ifndef BOOL_REWRITER_H_
-#define _BOOL_REWRITER_H_
+#define BOOL_REWRITER_H_
 
 #include"ast.h"
 #include"rewriter.h"

src/ast/rewriter/bv_rewriter.h

@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _BV_REWRITER_H_
+#ifndef BV_REWRITER_H_
-#define _BV_REWRITER_H_
+#define BV_REWRITER_H_
 
 #include"poly_rewriter.h"
 #include"bv_decl_plugin.h"

src/ast/rewriter/datatype_rewriter.h

@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _DATATYPE_REWRITER_H_
+#ifndef DATATYPE_REWRITER_H_
-#define _DATATYPE_REWRITER_H_
+#define DATATYPE_REWRITER_H_
 
 #include"datatype_decl_plugin.h"
 #include"rewriter_types.h"

src/ast/rewriter/der.h

@@ -18,8 +18,8 @@ Revision History:
     Christoph Wintersteiger, 2010-03-30: Added Destr. Multi-Equality Resolution
 
 --*/
-#ifndef _DER_H_
+#ifndef DER_H_
-#define _DER_H_
+#define DER_H_
 
 #include"ast.h"
 #include"var_subst.h"
@@ -183,5 +183,5 @@ public:
 
 typedef der_rewriter der_star; 
 
-#endif /* _DER_H_ */
+#endif /* DER_H_ */
 

src/ast/rewriter/dl_rewriter.h

@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _DL_REWRITER_H_
+#ifndef DL_REWRITER_H_
-#define _DL_REWRITER_H_
+#define DL_REWRITER_H_
 
 #include"dl_decl_plugin.h"
 #include"rewriter_types.h"

src/ast/rewriter/expr_replacer.h

@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _EXPR_REPLACER_H_
+#ifndef EXPR_REPLACER_H_
-#define _EXPR_REPLACER_H_
+#define EXPR_REPLACER_H_
 
 #include"ast.h"
 #include"expr_substitution.h"

src/ast/rewriter/expr_safe_replace.h

@@ -19,8 +19,8 @@ Revision History:
 
 --*/
 
-#ifndef __EXPR_SAFE_REPLACE_H__
+#ifndef EXPR_SAFE_REPLACE_H_
-#define __EXPR_SAFE_REPLACE_H__
+#define EXPR_SAFE_REPLACE_H_
 
 #include "ast.h"
 
@@ -49,4 +49,4 @@ public:
     bool empty() const { return m_subst.empty(); }
 };
 
-#endif /* __EXPR_SAFE_REPLACE_H__ */
+#endif /* EXPR_SAFE_REPLACE_H_ */

src/ast/rewriter/factor_rewriter.h

@@ -17,8 +17,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _FACTOR_REWRITER_H_
+#ifndef FACTOR_REWRITER_H_
-#define _FACTOR_REWRITER_H_
+#define FACTOR_REWRITER_H_
 
 #include"ast.h"
 #include"rewriter.h"

src/ast/rewriter/fpa_rewriter.h

@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _FLOAT_REWRITER_H_
+#ifndef FLOAT_REWRITER_H_
-#define _FLOAT_REWRITER_H_
+#define FLOAT_REWRITER_H_
 
 #include"ast.h"
 #include"rewriter.h"

src/ast/rewriter/mk_simplified_app.h

@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _MK_SIMPLIFIED_APP_H_
+#ifndef MK_SIMPLIFIED_APP_H_
-#define _MK_SIMPLIFIED_APP_H_
+#define MK_SIMPLIFIED_APP_H_
 
 #include"ast.h"
 #include"params.h"

src/ast/rewriter/pb_rewriter.h

@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _PB_REWRITER_H_
+#ifndef PB_REWRITER_H_
-#define _PB_REWRITER_H_
+#define PB_REWRITER_H_
 
 #include"pb_decl_plugin.h"
 #include"rewriter_types.h"

src/ast/rewriter/pb_rewriter_def.h

@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _PB_REWRITER_DEF_H_
+#ifndef PB_REWRITER_DEF_H_
-#define _PB_REWRITER_DEF_H_
+#define PB_REWRITER_DEF_H_
 
 #include"pb_rewriter.h"
 

src/ast/rewriter/poly_rewriter.h

@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _POLY_REWRITER_H_
+#ifndef POLY_REWRITER_H_
-#define _POLY_REWRITER_H_
+#define POLY_REWRITER_H_
 
 #include"ast.h"
 #include"obj_hashtable.h"

src/ast/rewriter/quant_hoist.h

@@ -19,8 +19,8 @@ Revision History:
 
 --*/
 
-#ifndef __QUANTIFIER_HOISTER_H_
+#ifndef QUANTIFIER_HOISTER_H_
-#define __QUANTIFIER_HOISTER_H_
+#define QUANTIFIER_HOISTER_H_
 
 #include "ast.h"
 

src/ast/rewriter/rewriter.h

@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _REWRITER_H_
+#ifndef REWRITER_H_
-#define _REWRITER_H_
+#define REWRITER_H_
 
 #include"ast.h"
 #include"rewriter_types.h"

src/ast/rewriter/rewriter_types.h

@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _REWRITER_TYPES_H_
+#ifndef REWRITER_TYPES_H_
-#define _REWRITER_TYPES_H_
+#define REWRITER_TYPES_H_
 
 #include"z3_exception.h"
 #include"common_msgs.h"

src/ast/rewriter/th_rewriter.h

@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _TH_REWRITER_H_
+#ifndef TH_REWRITER_H_
-#define _TH_REWRITER_H_
+#define TH_REWRITER_H_
 
 #include"ast.h"
 #include"rewriter_types.h"