diff --git a/src/aa-path-symex/build_goto_trace.h b/src/aa-path-symex/build_goto_trace.h index cffd2cf7059..72fefddb486 100644 --- a/src/aa-path-symex/build_goto_trace.h +++ b/src/aa-path-symex/build_goto_trace.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_PATH_SYMEX_BUILD_GOTO_TRACE_H -#define CPROVER_PATH_SYMEX_BUILD_GOTO_TRACE_H +#ifndef CPROVER_AA_PATH_SYMEX_BUILD_GOTO_TRACE_H +#define CPROVER_AA_PATH_SYMEX_BUILD_GOTO_TRACE_H #include #include @@ -19,4 +19,4 @@ void build_goto_trace( const decision_proceduret &decision_procedure, goto_tracet &goto_trace); -#endif +#endif // CPROVER_AA_PATH_SYMEX_BUILD_GOTO_TRACE_H diff --git a/src/aa-path-symex/loc_ref.h b/src/aa-path-symex/loc_ref.h index b9ddd1977e7..37e6935c6da 100644 --- a/src/aa-path-symex/loc_ref.h +++ b/src/aa-path-symex/loc_ref.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_LOC_REF_H -#define CPROVER_LOC_REF_H +#ifndef CPROVER_AA_PATH_SYMEX_LOC_REF_H +#define CPROVER_AA_PATH_SYMEX_LOC_REF_H #include @@ -83,4 +83,4 @@ static inline std::ostream &operator << (std::ostream &out, loc_reft l) return out << l.loc_number; } -#endif +#endif // CPROVER_AA_PATH_SYMEX_LOC_REF_H diff --git a/src/aa-path-symex/locs.h b/src/aa-path-symex/locs.h index bf83d504ada..9d5f45730fc 100644 --- a/src/aa-path-symex/locs.h +++ b/src/aa-path-symex/locs.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_PATH_SYMEX_LOCS_H -#define CPROVER_PATH_SYMEX_LOCS_H +#ifndef CPROVER_AA_PATH_SYMEX_LOCS_H +#define CPROVER_AA_PATH_SYMEX_LOCS_H #include @@ -112,4 +112,4 @@ class target_to_loc_mapt for(exprt::operandst::iterator it=(expr).loc_vector.begin(); \ it!=(locs).loc_vector.end(); it++) -#endif +#endif // CPROVER_AA_PATH_SYMEX_LOCS_H diff --git a/src/aa-path-symex/path_symex.h b/src/aa-path-symex/path_symex.h index 2abbeed1ade..6013e33a911 100644 --- a/src/aa-path-symex/path_symex.h +++ b/src/aa-path-symex/path_symex.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_PATH_SYMEX_H -#define CPROVER_PATH_SYMEX_H +#ifndef CPROVER_AA_PATH_SYMEX_PATH_SYMEX_H +#define CPROVER_AA_PATH_SYMEX_PATH_SYMEX_H #include "locs.h" #include "path_symex_state.h" @@ -39,4 +39,4 @@ void path_symex_goto( void path_symex_assert_fail( path_symex_statet &state); -#endif +#endif // CPROVER_AA_PATH_SYMEX_PATH_SYMEX_H diff --git a/src/aa-path-symex/path_symex_history.h b/src/aa-path-symex/path_symex_history.h index 85eb9ea8248..c2a261b7fdf 100644 --- a/src/aa-path-symex/path_symex_history.h +++ b/src/aa-path-symex/path_symex_history.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_PATH_SYMEX_HISTORY_H -#define CPROVER_PATH_SYMEX_HISTORY_H +#ifndef CPROVER_AA_PATH_SYMEX_PATH_SYMEX_HISTORY_H +#define CPROVER_AA_PATH_SYMEX_PATH_SYMEX_HISTORY_H #include #include @@ -161,4 +161,4 @@ inline void path_symex_step_reft::build_history( } } -#endif +#endif // CPROVER_AA_PATH_SYMEX_PATH_SYMEX_HISTORY_H diff --git a/src/aa-path-symex/path_symex_state.h b/src/aa-path-symex/path_symex_state.h index 5663e07ce9a..87c401007c9 100644 --- a/src/aa-path-symex/path_symex_state.h +++ b/src/aa-path-symex/path_symex_state.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_PATH_SYMEX_STATE_H -#define CPROVER_PATH_SYMEX_STATE_H +#ifndef CPROVER_AA_PATH_SYMEX_PATH_SYMEX_STATE_H +#define CPROVER_AA_PATH_SYMEX_PATH_SYMEX_STATE_H #include @@ -347,4 +347,4 @@ path_symex_statet initial_state( const locst &locs, path_symex_historyt &); -#endif +#endif // CPROVER_AA_PATH_SYMEX_PATH_SYMEX_STATE_H diff --git a/src/aa-path-symex/var_map.h b/src/aa-path-symex/var_map.h index e21c6d8e4d7..00c95ec3ad5 100644 --- a/src/aa-path-symex/var_map.h +++ b/src/aa-path-symex/var_map.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_PATH_SYMEX_VAR_MAP_H -#define CPROVER_PATH_SYMEX_VAR_MAP_H +#ifndef CPROVER_AA_PATH_SYMEX_VAR_MAP_H +#define CPROVER_AA_PATH_SYMEX_VAR_MAP_H #include @@ -118,4 +118,4 @@ class var_mapt unsigned dynamic_count; // memory allocation }; -#endif +#endif // CPROVER_AA_PATH_SYMEX_VAR_MAP_H diff --git a/src/aa-symex/path_search.h b/src/aa-symex/path_search.h index 4557f0736e2..3c546989fd2 100644 --- a/src/aa-symex/path_search.h +++ b/src/aa-symex/path_search.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_PATH_SEARCH_H -#define CPROVER_PATH_SEARCH_H +#ifndef CPROVER_AA_SYMEX_PATH_SEARCH_H +#define CPROVER_AA_SYMEX_PATH_SEARCH_H #include @@ -91,4 +91,4 @@ class path_searcht:public safety_checkert const goto_functionst &goto_functions); }; -#endif +#endif // CPROVER_AA_SYMEX_PATH_SEARCH_H diff --git a/src/aa-symex/symex_parseoptions.h b/src/aa-symex/symex_parseoptions.h index f70da76dbfe..2b07b5880fd 100644 --- a/src/aa-symex/symex_parseoptions.h +++ b/src/aa-symex/symex_parseoptions.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_SYMEX_PARSEOPTIONS_H -#define CPROVER_SYMEX_PARSEOPTIONS_H +#ifndef CPROVER_AA_SYMEX_SYMEX_PARSEOPTIONS_H +#define CPROVER_AA_SYMEX_SYMEX_PARSEOPTIONS_H #include #include @@ -75,4 +75,4 @@ class symex_parseoptionst: void eval_verbosity(); }; -#endif +#endif // CPROVER_AA_SYMEX_SYMEX_PARSEOPTIONS_H diff --git a/src/analyses/ai.h b/src/analyses/ai.h index c362cce8474..af93bef3a8e 100644 --- a/src/analyses/ai.h +++ b/src/analyses/ai.h @@ -360,4 +360,4 @@ class concurrency_aware_ait:public ait } }; -#endif +#endif // CPROVER_ANALYSES_AI_H diff --git a/src/analyses/call_graph.h b/src/analyses/call_graph.h index 935f6a94f9d..3410410f3d4 100644 --- a/src/analyses/call_graph.h +++ b/src/analyses/call_graph.h @@ -34,4 +34,4 @@ class call_grapht const goto_programt &body); }; -#endif +#endif // CPROVER_ANALYSES_CALL_GRAPH_H diff --git a/src/analyses/cfg_dominators.h b/src/analyses/cfg_dominators.h index c80754e4f1f..0abee1ec6e9 100644 --- a/src/analyses/cfg_dominators.h +++ b/src/analyses/cfg_dominators.h @@ -6,8 +6,8 @@ Author: Georg Weissenbacher, georg@weissenbacher.name \*******************************************************************/ -#ifndef CPROVER_CFG_DOMINATORS_H -#define CPROVER_CFG_DOMINATORS_H +#ifndef CPROVER_ANALYSES_CFG_DOMINATORS_H +#define CPROVER_ANALYSES_CFG_DOMINATORS_H #include #include @@ -251,4 +251,4 @@ typedef cfg_dominators_templatet cfg_post_dominatorst; -#endif +#endif // CPROVER_ANALYSES_CFG_DOMINATORS_H diff --git a/src/analyses/constant_propagator.h b/src/analyses/constant_propagator.h index 36170c71a74..58a1cf94123 100644 --- a/src/analyses/constant_propagator.h +++ b/src/analyses/constant_propagator.h @@ -6,8 +6,8 @@ Author: Peter Schrammel \*******************************************************************/ -#ifndef CPROVER_CONSTANT_PROPAGATOR_H -#define CPROVER_CONSTANT_PROPAGATOR_H +#ifndef CPROVER_ANALYSES_CONSTANT_PROPAGATOR_H +#define CPROVER_ANALYSES_CONSTANT_PROPAGATOR_H #include "ai.h" @@ -119,4 +119,4 @@ class constant_propagator_ait:public ait exprt &expr); }; -#endif +#endif // CPROVER_ANALYSES_CONSTANT_PROPAGATOR_H diff --git a/src/analyses/custom_bitvector_analysis.h b/src/analyses/custom_bitvector_analysis.h index b700c0b35ed..740497bddef 100644 --- a/src/analyses/custom_bitvector_analysis.h +++ b/src/analyses/custom_bitvector_analysis.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_CUSTOM_BITVECTOR_ANALYSIS_H -#define CPROVER_CUSTOM_BITVECTOR_ANALYSIS_H +#ifndef CPROVER_ANALYSES_CUSTOM_BITVECTOR_ANALYSIS_H +#define CPROVER_ANALYSES_CUSTOM_BITVECTOR_ANALYSIS_H #include @@ -158,4 +158,4 @@ class custom_bitvector_analysist:public ait std::set aliases(const exprt &, locationt loc); }; -#endif +#endif // CPROVER_ANALYSES_CUSTOM_BITVECTOR_ANALYSIS_H diff --git a/src/analyses/dependence_graph.h b/src/analyses/dependence_graph.h index cb25b7ff88b..407819532f7 100644 --- a/src/analyses/dependence_graph.h +++ b/src/analyses/dependence_graph.h @@ -9,8 +9,8 @@ Date: August 2013 \*******************************************************************/ -#ifndef CPROVER_DEPENDENCE_GRAPH_H -#define CPROVER_DEPENDENCE_GRAPH_H +#ifndef CPROVER_ANALYSES_DEPENDENCE_GRAPH_H +#define CPROVER_ANALYSES_DEPENDENCE_GRAPH_H #include @@ -176,4 +176,4 @@ class dependence_grapht: reaching_definitions_analysist rd; }; -#endif +#endif // CPROVER_ANALYSES_DEPENDENCE_GRAPH_H diff --git a/src/analyses/dirty.h b/src/analyses/dirty.h index a200690b963..e1d5b6aa64e 100644 --- a/src/analyses/dirty.h +++ b/src/analyses/dirty.h @@ -8,8 +8,8 @@ Date: March 2013 \*******************************************************************/ -#ifndef CPROVER_DIRTY_H -#define CPROVER_DIRTY_H +#ifndef CPROVER_ANALYSES_DIRTY_H +#define CPROVER_ANALYSES_DIRTY_H #include #include @@ -65,4 +65,4 @@ static inline std::ostream &operator << ( return out; } -#endif +#endif // CPROVER_ANALYSES_DIRTY_H diff --git a/src/analyses/escape_analysis.h b/src/analyses/escape_analysis.h index 232ade64d05..ed6edbe1457 100644 --- a/src/analyses/escape_analysis.h +++ b/src/analyses/escape_analysis.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_ESCAPE_ANALYSIS_H -#define CPROVER_ESCAPE_ANALYSIS_H +#ifndef CPROVER_ANALYSES_ESCAPE_ANALYSIS_H +#define CPROVER_ANALYSES_ESCAPE_ANALYSIS_H #include #include @@ -112,4 +112,4 @@ class escape_analysist:public ait const namespacet &); }; -#endif +#endif // CPROVER_ANALYSES_ESCAPE_ANALYSIS_H diff --git a/src/analyses/flow_insensitive_analysis.h b/src/analyses/flow_insensitive_analysis.h index ffe5f3671ad..00c8ad4f798 100644 --- a/src/analyses/flow_insensitive_analysis.h +++ b/src/analyses/flow_insensitive_analysis.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef FLOW_INSENSITIVE_ANALYSIS_H_ -#define FLOW_INSENSITIVE_ANALYSIS_H_ +#ifndef CPROVER_ANALYSES_FLOW_INSENSITIVE_ANALYSIS_H +#define CPROVER_ANALYSES_FLOW_INSENSITIVE_ANALYSIS_H #include #include @@ -259,4 +259,4 @@ class flow_insensitive_analysist:public flow_insensitive_analysis_baset void dummy(const T &s) { const statet &x=dummy1(s); (void)x; } }; -#endif /*FLOW_INSENSITIVE_ANALYSIS_H_*/ +#endif // CPROVER_ANALYSES_FLOW_INSENSITIVE_ANALYSIS_H diff --git a/src/analyses/global_may_alias.h b/src/analyses/global_may_alias.h index 49f6d7f8688..f57bf48d321 100644 --- a/src/analyses/global_may_alias.h +++ b/src/analyses/global_may_alias.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_GLOBAL_MAY_ALIAS_H -#define CPROVER_GLOBAL_MAY_ALIAS_H +#ifndef CPROVER_ANALYSES_GLOBAL_MAY_ALIAS_H +#define CPROVER_ANALYSES_GLOBAL_MAY_ALIAS_H #include #include @@ -71,4 +71,4 @@ class global_may_alias_analysist:public ait } }; -#endif +#endif // CPROVER_ANALYSES_GLOBAL_MAY_ALIAS_H diff --git a/src/analyses/goto_check.h b/src/analyses/goto_check.h index 8aaddcc3e68..ee589ca9e70 100644 --- a/src/analyses/goto_check.h +++ b/src/analyses/goto_check.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_GOTO_PROGRAMS_GOTO_CHECK_H -#define CPROVER_GOTO_PROGRAMS_GOTO_CHECK_H +#ifndef CPROVER_ANALYSES_GOTO_CHECK_H +#define CPROVER_ANALYSES_GOTO_CHECK_H #include #include @@ -61,4 +61,4 @@ void goto_check( options.set_option("float-overflow-check", cmdline.isset("float-overflow-check")); \ options.set_option("nan-check", cmdline.isset("nan-check")) -#endif +#endif // CPROVER_ANALYSES_GOTO_CHECK_H diff --git a/src/analyses/goto_rw.h b/src/analyses/goto_rw.h index 54b8bb309f8..8aa1aa33f57 100644 --- a/src/analyses/goto_rw.h +++ b/src/analyses/goto_rw.h @@ -8,8 +8,8 @@ Date: April 2010 \*******************************************************************/ -#ifndef CPROVER_GOTO_PROGRAMS_GOTO_RW_H -#define CPROVER_GOTO_PROGRAMS_GOTO_RW_H +#ifndef CPROVER_ANALYSES_GOTO_RW_H +#define CPROVER_ANALYSES_GOTO_RW_H #include #include @@ -307,4 +307,4 @@ class rw_guarded_range_set_value_sett:public rw_range_set_value_sett const range_spect &range_end); }; -#endif +#endif // CPROVER_ANALYSES_GOTO_RW_H diff --git a/src/analyses/interval_analysis.h b/src/analyses/interval_analysis.h index 1ba86059517..be86a6c65f8 100644 --- a/src/analyses/interval_analysis.h +++ b/src/analyses/interval_analysis.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_INTERVAL_ANALYSIS_H -#define CPROVER_INTERVAL_ANALYSIS_H +#ifndef CPROVER_ANALYSES_INTERVAL_ANALYSIS_H +#define CPROVER_ANALYSES_INTERVAL_ANALYSIS_H #include #include @@ -16,4 +16,4 @@ void interval_analysis( const namespacet &ns, goto_functionst &goto_functions); -#endif +#endif // CPROVER_ANALYSES_INTERVAL_ANALYSIS_H diff --git a/src/analyses/interval_domain.h b/src/analyses/interval_domain.h index b8cc21fa0d9..9dd73b992f9 100644 --- a/src/analyses/interval_domain.h +++ b/src/analyses/interval_domain.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_INTERVAL_DOMAIN_H -#define CPROVER_INTERVAL_DOMAIN_H +#ifndef CPROVER_ANALYSES_INTERVAL_DOMAIN_H +#define CPROVER_ANALYSES_INTERVAL_DOMAIN_H #include #include @@ -93,4 +93,4 @@ class interval_domaint:public ai_domain_baset ieee_float_intervalt get_float_rec(const exprt &); }; -#endif +#endif // CPROVER_ANALYSES_INTERVAL_DOMAIN_H diff --git a/src/analyses/invariant_propagation.h b/src/analyses/invariant_propagation.h index 5df6f6925d7..0884ba85d07 100644 --- a/src/analyses/invariant_propagation.h +++ b/src/analyses/invariant_propagation.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_CEGAR_INVARIANT_PROPAGATION_H -#define CPROVER_CEGAR_INVARIANT_PROPAGATION_H +#ifndef CPROVER_ANALYSES_INVARIANT_PROPAGATION_H +#define CPROVER_ANALYSES_INVARIANT_PROPAGATION_H #include @@ -68,4 +68,4 @@ class invariant_propagationt:public bool check_type(const typet &type) const; }; -#endif +#endif // CPROVER_ANALYSES_INVARIANT_PROPAGATION_H diff --git a/src/analyses/invariant_set.h b/src/analyses/invariant_set.h index 3420b67c21f..b24d0c75ab8 100644 --- a/src/analyses/invariant_set.h +++ b/src/analyses/invariant_set.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_CEGAR_INVARIANT_SET_H -#define CPROVER_CEGAR_INVARIANT_SET_H +#ifndef CPROVER_ANALYSES_INVARIANT_SET_H +#define CPROVER_ANALYSES_INVARIANT_SET_H #include #include @@ -285,4 +285,4 @@ class invariant_sett const std::pair &ineq); }; -#endif +#endif // CPROVER_ANALYSES_INVARIANT_SET_H diff --git a/src/analyses/invariant_set_domain.h b/src/analyses/invariant_set_domain.h index 528e5b404e2..4698fb4121b 100644 --- a/src/analyses/invariant_set_domain.h +++ b/src/analyses/invariant_set_domain.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_POINTER_ANALYSIS_INVARIANT_SET_DOMAIN_H -#define CPROVER_POINTER_ANALYSIS_INVARIANT_SET_DOMAIN_H +#ifndef CPROVER_ANALYSES_INVARIANT_SET_DOMAIN_H +#define CPROVER_ANALYSES_INVARIANT_SET_DOMAIN_H #include "ai.h" #include "invariant_set.h" @@ -49,4 +49,4 @@ class invariant_set_domaint:public ai_domain_baset const namespacet &ns); }; -#endif +#endif // CPROVER_ANALYSES_INVARIANT_SET_DOMAIN_H diff --git a/src/analyses/is_threaded.h b/src/analyses/is_threaded.h index 7b68e62c6f3..931baabb7db 100644 --- a/src/analyses/is_threaded.h +++ b/src/analyses/is_threaded.h @@ -8,8 +8,8 @@ Date: October 2012 \*******************************************************************/ -#ifndef CPROVER_GOTO_PROGRAMS_IS_THREADED_H -#define CPROVER_GOTO_PROGRAMS_IS_THREADED_H +#ifndef CPROVER_ANALYSES_IS_THREADED_H +#define CPROVER_ANALYSES_IS_THREADED_H #include @@ -37,4 +37,4 @@ class is_threadedt const goto_functionst &goto_functions); }; -#endif +#endif // CPROVER_ANALYSES_IS_THREADED_H diff --git a/src/analyses/local_bitvector_analysis.h b/src/analyses/local_bitvector_analysis.h index 788f7d34c14..ad0035b9e5e 100644 --- a/src/analyses/local_bitvector_analysis.h +++ b/src/analyses/local_bitvector_analysis.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_LOCAL_BITVECTOR_ANALYSIS_H -#define CPROVER_LOCAL_BITVECTOR_ANALYSIS_H +#ifndef CPROVER_ANALYSES_LOCAL_BITVECTOR_ANALYSIS_H +#define CPROVER_ANALYSES_LOCAL_BITVECTOR_ANALYSIS_H #include @@ -222,4 +222,4 @@ class local_bitvector_analysist bool is_tracked(const irep_idt &identifier); }; -#endif +#endif // CPROVER_ANALYSES_LOCAL_BITVECTOR_ANALYSIS_H diff --git a/src/analyses/local_cfg.h b/src/analyses/local_cfg.h index 92eda353932..ab6ee2cc345 100644 --- a/src/analyses/local_cfg.h +++ b/src/analyses/local_cfg.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_LOCAL_CFG_H -#define CPROVER_LOCAL_CFG_H +#ifndef CPROVER_ANALYSES_LOCAL_CFG_H +#define CPROVER_ANALYSES_LOCAL_CFG_H #include @@ -49,4 +49,4 @@ class local_cfgt void build(const goto_programt &goto_program); }; -#endif +#endif // CPROVER_ANALYSES_LOCAL_CFG_H diff --git a/src/analyses/local_may_alias.h b/src/analyses/local_may_alias.h index 503a4daab29..33ddf22bee9 100644 --- a/src/analyses/local_may_alias.h +++ b/src/analyses/local_may_alias.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_LOCAL_MAY_ALIAS_H -#define CPROVER_LOCAL_MAY_ALIAS_H +#ifndef CPROVER_ANALYSES_LOCAL_MAY_ALIAS_H +#define CPROVER_ANALYSES_LOCAL_MAY_ALIAS_H #include #include @@ -145,4 +145,4 @@ class local_may_alias_factoryt target_mapt target_map; }; -#endif +#endif // CPROVER_ANALYSES_LOCAL_MAY_ALIAS_H diff --git a/src/analyses/locals.h b/src/analyses/locals.h index 78883ad4699..8690d48d817 100644 --- a/src/analyses/locals.h +++ b/src/analyses/locals.h @@ -8,8 +8,8 @@ Date: March 2013 \*******************************************************************/ -#ifndef CPROVER_LOCALS_H -#define CPROVER_LOCALS_H +#ifndef CPROVER_ANALYSES_LOCALS_H +#define CPROVER_ANALYSES_LOCALS_H #include @@ -47,4 +47,4 @@ static inline std::ostream &operator << ( return out; } -#endif +#endif // CPROVER_ANALYSES_LOCALS_H diff --git a/src/analyses/natural_loops.h b/src/analyses/natural_loops.h index 50f84183370..2cbfd410375 100644 --- a/src/analyses/natural_loops.h +++ b/src/analyses/natural_loops.h @@ -6,8 +6,8 @@ Author: Georg Weissenbacher, georg@weissenbacher.name \*******************************************************************/ -#ifndef CPROVER_NATURAL_LOOPS_H -#define CPROVER_NATURAL_LOOPS_H +#ifndef CPROVER_ANALYSES_NATURAL_LOOPS_H +#define CPROVER_ANALYSES_NATURAL_LOOPS_H #include #include @@ -206,4 +206,4 @@ void natural_loops_templatet::output(std::ostream &out) const } } -#endif +#endif // CPROVER_ANALYSES_NATURAL_LOOPS_H diff --git a/src/analyses/reaching_definitions.h b/src/analyses/reaching_definitions.h index 91225e8fc86..7b29b9e03db 100644 --- a/src/analyses/reaching_definitions.h +++ b/src/analyses/reaching_definitions.h @@ -9,8 +9,8 @@ Date: February 2013 \*******************************************************************/ -#ifndef CPROVER_REACHING_DEFINITIONS_H -#define CPROVER_REACHING_DEFINITIONS_H +#ifndef CPROVER_ANALYSES_REACHING_DEFINITIONS_H +#define CPROVER_ANALYSES_REACHING_DEFINITIONS_H #include "ai.h" #include "goto_rw.h" @@ -248,4 +248,4 @@ class reaching_definitions_analysist : dirtyt * is_dirty; }; -#endif +#endif // CPROVER_ANALYSES_REACHING_DEFINITIONS_H diff --git a/src/analyses/replace_symbol_ext.h b/src/analyses/replace_symbol_ext.h index 2aac30957f2..7d03d61ff6e 100644 --- a/src/analyses/replace_symbol_ext.h +++ b/src/analyses/replace_symbol_ext.h @@ -6,8 +6,8 @@ Author: Peter Schrammel \*******************************************************************/ -#ifndef CPROVER_REPLACE_SYMBOL_EXT_H -#define CPROVER_REPLACE_SYMBOL_EXT_H +#ifndef CPROVER_ANALYSES_REPLACE_SYMBOL_EXT_H +#define CPROVER_ANALYSES_REPLACE_SYMBOL_EXT_H #include @@ -17,4 +17,4 @@ class replace_symbol_extt : public replace_symbolt virtual bool replace(exprt &dest) const; }; -#endif +#endif // CPROVER_ANALYSES_REPLACE_SYMBOL_EXT_H diff --git a/src/analyses/static_analysis.h b/src/analyses/static_analysis.h index 4d289296938..f25387d08f7 100644 --- a/src/analyses/static_analysis.h +++ b/src/analyses/static_analysis.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_GOTO_PROGRAMS_STATIC_ANALYSIS_H -#define CPROVER_GOTO_PROGRAMS_STATIC_ANALYSIS_H +#ifndef CPROVER_ANALYSES_STATIC_ANALYSIS_H +#define CPROVER_ANALYSES_STATIC_ANALYSIS_H #ifndef USE_DEPRECATED_STATIC_ANALYSIS_H #error Deprecated, use ai.h instead @@ -384,4 +384,4 @@ class concurrency_aware_static_analysist:public static_analysist } }; -#endif +#endif // CPROVER_ANALYSES_STATIC_ANALYSIS_H diff --git a/src/analyses/uninitialized_domain.h b/src/analyses/uninitialized_domain.h index 04066fe4b47..40bba2dc5a0 100644 --- a/src/analyses/uninitialized_domain.h +++ b/src/analyses/uninitialized_domain.h @@ -8,6 +8,9 @@ Date: January 2010 \*******************************************************************/ +#ifndef CPROVER_ANALYSES_UNINITIALIZED_DOMAIN_H +#define CPROVER_ANALYSES_UNINITIALIZED_DOMAIN_H + #include "ai.h" class uninitialized_domaint:public ai_domain_baset @@ -40,3 +43,5 @@ class uninitialized_domaint:public ai_domain_baset typedef ait uninitialized_analysist; + +#endif // CPROVER_ANALYSES_UNINITIALIZED_DOMAIN_H diff --git a/src/ansi-c/ansi_c_convert_type.h b/src/ansi-c/ansi_c_convert_type.h index f87e4c86a8f..6b46a1a4f61 100644 --- a/src/ansi-c/ansi_c_convert_type.h +++ b/src/ansi-c/ansi_c_convert_type.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_ANSI_C_CONVERT_TYPE_H -#define CPROVER_ANSI_C_CONVERT_TYPE_H +#ifndef CPROVER_ANSI_C_ANSI_C_CONVERT_TYPE_H +#define CPROVER_ANSI_C_ANSI_C_CONVERT_TYPE_H #include @@ -79,4 +79,4 @@ class ansi_c_convert_typet:public messaget void read_rec(const typet &type); }; -#endif +#endif // CPROVER_ANSI_C_ANSI_C_CONVERT_TYPE_H diff --git a/src/ansi-c/ansi_c_declaration.h b/src/ansi-c/ansi_c_declaration.h index 87ea59a818a..5a2b5649387 100644 --- a/src/ansi-c/ansi_c_declaration.h +++ b/src/ansi-c/ansi_c_declaration.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_ANSI_C_DECLARATION_H -#define CPROVER_ANSI_C_DECLARATION_H +#ifndef CPROVER_ANSI_C_ANSI_C_DECLARATION_H +#define CPROVER_ANSI_C_ANSI_C_DECLARATION_H #include @@ -244,4 +244,4 @@ extern inline const ansi_c_declarationt &to_ansi_c_declaration(const exprt &expr return static_cast(expr); } -#endif +#endif // CPROVER_ANSI_C_ANSI_C_DECLARATION_H diff --git a/src/ansi-c/ansi_c_entry_point.h b/src/ansi-c/ansi_c_entry_point.h index 52349d10fd2..07d09ae2d44 100644 --- a/src/ansi-c/ansi_c_entry_point.h +++ b/src/ansi-c/ansi_c_entry_point.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_ANSI_C_ENTRY_POINT_H -#define CPROVER_ANSI_C_ENTRY_POINT_H +#ifndef CPROVER_ANSI_C_ANSI_C_ENTRY_POINT_H +#define CPROVER_ANSI_C_ANSI_C_ENTRY_POINT_H #include #include @@ -17,4 +17,4 @@ bool ansi_c_entry_point( const std::string &standard_main, message_handlert &message_handler); -#endif +#endif // CPROVER_ANSI_C_ANSI_C_ENTRY_POINT_H diff --git a/src/ansi-c/ansi_c_internal_additions.h b/src/ansi-c/ansi_c_internal_additions.h index 9ac0dc3a269..2b4a94f1d9b 100644 --- a/src/ansi-c/ansi_c_internal_additions.h +++ b/src/ansi-c/ansi_c_internal_additions.h @@ -6,6 +6,9 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#ifndef CPROVER_ANSI_C_ANSI_C_INTERNAL_ADDITIONS_H +#define CPROVER_ANSI_C_ANSI_C_INTERNAL_ADDITIONS_H + #include void ansi_c_internal_additions(std::string &code); @@ -14,3 +17,5 @@ void ansi_c_architecture_strings(std::string &code); extern const char gcc_builtin_headers_generic[]; extern const char gcc_builtin_headers_ia32[]; extern const char arm_builtin_headers[]; + +#endif // CPROVER_ANSI_C_ANSI_C_INTERNAL_ADDITIONS_H diff --git a/src/ansi-c/ansi_c_language.h b/src/ansi-c/ansi_c_language.h index 5344bce5ebb..9ef160f1f11 100644 --- a/src/ansi-c/ansi_c_language.h +++ b/src/ansi-c/ansi_c_language.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_ANSI_C_LANGUAGE_H -#define CPROVER_ANSI_C_LANGUAGE_H +#ifndef CPROVER_ANSI_C_ANSI_C_LANGUAGE_H +#define CPROVER_ANSI_C_ANSI_C_LANGUAGE_H /*! \defgroup gr_ansi_c ANSI-C front-end */ @@ -79,4 +79,4 @@ class ansi_c_languaget:public languaget languaget *new_ansi_c_language(); -#endif +#endif // CPROVER_ANSI_C_ANSI_C_LANGUAGE_H diff --git a/src/ansi-c/ansi_c_parse_tree.h b/src/ansi-c/ansi_c_parse_tree.h index 0ca726c0c4e..e32d5a6ca20 100644 --- a/src/ansi-c/ansi_c_parse_tree.h +++ b/src/ansi-c/ansi_c_parse_tree.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_ANSI_C_PARSE_TREE_H -#define CPROVER_ANSI_C_PARSE_TREE_H +#ifndef CPROVER_ANSI_C_ANSI_C_PARSE_TREE_H +#define CPROVER_ANSI_C_ANSI_C_PARSE_TREE_H #include "ansi_c_declaration.h" @@ -23,4 +23,4 @@ class ansi_c_parse_treet void output(std::ostream &out) const; }; -#endif +#endif // CPROVER_ANSI_C_ANSI_C_PARSE_TREE_H diff --git a/src/ansi-c/ansi_c_parser.h b/src/ansi-c/ansi_c_parser.h index 0ca7f4f5b89..7e078abd7e5 100644 --- a/src/ansi-c/ansi_c_parser.h +++ b/src/ansi-c/ansi_c_parser.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_ANSI_C_PARSER_H -#define CPROVER_ANSI_C_PARSER_H +#ifndef CPROVER_ANSI_C_ANSI_C_PARSER_H +#define CPROVER_ANSI_C_ANSI_C_PARSER_H #include @@ -142,4 +142,4 @@ extern ansi_c_parsert ansi_c_parser; int yyansi_cerror(const std::string &error); void ansi_c_scanner_init(); -#endif +#endif // CPROVER_ANSI_C_ANSI_C_PARSER_H diff --git a/src/ansi-c/ansi_c_scope.h b/src/ansi-c/ansi_c_scope.h index b95cdcb06f7..c23f5eb2363 100644 --- a/src/ansi-c/ansi_c_scope.h +++ b/src/ansi-c/ansi_c_scope.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_ANSI_C_SCOPE_H -#define CPROVER_ANSI_C_SCOPE_H +#ifndef CPROVER_ANSI_C_ANSI_C_SCOPE_H +#define CPROVER_ANSI_C_ANSI_C_SCOPE_H #include #include @@ -57,4 +57,4 @@ class ansi_c_scopet void print(std::ostream &out) const; }; -#endif +#endif // CPROVER_ANSI_C_ANSI_C_SCOPE_H diff --git a/src/ansi-c/ansi_c_typecheck.h b/src/ansi-c/ansi_c_typecheck.h index e4d2be9ec1e..aa6672d0d01 100644 --- a/src/ansi-c/ansi_c_typecheck.h +++ b/src/ansi-c/ansi_c_typecheck.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_ANSI_C_TYPECHECK_H -#define CPROVER_ANSI_C_TYPECHECK_H +#ifndef CPROVER_ANSI_C_ANSI_C_TYPECHECK_H +#define CPROVER_ANSI_C_ANSI_C_TYPECHECK_H #include "c_typecheck_base.h" #include "ansi_c_parse_tree.h" @@ -56,4 +56,4 @@ class ansi_c_typecheckt:public c_typecheck_baset ansi_c_parse_treet &parse_tree; }; -#endif +#endif // CPROVER_ANSI_C_ANSI_C_TYPECHECK_H diff --git a/src/ansi-c/c_preprocess.h b/src/ansi-c/c_preprocess.h index 37b6bfa83c1..2a50e0bfa36 100644 --- a/src/ansi-c/c_preprocess.h +++ b/src/ansi-c/c_preprocess.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_C_PREPROCESS_H -#define CPROVER_C_PREPROCESS_H +#ifndef CPROVER_ANSI_C_C_PREPROCESS_H +#define CPROVER_ANSI_C_C_PREPROCESS_H #include #include @@ -27,4 +27,4 @@ bool c_preprocess( // returns 'true' in case of error bool test_c_preprocessor(message_handlert &message_handler); -#endif +#endif // CPROVER_ANSI_C_C_PREPROCESS_H diff --git a/src/ansi-c/c_qualifiers.h b/src/ansi-c/c_qualifiers.h index f676d12b2b7..3d0da08b8a6 100644 --- a/src/ansi-c/c_qualifiers.h +++ b/src/ansi-c/c_qualifiers.h @@ -112,4 +112,4 @@ class c_qualifierst std::ostream &operator << (std::ostream &, const c_qualifierst &); -#endif +#endif // CPROVER_ANSI_C_C_QUALIFIERS_H diff --git a/src/ansi-c/c_storage_spec.h b/src/ansi-c/c_storage_spec.h index b4a28c117c9..9394552b5ca 100644 --- a/src/ansi-c/c_storage_spec.h +++ b/src/ansi-c/c_storage_spec.h @@ -90,4 +90,4 @@ class c_storage_spect void read(const typet &type); }; -#endif +#endif // CPROVER_ANSI_C_C_STORAGE_SPEC_H diff --git a/src/ansi-c/c_typecast.h b/src/ansi-c/c_typecast.h index d2039237000..2ec8cbf150c 100644 --- a/src/ansi-c/c_typecast.h +++ b/src/ansi-c/c_typecast.h @@ -98,4 +98,4 @@ class c_typecastt c_typet minimum_promotion(const typet &type) const; }; -#endif +#endif // CPROVER_ANSI_C_C_TYPECAST_H diff --git a/src/ansi-c/c_typecheck_base.h b/src/ansi-c/c_typecheck_base.h index eb2d6e66c3a..9d79fe18429 100644 --- a/src/ansi-c/c_typecheck_base.h +++ b/src/ansi-c/c_typecheck_base.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_C_TYPECHECK_BASE_H -#define CPROVER_C_TYPECHECK_BASE_H +#ifndef CPROVER_ANSI_C_C_TYPECHECK_BASE_H +#define CPROVER_ANSI_C_C_TYPECHECK_BASE_H #include #include @@ -259,4 +259,4 @@ class c_typecheck_baset: void apply_asm_label(const irep_idt &asm_label, symbolt &symbol); }; -#endif +#endif // CPROVER_ANSI_C_C_TYPECHECK_BASE_H diff --git a/src/ansi-c/c_types.h b/src/ansi-c/c_types.h index bc746011751..6c571bd448b 100644 --- a/src/ansi-c/c_types.h +++ b/src/ansi-c/c_types.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_C_TYPES_H -#define CPROVER_C_TYPES_H +#ifndef CPROVER_ANSI_C_C_TYPES_H +#define CPROVER_ANSI_C_C_TYPES_H #include @@ -44,4 +44,4 @@ typet void_type(); // ID_signed_int gets "signed int". std::string c_type_as_string(const irep_idt &); -#endif +#endif // CPROVER_ANSI_C_C_TYPES_H diff --git a/src/ansi-c/cprover_library.h b/src/ansi-c/cprover_library.h index 6c19030b15f..9b6012cbeef 100644 --- a/src/ansi-c/cprover_library.h +++ b/src/ansi-c/cprover_library.h @@ -28,4 +28,4 @@ void add_cprover_library( symbol_tablet &, message_handlert &); -#endif +#endif // CPROVER_ANSI_C_CPROVER_LIBRARY_H diff --git a/src/ansi-c/designator.h b/src/ansi-c/designator.h index a340c57ff7c..d1e6ac720c5 100644 --- a/src/ansi-c/designator.h +++ b/src/ansi-c/designator.h @@ -61,4 +61,4 @@ inline std::ostream &operator << (std::ostream &os, const designatort &d) return os; } -#endif +#endif // CPROVER_ANSI_C_DESIGNATOR_H diff --git a/src/ansi-c/expr2c.h b/src/ansi-c/expr2c.h index 90715558fc1..6a1b24aa221 100644 --- a/src/ansi-c/expr2c.h +++ b/src/ansi-c/expr2c.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_EXPR2C_H -#define CPROVER_EXPR2C_H +#ifndef CPROVER_ANSI_C_EXPR2C_H +#define CPROVER_ANSI_C_EXPR2C_H #include @@ -18,4 +18,4 @@ class typet; std::string expr2c(const exprt &expr, const namespacet &ns); std::string type2c(const typet &type, const namespacet &ns); -#endif +#endif // CPROVER_ANSI_C_EXPR2C_H diff --git a/src/ansi-c/expr2c_class.h b/src/ansi-c/expr2c_class.h index 2f38aae71cc..4048cf0f9ae 100644 --- a/src/ansi-c/expr2c_class.h +++ b/src/ansi-c/expr2c_class.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_EXPR2C_CLASS_H -#define CPROVER_EXPR2C_CLASS_H +#ifndef CPROVER_ANSI_C_EXPR2C_CLASS_H +#define CPROVER_ANSI_C_EXPR2C_CLASS_H #include @@ -210,4 +210,4 @@ class expr2ct std::string convert_sizeof(const exprt &src, unsigned &precedence); }; -#endif +#endif // CPROVER_ANSI_C_EXPR2C_CLASS_H diff --git a/src/ansi-c/library/jsa.h b/src/ansi-c/library/jsa.h index 7a2bf1ac6c8..9fff04bb0b5 100644 --- a/src/ansi-c/library/jsa.h +++ b/src/ansi-c/library/jsa.h @@ -1,6 +1,7 @@ /* FUNCTION: __CPROVER_jsa_synthesise */ -#ifndef JSA_TRANSFORMERS_H_ +#ifndef CPROVER_ANSI_C_LIBRARY_JSA_H +#define CPROVER_ANSI_C_LIBRARY_JSA_H #ifdef JSA_GENETIC_SYNTHESIS_H_ #ifndef __CPROVER_jsa_extern @@ -1164,4 +1165,4 @@ __CPROVER_jsa_inline void __CPROVER_jsa_assume_valid_invariant_iterator( #endif -#endif /* CEGIS_JSA_TRANSFORMERS_H_ */ +#endif // CPROVER_ANSI_C_LIBRARY_JSA_H diff --git a/src/ansi-c/literals/convert_character_literal.h b/src/ansi-c/literals/convert_character_literal.h index 55de068f5b5..4c497db73cd 100644 --- a/src/ansi-c/literals/convert_character_literal.h +++ b/src/ansi-c/literals/convert_character_literal.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_CPP_CONVERT_CHARACTER_LITERAL_H -#define CPROVER_CPP_CONVERT_CHARACTER_LITERAL_H +#ifndef CPROVER_ANSI_C_LITERALS_CONVERT_CHARACTER_LITERAL_H +#define CPROVER_ANSI_C_LITERALS_CONVERT_CHARACTER_LITERAL_H #include @@ -20,4 +20,4 @@ exprt convert_character_literal( const std::string &src, bool force_integer_type); -#endif +#endif // CPROVER_ANSI_C_LITERALS_CONVERT_CHARACTER_LITERAL_H diff --git a/src/ansi-c/literals/convert_float_literal.h b/src/ansi-c/literals/convert_float_literal.h index 0fd6cf98ad8..4c76abbd312 100644 --- a/src/ansi-c/literals/convert_float_literal.h +++ b/src/ansi-c/literals/convert_float_literal.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_ANSI_C_CONVERT_FLOAT_LITERAL_H -#define CPROVER_ANSI_C_CONVERT_FLOAT_LITERAL_H +#ifndef CPROVER_ANSI_C_LITERALS_CONVERT_FLOAT_LITERAL_H +#define CPROVER_ANSI_C_LITERALS_CONVERT_FLOAT_LITERAL_H #include @@ -15,4 +15,4 @@ Author: Daniel Kroening, kroening@kroening.com exprt convert_float_literal(const std::string &src); -#endif +#endif // CPROVER_ANSI_C_LITERALS_CONVERT_FLOAT_LITERAL_H diff --git a/src/ansi-c/literals/convert_integer_literal.h b/src/ansi-c/literals/convert_integer_literal.h index 5c33bfe20a9..5ce3847fdb6 100644 --- a/src/ansi-c/literals/convert_integer_literal.h +++ b/src/ansi-c/literals/convert_integer_literal.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_CPP_CONVERT_INTEGER_LITERAL_H -#define CPROVER_CPP_CONVERT_INTEGER_LITERAL_H +#ifndef CPROVER_ANSI_C_LITERALS_CONVERT_INTEGER_LITERAL_H +#define CPROVER_ANSI_C_LITERALS_CONVERT_INTEGER_LITERAL_H #include @@ -15,4 +15,4 @@ Author: Daniel Kroening, kroening@kroening.com exprt convert_integer_literal(const std::string &src); -#endif +#endif // CPROVER_ANSI_C_LITERALS_CONVERT_INTEGER_LITERAL_H diff --git a/src/ansi-c/literals/convert_string_literal.h b/src/ansi-c/literals/convert_string_literal.h index f43394bad1c..f634a1dfb1f 100644 --- a/src/ansi-c/literals/convert_string_literal.h +++ b/src/ansi-c/literals/convert_string_literal.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_ANSI_C_CONVERT_STRING_LITERAL_H -#define CPROVER_ANSI_C_CONVERT_STRING_LITERAL_H +#ifndef CPROVER_ANSI_C_LITERALS_CONVERT_STRING_LITERAL_H +#define CPROVER_ANSI_C_LITERALS_CONVERT_STRING_LITERAL_H #include @@ -15,4 +15,4 @@ Author: Daniel Kroening, kroening@kroening.com exprt convert_string_literal(const std::string &src); -#endif +#endif // CPROVER_ANSI_C_LITERALS_CONVERT_STRING_LITERAL_H diff --git a/src/ansi-c/literals/parse_float.h b/src/ansi-c/literals/parse_float.h index 7cb66de5014..7edb55a08b7 100644 --- a/src/ansi-c/literals/parse_float.h +++ b/src/ansi-c/literals/parse_float.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_ANSI_C_PARSE_FLOAT_H -#define CPROVER_ANSI_C_PARSE_FLOAT_H +#ifndef CPROVER_ANSI_C_LITERALS_PARSE_FLOAT_H +#define CPROVER_ANSI_C_LITERALS_PARSE_FLOAT_H #include @@ -25,4 +25,4 @@ void parse_float( bool &is_float80, // a gcc extension bool &is_float128); // a gcc extension -#endif +#endif // CPROVER_ANSI_C_LITERALS_PARSE_FLOAT_H diff --git a/src/ansi-c/literals/unescape_string.h b/src/ansi-c/literals/unescape_string.h index 0d4db7705ae..9d672cde19c 100644 --- a/src/ansi-c/literals/unescape_string.h +++ b/src/ansi-c/literals/unescape_string.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_C_TYPECHECK_UNESCAPE_STRING_H -#define CPROVER_C_TYPECHECK_UNESCAPE_STRING_H +#ifndef CPROVER_ANSI_C_LITERALS_UNESCAPE_STRING_H +#define CPROVER_ANSI_C_LITERALS_UNESCAPE_STRING_H #include @@ -17,4 +17,4 @@ std::basic_string unescape_wide_string(const std::string &); unsigned hex_to_unsigned(const char *, std::size_t digits); unsigned octal_to_unsigned(const char *, std::size_t digits); -#endif +#endif // CPROVER_ANSI_C_LITERALS_UNESCAPE_STRING_H diff --git a/src/ansi-c/padding.h b/src/ansi-c/padding.h index 2c3f5cb22aa..18634a61559 100644 --- a/src/ansi-c/padding.h +++ b/src/ansi-c/padding.h @@ -17,4 +17,4 @@ mp_integer alignment(const typet &type, const namespacet &); void add_padding(struct_typet &type, const namespacet &); void add_padding(union_typet &type, const namespacet &); -#endif +#endif // CPROVER_ANSI_C_PADDING_H diff --git a/src/ansi-c/preprocessor_line.h b/src/ansi-c/preprocessor_line.h index af0497255a7..5222fdd83d9 100644 --- a/src/ansi-c/preprocessor_line.h +++ b/src/ansi-c/preprocessor_line.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_ANSI_C_LANGUAGE_PREPROCESSOR_LINE_H -#define CPROVER_ANSI_C_LANGUAGE_PREPROCESSOR_LINE_H +#ifndef CPROVER_ANSI_C_PREPROCESSOR_LINE_H +#define CPROVER_ANSI_C_PREPROCESSOR_LINE_H class parsert; @@ -15,4 +15,4 @@ void preprocessor_line( const char *text, parsert &parser); -#endif +#endif // CPROVER_ANSI_C_PREPROCESSOR_LINE_H diff --git a/src/ansi-c/printf_formatter.h b/src/ansi-c/printf_formatter.h index 8af65a78fce..1b7f56f3e72 100644 --- a/src/ansi-c/printf_formatter.h +++ b/src/ansi-c/printf_formatter.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_PRINTF_FORMATTER -#define CPROVER_PRINTF_FORMATTER +#ifndef CPROVER_ANSI_C_PRINTF_FORMATTER_H +#define CPROVER_ANSI_C_PRINTF_FORMATTER_H #include #include @@ -48,4 +48,4 @@ class printf_formattert const exprt make_type(const exprt &src, const typet &dest); }; -#endif +#endif // CPROVER_ANSI_C_PRINTF_FORMATTER_H diff --git a/src/ansi-c/string_constant.h b/src/ansi-c/string_constant.h index 0d57246673a..ad38fa2dc43 100644 --- a/src/ansi-c/string_constant.h +++ b/src/ansi-c/string_constant.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_STRING_CONSTANT_H -#define CPROVER_STRING_CONSTANT_H +#ifndef CPROVER_ANSI_C_STRING_CONSTANT_H +#define CPROVER_ANSI_C_STRING_CONSTANT_H #include #include @@ -44,4 +44,4 @@ class string_constantt:public exprt const string_constantt &to_string_constant(const exprt &expr); string_constantt &to_string_constant(exprt &expr); -#endif +#endif // CPROVER_ANSI_C_STRING_CONSTANT_H diff --git a/src/assembler/assembler_parser.h b/src/assembler/assembler_parser.h index b2094f3feb0..970bb5a0bd2 100644 --- a/src/assembler/assembler_parser.h +++ b/src/assembler/assembler_parser.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_ASSEMBLER_PARSER_H -#define CPROVER_ASSEMBLER_PARSER_H +#ifndef CPROVER_ASSEMBLER_ASSEMBLER_PARSER_H +#define CPROVER_ASSEMBLER_ASSEMBLER_PARSER_H #include #include @@ -55,4 +55,4 @@ class assembler_parsert:public parsert extern assembler_parsert assembler_parser; -#endif +#endif // CPROVER_ASSEMBLER_ASSEMBLER_PARSER_H diff --git a/src/big-int/allocainc.h b/src/big-int/allocainc.h index ebfe8f0fd2c..d0817d01484 100644 --- a/src/big-int/allocainc.h +++ b/src/big-int/allocainc.h @@ -2,8 +2,8 @@ // Whatever is necessary to use alloca(). -#ifndef ALLOCAINC_H -#define ALLOCAINC_H +#ifndef CPROVER_BIG_INT_ALLOCAINC_H +#define CPROVER_BIG_INT_ALLOCAINC_H #if defined linux || defined __linux__ \ @@ -48,4 +48,4 @@ extern "C" void *alloca (unsigned); #endif -#endif//ndef ALLOCAINC_H +#endif // CPROVER_BIG_INT_ALLOCAINC_H diff --git a/src/cbmc/all_properties_class.h b/src/cbmc/all_properties_class.h index 3409c00a43d..ff3240d9e29 100644 --- a/src/cbmc/all_properties_class.h +++ b/src/cbmc/all_properties_class.h @@ -6,6 +6,9 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#ifndef CPROVER_CBMC_ALL_PROPERTIES_CLASS_H +#define CPROVER_CBMC_ALL_PROPERTIES_CLASS_H + #include #include "bmc.h" @@ -99,3 +102,5 @@ class bmc_all_propertiest: virtual void report(const cover_goalst &cover_goals); virtual void do_before_solving() {} }; + +#endif // CPROVER_CBMC_ALL_PROPERTIES_CLASS_H diff --git a/src/cbmc/bmc.h b/src/cbmc/bmc.h index 4a2f683b028..a99d859b19d 100644 --- a/src/cbmc/bmc.h +++ b/src/cbmc/bmc.h @@ -116,4 +116,4 @@ class bmct:public safety_checkert friend class fault_localizationt; }; -#endif +#endif // CPROVER_CBMC_BMC_H diff --git a/src/cbmc/bv_cbmc.h b/src/cbmc/bv_cbmc.h index bbaa9eb3d5b..9f7cc8630f4 100644 --- a/src/cbmc/bv_cbmc.h +++ b/src/cbmc/bv_cbmc.h @@ -27,4 +27,4 @@ class bv_cbmct:public bv_pointerst virtual bvt convert_waitfor_symbol(const exprt &expr); }; -#endif +#endif // CPROVER_CBMC_BV_CBMC_H diff --git a/src/cbmc/cbmc_dimacs.h b/src/cbmc/cbmc_dimacs.h index 9f7bb74414d..e8ccda5155a 100644 --- a/src/cbmc/cbmc_dimacs.h +++ b/src/cbmc/cbmc_dimacs.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_CBMC_DIMACS_H -#define CPROVER_CBMC_DIMACS_H +#ifndef CPROVER_CBMC_CBMC_DIMACS_H +#define CPROVER_CBMC_CBMC_DIMACS_H #include "bv_cbmc.h" @@ -34,4 +34,4 @@ class cbmc_dimacst:public bv_cbmct bool write_dimacs(std::ostream &); }; -#endif +#endif // CPROVER_CBMC_CBMC_DIMACS_H diff --git a/src/cbmc/cbmc_parse_options.h b/src/cbmc/cbmc_parse_options.h index 18a75492d57..daefb5934c1 100644 --- a/src/cbmc/cbmc_parse_options.h +++ b/src/cbmc/cbmc_parse_options.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_CBMC_PARSE_OPTIONS_H -#define CPROVER_CBMC_PARSE_OPTIONS_H +#ifndef CPROVER_CBMC_CBMC_PARSE_OPTIONS_H +#define CPROVER_CBMC_CBMC_PARSE_OPTIONS_H #include #include @@ -102,4 +102,4 @@ class cbmc_parse_optionst: void preprocessing(); }; -#endif +#endif // CPROVER_CBMC_CBMC_PARSE_OPTIONS_H diff --git a/src/cbmc/cbmc_solvers.h b/src/cbmc/cbmc_solvers.h index 765b3bbfd13..c834b4875d0 100644 --- a/src/cbmc/cbmc_solvers.h +++ b/src/cbmc/cbmc_solvers.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_CBMC_SOLVERS_H -#define CPROVER_CBMC_SOLVERS_H +#ifndef CPROVER_CBMC_CBMC_SOLVERS_H +#define CPROVER_CBMC_CBMC_SOLVERS_H #include #include @@ -123,4 +123,4 @@ class cbmc_solverst:public messaget }; -#endif +#endif // CPROVER_CBMC_CBMC_SOLVERS_H diff --git a/src/cbmc/counterexample_beautification.h b/src/cbmc/counterexample_beautification.h index 92da4db8319..d4f9c35bc88 100644 --- a/src/cbmc/counterexample_beautification.h +++ b/src/cbmc/counterexample_beautification.h @@ -47,4 +47,4 @@ class counterexample_beautificationt symex_target_equationt::SSA_stepst::const_iterator failed; }; -#endif +#endif // CPROVER_CBMC_COUNTEREXAMPLE_BEAUTIFICATION_H diff --git a/src/cbmc/fault_localization.h b/src/cbmc/fault_localization.h index 69251e67d5e..661883e8da4 100644 --- a/src/cbmc/fault_localization.h +++ b/src/cbmc/fault_localization.h @@ -96,4 +96,4 @@ class fault_localizationt: } }; -#endif +#endif // CPROVER_CBMC_FAULT_LOCALIZATION_H diff --git a/src/cbmc/symex_bmc.h b/src/cbmc/symex_bmc.h index 919cd6f73f8..76026b3757f 100644 --- a/src/cbmc/symex_bmc.h +++ b/src/cbmc/symex_bmc.h @@ -88,4 +88,4 @@ class symex_bmct: hash_set_cont body_warnings; }; -#endif +#endif // CPROVER_CBMC_SYMEX_BMC_H diff --git a/src/cbmc/version.h b/src/cbmc/version.h index 6bc88eb3be7..d7a7a08a8ed 100644 --- a/src/cbmc/version.h +++ b/src/cbmc/version.h @@ -1 +1,6 @@ +#ifndef CPROVER_CBMC_VERSION_H +#define CPROVER_CBMC_VERSION_H + #define CBMC_VERSION "5.6" + +#endif // CPROVER_CBMC_VERSION_H diff --git a/src/cbmc/xml_interface.h b/src/cbmc/xml_interface.h index b0307bd4e21..1c2a926e33c 100644 --- a/src/cbmc/xml_interface.h +++ b/src/cbmc/xml_interface.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_XML_INTERFACE_H -#define CPROVER_XML_INTERFACE_H +#ifndef CPROVER_CBMC_XML_INTERFACE_H +#define CPROVER_CBMC_XML_INTERFACE_H #include @@ -24,4 +24,4 @@ class xml_interfacet void get_xml_options(const class xmlt &xml, cmdlinet &cmdline); }; -#endif +#endif // CPROVER_CBMC_XML_INTERFACE_H diff --git a/src/cegis/cegis-util/cbmc_runner.h b/src/cegis/cegis-util/cbmc_runner.h index edefd241e49..6317ca444c2 100644 --- a/src/cegis/cegis-util/cbmc_runner.h +++ b/src/cegis/cegis-util/cbmc_runner.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_UTIL_CBMC_RUNNER_H_ -#define CEGIS_UTIL_CBMC_RUNNER_H_ +#ifndef CPROVER_CEGIS_CEGIS_UTIL_CBMC_RUNNER_H +#define CPROVER_CEGIS_CEGIS_UTIL_CBMC_RUNNER_H #include @@ -63,4 +63,4 @@ safety_checkert::resultt run_cbmc( cbmc_resultt &result, const class optionst &options); -#endif /* CEGIS_UTIL_CBMC_RUNNER_H_ */ +#endif // CPROVER_CEGIS_CEGIS_UTIL_CBMC_RUNNER_H diff --git a/src/cegis/cegis-util/constant_width.h b/src/cegis/cegis-util/constant_width.h index 1a724745746..0e53b29a20e 100644 --- a/src/cegis/cegis-util/constant_width.h +++ b/src/cegis/cegis-util/constant_width.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef UTIL_CONSTANT_WIDTH_H_ -#define UTIL_CONSTANT_WIDTH_H_ +#ifndef CPROVER_CEGIS_CEGIS_UTIL_CONSTANT_WIDTH_H +#define CPROVER_CEGIS_CEGIS_UTIL_CONSTANT_WIDTH_H #include @@ -24,4 +24,4 @@ Author: Daniel Kroening, kroening@kroening.com */ size_t get_min_word_width(const class exprt &expr); -#endif /* UTIL_CONSTANT_WIDTH_H_ */ +#endif // CPROVER_CEGIS_CEGIS_UTIL_CONSTANT_WIDTH_H diff --git a/src/cegis/cegis-util/counterexample_vars.h b/src/cegis/cegis-util/counterexample_vars.h index 3efb30d6766..b0e68f4f91c 100644 --- a/src/cegis/cegis-util/counterexample_vars.h +++ b/src/cegis/cegis-util/counterexample_vars.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_COUNTEREXAMPLE_VARS_H_ -#define CEGIS_COUNTEREXAMPLE_VARS_H_ +#ifndef CPROVER_CEGIS_CEGIS_UTIL_COUNTEREXAMPLE_VARS_H +#define CPROVER_CEGIS_CEGIS_UTIL_COUNTEREXAMPLE_VARS_H #include #include @@ -147,4 +147,4 @@ bool has_counterexample_marker(goto_programt::const_targett pos); */ const irep_idt &get_counterexample_marker(goto_programt::const_targett pos); -#endif /* CEGIS_COUNTEREXAMPLE_VARS_H_ */ +#endif // CPROVER_CEGIS_CEGIS_UTIL_COUNTEREXAMPLE_VARS_H diff --git a/src/cegis/cegis-util/inline_user_program.h b/src/cegis/cegis-util/inline_user_program.h index d4edd446c59..41a4b332e0a 100644 --- a/src/cegis/cegis-util/inline_user_program.h +++ b/src/cegis/cegis-util/inline_user_program.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_INLINE_USER_PROGRAM_H_ -#define CEGIS_INLINE_USER_PROGRAM_H_ +#ifndef CPROVER_CEGIS_CEGIS_UTIL_INLINE_USER_PROGRAM_H +#define CPROVER_CEGIS_CEGIS_UTIL_INLINE_USER_PROGRAM_H /** * @brief @@ -22,4 +22,4 @@ void inline_user_program( const class symbol_tablet &st, class goto_functionst &gf); -#endif /* CEGIS_INLINE_USER_PROGRAM_H_ */ +#endif // CPROVER_CEGIS_CEGIS_UTIL_INLINE_USER_PROGRAM_H diff --git a/src/cegis/cegis-util/instruction_iterator.h b/src/cegis/cegis-util/instruction_iterator.h index 7e81ffdddee..94044e3cfc3 100644 --- a/src/cegis/cegis-util/instruction_iterator.h +++ b/src/cegis/cegis-util/instruction_iterator.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_CEGIS_UTIL_INSTRUCTION_ITERATOR_H_ -#define CEGIS_CEGIS_UTIL_INSTRUCTION_ITERATOR_H_ +#ifndef CPROVER_CEGIS_CEGIS_UTIL_INSTRUCTION_ITERATOR_H +#define CPROVER_CEGIS_CEGIS_UTIL_INSTRUCTION_ITERATOR_H #include @@ -113,4 +113,4 @@ class instr_iteratort: public std::iterator @@ -28,4 +28,4 @@ typedef std::map labelled_assignmentst; */ typedef std::deque labelled_counterexamplest; -#endif /* CEGIS_UTIL_LABELLED_ASSIGNMENTS_H_ */ +#endif // CPROVER_CEGIS_CEGIS_UTIL_LABELLED_ASSIGNMENTS_H diff --git a/src/cegis/cegis-util/module_helper.h b/src/cegis/cegis-util/module_helper.h index c0d03112d79..ad5283f099b 100644 --- a/src/cegis/cegis-util/module_helper.h +++ b/src/cegis/cegis-util/module_helper.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_CEGIS_UTIL_MODULE_HELPER_H_ -#define CEGIS_CEGIS_UTIL_MODULE_HELPER_H_ +#ifndef CPROVER_CEGIS_CEGIS_UTIL_MODULE_HELPER_H +#define CPROVER_CEGIS_CEGIS_UTIL_MODULE_HELPER_H #include @@ -21,4 +21,4 @@ Author: Daniel Kroening, kroening@kroening.com */ std::string get_current_executable_file_path(); -#endif /* CEGIS_CEGIS_UTIL_MODULE_HELPER_H_ */ +#endif // CPROVER_CEGIS_CEGIS_UTIL_MODULE_HELPER_H diff --git a/src/cegis/cegis-util/program_helper.h b/src/cegis/cegis-util/program_helper.h index 9c8e0f28e4d..f6e1249cf7d 100644 --- a/src/cegis/cegis-util/program_helper.h +++ b/src/cegis/cegis-util/program_helper.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_PROGRAM_HELPER_H_ -#define CEGIS_PROGRAM_HELPER_H_ +#ifndef CPROVER_CEGIS_CEGIS_UTIL_PROGRAM_HELPER_H +#define CPROVER_CEGIS_CEGIS_UTIL_PROGRAM_HELPER_H #include @@ -402,4 +402,4 @@ void assign_in_cprover_init( symbolt &symbol, const exprt &value); -#endif /* CEGIS_PROGRAM_HELPER_H_ */ +#endif // CPROVER_CEGIS_CEGIS_UTIL_PROGRAM_HELPER_H diff --git a/src/cegis/cegis-util/string_helper.h b/src/cegis/cegis-util/string_helper.h index ff612736614..26c987d08c8 100644 --- a/src/cegis/cegis-util/string_helper.h +++ b/src/cegis/cegis-util/string_helper.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_STRING_HELPER_H_ -#define CEGIS_STRING_HELPER_H_ +#ifndef CPROVER_CEGIS_CEGIS_UTIL_STRING_HELPER_H +#define CPROVER_CEGIS_CEGIS_UTIL_STRING_HELPER_H #include @@ -58,4 +58,4 @@ bool ends_with(const std::string &haystack, const std::string &suffix); */ void remove_suffix(std::string &haystack, const std::string &suffix); -#endif /* CEGIS_STRING_HELPER_H_ */ +#endif // CPROVER_CEGIS_CEGIS_UTIL_STRING_HELPER_H diff --git a/src/cegis/cegis-util/task_pool.h b/src/cegis/cegis-util/task_pool.h index 5efd638beb7..62b8266023f 100644 --- a/src/cegis/cegis-util/task_pool.h +++ b/src/cegis/cegis-util/task_pool.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef UTIL_TASK_POOL_H_ -#define UTIL_TASK_POOL_H_ +#ifndef CPROVER_CEGIS_CEGIS_UTIL_TASK_POOL_H +#define CPROVER_CEGIS_CEGIS_UTIL_TASK_POOL_H #ifndef _WIN32 #include @@ -108,4 +108,4 @@ class task_poolt void join_some(); }; -#endif /* UTIL_TASK_POOL_H_ */ +#endif // CPROVER_CEGIS_CEGIS_UTIL_TASK_POOL_H diff --git a/src/cegis/cegis-util/temporary_output_block.h b/src/cegis/cegis-util/temporary_output_block.h index 49698526e8d..20c7aa0a807 100644 --- a/src/cegis/cegis-util/temporary_output_block.h +++ b/src/cegis/cegis-util/temporary_output_block.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_UTIL_TEMPORARY_OUTPUT_BLOCK_H_ -#define CEGIS_UTIL_TEMPORARY_OUTPUT_BLOCK_H_ +#ifndef CPROVER_CEGIS_CEGIS_UTIL_TEMPORARY_OUTPUT_BLOCK_H +#define CPROVER_CEGIS_CEGIS_UTIL_TEMPORARY_OUTPUT_BLOCK_H /** * @brief @@ -40,4 +40,4 @@ class temporary_output_blockt void release() const; }; -#endif /* CEGIS_UTIL_TEMPORARY_OUTPUT_BLOCK_H_ */ +#endif // CPROVER_CEGIS_CEGIS_UTIL_TEMPORARY_OUTPUT_BLOCK_H diff --git a/src/cegis/cegis-util/type_helper.h b/src/cegis/cegis-util/type_helper.h index e2b8b702db8..db86f15d57a 100644 --- a/src/cegis/cegis-util/type_helper.h +++ b/src/cegis/cegis-util/type_helper.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_UTIL_TYPE_HELPER_H_ -#define CEGIS_UTIL_TYPE_HELPER_H_ +#ifndef CPROVER_CEGIS_CEGIS_UTIL_TYPE_HELPER_H +#define CPROVER_CEGIS_CEGIS_UTIL_TYPE_HELPER_H #include @@ -74,4 +74,4 @@ class instanceof_anyt bool operator()(const typet &type) const; }; -#endif /* CEGIS_UTIL_TYPE_HELPER_H_ */ +#endif // CPROVER_CEGIS_CEGIS_UTIL_TYPE_HELPER_H diff --git a/src/cegis/constant/add_constant.h b/src/cegis/constant/add_constant.h index df0e607404a..437a722ca53 100644 --- a/src/cegis/constant/add_constant.h +++ b/src/cegis/constant/add_constant.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_ADD_CONSTANT_H_ -#define CEGIS_ADD_CONSTANT_H_ +#ifndef CPROVER_CEGIS_CONSTANT_ADD_CONSTANT_H +#define CPROVER_CEGIS_CONSTANT_ADD_CONSTANT_H #include @@ -45,4 +45,4 @@ void add_cegis_constant( const exprt &value, goto_programt::targett pos); -#endif /* CEGIS_ADD_CONSTANT_H_ */ +#endif // CPROVER_CEGIS_CONSTANT_ADD_CONSTANT_H diff --git a/src/cegis/constant/default_cegis_constant_strategy.h b/src/cegis/constant/default_cegis_constant_strategy.h index ad03a5c0fc9..ad952aaca76 100644 --- a/src/cegis/constant/default_cegis_constant_strategy.h +++ b/src/cegis/constant/default_cegis_constant_strategy.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_DEFAULT_CONSTANT_STRATEGY_H_ -#define CEGIS_DEFAULT_CONSTANT_STRATEGY_H_ +#ifndef CPROVER_CEGIS_CONSTANT_DEFAULT_CEGIS_CONSTANT_STRATEGY_H +#define CPROVER_CEGIS_CONSTANT_DEFAULT_CEGIS_CONSTANT_STRATEGY_H #include @@ -24,4 +24,4 @@ size_t default_cegis_constant_strategy( class symbol_tablet &st, class goto_functionst &gf); -#endif /* CEGIS_DEFAULT_CONSTANT_STRATEGY_H_ */ +#endif // CPROVER_CEGIS_CONSTANT_DEFAULT_CEGIS_CONSTANT_STRATEGY_H diff --git a/src/cegis/constant/literals_collector.h b/src/cegis/constant/literals_collector.h index eae8c0105e1..d25212f905e 100644 --- a/src/cegis/constant/literals_collector.h +++ b/src/cegis/constant/literals_collector.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_LITERALS_COLLECTOR_H_ -#define CEGIS_LITERALS_COLLECTOR_H_ +#ifndef CPROVER_CEGIS_CONSTANT_LITERALS_COLLECTOR_H +#define CPROVER_CEGIS_CONSTANT_LITERALS_COLLECTOR_H #include @@ -26,4 +26,4 @@ std::vector collect_integer_literals( const class symbol_tablet &st, const class goto_functionst &gf); -#endif /* CEGIS_LITERALS_COLLECTOR_H_ */ +#endif // CPROVER_CEGIS_CONSTANT_LITERALS_COLLECTOR_H diff --git a/src/cegis/control/facade/control_runner.h b/src/cegis/control/facade/control_runner.h index c67dc9daf8f..eb013720d56 100644 --- a/src/cegis/control/facade/control_runner.h +++ b/src/cegis/control/facade/control_runner.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_CONTROL_RUNNER_H_ -#define CEGIS_CONTROL_RUNNER_H_ +#ifndef CPROVER_CEGIS_CONTROL_FACADE_CONTROL_RUNNER_H +#define CPROVER_CEGIS_CONTROL_FACADE_CONTROL_RUNNER_H #include @@ -27,4 +27,4 @@ int run_control(class optionst &options, messaget::mstreamt &result, const class symbol_tablet &st, const class goto_functionst &gf); -#endif /* CEGIS_CONTROL_RUNNER_H_ */ +#endif // CPROVER_CEGIS_CONTROL_FACADE_CONTROL_RUNNER_H diff --git a/src/cegis/control/learn/control_symex_learn.h b/src/cegis/control/learn/control_symex_learn.h index 14c9a693324..c11396c4696 100644 --- a/src/cegis/control/learn/control_symex_learn.h +++ b/src/cegis/control/learn/control_symex_learn.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_CONTROL_SYMEX_LEARN_H_ -#define CEGIS_CONTROL_SYMEX_LEARN_H_ +#ifndef CPROVER_CEGIS_CONTROL_LEARN_CONTROL_SYMEX_LEARN_H +#define CPROVER_CEGIS_CONTROL_LEARN_CONTROL_SYMEX_LEARN_H #include @@ -104,4 +104,4 @@ class control_symex_learnt const candidatet &candidate) const; }; -#endif /* CEGIS_CONTROL_SYMEX_LEARN_H_ */ +#endif // CPROVER_CEGIS_CONTROL_LEARN_CONTROL_SYMEX_LEARN_H diff --git a/src/cegis/control/learn/nondet_solution.h b/src/cegis/control/learn/nondet_solution.h index 65e4ce989cd..e569373192e 100644 --- a/src/cegis/control/learn/nondet_solution.h +++ b/src/cegis/control/learn/nondet_solution.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_CONTROL_LEARN_NONDET_SOLUTION_H_ -#define CEGIS_CONTROL_LEARN_NONDET_SOLUTION_H_ +#ifndef CPROVER_CEGIS_CONTROL_LEARN_NONDET_SOLUTION_H +#define CPROVER_CEGIS_CONTROL_LEARN_NONDET_SOLUTION_H /** * @brief @@ -22,4 +22,4 @@ void nondet_control_solution( const class symbol_tablet &st, class goto_functionst &gf); -#endif /* CEGIS_CONTROL_LEARN_NONDET_SOLUTION_H_ */ +#endif // CPROVER_CEGIS_CONTROL_LEARN_NONDET_SOLUTION_H diff --git a/src/cegis/control/options/control_program.h b/src/cegis/control/options/control_program.h index 5a59db3ef49..ad8f99196b5 100644 --- a/src/cegis/control/options/control_program.h +++ b/src/cegis/control/options/control_program.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_CONTROL_PROGRAM_H_ -#define CEGIS_CONTROL_PROGRAM_H_ +#ifndef CPROVER_CEGIS_CONTROL_OPTIONS_CONTROL_PROGRAM_H +#define CPROVER_CEGIS_CONTROL_OPTIONS_CONTROL_PROGRAM_H #include @@ -66,4 +66,4 @@ class control_programt control_programt &operator=(const control_programt &other); }; -#endif /* CEGIS_CONTROL_PROGRAM_H_ */ +#endif // CPROVER_CEGIS_CONTROL_OPTIONS_CONTROL_PROGRAM_H diff --git a/src/cegis/control/preprocessing/control_preprocessing.h b/src/cegis/control/preprocessing/control_preprocessing.h index 8dbf46de88d..ff8601f19bb 100644 --- a/src/cegis/control/preprocessing/control_preprocessing.h +++ b/src/cegis/control/preprocessing/control_preprocessing.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_CONTROL_PREPROCESSING_H_ -#define CEGIS_CONTROL_PREPROCESSING_H_ +#ifndef CPROVER_CEGIS_CONTROL_PREPROCESSING_CONTROL_PREPROCESSING_H +#define CPROVER_CEGIS_CONTROL_PREPROCESSING_CONTROL_PREPROCESSING_H #include @@ -68,4 +68,4 @@ class control_preprocessingt const control_programt &get_program() const; }; -#endif /* CEGIS_CONTROL_PREPROCESSING_H_ */ +#endif // CPROVER_CEGIS_CONTROL_PREPROCESSING_CONTROL_PREPROCESSING_H diff --git a/src/cegis/control/preprocessing/propagate_controller_sizes.h b/src/cegis/control/preprocessing/propagate_controller_sizes.h index 7428f039d1e..9d2672415ce 100644 --- a/src/cegis/control/preprocessing/propagate_controller_sizes.h +++ b/src/cegis/control/preprocessing/propagate_controller_sizes.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_PROPAGATE_CONTROLLER_SIZES_H_ -#define CEGIS_PROPAGATE_CONTROLLER_SIZES_H_ +#ifndef CPROVER_CEGIS_CONTROL_PREPROCESSING_PROPAGATE_CONTROLLER_SIZES_H +#define CPROVER_CEGIS_CONTROL_PREPROCESSING_PROPAGATE_CONTROLLER_SIZES_H #include @@ -86,4 +86,4 @@ void remove_solution_assignment(goto_programt &body); */ goto_programt::targett get_solution_assignment(goto_programt &body); -#endif /* CEGIS_PROPAGATE_CONTROLLER_SIZES_H_ */ +#endif // CPROVER_CEGIS_CONTROL_PREPROCESSING_PROPAGATE_CONTROLLER_SIZES_H diff --git a/src/cegis/control/simplify/remove_unused_elements.h b/src/cegis/control/simplify/remove_unused_elements.h index 4cd710866dc..a02782b56da 100644 --- a/src/cegis/control/simplify/remove_unused_elements.h +++ b/src/cegis/control/simplify/remove_unused_elements.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_CONTROL_REMOVE_UNUSED_ELEMENTS_H_ -#define CEGIS_CONTROL_REMOVE_UNUSED_ELEMENTS_H_ +#ifndef CPROVER_CEGIS_CONTROL_SIMPLIFY_REMOVE_UNUSED_ELEMENTS_H +#define CPROVER_CEGIS_CONTROL_SIMPLIFY_REMOVE_UNUSED_ELEMENTS_H /** * @brief @@ -22,4 +22,4 @@ void remove_unused_elements( symbol_tablet &st, goto_functionst &gf); -#endif /* CEGIS_CONTROL_REMOVE_UNUSED_ELEMENTS_H_ */ +#endif // CPROVER_CEGIS_CONTROL_SIMPLIFY_REMOVE_UNUSED_ELEMENTS_H diff --git a/src/cegis/control/value/control_counterexample.h b/src/cegis/control/value/control_counterexample.h index a688d210769..9b06c0ada6e 100644 --- a/src/cegis/control/value/control_counterexample.h +++ b/src/cegis/control/value/control_counterexample.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_CONTROL_COUNTEREXAMPLE_H_ -#define CEGIS_CONTROL_COUNTEREXAMPLE_H_ +#ifndef CPROVER_CEGIS_CONTROL_VALUE_CONTROL_COUNTEREXAMPLE_H +#define CPROVER_CEGIS_CONTROL_VALUE_CONTROL_COUNTEREXAMPLE_H #include #include @@ -24,4 +24,4 @@ typedef std::map control_counterexamplet; typedef std::deque control_counterexamplest; -#endif /* CEGIS_CONTROL_COUNTEREXAMPLE_H_ */ +#endif // CPROVER_CEGIS_CONTROL_VALUE_CONTROL_COUNTEREXAMPLE_H diff --git a/src/cegis/control/value/control_solution.h b/src/cegis/control/value/control_solution.h index f5556f2a159..c9791d066b1 100644 --- a/src/cegis/control/value/control_solution.h +++ b/src/cegis/control/value/control_solution.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_CONTROL_SOLUTION_H_ -#define CEGIS_CONTROL_SOLUTION_H_ +#ifndef CPROVER_CEGIS_CONTROL_VALUE_CONTROL_SOLUTION_H +#define CPROVER_CEGIS_CONTROL_VALUE_CONTROL_SOLUTION_H #include @@ -35,4 +35,4 @@ class control_solutiont array_exprt b; }; -#endif /* CEGIS_CONTROL_SOLUTION_H_ */ +#endif // CPROVER_CEGIS_CONTROL_VALUE_CONTROL_SOLUTION_H diff --git a/src/cegis/control/value/control_types.h b/src/cegis/control/value/control_types.h index a07ac53e519..be0a847baa2 100644 --- a/src/cegis/control/value/control_types.h +++ b/src/cegis/control/value/control_types.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_CONTROL_TYPES_H_ -#define CEGIS_CONTROL_TYPES_H_ +#ifndef CPROVER_CEGIS_CONTROL_VALUE_CONTROL_TYPES_H +#define CPROVER_CEGIS_CONTROL_VALUE_CONTROL_TYPES_H /** * @brief @@ -54,4 +54,4 @@ const typet &control_array_size_type(const symbol_tablet &st); */ const typet &control_runtime_array_size_type(const symbol_tablet &st); -#endif /* CEGIS_CONTROL_TYPES_H_ */ +#endif // CPROVER_CEGIS_CONTROL_VALUE_CONTROL_TYPES_H diff --git a/src/cegis/control/value/control_vars.h b/src/cegis/control/value/control_vars.h index fcdcc7f12a5..d061fd24548 100644 --- a/src/cegis/control/value/control_vars.h +++ b/src/cegis/control/value/control_vars.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_CONTROL_VARS_H_ -#define CEGIS_CONTROL_VARS_H_ +#ifndef CPROVER_CEGIS_CONTROL_VALUE_CONTROL_VARS_H +#define CPROVER_CEGIS_CONTROL_VALUE_CONTROL_VARS_H #define CEGIS_CONTROL_SOLUTION_VAR_NAME "controller" #define __CEGIS_ALTERNATIVE_MEMBER_NAMES @@ -24,4 +24,4 @@ #define CEGIS_CONTROL_B_SIZE_MEMBER_NAME "num_size" #endif -#endif /* CEGIS_CONTROL_VARS_H_ */ +#endif // CPROVER_CEGIS_CONTROL_VALUE_CONTROL_VARS_H diff --git a/src/cegis/control/value/float_helper.h b/src/cegis/control/value/float_helper.h index ed8c3ee9414..6a538317a5a 100644 --- a/src/cegis/control/value/float_helper.h +++ b/src/cegis/control/value/float_helper.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_CONTROL_FLOAT_HELPER_H_ -#define CEGIS_CONTROL_FLOAT_HELPER_H_ +#ifndef CPROVER_CEGIS_CONTROL_VALUE_FLOAT_HELPER_H +#define CPROVER_CEGIS_CONTROL_VALUE_FLOAT_HELPER_H #include @@ -35,4 +35,4 @@ double to_control_float(const constant_exprt &expr); */ exprt to_control_float_expr(const class symbol_tablet &st, double value); -#endif /* CEGIS_CONTROL_FLOAT_HELPER_H_ */ +#endif // CPROVER_CEGIS_CONTROL_VALUE_FLOAT_HELPER_H diff --git a/src/cegis/control/verify/control_symex_verify.h b/src/cegis/control/verify/control_symex_verify.h index 2a7947afc3c..c7db8512ec2 100644 --- a/src/cegis/control/verify/control_symex_verify.h +++ b/src/cegis/control/verify/control_symex_verify.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_CONTROL_SYMEX_VERIFY_H_ -#define CEGIS_CONTROL_SYMEX_VERIFY_H_ +#ifndef CPROVER_CEGIS_CONTROL_VERIFY_CONTROL_SYMEX_VERIFY_H +#define CPROVER_CEGIS_CONTROL_VERIFY_CONTROL_SYMEX_VERIFY_H #include @@ -91,4 +91,4 @@ class control_symex_verifyt const counterexamplet &counterexample) const; }; -#endif /* CEGIS_CONTROL_SYMEX_VERIFY_H_ */ +#endif // CPROVER_CEGIS_CONTROL_VERIFY_CONTROL_SYMEX_VERIFY_H diff --git a/src/cegis/control/verify/insert_solution.h b/src/cegis/control/verify/insert_solution.h index e26be443716..83ea3bb0e75 100644 --- a/src/cegis/control/verify/insert_solution.h +++ b/src/cegis/control/verify/insert_solution.h @@ -8,8 +8,8 @@ \*******************************************************************/ -#ifndef CEGIS_CONTROL_INSERT_SOLUTION_H_ -#define CEGIS_CONTROL_INSERT_SOLUTION_H_ +#ifndef CPROVER_CEGIS_CONTROL_VERIFY_INSERT_SOLUTION_H +#define CPROVER_CEGIS_CONTROL_VERIFY_INSERT_SOLUTION_H /** * @brief @@ -23,4 +23,4 @@ void insert_solution( class control_programt &program, const class control_solutiont &solution); -#endif /* CEGIS_CONTROL_INSERT_SOLUTION_H_ */ +#endif // CPROVER_CEGIS_CONTROL_VERIFY_INSERT_SOLUTION_H diff --git a/src/cegis/danger/constraint/danger_constraint_factory.h b/src/cegis/danger/constraint/danger_constraint_factory.h index 5fa3ccd6a6d..860ed10f77c 100644 --- a/src/cegis/danger/constraint/danger_constraint_factory.h +++ b/src/cegis/danger/constraint/danger_constraint_factory.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_DANGER_CONSTRAINT_FACTORY_H_ -#define CEGIS_DANGER_CONSTRAINT_FACTORY_H_ +#ifndef CPROVER_CEGIS_DANGER_CONSTRAINT_DANGER_CONSTRAINT_FACTORY_H +#define CPROVER_CEGIS_DANGER_CONSTRAINT_DANGER_CONSTRAINT_FACTORY_H #include @@ -50,4 +50,4 @@ class danger_constraint { */ notequal_exprt danger_component_as_bool(const std::string &base_name); -#endif /* CEGIS_DANGER_CONSTRAINT_FACTORY_H_ */ +#endif // CPROVER_CEGIS_DANGER_CONSTRAINT_DANGER_CONSTRAINT_FACTORY_H diff --git a/src/cegis/danger/facade/danger_runner.h b/src/cegis/danger/facade/danger_runner.h index cf70ca08b63..1b6512eb264 100644 --- a/src/cegis/danger/facade/danger_runner.h +++ b/src/cegis/danger/facade/danger_runner.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_DANGER_RUNNER_H_ -#define CEGIS_DANGER_RUNNER_H_ +#ifndef CPROVER_CEGIS_DANGER_FACADE_DANGER_RUNNER_H +#define CPROVER_CEGIS_DANGER_FACADE_DANGER_RUNNER_H #include @@ -28,4 +28,4 @@ Author: Daniel Kroening, kroening@kroening.com int run_danger(class optionst &options, messaget::mstreamt &result, const class symbol_tablet &st, const class goto_functionst &gf); -#endif /* CEGIS_DANGER_RUNNER_H_ */ +#endif // CPROVER_CEGIS_DANGER_FACADE_DANGER_RUNNER_H diff --git a/src/cegis/danger/genetic/dynamic_danger_test_runner.h b/src/cegis/danger/genetic/dynamic_danger_test_runner.h index daffacd0e29..5279099d0fb 100644 --- a/src/cegis/danger/genetic/dynamic_danger_test_runner.h +++ b/src/cegis/danger/genetic/dynamic_danger_test_runner.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_GENETIC_DYNAMIC_DANGER_TEST_RUNNER_H_ -#define CEGIS_GENETIC_DYNAMIC_DANGER_TEST_RUNNER_H_ +#ifndef CPROVER_CEGIS_DANGER_GENETIC_DYNAMIC_DANGER_TEST_RUNNER_H +#define CPROVER_CEGIS_DANGER_GENETIC_DYNAMIC_DANGER_TEST_RUNNER_H #include @@ -76,4 +76,4 @@ class dynamic_danger_test_runnert void join(); }; -#endif /* CEGIS_GENETIC_DYNAMIC_DANGER_TEST_RUNNER_H_ */ +#endif // CPROVER_CEGIS_DANGER_GENETIC_DYNAMIC_DANGER_TEST_RUNNER_H diff --git a/src/cegis/danger/meta/literals.h b/src/cegis/danger/meta/literals.h index 29036b09eb7..b73a37ca971 100644 --- a/src/cegis/danger/meta/literals.h +++ b/src/cegis/danger/meta/literals.h @@ -7,11 +7,11 @@ \*******************************************************************/ -#ifndef CEGIS_DANGER_LITERALS_H_ -#define CEGIS_DANGER_LITERALS_H_ +#ifndef CPROVER_CEGIS_DANGER_META_LITERALS_H +#define CPROVER_CEGIS_DANGER_META_LITERALS_H #define DANGER_PREFIX "__CPROVER_danger_" #define DANGER_EXECUTE DANGER_PREFIX "execute" #define DANGER_X0_PLACEHOLDER_PREFIX DANGER_PREFIX "x0_" -#endif /* CEGIS_DANGER_LITERALS_H_ */ +#endif // CPROVER_CEGIS_DANGER_META_LITERALS_H diff --git a/src/cegis/danger/meta/meta_variable_names.h b/src/cegis/danger/meta/meta_variable_names.h index d1cbf1b1dee..eb13216f5f6 100644 --- a/src/cegis/danger/meta/meta_variable_names.h +++ b/src/cegis/danger/meta/meta_variable_names.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_DANGER_META_VARIABLE_NAMES_H_ -#define CEGIS_DANGER_META_VARIABLE_NAMES_H_ +#ifndef CPROVER_CEGIS_DANGER_META_META_VARIABLE_NAMES_H +#define CPROVER_CEGIS_DANGER_META_META_VARIABLE_NAMES_H #include @@ -79,4 +79,4 @@ std::string get_Rx_prime(const size_t loop_id, const size_t result_id); */ std::string get_Sx(const size_t loop_id, const size_t result_id); -#endif /* CEGIS_DANGER_META_VARIABLE_NAMES_H_ */ +#endif // CPROVER_CEGIS_DANGER_META_META_VARIABLE_NAMES_H diff --git a/src/cegis/danger/options/danger_program.h b/src/cegis/danger/options/danger_program.h index 48e802bd1b4..a7024d89a34 100644 --- a/src/cegis/danger/options/danger_program.h +++ b/src/cegis/danger/options/danger_program.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_DANGER_PROGRAM_H_ -#define CEGIS_DANGER_PROGRAM_H_ +#ifndef CPROVER_CEGIS_DANGER_OPTIONS_DANGER_PROGRAM_H +#define CPROVER_CEGIS_DANGER_OPTIONS_DANGER_PROGRAM_H #include @@ -110,4 +110,4 @@ class danger_programt: public invariant_programt virtual invariant_loopt &add_loop(); }; -#endif /* CEGIS_DANGER_PROGRAM_H_ */ +#endif // CPROVER_CEGIS_DANGER_OPTIONS_DANGER_PROGRAM_H diff --git a/src/cegis/danger/options/danger_program_genetic_settings.h b/src/cegis/danger/options/danger_program_genetic_settings.h index 25097421b78..8fddcd52974 100644 --- a/src/cegis/danger/options/danger_program_genetic_settings.h +++ b/src/cegis/danger/options/danger_program_genetic_settings.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_DANGER_PROGRAM_GENETIC_SETTINGS_H_ -#define CEGIS_DANGER_PROGRAM_GENETIC_SETTINGS_H_ +#ifndef CPROVER_CEGIS_DANGER_OPTIONS_DANGER_PROGRAM_GENETIC_SETTINGS_H +#define CPROVER_CEGIS_DANGER_OPTIONS_DANGER_PROGRAM_GENETIC_SETTINGS_H #include @@ -81,4 +81,4 @@ class danger_program_genetic_settingst: public genetic_settingst #include "danger_program_genetic_settings.inc" -#endif /* CEGIS_DANGER_PROGRAM_GENETIC_SETTINGS_H_ */ +#endif // CPROVER_CEGIS_DANGER_OPTIONS_DANGER_PROGRAM_GENETIC_SETTINGS_H diff --git a/src/cegis/danger/options/danger_program_printer.h b/src/cegis/danger/options/danger_program_printer.h index 57a93066b3f..ae16b92fe08 100644 --- a/src/cegis/danger/options/danger_program_printer.h +++ b/src/cegis/danger/options/danger_program_printer.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_DANGER_PROGRAM_PRINTER_H_ -#define CEGIS_DANGER_PROGRAM_PRINTER_H_ +#ifndef CPROVER_CEGIS_DANGER_OPTIONS_DANGER_PROGRAM_PRINTER_H +#define CPROVER_CEGIS_DANGER_OPTIONS_DANGER_PROGRAM_PRINTER_H #include @@ -25,4 +25,4 @@ void print_danger_program(messaget::mstreamt &os, const class danger_programt &program, const class danger_goto_solutiont &solution); -#endif /* CEGIS_DANGER_PROGRAM_PRINTER_H_ */ +#endif // CPROVER_CEGIS_DANGER_OPTIONS_DANGER_PROGRAM_PRINTER_H diff --git a/src/cegis/danger/preprocess/add_ranking_and_skolem_variables.h b/src/cegis/danger/preprocess/add_ranking_and_skolem_variables.h index 83a41c6cb32..6097b181d90 100644 --- a/src/cegis/danger/preprocess/add_ranking_and_skolem_variables.h +++ b/src/cegis/danger/preprocess/add_ranking_and_skolem_variables.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_DANGER_ADD_INVARIANT_AND_TEMP_VARIABLES_H_ -#define CEGIS_DANGER_ADD_INVARIANT_AND_TEMP_VARIABLES_H_ +#ifndef CPROVER_CEGIS_DANGER_PREPROCESS_ADD_RANKING_AND_SKOLEM_VARIABLES_H +#define CPROVER_CEGIS_DANGER_PREPROCESS_ADD_RANKING_AND_SKOLEM_VARIABLES_H /** * @brief @@ -21,4 +21,4 @@ void add_ranking_and_skolem_variables(class danger_programt &program, const size_t max_program_length); -#endif /* CEGIS_DANGER_ADD_INVARIANT_AND_TEMP_VARIABLES_H_ */ +#endif // CPROVER_CEGIS_DANGER_PREPROCESS_ADD_RANKING_AND_SKOLEM_VARIABLES_H diff --git a/src/cegis/danger/preprocess/danger_preprocessing.h b/src/cegis/danger/preprocess/danger_preprocessing.h index 5c0c66e226c..816a3546160 100644 --- a/src/cegis/danger/preprocess/danger_preprocessing.h +++ b/src/cegis/danger/preprocess/danger_preprocessing.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_DANGER_PREPROCESSING_H_ -#define CEGIS_DANGER_PREPROCESSING_H_ +#ifndef CPROVER_CEGIS_DANGER_PREPROCESS_DANGER_PREPROCESSING_H +#define CPROVER_CEGIS_DANGER_PREPROCESS_DANGER_PREPROCESSING_H #include #include @@ -78,4 +78,4 @@ class danger_preprocessingt const danger_programt &get_danger_program() const; }; -#endif /* CEGIS_DANGER_PREPROCESSING_H_ */ +#endif // CPROVER_CEGIS_DANGER_PREPROCESS_DANGER_PREPROCESSING_H diff --git a/src/cegis/danger/preprocess/store_nondet_choices.h b/src/cegis/danger/preprocess/store_nondet_choices.h index 9458fb18bac..1171096fbd3 100644 --- a/src/cegis/danger/preprocess/store_nondet_choices.h +++ b/src/cegis/danger/preprocess/store_nondet_choices.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_DANGER_STORE_NONDET_CHOICES_H_ -#define CEGIS_DANGER_STORE_NONDET_CHOICES_H_ +#ifndef CPROVER_CEGIS_DANGER_PREPROCESS_STORE_NONDET_CHOICES_H +#define CPROVER_CEGIS_DANGER_PREPROCESS_STORE_NONDET_CHOICES_H /** * @brief @@ -28,4 +28,4 @@ void store_skolem_choices(class invariant_programt &program); */ void store_x0_choices(invariant_programt &program); -#endif /* CEGIS_DANGER_STORE_NONDET_CHOICES_H_ */ +#endif // CPROVER_CEGIS_DANGER_PREPROCESS_STORE_NONDET_CHOICES_H diff --git a/src/cegis/danger/symex/fitness/danger_fitness_config.h b/src/cegis/danger/symex/fitness/danger_fitness_config.h index 8aac65b2702..ee474ba887f 100644 --- a/src/cegis/danger/symex/fitness/danger_fitness_config.h +++ b/src/cegis/danger/symex/fitness/danger_fitness_config.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_DANGER_FITNESS_CONFIG_H_ -#define CEGIS_DANGER_FITNESS_CONFIG_H_ +#ifndef CPROVER_CEGIS_DANGER_SYMEX_FITNESS_DANGER_FITNESS_CONFIG_H +#define CPROVER_CEGIS_DANGER_SYMEX_FITNESS_DANGER_FITNESS_CONFIG_H #include @@ -117,4 +117,4 @@ class danger_fitness_configt void show(messaget::mstreamt &os, const candidatet &candidate) const; }; -#endif /* CEGIS_DANGER_FITNESS_CONFIG_H_ */ +#endif // CPROVER_CEGIS_DANGER_SYMEX_FITNESS_DANGER_FITNESS_CONFIG_H diff --git a/src/cegis/danger/symex/learn/add_programs_to_learn.h b/src/cegis/danger/symex/learn/add_programs_to_learn.h index 8f8227e0efb..d61fb6954ee 100644 --- a/src/cegis/danger/symex/learn/add_programs_to_learn.h +++ b/src/cegis/danger/symex/learn/add_programs_to_learn.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_DANGER_SYMEX_PROGRAM_INSTRUMENTER_H_ -#define CEGIS_DANGER_SYMEX_PROGRAM_INSTRUMENTER_H_ +#ifndef CPROVER_CEGIS_DANGER_SYMEX_LEARN_ADD_PROGRAMS_TO_LEARN_H +#define CPROVER_CEGIS_DANGER_SYMEX_LEARN_ADD_PROGRAMS_TO_LEARN_H /** * @brief @@ -20,4 +20,4 @@ void danger_add_programs_to_learn(class danger_programt &prog, const size_t max_solution_size); -#endif /* CEGIS_DANGER_SYMEX_PROGRAM_INSTRUMENTER_H_ */ +#endif // CPROVER_CEGIS_DANGER_SYMEX_LEARN_ADD_PROGRAMS_TO_LEARN_H diff --git a/src/cegis/danger/symex/learn/add_variable_refs.h b/src/cegis/danger/symex/learn/add_variable_refs.h index 73147447264..f980563a741 100644 --- a/src/cegis/danger/symex/learn/add_variable_refs.h +++ b/src/cegis/danger/symex/learn/add_variable_refs.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_DANGER_INSTRUMENT_VARIABLE_REFS_H_ -#define CEGIS_DANGER_INSTRUMENT_VARIABLE_REFS_H_ +#ifndef CPROVER_CEGIS_DANGER_SYMEX_LEARN_ADD_VARIABLE_REFS_H +#define CPROVER_CEGIS_DANGER_SYMEX_LEARN_ADD_VARIABLE_REFS_H #include @@ -24,4 +24,4 @@ void link_meta_variables(danger_programt &prog, const size_t user_vars, const size_t max_solution_size); -#endif /* CEGIS_DANGER_INSTRUMENT_VARIABLE_REFS_H_ */ +#endif // CPROVER_CEGIS_DANGER_SYMEX_LEARN_ADD_VARIABLE_REFS_H diff --git a/src/cegis/danger/symex/learn/add_x0_placeholders.h b/src/cegis/danger/symex/learn/add_x0_placeholders.h index 96b9edc2bbe..830746adbb2 100644 --- a/src/cegis/danger/symex/learn/add_x0_placeholders.h +++ b/src/cegis/danger/symex/learn/add_x0_placeholders.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_DANGER_ADD_X0_PLACEHOLDERS_H_ -#define CEGIS_DANGER_ADD_X0_PLACEHOLDERS_H_ +#ifndef CPROVER_CEGIS_DANGER_SYMEX_LEARN_ADD_X0_PLACEHOLDERS_H +#define CPROVER_CEGIS_DANGER_SYMEX_LEARN_ADD_X0_PLACEHOLDERS_H /** * @brief @@ -19,4 +19,4 @@ Author: Daniel Kroening, kroening@kroening.com */ void danger_add_x0_placeholders(class danger_programt &prog); -#endif /* CEGIS_DANGER_ADD_X0_PLACEHOLDERS_H_ */ +#endif // CPROVER_CEGIS_DANGER_SYMEX_LEARN_ADD_X0_PLACEHOLDERS_H diff --git a/src/cegis/danger/symex/learn/danger_learn_config.h b/src/cegis/danger/symex/learn/danger_learn_config.h index 9b819911e09..910402065aa 100644 --- a/src/cegis/danger/symex/learn/danger_learn_config.h +++ b/src/cegis/danger/symex/learn/danger_learn_config.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_DANGER_LEARN_CONFIG_H_ -#define CEGIS_DANGER_LEARN_CONFIG_H_ +#ifndef CPROVER_CEGIS_DANGER_SYMEX_LEARN_DANGER_LEARN_CONFIG_H +#define CPROVER_CEGIS_DANGER_SYMEX_LEARN_DANGER_LEARN_CONFIG_H #include @@ -176,4 +176,4 @@ class danger_learn_configt size_t get_num_consts() const; }; -#endif /* CEGIS_DANGER_LEARN_CONFIG_H_ */ +#endif // CPROVER_CEGIS_DANGER_SYMEX_LEARN_DANGER_LEARN_CONFIG_H diff --git a/src/cegis/danger/symex/learn/encoded_danger_learn_config.h b/src/cegis/danger/symex/learn/encoded_danger_learn_config.h index 7db8e1f462c..8e9a2a1826d 100644 --- a/src/cegis/danger/symex/learn/encoded_danger_learn_config.h +++ b/src/cegis/danger/symex/learn/encoded_danger_learn_config.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_ENCODED_DANGER_LEARN_CONFIG_H_ -#define CEGIS_ENCODED_DANGER_LEARN_CONFIG_H_ +#ifndef CPROVER_CEGIS_DANGER_SYMEX_LEARN_ENCODED_DANGER_LEARN_CONFIG_H +#define CPROVER_CEGIS_DANGER_SYMEX_LEARN_ENCODED_DANGER_LEARN_CONFIG_H #include @@ -122,4 +122,4 @@ class encoded_danger_learn_configt size_t get_num_consts() const; }; -#endif /* CEGIS_ENCODED_DANGER_LEARN_CONFIG_H_ */ +#endif // CPROVER_CEGIS_DANGER_SYMEX_LEARN_ENCODED_DANGER_LEARN_CONFIG_H diff --git a/src/cegis/danger/symex/learn/read_x0.h b/src/cegis/danger/symex/learn/read_x0.h index 50cee78a8f0..433b1175c4b 100644 --- a/src/cegis/danger/symex/learn/read_x0.h +++ b/src/cegis/danger/symex/learn/read_x0.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_DANGER_READ_X0_H_ -#define CEGIS_DANGER_READ_X0_H_ +#ifndef CPROVER_CEGIS_DANGER_SYMEX_LEARN_READ_X0_H +#define CPROVER_CEGIS_DANGER_SYMEX_LEARN_READ_X0_H /** * @brief @@ -34,4 +34,4 @@ void danger_read_x0(class danger_goto_solutiont &result, void danger_read_x0(class program_individualt &ind, const danger_programt &prog, const goto_tracet &trace); -#endif /* CEGIS_DANGER_READ_X0_H_ */ +#endif // CPROVER_CEGIS_DANGER_SYMEX_LEARN_READ_X0_H diff --git a/src/cegis/danger/symex/learn/solution_factory.h b/src/cegis/danger/symex/learn/solution_factory.h index 83eb4696792..f1cd177d2e6 100644 --- a/src/cegis/danger/symex/learn/solution_factory.h +++ b/src/cegis/danger/symex/learn/solution_factory.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_DANGER_SOLUTION_FACTORY_H_ -#define CEGIS_DANGER_SOLUTION_FACTORY_H_ +#ifndef CPROVER_CEGIS_DANGER_SYMEX_LEARN_SOLUTION_FACTORY_H +#define CPROVER_CEGIS_DANGER_SYMEX_LEARN_SOLUTION_FACTORY_H #include @@ -63,4 +63,4 @@ void create_danger_solution(danger_goto_solutiont &result, const danger_programt &prog, const program_individualt &ind, const operand_variable_idst &ids); -#endif /* CEGIS_DANGER_SOLUTION_FACTORY_H_ */ +#endif // CPROVER_CEGIS_DANGER_SYMEX_LEARN_SOLUTION_FACTORY_H diff --git a/src/cegis/danger/symex/verify/danger_verify_config.h b/src/cegis/danger/symex/verify/danger_verify_config.h index 4557c9e2617..763804d5f69 100644 --- a/src/cegis/danger/symex/verify/danger_verify_config.h +++ b/src/cegis/danger/symex/verify/danger_verify_config.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_DANGER_VERIFY_CONFIG_H_ -#define CEGIS_DANGER_VERIFY_CONFIG_H_ +#ifndef CPROVER_CEGIS_DANGER_SYMEX_VERIFY_DANGER_VERIFY_CONFIG_H +#define CPROVER_CEGIS_DANGER_SYMEX_VERIFY_DANGER_VERIFY_CONFIG_H #include @@ -147,4 +147,4 @@ class danger_verify_configt const counterexamplet &counterexample) const; }; -#endif /* CEGIS_DANGER_VERIFY_CONFIG_H_ */ +#endif // CPROVER_CEGIS_DANGER_SYMEX_VERIFY_DANGER_VERIFY_CONFIG_H diff --git a/src/cegis/danger/symex/verify/insert_candidate.h b/src/cegis/danger/symex/verify/insert_candidate.h index 82979084e0d..cd945f5a5d3 100644 --- a/src/cegis/danger/symex/verify/insert_candidate.h +++ b/src/cegis/danger/symex/verify/insert_candidate.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_DANGER_INSERT_CANDIDATE_H_ -#define CEGIS_DANGER_INSERT_CANDIDATE_H_ +#ifndef CPROVER_CEGIS_DANGER_SYMEX_VERIFY_INSERT_CANDIDATE_H +#define CPROVER_CEGIS_DANGER_SYMEX_VERIFY_INSERT_CANDIDATE_H /** * @brief Candidate solution type for this CEGIS component. @@ -29,4 +29,4 @@ typedef class danger_goto_solutiont candidatet; void danger_insert_candidate(class danger_programt &program, const candidatet &candidate); -#endif /* CEGIS_DANGER_INSERT_CANDIDATE_H_ */ +#endif // CPROVER_CEGIS_DANGER_SYMEX_VERIFY_INSERT_CANDIDATE_H diff --git a/src/cegis/danger/symex/verify/parallel_danger_verifier.h b/src/cegis/danger/symex/verify/parallel_danger_verifier.h index 904dc848c3c..9a7c3c5841a 100644 --- a/src/cegis/danger/symex/verify/parallel_danger_verifier.h +++ b/src/cegis/danger/symex/verify/parallel_danger_verifier.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_PARALLEL_DANGER_VERIFIER_H_ -#define CEGIS_PARALLEL_DANGER_VERIFIER_H_ +#ifndef CPROVER_CEGIS_DANGER_SYMEX_VERIFY_PARALLEL_DANGER_VERIFIER_H +#define CPROVER_CEGIS_DANGER_SYMEX_VERIFY_PARALLEL_DANGER_VERIFIER_H #include @@ -107,4 +107,4 @@ class parallel_danger_verifiert const counterexamplet &counterexample) const; }; -#endif /* CEGIS_PARALLEL_DANGER_VERIFIER_H_ */ +#endif // CPROVER_CEGIS_DANGER_SYMEX_VERIFY_PARALLEL_DANGER_VERIFIER_H diff --git a/src/cegis/danger/symex/verify/parallel_danger_verify_task.h b/src/cegis/danger/symex/verify/parallel_danger_verify_task.h index e96c86ab2b4..524acc9b97e 100644 --- a/src/cegis/danger/symex/verify/parallel_danger_verify_task.h +++ b/src/cegis/danger/symex/verify/parallel_danger_verify_task.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_PARALLEL_DANGER_VERIFY_TASK_H_ -#define CEGIS_PARALLEL_DANGER_VERIFY_TASK_H_ +#ifndef CPROVER_CEGIS_DANGER_SYMEX_VERIFY_PARALLEL_DANGER_VERIFY_TASK_H +#define CPROVER_CEGIS_DANGER_SYMEX_VERIFY_PARALLEL_DANGER_VERIFY_TASK_H #include #include @@ -164,4 +164,4 @@ class parallel_danger_verify_poolt bool join(); }; -#endif /* CEGIS_PARALLEL_DANGER_VERIFY_TASK_H_ */ +#endif // CPROVER_CEGIS_DANGER_SYMEX_VERIFY_PARALLEL_DANGER_VERIFY_TASK_H diff --git a/src/cegis/danger/symex/verify/restrict_counterexamples.h b/src/cegis/danger/symex/verify/restrict_counterexamples.h index b00dcdee921..d3667275017 100644 --- a/src/cegis/danger/symex/verify/restrict_counterexamples.h +++ b/src/cegis/danger/symex/verify/restrict_counterexamples.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_DANGER_RESTRICT_COUNTEREXAMPLES_H_ -#define CEGIS_DANGER_RESTRICT_COUNTEREXAMPLES_H_ +#ifndef CPROVER_CEGIS_DANGER_SYMEX_VERIFY_RESTRICT_COUNTEREXAMPLES_H +#define CPROVER_CEGIS_DANGER_SYMEX_VERIFY_RESTRICT_COUNTEREXAMPLES_H #include @@ -64,4 +64,4 @@ void force_guard_violation(goto_functionst &gf, const size_t num_loops); void force_ranking_error(goto_functionst &gf, const size_t num_loops); -#endif /* CEGIS_DANGER_RESTRICT_COUNTEREXAMPLES_H_ */ +#endif // CPROVER_CEGIS_DANGER_SYMEX_VERIFY_RESTRICT_COUNTEREXAMPLES_H diff --git a/src/cegis/danger/value/danger_goto_solution.h b/src/cegis/danger/value/danger_goto_solution.h index d3f746dd9a1..24401681ed4 100644 --- a/src/cegis/danger/value/danger_goto_solution.h +++ b/src/cegis/danger/value/danger_goto_solution.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_DANGER_GOTO_SOLUTION_H_ -#define CEGIS_DANGER_GOTO_SOLUTION_H_ +#ifndef CPROVER_CEGIS_DANGER_VALUE_DANGER_GOTO_SOLUTION_H +#define CPROVER_CEGIS_DANGER_VALUE_DANGER_GOTO_SOLUTION_H #include @@ -38,4 +38,4 @@ class danger_goto_solutiont nondet_choicest x0_choices; }; -#endif /* CEGIS_DANGER_GOTO_SOLUTION_H_ */ +#endif // CPROVER_CEGIS_DANGER_VALUE_DANGER_GOTO_SOLUTION_H diff --git a/src/cegis/facade/cegis.h b/src/cegis/facade/cegis.h index 10032cfa339..6f783f942f0 100644 --- a/src/cegis/facade/cegis.h +++ b/src/cegis/facade/cegis.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_CEGIS_H -#define CPROVER_CEGIS_H +#ifndef CPROVER_CEGIS_FACADE_CEGIS_H +#define CPROVER_CEGIS_FACADE_CEGIS_H #include @@ -50,4 +50,4 @@ int run_cegis(learnt &learn, oraclet &oracle, preproct &preproc, seedt &seed, si return 10; } -#endif /* CPROVER_CEGIS_H */ +#endif // CPROVER_CEGIS_FACADE_CEGIS_H diff --git a/src/cegis/facade/runner_helper.h b/src/cegis/facade/runner_helper.h index bfda5b8e4de..4a634e4b2eb 100644 --- a/src/cegis/facade/runner_helper.h +++ b/src/cegis/facade/runner_helper.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_FACADE_RUNNER_HELPER_H_ -#define CEGIS_FACADE_RUNNER_HELPER_H_ +#ifndef CPROVER_CEGIS_FACADE_RUNNER_HELPER_H +#define CPROVER_CEGIS_FACADE_RUNNER_HELPER_H #include @@ -63,4 +63,4 @@ int run_cegis_with_statistics_wrapper( #include "runner_helper.inc" -#endif /* CEGIS_FACADE_RUNNER_HELPER_H_ */ +#endif // CPROVER_CEGIS_FACADE_RUNNER_HELPER_H diff --git a/src/cegis/genetic/concrete_test_runner.h b/src/cegis/genetic/concrete_test_runner.h index e92c5cb0dd9..abf6da7076e 100644 --- a/src/cegis/genetic/concrete_test_runner.h +++ b/src/cegis/genetic/concrete_test_runner.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_GENETIC_CONCRETE_TEST_RUNNER_H_ -#define CEGIS_GENETIC_CONCRETE_TEST_RUNNER_H_ +#ifndef CPROVER_CEGIS_GENETIC_CONCRETE_TEST_RUNNER_H +#define CPROVER_CEGIS_GENETIC_CONCRETE_TEST_RUNNER_H #include @@ -68,4 +68,4 @@ class concrete_test_runnert void join(); }; -#endif /* CEGIS_GENETIC_CONCRETE_TEST_RUNNER_H_ */ +#endif // CPROVER_CEGIS_GENETIC_CONCRETE_TEST_RUNNER_H diff --git a/src/cegis/genetic/dynamic_test_runner_helper.h b/src/cegis/genetic/dynamic_test_runner_helper.h index b5c5fd93b53..50a3c3a09b4 100644 --- a/src/cegis/genetic/dynamic_test_runner_helper.h +++ b/src/cegis/genetic/dynamic_test_runner_helper.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_DYNAMIC_TEST_RUNNER_HELPER_H_ -#define CEGIS_DYNAMIC_TEST_RUNNER_HELPER_H_ +#ifndef CPROVER_CEGIS_GENETIC_DYNAMIC_TEST_RUNNER_HELPER_H +#define CPROVER_CEGIS_GENETIC_DYNAMIC_TEST_RUNNER_HELPER_H #include @@ -80,4 +80,4 @@ void close_fitness_tester_library( #include "dynamic_test_runner_helper.inc" -#endif /* CEGIS_DYNAMIC_TEST_RUNNER_HELPER_H_ */ +#endif // CPROVER_CEGIS_GENETIC_DYNAMIC_TEST_RUNNER_HELPER_H diff --git a/src/cegis/genetic/family_selection.h b/src/cegis/genetic/family_selection.h index 37b4201df03..1afea9c0bd2 100644 --- a/src/cegis/genetic/family_selection.h +++ b/src/cegis/genetic/family_selection.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_GENETIC_FAMILY_SELECTION_H_ -#define CEGIS_GENETIC_FAMILY_SELECTION_H_ +#ifndef CPROVER_CEGIS_GENETIC_FAMILY_SELECTION_H +#define CPROVER_CEGIS_GENETIC_FAMILY_SELECTION_H /** * @brief @@ -81,4 +81,4 @@ class family_selectiont #include "family_selection.inc" -#endif /* CEGIS_GENETIC_FAMILY_SELECTION_H_ */ +#endif // CPROVER_CEGIS_GENETIC_FAMILY_SELECTION_H diff --git a/src/cegis/genetic/ga_learn.h b/src/cegis/genetic/ga_learn.h index 57a63b629eb..379802f7eea 100644 --- a/src/cegis/genetic/ga_learn.h +++ b/src/cegis/genetic/ga_learn.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_GENETIC_GA_LEARN_H_ -#define CEGIS_GENETIC_GA_LEARN_H_ +#ifndef CPROVER_CEGIS_GENETIC_GA_LEARN_H +#define CPROVER_CEGIS_GENETIC_GA_LEARN_H #include #include @@ -153,4 +153,4 @@ class ga_learnt #include "ga_learn.inc" -#endif /* CEGIS_GENETIC_GA_LEARN_H_ */ +#endif // CPROVER_CEGIS_GENETIC_GA_LEARN_H diff --git a/src/cegis/genetic/genetic_constant_strategy.h b/src/cegis/genetic/genetic_constant_strategy.h index 08a72a94355..e07175b55d4 100644 --- a/src/cegis/genetic/genetic_constant_strategy.h +++ b/src/cegis/genetic/genetic_constant_strategy.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_GENETIC_CONSTANT_STRATEGY_H_ -#define CEGIS_GENETIC_CONSTANT_STRATEGY_H_ +#ifndef CPROVER_CEGIS_GENETIC_GENETIC_CONSTANT_STRATEGY_H +#define CPROVER_CEGIS_GENETIC_GENETIC_CONSTANT_STRATEGY_H #include @@ -23,4 +23,4 @@ size_t genetic_constant_strategy(class invariant_programt &program, size_t max_length); -#endif /* CEGIS_GENETIC_CONSTANT_STRATEGY_H_ */ +#endif // CPROVER_CEGIS_GENETIC_GENETIC_CONSTANT_STRATEGY_H diff --git a/src/cegis/genetic/genetic_preprocessing.h b/src/cegis/genetic/genetic_preprocessing.h index 5d6e21f1716..1f893c1a78d 100644 --- a/src/cegis/genetic/genetic_preprocessing.h +++ b/src/cegis/genetic/genetic_preprocessing.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_GENETIC_PREPROCESSING_H_ -#define CEGIS_GENETIC_PREPROCESSING_H_ +#ifndef CPROVER_CEGIS_GENETIC_GENETIC_PREPROCESSING_H +#define CPROVER_CEGIS_GENETIC_GENETIC_PREPROCESSING_H /** * @brief @@ -65,4 +65,4 @@ class genetic_preprocessingt #include "genetic_preprocessing.inc" -#endif /* CEGIS_GENETIC_PREPROCESSING_H_ */ +#endif // CPROVER_CEGIS_GENETIC_GENETIC_PREPROCESSING_H diff --git a/src/cegis/genetic/genetic_settings.h b/src/cegis/genetic/genetic_settings.h index 881bcacb7f1..a1905ae8bb8 100644 --- a/src/cegis/genetic/genetic_settings.h +++ b/src/cegis/genetic/genetic_settings.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_GENETIC_SETTINGS_H_ -#define CEGIS_GENETIC_SETTINGS_H_ +#ifndef CPROVER_CEGIS_GENETIC_GENETIC_SETTINGS_H +#define CPROVER_CEGIS_GENETIC_GENETIC_SETTINGS_H #include @@ -95,4 +95,4 @@ class genetic_settingst virtual ~genetic_settingst(); }; -#endif /* CEGIS_GENETIC_SETTINGS_H_ */ +#endif // CPROVER_CEGIS_GENETIC_GENETIC_SETTINGS_H diff --git a/src/cegis/genetic/instruction_set_info_factory.h b/src/cegis/genetic/instruction_set_info_factory.h index 79123b3fa2c..ee62f785194 100644 --- a/src/cegis/genetic/instruction_set_info_factory.h +++ b/src/cegis/genetic/instruction_set_info_factory.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_GENETIC_INSTRUCTION_SET_INFO_FACTORY_H_ -#define CEGIS_GENETIC_INSTRUCTION_SET_INFO_FACTORY_H_ +#ifndef CPROVER_CEGIS_GENETIC_INSTRUCTION_SET_INFO_FACTORY_H +#define CPROVER_CEGIS_GENETIC_INSTRUCTION_SET_INFO_FACTORY_H #include @@ -76,4 +76,4 @@ class instruction_set_info_factoryt #include "instruction_set_info_factory.inc" -#endif /* CEGIS_GENETIC_INSTRUCTION_SET_INFO_FACTORY_H_ */ +#endif // CPROVER_CEGIS_GENETIC_INSTRUCTION_SET_INFO_FACTORY_H diff --git a/src/cegis/genetic/lazy_fitness.h b/src/cegis/genetic/lazy_fitness.h index 0c0a763dbce..350fe9796e4 100644 --- a/src/cegis/genetic/lazy_fitness.h +++ b/src/cegis/genetic/lazy_fitness.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_GENETIC_SYMEX_FITNESS_H_ -#define CEGIS_GENETIC_SYMEX_FITNESS_H_ +#ifndef CPROVER_CEGIS_GENETIC_LAZY_FITNESS_H +#define CPROVER_CEGIS_GENETIC_LAZY_FITNESS_H /** * @brief @@ -108,4 +108,4 @@ class lazy_fitnesst #include "lazy_fitness.inc" -#endif /* CEGIS_GENETIC_SYMEX_FITNESS_H_ */ +#endif // CPROVER_CEGIS_GENETIC_LAZY_FITNESS_H diff --git a/src/cegis/genetic/lazy_genetic_settings.h b/src/cegis/genetic/lazy_genetic_settings.h index fa7bad3e4e0..ec0c9279e73 100644 --- a/src/cegis/genetic/lazy_genetic_settings.h +++ b/src/cegis/genetic/lazy_genetic_settings.h @@ -5,8 +5,8 @@ * Author: Pascal */ -#ifndef CEGIS_LAZY_GENETIC_SETTINGS_H_ -#define CEGIS_LAZY_GENETIC_SETTINGS_H_ +#ifndef CPROVER_CEGIS_GENETIC_LAZY_GENETIC_SETTINGS_H +#define CPROVER_CEGIS_GENETIC_LAZY_GENETIC_SETTINGS_H #include @@ -106,4 +106,4 @@ class lazy_genetic_settingst: public genetic_settingst #include "lazy_genetic_settings.inc" -#endif /* CEGIS_LAZY_GENETIC_SETTINGS_H_ */ +#endif // CPROVER_CEGIS_GENETIC_LAZY_GENETIC_SETTINGS_H diff --git a/src/cegis/genetic/learn_preprocess_seed.h b/src/cegis/genetic/learn_preprocess_seed.h index 0f1f9c79cb5..910103ed239 100644 --- a/src/cegis/genetic/learn_preprocess_seed.h +++ b/src/cegis/genetic/learn_preprocess_seed.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_GENETIC_LEARN_PREPROCESS_SEED_H_ -#define CEGIS_GENETIC_LEARN_PREPROCESS_SEED_H_ +#ifndef CPROVER_CEGIS_GENETIC_LEARN_PREPROCESS_SEED_H +#define CPROVER_CEGIS_GENETIC_LEARN_PREPROCESS_SEED_H /** * @brief @@ -45,4 +45,4 @@ class learn_preprocess_seedt #include "learn_preprocess_seed.inc" -#endif /* CEGIS_GENETIC_LEARN_PREPROCESS_SEED_H_ */ +#endif // CPROVER_CEGIS_GENETIC_LEARN_PREPROCESS_SEED_H diff --git a/src/cegis/genetic/match_select.h b/src/cegis/genetic/match_select.h index c87610f81aa..d6e60fdee5c 100644 --- a/src/cegis/genetic/match_select.h +++ b/src/cegis/genetic/match_select.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_GENETIC_MATCH_SELECT_H_ -#define CEGIS_GENETIC_MATCH_SELECT_H_ +#ifndef CPROVER_CEGIS_GENETIC_MATCH_SELECT_H +#define CPROVER_CEGIS_GENETIC_MATCH_SELECT_H #include @@ -81,4 +81,4 @@ class match_selectt #include "match_select.inc" -#endif /* CEGIS_GENETIC_MATCH_SELECT_H_ */ +#endif // CPROVER_CEGIS_GENETIC_MATCH_SELECT_H diff --git a/src/cegis/genetic/program_individual_test_runner_helper.h b/src/cegis/genetic/program_individual_test_runner_helper.h index d7b9c4c6977..bbd6cf6ed6b 100644 --- a/src/cegis/genetic/program_individual_test_runner_helper.h +++ b/src/cegis/genetic/program_individual_test_runner_helper.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_GENETIC_PROGRAM_INDIVIDUAL_TEST_RUNNER_HELPER_H_ -#define CEGIS_GENETIC_PROGRAM_INDIVIDUAL_TEST_RUNNER_HELPER_H_ +#ifndef CPROVER_CEGIS_GENETIC_PROGRAM_INDIVIDUAL_TEST_RUNNER_HELPER_H +#define CPROVER_CEGIS_GENETIC_PROGRAM_INDIVIDUAL_TEST_RUNNER_HELPER_H #include @@ -32,4 +32,4 @@ void implement_program_individual_deserialise(std::string &source, bool danger); */ void transform_program_individual_main_to_lib(std::string &source, bool danger); -#endif /* CEGIS_GENETIC_PROGRAM_INDIVIDUAL_TEST_RUNNER_HELPER_H_ */ +#endif // CPROVER_CEGIS_GENETIC_PROGRAM_INDIVIDUAL_TEST_RUNNER_HELPER_H diff --git a/src/cegis/genetic/random_cross.h b/src/cegis/genetic/random_cross.h index 869ce22cfdd..32ad57bf8ac 100644 --- a/src/cegis/genetic/random_cross.h +++ b/src/cegis/genetic/random_cross.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_GENETIC_RANDOM_CROSS_H_ -#define CEGIS_GENETIC_RANDOM_CROSS_H_ +#ifndef CPROVER_CEGIS_GENETIC_RANDOM_CROSS_H +#define CPROVER_CEGIS_GENETIC_RANDOM_CROSS_H #include @@ -52,4 +52,4 @@ class random_crosst void operator()(const individualst &parents, const individualst &children); }; -#endif /* CEGIS_GENETIC_RANDOM_CROSS_H_ */ +#endif // CPROVER_CEGIS_GENETIC_RANDOM_CROSS_H diff --git a/src/cegis/genetic/random_individual.h b/src/cegis/genetic/random_individual.h index e103e80d9cc..49b64db8881 100644 --- a/src/cegis/genetic/random_individual.h +++ b/src/cegis/genetic/random_individual.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_GENETIC_RANDOM_INDIVIDUAL_H_ -#define CEGIS_GENETIC_RANDOM_INDIVIDUAL_H_ +#ifndef CPROVER_CEGIS_GENETIC_RANDOM_INDIVIDUAL_H +#define CPROVER_CEGIS_GENETIC_RANDOM_INDIVIDUAL_H #include @@ -183,4 +183,4 @@ class random_individualt operator std::function() const; }; -#endif /* CEGIS_GENETIC_RANDOM_INDIVIDUAL_H_ */ +#endif // CPROVER_CEGIS_GENETIC_RANDOM_INDIVIDUAL_H diff --git a/src/cegis/genetic/random_mutate.h b/src/cegis/genetic/random_mutate.h index 283bca8e7fc..86c74c351db 100644 --- a/src/cegis/genetic/random_mutate.h +++ b/src/cegis/genetic/random_mutate.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_GENETIC_RANDOM_MUTATE_H_ -#define CEGIS_GENETIC_RANDOM_MUTATE_H_ +#ifndef CPROVER_CEGIS_GENETIC_RANDOM_MUTATE_H +#define CPROVER_CEGIS_GENETIC_RANDOM_MUTATE_H #include @@ -71,4 +71,4 @@ class random_mutatet void post_process(program_individualt &ind) const; }; -#endif /* CEGIS_GENETIC_RANDOM_MUTATE_H_ */ +#endif // CPROVER_CEGIS_GENETIC_RANDOM_MUTATE_H diff --git a/src/cegis/genetic/serialise_individual.h b/src/cegis/genetic/serialise_individual.h index ad52788ba34..58ca35ea0b5 100644 --- a/src/cegis/genetic/serialise_individual.h +++ b/src/cegis/genetic/serialise_individual.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_GENETIC_SERIALISE_INDIVIDUAL_H_ -#define CEGIS_GENETIC_SERIALISE_INDIVIDUAL_H_ +#ifndef CPROVER_CEGIS_GENETIC_SERIALISE_INDIVIDUAL_H +#define CPROVER_CEGIS_GENETIC_SERIALISE_INDIVIDUAL_H #include #include @@ -39,4 +39,4 @@ void serialise(std::deque &stream, void serialise(std::deque &stream, const std::map assignments); -#endif /* CEGIS_GENETIC_SERIALISE_INDIVIDUAL_H_ */ +#endif // CPROVER_CEGIS_GENETIC_SERIALISE_INDIVIDUAL_H diff --git a/src/cegis/genetic/symex_test_runner.h b/src/cegis/genetic/symex_test_runner.h index 7f9d9c6ce23..54074632384 100644 --- a/src/cegis/genetic/symex_test_runner.h +++ b/src/cegis/genetic/symex_test_runner.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_GENETIC_SYMEX_TEST_RUNNER_H_ -#define CEGIS_GENETIC_SYMEX_TEST_RUNNER_H_ +#ifndef CPROVER_CEGIS_GENETIC_SYMEX_TEST_RUNNER_H +#define CPROVER_CEGIS_GENETIC_SYMEX_TEST_RUNNER_H #include @@ -82,4 +82,4 @@ class symex_test_runnert #include "symex_test_runner.inc" -#endif /* CEGIS_GENETIC_SYMEX_TEST_RUNNER_H_ */ +#endif // CPROVER_CEGIS_GENETIC_SYMEX_TEST_RUNNER_H diff --git a/src/cegis/genetic/tournament_select.h b/src/cegis/genetic/tournament_select.h index 39815f00b5c..283cc3b99da 100644 --- a/src/cegis/genetic/tournament_select.h +++ b/src/cegis/genetic/tournament_select.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_GENETIC_TOURNAMENT_SELECT_H_ -#define CEGIS_GENETIC_TOURNAMENT_SELECT_H_ +#ifndef CPROVER_CEGIS_GENETIC_TOURNAMENT_SELECT_H +#define CPROVER_CEGIS_GENETIC_TOURNAMENT_SELECT_H #include @@ -59,4 +59,4 @@ class tournament_selectt #include "tournament_select.inc" -#endif /* CEGIS_GENETIC_TOURNAMENT_SELECT_H_ */ +#endif // CPROVER_CEGIS_GENETIC_TOURNAMENT_SELECT_H diff --git a/src/cegis/instructions/instruction_set_factory.h b/src/cegis/instructions/instruction_set_factory.h index ae163d64a31..26c8d43c9d0 100644 --- a/src/cegis/instructions/instruction_set_factory.h +++ b/src/cegis/instructions/instruction_set_factory.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_DANGER_INSTRUCTION_SET_FACTORY_H_ -#define CEGIS_DANGER_INSTRUCTION_SET_FACTORY_H_ +#ifndef CPROVER_CEGIS_INSTRUCTIONS_INSTRUCTION_SET_FACTORY_H +#define CPROVER_CEGIS_INSTRUCTIONS_INSTRUCTION_SET_FACTORY_H #include @@ -41,4 +41,4 @@ instruction_sett extract_instruction_set( const std::string &last_prefix, const std::string &single_prefix); -#endif /* CEGIS_DANGER_INSTRUCTION_SET_FACTORY_H_ */ +#endif // CPROVER_CEGIS_INSTRUCTIONS_INSTRUCTION_SET_FACTORY_H diff --git a/src/cegis/instrument/cegis_library.h b/src/cegis/instrument/cegis_library.h index 3481ff9cccc..06cfc6e08dc 100644 --- a/src/cegis/instrument/cegis_library.h +++ b/src/cegis/instrument/cegis_library.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_LIBRARY_H_ -#define CEGIS_LIBRARY_H_ +#ifndef CPROVER_CEGIS_INSTRUMENT_CEGIS_LIBRARY_H +#define CPROVER_CEGIS_INSTRUMENT_CEGIS_LIBRARY_H #include @@ -61,4 +61,4 @@ void add_cegis_execute_placeholder(symbol_tablet &st); */ code_typet cegis_execute_type(); -#endif /* CEGIS_LIBRARY_H_ */ +#endif // CPROVER_CEGIS_INSTRUMENT_CEGIS_LIBRARY_H diff --git a/src/cegis/instrument/find_cprover_initialize.h b/src/cegis/instrument/find_cprover_initialize.h index 9870e7c6a3e..de1ab0597e5 100644 --- a/src/cegis/instrument/find_cprover_initialize.h +++ b/src/cegis/instrument/find_cprover_initialize.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_FIND_CPROVER_INITIALIZE_H_ -#define CEGIS_FIND_CPROVER_INITIALIZE_H_ +#ifndef CPROVER_CEGIS_INSTRUMENT_FIND_CPROVER_INITIALIZE_H +#define CPROVER_CEGIS_INSTRUMENT_FIND_CPROVER_INITIALIZE_H #include @@ -34,4 +34,4 @@ goto_programt::targett find_cprover_initialize(goto_programt &body); */ goto_programt::targett find_last_instr(goto_programt &body); -#endif /* CEGIS_FIND_CPROVER_INITIALIZE_H_ */ +#endif // CPROVER_CEGIS_INSTRUMENT_FIND_CPROVER_INITIALIZE_H diff --git a/src/cegis/instrument/instrument_var_ops.h b/src/cegis/instrument/instrument_var_ops.h index d0eb6d75cd4..688b65b2b56 100644 --- a/src/cegis/instrument/instrument_var_ops.h +++ b/src/cegis/instrument/instrument_var_ops.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_INSTRUMENT_VAR_OPS_H_ -#define CEGIS_INSTRUMENT_VAR_OPS_H_ +#ifndef CPROVER_CEGIS_INSTRUMENT_INSTRUMENT_VAR_OPS_H +#define CPROVER_CEGIS_INSTRUMENT_INSTRUMENT_VAR_OPS_H #include @@ -166,4 +166,4 @@ goto_programt::targett set_ops_reference(const symbol_tablet &st, */ source_locationt default_cegis_source_location(); -#endif /* CEGIS_INSTRUMENT_VAR_OPS_H_ */ +#endif // CPROVER_CEGIS_INSTRUMENT_INSTRUMENT_VAR_OPS_H diff --git a/src/cegis/instrument/literals.h b/src/cegis/instrument/literals.h index 6991f6963f9..1377946bc2c 100644 --- a/src/cegis/instrument/literals.h +++ b/src/cegis/instrument/literals.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_LITERALS_H_ -#define CEGIS_LITERALS_H_ +#ifndef CPROVER_CEGIS_INSTRUMENT_LITERALS_H +#define CPROVER_CEGIS_INSTRUMENT_LITERALS_H #include @@ -27,4 +27,4 @@ #define CONSTRAINT_CALLER CONSTRAINT_CALLER_NAME ":()V" #define CONSTRAINT_CALLER_ID "java::" CONSTRAINT_CALLER -#endif /* CEGIS_LITERALS_H_ */ +#endif // CPROVER_CEGIS_INSTRUMENT_LITERALS_H diff --git a/src/cegis/instrument/meta_variables.h b/src/cegis/instrument/meta_variables.h index 9c59d5e3b66..00df2b5c15b 100644 --- a/src/cegis/instrument/meta_variables.h +++ b/src/cegis/instrument/meta_variables.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_META_VARIABLES_H_ -#define CEGIS_META_VARIABLES_H_ +#ifndef CPROVER_CEGIS_INSTRUMENT_META_VARIABLES_H +#define CPROVER_CEGIS_INSTRUMENT_META_VARIABLES_H #include @@ -155,4 +155,4 @@ std::string get_cegis_code_prefix( size_t num_consts, size_t max_solution_size); -#endif /* CEGIS_META_VARIABLES_H_ */ +#endif // CPROVER_CEGIS_INSTRUMENT_META_VARIABLES_H diff --git a/src/cegis/invariant/constant/add_constant.h b/src/cegis/invariant/constant/add_constant.h index c506ff0c113..3c8d5af7c3d 100644 --- a/src/cegis/invariant/constant/add_constant.h +++ b/src/cegis/invariant/constant/add_constant.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_DANGER_ADD_CONSTANT_H_ -#define CEGIS_DANGER_ADD_CONSTANT_H_ +#ifndef CPROVER_CEGIS_INVARIANT_CONSTANT_ADD_CONSTANT_H +#define CPROVER_CEGIS_INVARIANT_CONSTANT_ADD_CONSTANT_H #include @@ -35,4 +35,4 @@ void add_danger_constant(class invariant_programt &program, void add_danger_constant(invariant_programt &program, const std::string &name, const exprt &value); -#endif /* CEGIS_DANGER_ADD_CONSTANT_H_ */ +#endif // CPROVER_CEGIS_INVARIANT_CONSTANT_ADD_CONSTANT_H diff --git a/src/cegis/invariant/constant/constant_strategy.h b/src/cegis/invariant/constant/constant_strategy.h index ff68a20da97..e91b082bb66 100644 --- a/src/cegis/invariant/constant/constant_strategy.h +++ b/src/cegis/invariant/constant/constant_strategy.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_DANGER_CONSTANT_STRATEGY_H_ -#define CEGIS_DANGER_CONSTANT_STRATEGY_H_ +#ifndef CPROVER_CEGIS_INVARIANT_CONSTANT_CONSTANT_STRATEGY_H +#define CPROVER_CEGIS_INVARIANT_CONSTANT_CONSTANT_STRATEGY_H #include @@ -25,4 +25,4 @@ Author: Daniel Kroening, kroening@kroening.com typedef size_t (*constant_strategyt)(class invariant_programt &program, const size_t max_length); -#endif /* CEGIS_DANGER_CONSTANT_STRATEGY_H_ */ +#endif // CPROVER_CEGIS_INVARIANT_CONSTANT_CONSTANT_STRATEGY_H diff --git a/src/cegis/invariant/constant/default_constant_strategy.h b/src/cegis/invariant/constant/default_constant_strategy.h index 7c02c8750a9..342ef5f95d1 100644 --- a/src/cegis/invariant/constant/default_constant_strategy.h +++ b/src/cegis/invariant/constant/default_constant_strategy.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_DANGER_DEFAULT_CONSTANT_STRATEGY_H_ -#define CEGIS_DANGER_DEFAULT_CONSTANT_STRATEGY_H_ +#ifndef CPROVER_CEGIS_INVARIANT_CONSTANT_DEFAULT_CONSTANT_STRATEGY_H +#define CPROVER_CEGIS_INVARIANT_CONSTANT_DEFAULT_CONSTANT_STRATEGY_H /** * @brief @@ -23,4 +23,4 @@ Author: Daniel Kroening, kroening@kroening.com size_t default_constant_strategy(class invariant_programt &program, const size_t max_length); -#endif /* CEGIS_DANGER_DEFAULT_CONSTANT_STRATEGY_H_ */ +#endif // CPROVER_CEGIS_INVARIANT_CONSTANT_DEFAULT_CONSTANT_STRATEGY_H diff --git a/src/cegis/invariant/constant/literals_constant_strategy.h b/src/cegis/invariant/constant/literals_constant_strategy.h index b4f96f4a3d4..90158f1466f 100644 --- a/src/cegis/invariant/constant/literals_constant_strategy.h +++ b/src/cegis/invariant/constant/literals_constant_strategy.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_DANGER_LITERALS_CONSTANT_STRATEGY_H_ -#define CEGIS_DANGER_LITERALS_CONSTANT_STRATEGY_H_ +#ifndef CPROVER_CEGIS_INVARIANT_CONSTANT_LITERALS_CONSTANT_STRATEGY_H +#define CPROVER_CEGIS_INVARIANT_CONSTANT_LITERALS_CONSTANT_STRATEGY_H #include @@ -39,4 +39,4 @@ std::vector collect_literal_constants( size_t literals_constant_strategy(invariant_programt &program, const size_t max_length); -#endif /* CEGIS_DANGER_LITERALS_CONSTANT_STRATEGY_H_ */ +#endif // CPROVER_CEGIS_INVARIANT_CONSTANT_LITERALS_CONSTANT_STRATEGY_H diff --git a/src/cegis/invariant/fitness/concrete_fitness_source_provider.h b/src/cegis/invariant/fitness/concrete_fitness_source_provider.h index 970c2a1fa44..9fcbd69ec77 100644 --- a/src/cegis/invariant/fitness/concrete_fitness_source_provider.h +++ b/src/cegis/invariant/fitness/concrete_fitness_source_provider.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_CONCRETE_FITNESS_SOURCE_PROVIDER_H_ -#define CEGIS_CONCRETE_FITNESS_SOURCE_PROVIDER_H_ +#ifndef CPROVER_CEGIS_INVARIANT_FITNESS_CONCRETE_FITNESS_SOURCE_PROVIDER_H +#define CPROVER_CEGIS_INVARIANT_FITNESS_CONCRETE_FITNESS_SOURCE_PROVIDER_H #include @@ -79,4 +79,4 @@ std::string &post_process_fitness_source(std::string &result, #include "concrete_fitness_source_provider.inc" -#endif /* CEGIS_CONCRETE_FITNESS_SOURCE_PROVIDER_H_ */ +#endif // CPROVER_CEGIS_INVARIANT_FITNESS_CONCRETE_FITNESS_SOURCE_PROVIDER_H diff --git a/src/cegis/invariant/meta/meta_variable_names.h b/src/cegis/invariant/meta/meta_variable_names.h index 4d0dfb5f08b..68169d27a47 100644 --- a/src/cegis/invariant/meta/meta_variable_names.h +++ b/src/cegis/invariant/meta/meta_variable_names.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_INVARIANT_META_VARIABLE_NAMES_H_ -#define CEGIS_INVARIANT_META_VARIABLE_NAMES_H_ +#ifndef CPROVER_CEGIS_INVARIANT_META_META_VARIABLE_NAMES_H +#define CPROVER_CEGIS_INVARIANT_META_META_VARIABLE_NAMES_H #include @@ -45,4 +45,4 @@ std::string get_Gx(const size_t loop_id); */ std::string get_tmp(const size_t id); -#endif /* CEGIS_INVARIANT_META_VARIABLE_NAMES_H_ */ +#endif // CPROVER_CEGIS_INVARIANT_META_META_VARIABLE_NAMES_H diff --git a/src/cegis/invariant/options/invariant_program.h b/src/cegis/invariant/options/invariant_program.h index 14c63c42d62..1d79880269f 100644 --- a/src/cegis/invariant/options/invariant_program.h +++ b/src/cegis/invariant/options/invariant_program.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_INVARIANT_PROGRAM_H_ -#define CEGIS_INVARIANT_PROGRAM_H_ +#ifndef CPROVER_CEGIS_INVARIANT_OPTIONS_INVARIANT_PROGRAM_H +#define CPROVER_CEGIS_INVARIANT_OPTIONS_INVARIANT_PROGRAM_H #include @@ -145,4 +145,4 @@ class invariant_programt virtual invariant_loopt &add_loop() = 0; }; -#endif /* CEGIS_INVARIANT_PROGRAM_H_ */ +#endif // CPROVER_CEGIS_INVARIANT_OPTIONS_INVARIANT_PROGRAM_H diff --git a/src/cegis/invariant/options/target_copy_helper.h b/src/cegis/invariant/options/target_copy_helper.h index a3da80cbad2..a09a5a431a8 100644 --- a/src/cegis/invariant/options/target_copy_helper.h +++ b/src/cegis/invariant/options/target_copy_helper.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_TARGET_COPY_HELPER_H_ -#define CEGIS_TARGET_COPY_HELPER_H_ +#ifndef CPROVER_CEGIS_INVARIANT_OPTIONS_TARGET_COPY_HELPER_H +#define CPROVER_CEGIS_INVARIANT_OPTIONS_TARGET_COPY_HELPER_H #include @@ -93,4 +93,4 @@ class target_copy_helpert const invariant_programt::invariant_loopt &loop) const; }; -#endif /* CEGIS_TARGET_COPY_HELPER_H_ */ +#endif // CPROVER_CEGIS_INVARIANT_OPTIONS_TARGET_COPY_HELPER_H diff --git a/src/cegis/invariant/preprocess/add_invariants_and_temp_variables.h b/src/cegis/invariant/preprocess/add_invariants_and_temp_variables.h index ae01eec9d69..f34f6ec7ce8 100644 --- a/src/cegis/invariant/preprocess/add_invariants_and_temp_variables.h +++ b/src/cegis/invariant/preprocess/add_invariants_and_temp_variables.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_INVARIANT_ADD_INVARIANT_AND_TEMP_VARIABLES_H_ -#define CEGIS_INVARIANT_ADD_INVARIANT_AND_TEMP_VARIABLES_H_ +#ifndef CPROVER_CEGIS_INVARIANT_PREPROCESS_ADD_INVARIANTS_AND_TEMP_VARIABLES_H +#define CPROVER_CEGIS_INVARIANT_PREPROCESS_ADD_INVARIANTS_AND_TEMP_VARIABLES_H #include @@ -70,4 +70,4 @@ void create_tmp_variables( const size_t max_program_length, const class typet &type); -#endif /* CEGIS_INVARIANT_ADD_INVARIANT_AND_TEMP_VARIABLES_H_ */ +#endif // CPROVER_CEGIS_INVARIANT_PREPROCESS_ADD_INVARIANTS_AND_TEMP_VARIABLES_H diff --git a/src/cegis/invariant/preprocess/remove_loops_and_assertion.h b/src/cegis/invariant/preprocess/remove_loops_and_assertion.h index ab59f177294..19367a29bb9 100644 --- a/src/cegis/invariant/preprocess/remove_loops_and_assertion.h +++ b/src/cegis/invariant/preprocess/remove_loops_and_assertion.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_INVARIANT_REMOVE_LOOPS_AND_ASSERTION_H_ -#define CEGIS_INVARIANT_REMOVE_LOOPS_AND_ASSERTION_H_ +#ifndef CPROVER_CEGIS_INVARIANT_PREPROCESS_REMOVE_LOOPS_AND_ASSERTION_H +#define CPROVER_CEGIS_INVARIANT_PREPROCESS_REMOVE_LOOPS_AND_ASSERTION_H #include @@ -40,4 +40,4 @@ void invariant_remove_loop( goto_programt::targett &body_begin, goto_programt::targett &body_end); -#endif /* CEGIS_INVARIANT_REMOVE_LOOPS_AND_ASSERTION_H_ */ +#endif // CPROVER_CEGIS_INVARIANT_PREPROCESS_REMOVE_LOOPS_AND_ASSERTION_H diff --git a/src/cegis/invariant/symex/learn/add_counterexamples.h b/src/cegis/invariant/symex/learn/add_counterexamples.h index 7ddc18e27c0..008dc14f794 100644 --- a/src/cegis/invariant/symex/learn/add_counterexamples.h +++ b/src/cegis/invariant/symex/learn/add_counterexamples.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_INVARIANT_ADD_COUNTEREXAMPLES_H_ -#define CEGIS_INVARIANT_ADD_COUNTEREXAMPLES_H_ +#ifndef CPROVER_CEGIS_INVARIANT_SYMEX_LEARN_ADD_COUNTEREXAMPLES_H +#define CPROVER_CEGIS_INVARIANT_SYMEX_LEARN_ADD_COUNTEREXAMPLES_H #include #include @@ -108,4 +108,4 @@ void invariant_add_constraint(invariant_programt &prog, const constraint_factoryt constraint, const goto_programt::targett &ce_loop_end); -#endif /* CEGIS_INVARIANT_ADD_COUNTEREXAMPLES_H_ */ +#endif // CPROVER_CEGIS_INVARIANT_SYMEX_LEARN_ADD_COUNTEREXAMPLES_H diff --git a/src/cegis/invariant/symex/learn/add_invariant_programs_to_learn.h b/src/cegis/invariant/symex/learn/add_invariant_programs_to_learn.h index 51e252c9f60..a4a69fd8277 100644 --- a/src/cegis/invariant/symex/learn/add_invariant_programs_to_learn.h +++ b/src/cegis/invariant/symex/learn/add_invariant_programs_to_learn.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_INVARIANT_ADD_INVARIANT_PROGRAMS_TO_LEARN_H_ -#define CEGIS_INVARIANT_ADD_INVARIANT_PROGRAMS_TO_LEARN_H_ +#ifndef CPROVER_CEGIS_INVARIANT_SYMEX_LEARN_ADD_INVARIANT_PROGRAMS_TO_LEARN_H +#define CPROVER_CEGIS_INVARIANT_SYMEX_LEARN_ADD_INVARIANT_PROGRAMS_TO_LEARN_H #include @@ -75,4 +75,4 @@ goto_programt::targett add_inv_prog(invariant_programt &prog, goto_programt::targett add_invariant_progs_to_learn( class invariant_programt &prog, size_t max_solution_size); -#endif /* CEGIS_INVARIANT_ADD_INVARIANT_PROGRAMS_TO_LEARN_H_ */ +#endif // CPROVER_CEGIS_INVARIANT_SYMEX_LEARN_ADD_INVARIANT_PROGRAMS_TO_LEARN_H diff --git a/src/cegis/invariant/symex/learn/instrument_vars.h b/src/cegis/invariant/symex/learn/instrument_vars.h index bdab8e9e193..b5a37acf96b 100644 --- a/src/cegis/invariant/symex/learn/instrument_vars.h +++ b/src/cegis/invariant/symex/learn/instrument_vars.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_INVARIANT_INSTRUMENT_VARS_H_ -#define CEGIS_INVARIANT_INSTRUMENT_VARS_H_ +#ifndef CPROVER_CEGIS_INVARIANT_SYMEX_LEARN_INSTRUMENT_VARS_H +#define CPROVER_CEGIS_INVARIANT_SYMEX_LEARN_INSTRUMENT_VARS_H #include @@ -89,4 +89,4 @@ void link_user_program_variables(class invariant_programt &prog, size_t get_invariant_variable_ids(const class symbol_tablet &st, operand_variable_idst &ids); -#endif /* CEGIS_INVARIANT_INSTRUMENT_VARS_H_ */ +#endif // CPROVER_CEGIS_INVARIANT_SYMEX_LEARN_INSTRUMENT_VARS_H diff --git a/src/cegis/invariant/symex/learn/invariant_body_provider.h b/src/cegis/invariant/symex/learn/invariant_body_provider.h index 6ea27acef26..04720832790 100644 --- a/src/cegis/invariant/symex/learn/invariant_body_provider.h +++ b/src/cegis/invariant/symex/learn/invariant_body_provider.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_INVARIANT_BODY_PROVIDER_H_ -#define CEGIS_INVARIANT_BODY_PROVIDER_H_ +#ifndef CPROVER_CEGIS_INVARIANT_SYMEX_LEARN_INVARIANT_BODY_PROVIDER_H +#define CPROVER_CEGIS_INVARIANT_SYMEX_LEARN_INVARIANT_BODY_PROVIDER_H #include @@ -55,4 +55,4 @@ class invariant_exec_body_providert #include "invariant_body_provider.inc" -#endif /* CEGIS_INVARIANT_BODY_PROVIDER_H_ */ +#endif // CPROVER_CEGIS_INVARIANT_SYMEX_LEARN_INVARIANT_BODY_PROVIDER_H diff --git a/src/cegis/invariant/symex/learn/replace_operators.h b/src/cegis/invariant/symex/learn/replace_operators.h index faa478a8675..82c50952fa6 100644 --- a/src/cegis/invariant/symex/learn/replace_operators.h +++ b/src/cegis/invariant/symex/learn/replace_operators.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_INVARIANT_REPLACE_OPERATORS_H_ -#define CEGIS_INVARIANT_REPLACE_OPERATORS_H_ +#ifndef CPROVER_CEGIS_INVARIANT_SYMEX_LEARN_REPLACE_OPERATORS_H +#define CPROVER_CEGIS_INVARIANT_SYMEX_LEARN_REPLACE_OPERATORS_H #include @@ -48,4 +48,4 @@ void replace_ops_in_instr(const symbol_tablet &st, const std::string &func_name, const size_t op0, const size_t op1, const size_t op2, const size_t instr_idx); -#endif /* CEGIS_INVARIANT_REPLACE_OPERATORS_H_ */ +#endif // CPROVER_CEGIS_INVARIANT_SYMEX_LEARN_REPLACE_OPERATORS_H diff --git a/src/cegis/invariant/symex/verify/extract_counterexample.h b/src/cegis/invariant/symex/verify/extract_counterexample.h index cdcdbc3a1ef..7281314db26 100644 --- a/src/cegis/invariant/symex/verify/extract_counterexample.h +++ b/src/cegis/invariant/symex/verify/extract_counterexample.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_INVARIANT_EXTRACT_COUNTEREXAMPLE_H_ -#define CEGIS_INVARIANT_EXTRACT_COUNTEREXAMPLE_H_ +#ifndef CPROVER_CEGIS_INVARIANT_SYMEX_VERIFY_EXTRACT_COUNTEREXAMPLE_H +#define CPROVER_CEGIS_INVARIANT_SYMEX_VERIFY_EXTRACT_COUNTEREXAMPLE_H #include @@ -31,4 +31,4 @@ typedef std::map counterexamplet; void invariant_extract_counterexample(counterexamplet &result, const class goto_tracet &trace, const goto_programt::targetst &quantifiers); -#endif /* CEGIS_INVARIANT_EXTRACT_COUNTEREXAMPLE_H_ */ +#endif // CPROVER_CEGIS_INVARIANT_SYMEX_VERIFY_EXTRACT_COUNTEREXAMPLE_H diff --git a/src/cegis/invariant/symex/verify/insert_constraint.h b/src/cegis/invariant/symex/verify/insert_constraint.h index d3be7df09b1..139e629f44b 100644 --- a/src/cegis/invariant/symex/verify/insert_constraint.h +++ b/src/cegis/invariant/symex/verify/insert_constraint.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_INVARIANT_INSERT_CONSTRAINT_H_ -#define CEGIS_INVARIANT_INSERT_CONSTRAINT_H_ +#ifndef CPROVER_CEGIS_INVARIANT_SYMEX_VERIFY_INSERT_CONSTRAINT_H +#define CPROVER_CEGIS_INVARIANT_SYMEX_VERIFY_INSERT_CONSTRAINT_H #include #include @@ -38,4 +38,4 @@ void invariant_insert_constraint( constraint_factoryt constraint_factory, size_t quantifier_label_offset = 0); -#endif /* CEGIS_INVARIANT_INSERT_CONSTRAINT_H_ */ +#endif // CPROVER_CEGIS_INVARIANT_SYMEX_VERIFY_INSERT_CONSTRAINT_H diff --git a/src/cegis/invariant/symex/verify/insert_program.h b/src/cegis/invariant/symex/verify/insert_program.h index 938905f2597..eae08aea2a0 100644 --- a/src/cegis/invariant/symex/verify/insert_program.h +++ b/src/cegis/invariant/symex/verify/insert_program.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_INVARIANT_INSERT_PROGRAM_H_ -#define CEGIS_INVARIANT_INSERT_PROGRAM_H_ +#ifndef CPROVER_CEGIS_INVARIANT_SYMEX_VERIFY_INSERT_PROGRAM_H +#define CPROVER_CEGIS_INVARIANT_SYMEX_VERIFY_INSERT_PROGRAM_H #include @@ -54,4 +54,4 @@ void insert_program(goto_programt &body, const goto_programt::targett &pos, void insert_program(goto_programt &body, goto_programt::targett pos, const goto_programt::instructionst &prog, const replacementst &replacements); -#endif /* CEGIS_INVARIANT_INSERT_PROGRAM_H_ */ +#endif // CPROVER_CEGIS_INVARIANT_SYMEX_VERIFY_INSERT_PROGRAM_H diff --git a/src/cegis/invariant/util/copy_instructions.h b/src/cegis/invariant/util/copy_instructions.h index 69ab5c2b9ed..82687e6818c 100644 --- a/src/cegis/invariant/util/copy_instructions.h +++ b/src/cegis/invariant/util/copy_instructions.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_DANGER_COPY_INSTRUCTIONS_H_ -#define CEGIS_DANGER_COPY_INSTRUCTIONS_H_ +#ifndef CPROVER_CEGIS_INVARIANT_UTIL_COPY_INSTRUCTIONS_H +#define CPROVER_CEGIS_INVARIANT_UTIL_COPY_INSTRUCTIONS_H #include @@ -113,4 +113,4 @@ goto_programt::targett copy_instructions( goto_programt::targett pos, const goto_programt::instructionst &source); -#endif /* SRC_CEGIS_DANGER_UTIL_COPY_INSTRUCTIONS_H_ */ +#endif // CPROVER_CEGIS_INVARIANT_UTIL_COPY_INSTRUCTIONS_H diff --git a/src/cegis/invariant/util/invariant_constraint_variables.h b/src/cegis/invariant/util/invariant_constraint_variables.h index 84330053651..3c2c1a090ce 100644 --- a/src/cegis/invariant/util/invariant_constraint_variables.h +++ b/src/cegis/invariant/util/invariant_constraint_variables.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_INVARIANT_CONSTRAINT_VARIABLES_H_ -#define CEGIS_INVARIANT_CONSTRAINT_VARIABLES_H_ +#ifndef CPROVER_CEGIS_INVARIANT_UTIL_INVARIANT_CONSTRAINT_VARIABLES_H +#define CPROVER_CEGIS_INVARIANT_UTIL_INVARIANT_CONSTRAINT_VARIABLES_H #include #include @@ -67,4 +67,4 @@ typedef std::deque constraint_varst; void get_invariant_constraint_vars(constraint_varst &vars, const invariant_programt &program); -#endif /* CEGIS_INVARIANT_CONSTRAINT_VARIABLES_H_ */ +#endif // CPROVER_CEGIS_INVARIANT_UTIL_INVARIANT_CONSTRAINT_VARIABLES_H diff --git a/src/cegis/invariant/util/invariant_program_helper.h b/src/cegis/invariant/util/invariant_program_helper.h index 7894f3c2fd4..c408a688d70 100644 --- a/src/cegis/invariant/util/invariant_program_helper.h +++ b/src/cegis/invariant/util/invariant_program_helper.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_INVARIANT_PROGRAM_HELPER_H_ -#define CEGIS_INVARIANT_PROGRAM_HELPER_H_ +#ifndef CPROVER_CEGIS_INVARIANT_UTIL_INVARIANT_PROGRAM_HELPER_H +#define CPROVER_CEGIS_INVARIANT_UTIL_INVARIANT_PROGRAM_HELPER_H #include @@ -47,4 +47,4 @@ template void restrict_bv_size(invariant_programt &prog, loop_itert first_loop, const loop_itert &last_loop, size_t width_in_bits); -#endif /* CEGIS_INVARIANT_PROGRAM_HELPER_H_ */ +#endif // CPROVER_CEGIS_INVARIANT_UTIL_INVARIANT_PROGRAM_HELPER_H diff --git a/src/cegis/jsa/constraint/jsa_constraint_factory.h b/src/cegis/jsa/constraint/jsa_constraint_factory.h index 8fa2389f0c2..107a64e8505 100644 --- a/src/cegis/jsa/constraint/jsa_constraint_factory.h +++ b/src/cegis/jsa/constraint/jsa_constraint_factory.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef JSA_CONSTRAINT_FACTORY_H_ -#define JSA_CONSTRAINT_FACTORY_H_ +#ifndef CPROVER_CEGIS_JSA_CONSTRAINT_JSA_CONSTRAINT_FACTORY_H +#define CPROVER_CEGIS_JSA_CONSTRAINT_JSA_CONSTRAINT_FACTORY_H /** * @brief @@ -20,4 +20,4 @@ Author: Daniel Kroening, kroening@kroening.com */ void insert_jsa_constraint(class jsa_programt &prog, bool use_assume); -#endif /* JSA_CONSTRAINT_FACTORY_H_ */ +#endif // CPROVER_CEGIS_JSA_CONSTRAINT_JSA_CONSTRAINT_FACTORY_H diff --git a/src/cegis/jsa/converters/counterexample.h b/src/cegis/jsa/converters/counterexample.h index a02555e81ca..db1669f834b 100644 --- a/src/cegis/jsa/converters/counterexample.h +++ b/src/cegis/jsa/converters/counterexample.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_JSA_CONVERTERS_COUNTEREXAMPLE_H_ -#define CEGIS_JSA_CONVERTERS_COUNTEREXAMPLE_H_ +#ifndef CPROVER_CEGIS_JSA_CONVERTERS_COUNTEREXAMPLE_H +#define CPROVER_CEGIS_JSA_CONVERTERS_COUNTEREXAMPLE_H #include #include @@ -63,4 +63,4 @@ void retrieve_words( const jsa_counterexamplet &counterexample, __CPROVER_jsa_word_t *words); -#endif /* CEGIS_JSA_CONVERTERS_COUNTEREXAMPLE_H_ */ +#endif // CPROVER_CEGIS_JSA_CONVERTERS_COUNTEREXAMPLE_H diff --git a/src/cegis/jsa/converters/replace_operators.h b/src/cegis/jsa/converters/replace_operators.h index 8308dc8293b..b3326aa0931 100644 --- a/src/cegis/jsa/converters/replace_operators.h +++ b/src/cegis/jsa/converters/replace_operators.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_JSA_REPLACE_OPERATORS_H_ -#define CEGIS_JSA_REPLACE_OPERATORS_H_ +#ifndef CPROVER_CEGIS_JSA_CONVERTERS_REPLACE_OPERATORS_H +#define CPROVER_CEGIS_JSA_CONVERTERS_REPLACE_OPERATORS_H #include @@ -46,4 +46,4 @@ void replace_query_ops( const __CPROVER_jsa_query_instructiont &instr, const __CPROVER_jsa_query_instructiont &prefix); -#endif /* CEGIS_JSA_REPLACE_OPERATORS_H_ */ +#endif // CPROVER_CEGIS_JSA_CONVERTERS_REPLACE_OPERATORS_H diff --git a/src/cegis/jsa/converters/solution.h b/src/cegis/jsa/converters/solution.h index 6d60d1fb926..b21b4e3803a 100644 --- a/src/cegis/jsa/converters/solution.h +++ b/src/cegis/jsa/converters/solution.h @@ -9,8 +9,8 @@ Author: Daniel Kroening, kroening@kroening.com #include -#ifndef CEGIS_JSA_CONVERT_SOLUTION_H_ -#define CEGIS_JSA_CONVERT_SOLUTION_H_ +#ifndef CPROVER_CEGIS_JSA_CONVERTERS_SOLUTION_H +#define CPROVER_CEGIS_JSA_CONVERTERS_SOLUTION_H // TODO: Convert genetic solution to irep / irep to genetic solution @@ -27,4 +27,4 @@ jsa_solutiont convert( const class jsa_genetic_solutiont &solution, const class jsa_programt &prog); -#endif /* CEGIS_JSA_CONVERT_SOLUTION_H_ */ +#endif // CPROVER_CEGIS_JSA_CONVERTERS_SOLUTION_H diff --git a/src/cegis/jsa/converters/translate_to_goto_program.h b/src/cegis/jsa/converters/translate_to_goto_program.h index 0490157bcfe..8846fd43079 100644 --- a/src/cegis/jsa/converters/translate_to_goto_program.h +++ b/src/cegis/jsa/converters/translate_to_goto_program.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_JSA_TRANSLATE_TO_GOTO_PROGRAM_H_ -#define CEGIS_JSA_TRANSLATE_TO_GOTO_PROGRAM_H_ +#ifndef CPROVER_CEGIS_JSA_CONVERTERS_TRANSLATE_TO_GOTO_PROGRAM_H +#define CPROVER_CEGIS_JSA_CONVERTERS_TRANSLATE_TO_GOTO_PROGRAM_H #include #include @@ -56,4 +56,4 @@ void convert( const jsa_programt &prog, const std::vector<__CPROVER_jsa_invariant_instructiont> &solution); -#endif /* CEGIS_JSA_TRANSLATE_TO_GOTO_PROGRAM_H_ */ +#endif // CPROVER_CEGIS_JSA_CONVERTERS_TRANSLATE_TO_GOTO_PROGRAM_H diff --git a/src/cegis/jsa/facade/jsa_runner.h b/src/cegis/jsa/facade/jsa_runner.h index ff3079bc681..efe6975c576 100644 --- a/src/cegis/jsa/facade/jsa_runner.h +++ b/src/cegis/jsa/facade/jsa_runner.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_JSA_RUNNER_H_ -#define CEGIS_JSA_RUNNER_H_ +#ifndef CPROVER_CEGIS_JSA_FACADE_JSA_RUNNER_H +#define CPROVER_CEGIS_JSA_FACADE_JSA_RUNNER_H #include @@ -27,4 +27,4 @@ Author: Daniel Kroening, kroening@kroening.com int run_jsa(class optionst &options, messaget::mstreamt &result, const class symbol_tablet &st, const class goto_functionst &gf); -#endif /* CEGIS_JSA_RUNNER_H_ */ +#endif // CPROVER_CEGIS_JSA_FACADE_JSA_RUNNER_H diff --git a/src/cegis/jsa/genetic/dynamic_jsa_test_runner.h b/src/cegis/jsa/genetic/dynamic_jsa_test_runner.h index 08a7d473d6e..77b8bd85f58 100644 --- a/src/cegis/jsa/genetic/dynamic_jsa_test_runner.h +++ b/src/cegis/jsa/genetic/dynamic_jsa_test_runner.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_DYNAMIC_JSA_TEST_RUNNER_H_ -#define CEGIS_DYNAMIC_JSA_TEST_RUNNER_H_ +#ifndef CPROVER_CEGIS_JSA_GENETIC_DYNAMIC_JSA_TEST_RUNNER_H +#define CPROVER_CEGIS_JSA_GENETIC_DYNAMIC_JSA_TEST_RUNNER_H #include @@ -82,4 +82,4 @@ class dynamic_jsa_test_runnert void join(); }; -#endif /* CEGIS_DYNAMIC_JSA_TEST_RUNNER_H_ */ +#endif // CPROVER_CEGIS_JSA_GENETIC_DYNAMIC_JSA_TEST_RUNNER_H diff --git a/src/cegis/jsa/genetic/jsa_genetic_convert.h b/src/cegis/jsa/genetic/jsa_genetic_convert.h index 7d4abb87fc4..f50107fcee5 100644 --- a/src/cegis/jsa/genetic/jsa_genetic_convert.h +++ b/src/cegis/jsa/genetic/jsa_genetic_convert.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_JSA_GENETIC_CONVERT_H_ -#define CEGIS_JSA_GENETIC_CONVERT_H_ +#ifndef CPROVER_CEGIS_JSA_GENETIC_JSA_GENETIC_CONVERT_H +#define CPROVER_CEGIS_JSA_GENETIC_JSA_GENETIC_CONVERT_H #include @@ -54,4 +54,4 @@ class jsa_genetic_convertt void show(messaget::mstreamt &os, const candidatet &candidate) const; }; -#endif /* CEGIS_JSA_GENETIC_CONVERT_H_ */ +#endif // CPROVER_CEGIS_JSA_GENETIC_JSA_GENETIC_CONVERT_H diff --git a/src/cegis/jsa/genetic/jsa_paragon_wrapper.h b/src/cegis/jsa/genetic/jsa_paragon_wrapper.h index cffc2e94e0b..88c302f386f 100644 --- a/src/cegis/jsa/genetic/jsa_paragon_wrapper.h +++ b/src/cegis/jsa/genetic/jsa_paragon_wrapper.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_JSA_PARAGON_WRAPPER_H_ -#define CEGIS_JSA_PARAGON_WRAPPER_H_ +#ifndef CPROVER_CEGIS_JSA_GENETIC_JSA_PARAGON_WRAPPER_H +#define CPROVER_CEGIS_JSA_GENETIC_JSA_PARAGON_WRAPPER_H #include #include @@ -110,4 +110,4 @@ class jsa_paragon_wrappert const candidatet &candidate) const; }; -#endif /* CEGIS_JSA_PARAGON_WRAPPER_H_ */ +#endif // CPROVER_CEGIS_JSA_GENETIC_JSA_PARAGON_WRAPPER_H diff --git a/src/cegis/jsa/genetic/jsa_random.h b/src/cegis/jsa/genetic/jsa_random.h index 049fddde863..6ee282b6849 100644 --- a/src/cegis/jsa/genetic/jsa_random.h +++ b/src/cegis/jsa/genetic/jsa_random.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_GENETIC_JSA_RANDOM_H_ -#define CEGIS_GENETIC_JSA_RANDOM_H_ +#ifndef CPROVER_CEGIS_JSA_GENETIC_JSA_RANDOM_H +#define CPROVER_CEGIS_JSA_GENETIC_JSA_RANDOM_H #include @@ -150,4 +150,4 @@ class jsa_randomt unsigned int rand() const; }; -#endif /* CEGIS_GENETIC_JSA_RANDOM_H_ */ +#endif // CPROVER_CEGIS_JSA_GENETIC_JSA_RANDOM_H diff --git a/src/cegis/jsa/genetic/jsa_serialiser.h b/src/cegis/jsa/genetic/jsa_serialiser.h index 4e8a3575b58..46d7e9ae00e 100644 --- a/src/cegis/jsa/genetic/jsa_serialiser.h +++ b/src/cegis/jsa/genetic/jsa_serialiser.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_JSA_SERIALISER_H_ -#define CEGIS_JSA_SERIALISER_H_ +#ifndef CPROVER_CEGIS_JSA_GENETIC_JSA_SERIALISER_H +#define CPROVER_CEGIS_JSA_GENETIC_JSA_SERIALISER_H #include @@ -88,4 +88,4 @@ class jsa_serialisert operator std::function() const; }; -#endif /* CEGIS_JSA_SERIALISER_H_ */ +#endif // CPROVER_CEGIS_JSA_GENETIC_JSA_SERIALISER_H diff --git a/src/cegis/jsa/genetic/jsa_source_provider.h b/src/cegis/jsa/genetic/jsa_source_provider.h index 75255666e52..1a8d6f096dc 100644 --- a/src/cegis/jsa/genetic/jsa_source_provider.h +++ b/src/cegis/jsa/genetic/jsa_source_provider.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_GENETIC_JSA_SOURCE_PROVIDER_H_ -#define CEGIS_GENETIC_JSA_SOURCE_PROVIDER_H_ +#ifndef CPROVER_CEGIS_JSA_GENETIC_JSA_SOURCE_PROVIDER_H +#define CPROVER_CEGIS_JSA_GENETIC_JSA_SOURCE_PROVIDER_H #include @@ -41,4 +41,4 @@ class jsa_source_providert const std::string &operator()(); }; -#endif /* CEGIS_GENETIC_JSA_SOURCE_PROVIDER_H_ */ +#endif // CPROVER_CEGIS_JSA_GENETIC_JSA_SOURCE_PROVIDER_H diff --git a/src/cegis/jsa/genetic/random_jsa_cross.h b/src/cegis/jsa/genetic/random_jsa_cross.h index 710419efcaf..7d27eebc443 100644 --- a/src/cegis/jsa/genetic/random_jsa_cross.h +++ b/src/cegis/jsa/genetic/random_jsa_cross.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_RANDOM_JSA_CROSS_H_ -#define CEGIS_RANDOM_JSA_CROSS_H_ +#ifndef CPROVER_CEGIS_JSA_GENETIC_RANDOM_JSA_CROSS_H +#define CPROVER_CEGIS_JSA_GENETIC_RANDOM_JSA_CROSS_H #include @@ -49,4 +49,4 @@ class random_jsa_crosst const individualst &children) const; }; -#endif /* CEGIS_RANDOM_JSA_CROSS_H_ */ +#endif // CPROVER_CEGIS_JSA_GENETIC_RANDOM_JSA_CROSS_H diff --git a/src/cegis/jsa/genetic/random_jsa_mutate.h b/src/cegis/jsa/genetic/random_jsa_mutate.h index b8fbcaa0ca0..9265b50d559 100644 --- a/src/cegis/jsa/genetic/random_jsa_mutate.h +++ b/src/cegis/jsa/genetic/random_jsa_mutate.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_RANDOM_JSA_MUTATE_H_ -#define CEGIS_RANDOM_JSA_MUTATE_H_ +#ifndef CPROVER_CEGIS_JSA_GENETIC_RANDOM_JSA_MUTATE_H +#define CPROVER_CEGIS_JSA_GENETIC_RANDOM_JSA_MUTATE_H /** * @brief @@ -59,4 +59,4 @@ class random_jsa_mutatet void post_process(individualt &ind) const; }; -#endif /* CEGIS_RANDOM_JSA_MUTATE_H_ */ +#endif // CPROVER_CEGIS_JSA_GENETIC_RANDOM_JSA_MUTATE_H diff --git a/src/cegis/jsa/genetic/solution_helper.h b/src/cegis/jsa/genetic/solution_helper.h index fcfd2ed1014..6497bd000a8 100644 --- a/src/cegis/jsa/genetic/solution_helper.h +++ b/src/cegis/jsa/genetic/solution_helper.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_JSA_GENETIC_SOLUTION_HELPER_H_ -#define CEGIS_JSA_GENETIC_SOLUTION_HELPER_H_ +#ifndef CPROVER_CEGIS_JSA_GENETIC_SOLUTION_HELPER_H +#define CPROVER_CEGIS_JSA_GENETIC_SOLUTION_HELPER_H #include @@ -23,4 +23,4 @@ */ size_t get_num_genetic_targets(const class jsa_genetic_solutiont &solution); -#endif /* CEGIS_JSA_GENETIC_SOLUTION_HELPER_H_ */ +#endif // CPROVER_CEGIS_JSA_GENETIC_SOLUTION_HELPER_H diff --git a/src/cegis/jsa/instrument/jsa_meta_data.h b/src/cegis/jsa/instrument/jsa_meta_data.h index b3e85fbb251..faacef24090 100644 --- a/src/cegis/jsa/instrument/jsa_meta_data.h +++ b/src/cegis/jsa/instrument/jsa_meta_data.h @@ -10,8 +10,8 @@ Author: Daniel Kroening, kroening@kroening.com #include #include -#ifndef CEGIS_JSA_META_DATA_H_ -#define CEGIS_JSA_META_DATA_H_ +#ifndef CPROVER_CEGIS_JSA_INSTRUMENT_JSA_META_DATA_H +#define CPROVER_CEGIS_JSA_INSTRUMENT_JSA_META_DATA_H #define JSA_MODULE "" #define JSA_PREFIX CPROVER_PREFIX "jsa_" @@ -95,4 +95,4 @@ source_locationt jsa_builtin_source_location(); */ bool is_jsa_const(const class symbol_exprt &symbol); -#endif /* CEGIS_JSA_META_DATA_H_ */ +#endif // CPROVER_CEGIS_JSA_INSTRUMENT_JSA_META_DATA_H diff --git a/src/cegis/jsa/instrument/temps_helper.h b/src/cegis/jsa/instrument/temps_helper.h index aa7eff42aee..68f743bca7c 100644 --- a/src/cegis/jsa/instrument/temps_helper.h +++ b/src/cegis/jsa/instrument/temps_helper.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_JSA_TEMPS_HELPER_H_ -#define CEGIS_JSA_TEMPS_HELPER_H_ +#ifndef CPROVER_CEGIS_JSA_INSTRUMENT_TEMPS_HELPER_H +#define CPROVER_CEGIS_JSA_INSTRUMENT_TEMPS_HELPER_H #include @@ -43,4 +43,4 @@ void add_zero_jsa_temps_to_pred_exec(jsa_programt &prog); */ size_t count_tmps(const symbol_tablet &st); -#endif /* CEGIS_JSA_TEMPS_HELPER_H_ */ +#endif // CPROVER_CEGIS_JSA_INSTRUMENT_TEMPS_HELPER_H diff --git a/src/cegis/jsa/learn/execute_jsa_programs.h b/src/cegis/jsa/learn/execute_jsa_programs.h index d6e3038dbaf..fc3604e7419 100644 --- a/src/cegis/jsa/learn/execute_jsa_programs.h +++ b/src/cegis/jsa/learn/execute_jsa_programs.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_JSA_EXECUTE_JSA_PROGRAMS_H_ -#define CEGIS_JSA_EXECUTE_JSA_PROGRAMS_H_ +#ifndef CPROVER_CEGIS_JSA_LEARN_EXECUTE_JSA_PROGRAMS_H +#define CPROVER_CEGIS_JSA_LEARN_EXECUTE_JSA_PROGRAMS_H /** * @brief @@ -19,4 +19,4 @@ Author: Daniel Kroening, kroening@kroening.com */ void execute_jsa_learn_programs(class jsa_programt &prog); -#endif /* CEGIS_JSA_EXECUTE_JSA_PROGRAMS_H_ */ +#endif // CPROVER_CEGIS_JSA_LEARN_EXECUTE_JSA_PROGRAMS_H diff --git a/src/cegis/jsa/learn/extract_candidate.h b/src/cegis/jsa/learn/extract_candidate.h index 93049f0c14f..6a856b401cd 100644 --- a/src/cegis/jsa/learn/extract_candidate.h +++ b/src/cegis/jsa/learn/extract_candidate.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_JSA_EXTRACT_CANDIDATE_H_ -#define CEGIS_JSA_EXTRACT_CANDIDATE_H_ +#ifndef CPROVER_CEGIS_JSA_LEARN_EXTRACT_CANDIDATE_H +#define CPROVER_CEGIS_JSA_LEARN_EXTRACT_CANDIDATE_H #include @@ -45,4 +45,4 @@ void extract_jsa_candidate( const pred_op_idst &result_pred_ops, const size_t max_size); -#endif /* CEGIS_JSA_EXTRACT_CANDIDATE_H_ */ +#endif // CPROVER_CEGIS_JSA_LEARN_EXTRACT_CANDIDATE_H diff --git a/src/cegis/jsa/learn/insert_counterexample.h b/src/cegis/jsa/learn/insert_counterexample.h index a30d8edc364..5d69439d850 100644 --- a/src/cegis/jsa/learn/insert_counterexample.h +++ b/src/cegis/jsa/learn/insert_counterexample.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_JSA_INSERT_COUNTEREXAMPLE_H_ -#define CEGIS_JSA_INSERT_COUNTEREXAMPLE_H_ +#ifndef CPROVER_CEGIS_JSA_LEARN_INSERT_COUNTEREXAMPLE_H +#define CPROVER_CEGIS_JSA_LEARN_INSERT_COUNTEREXAMPLE_H #include @@ -24,4 +24,4 @@ void insert_counterexamples( class jsa_programt &program, const jsa_counterexamplest &ces); -#endif /* CEGIS_JSA_INSERT_COUNTEREXAMPLE_H_ */ +#endif // CPROVER_CEGIS_JSA_LEARN_INSERT_COUNTEREXAMPLE_H diff --git a/src/cegis/jsa/learn/insert_predicates_and_queries.h b/src/cegis/jsa/learn/insert_predicates_and_queries.h index 8b11605eab9..15dfd7483f5 100644 --- a/src/cegis/jsa/learn/insert_predicates_and_queries.h +++ b/src/cegis/jsa/learn/insert_predicates_and_queries.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_JSA_INSERT_PREDICATES_AND_QUERIES_H_ -#define CEGIS_JSA_INSERT_PREDICATES_AND_QUERIES_H_ +#ifndef CPROVER_CEGIS_JSA_LEARN_INSERT_PREDICATES_AND_QUERIES_H +#define CPROVER_CEGIS_JSA_LEARN_INSERT_PREDICATES_AND_QUERIES_H #include @@ -42,4 +42,4 @@ void declare_jsa_query(jsa_programt &prog, size_t max_size); */ void declare_jsa_invariant(jsa_programt &prog, size_t max_size); -#endif /* CEGIS_JSA_INSERT_PREDICATES_AND_QUERIES_H_ */ +#endif // CPROVER_CEGIS_JSA_LEARN_INSERT_PREDICATES_AND_QUERIES_H diff --git a/src/cegis/jsa/learn/instrument_pred_ops.h b/src/cegis/jsa/learn/instrument_pred_ops.h index e83b591dd55..9aae3ee0706 100644 --- a/src/cegis/jsa/learn/instrument_pred_ops.h +++ b/src/cegis/jsa/learn/instrument_pred_ops.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_JSA_INSTRUMENT_PRED_OPS_H_ -#define CEGIS_JSA_INSTRUMENT_PRED_OPS_H_ +#ifndef CPROVER_CEGIS_JSA_LEARN_INSTRUMENT_PRED_OPS_H +#define CPROVER_CEGIS_JSA_LEARN_INSTRUMENT_PRED_OPS_H #include #include @@ -51,4 +51,4 @@ void instrument_pred_ops( class jsa_programt &prog, const goto_programt::targetst &ops); -#endif /* CEGIS_JSA_INSTRUMENT_PRED_OPS_H_ */ +#endif // CPROVER_CEGIS_JSA_LEARN_INSTRUMENT_PRED_OPS_H diff --git a/src/cegis/jsa/learn/jsa_symex_learn.h b/src/cegis/jsa/learn/jsa_symex_learn.h index ded0e87310d..1c85adc4796 100644 --- a/src/cegis/jsa/learn/jsa_symex_learn.h +++ b/src/cegis/jsa/learn/jsa_symex_learn.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_JSA_SYMEX_LEARN_H_ -#define CEGIS_JSA_SYMEX_LEARN_H_ +#ifndef CPROVER_CEGIS_JSA_LEARN_JSA_SYMEX_LEARN_H +#define CPROVER_CEGIS_JSA_LEARN_JSA_SYMEX_LEARN_H #include #include @@ -147,4 +147,4 @@ class jsa_symex_learnt std::function get_const_pred_ops_count() const; }; -#endif /* CEGIS_JSA_SYMEX_LEARN_H_ */ +#endif // CPROVER_CEGIS_JSA_LEARN_JSA_SYMEX_LEARN_H diff --git a/src/cegis/jsa/options/jsa_program.h b/src/cegis/jsa/options/jsa_program.h index c6ac9b2afd0..26c5a72fa76 100644 --- a/src/cegis/jsa/options/jsa_program.h +++ b/src/cegis/jsa/options/jsa_program.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_JSA_PROGRAM_H_ -#define CEGIS_JSA_PROGRAM_H_ +#ifndef CPROVER_CEGIS_JSA_OPTIONS_JSA_PROGRAM_H +#define CPROVER_CEGIS_JSA_OPTIONS_JSA_PROGRAM_H #include @@ -129,4 +129,4 @@ class jsa_programt jsa_programt &operator=(const jsa_programt &other); }; -#endif /* CEGIS_JSA_PROGRAM_H_ */ +#endif // CPROVER_CEGIS_JSA_OPTIONS_JSA_PROGRAM_H diff --git a/src/cegis/jsa/options/jsa_program_info.h b/src/cegis/jsa/options/jsa_program_info.h index 2a6a53ce220..626d37115ec 100644 --- a/src/cegis/jsa/options/jsa_program_info.h +++ b/src/cegis/jsa/options/jsa_program_info.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_JSA_PROGRAM_INFO_H_ -#define CEGIS_JSA_PROGRAM_INFO_H_ +#ifndef CPROVER_CEGIS_JSA_OPTIONS_JSA_PROGRAM_INFO_H +#define CPROVER_CEGIS_JSA_OPTIONS_JSA_PROGRAM_INFO_H #include @@ -124,4 +124,4 @@ size_t get_max_iterators(const symbol_tablet &st); */ size_t get_max_lists(const symbol_tablet &st); -#endif /* CEGIS_JSA_PROGRAM_INFO_H_ */ +#endif // CPROVER_CEGIS_JSA_OPTIONS_JSA_PROGRAM_INFO_H diff --git a/src/cegis/jsa/preprocessing/add_constraint_meta_variables.h b/src/cegis/jsa/preprocessing/add_constraint_meta_variables.h index 0eb260b01f3..c49e2991d2e 100644 --- a/src/cegis/jsa/preprocessing/add_constraint_meta_variables.h +++ b/src/cegis/jsa/preprocessing/add_constraint_meta_variables.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_JSA_ADD_CONSTRAINT_META_VARIABLES_H_ -#define CEGIS_JSA_ADD_CONSTRAINT_META_VARIABLES_H_ +#ifndef CPROVER_CEGIS_JSA_PREPROCESSING_ADD_CONSTRAINT_META_VARIABLES_H +#define CPROVER_CEGIS_JSA_PREPROCESSING_ADD_CONSTRAINT_META_VARIABLES_H #include @@ -72,4 +72,4 @@ goto_programt::targett jsa_assign( */ void add_jsa_constraint_meta_variables(class jsa_programt &prog); -#endif /* CEGIS_JSA_ADD_CONSTRAINT_META_VARIABLES_H_ */ +#endif // CPROVER_CEGIS_JSA_PREPROCESSING_ADD_CONSTRAINT_META_VARIABLES_H diff --git a/src/cegis/jsa/preprocessing/add_synthesis_library.h b/src/cegis/jsa/preprocessing/add_synthesis_library.h index 53147064c31..af8ee791346 100644 --- a/src/cegis/jsa/preprocessing/add_synthesis_library.h +++ b/src/cegis/jsa/preprocessing/add_synthesis_library.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_JSA_ADD_SYNTHESIS_LIBRARY_H_ -#define CEGIS_JSA_ADD_SYNTHESIS_LIBRARY_H_ +#ifndef CPROVER_CEGIS_JSA_PREPROCESSING_ADD_SYNTHESIS_LIBRARY_H +#define CPROVER_CEGIS_JSA_PREPROCESSING_ADD_SYNTHESIS_LIBRARY_H #include @@ -26,4 +26,4 @@ void add_jsa_library( size_t max_sz, const goto_programt::targetst &pred_op_locations); -#endif /* CEGIS_JSA_ADD_SYNTHESIS_LIBRARY_H_ */ +#endif // CPROVER_CEGIS_JSA_PREPROCESSING_ADD_SYNTHESIS_LIBRARY_H diff --git a/src/cegis/jsa/preprocessing/clone_heap.h b/src/cegis/jsa/preprocessing/clone_heap.h index 9472eed09e5..3f247c823d5 100644 --- a/src/cegis/jsa/preprocessing/clone_heap.h +++ b/src/cegis/jsa/preprocessing/clone_heap.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_JSA_CLONE_HEAP_H_ -#define CEGIS_JSA_CLONE_HEAP_H_ +#ifndef CPROVER_CEGIS_JSA_PREPROCESSING_CLONE_HEAP_H +#define CPROVER_CEGIS_JSA_PREPROCESSING_CLONE_HEAP_H #include @@ -67,4 +67,4 @@ goto_programt::targett assume_valid_heap( goto_programt::targett pos, const exprt &heap_ptr); -#endif /* CEGIS_JSA_CLONE_HEAP_H_ */ +#endif // CPROVER_CEGIS_JSA_PREPROCESSING_CLONE_HEAP_H diff --git a/src/cegis/jsa/preprocessing/collect_variables.h b/src/cegis/jsa/preprocessing/collect_variables.h index 16406d052a2..0f306b8be64 100644 --- a/src/cegis/jsa/preprocessing/collect_variables.h +++ b/src/cegis/jsa/preprocessing/collect_variables.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_JSA_PREPROCESSING_COLLECT_VARIABLES_H_ -#define CEGIS_JSA_PREPROCESSING_COLLECT_VARIABLES_H_ +#ifndef CPROVER_CEGIS_JSA_PREPROCESSING_COLLECT_VARIABLES_H +#define CPROVER_CEGIS_JSA_PREPROCESSING_COLLECT_VARIABLES_H /** * @brief @@ -28,4 +28,4 @@ void add_inductive_step_renondets(class jsa_programt &prog); */ void collect_counterexample_vars(jsa_programt &prog); -#endif /* CEGIS_JSA_PREPROCESSING_COLLECT_VARIABLES_H_ */ +#endif // CPROVER_CEGIS_JSA_PREPROCESSING_COLLECT_VARIABLES_H diff --git a/src/cegis/jsa/preprocessing/create_temp_variables.h b/src/cegis/jsa/preprocessing/create_temp_variables.h index 331a53cd57b..c7ec14da0e9 100644 --- a/src/cegis/jsa/preprocessing/create_temp_variables.h +++ b/src/cegis/jsa/preprocessing/create_temp_variables.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_JSA_CREATE_TEMP_VARIABLES_H_ -#define CEGIS_JSA_CREATE_TEMP_VARIABLES_H_ +#ifndef CPROVER_CEGIS_JSA_PREPROCESSING_CREATE_TEMP_VARIABLES_H +#define CPROVER_CEGIS_JSA_PREPROCESSING_CREATE_TEMP_VARIABLES_H #include @@ -22,4 +22,4 @@ Author: Daniel Kroening, kroening@kroening.com */ void create_jsa_temp_variables(class jsa_programt &prog, size_t max_size); -#endif /* CEGIS_JSA_CREATE_TEMP_VARIABLES_H_ */ +#endif // CPROVER_CEGIS_JSA_PREPROCESSING_CREATE_TEMP_VARIABLES_H diff --git a/src/cegis/jsa/preprocessing/default_jsa_constant_strategy.h b/src/cegis/jsa/preprocessing/default_jsa_constant_strategy.h index 7d20cea571a..3c42ce0289a 100644 --- a/src/cegis/jsa/preprocessing/default_jsa_constant_strategy.h +++ b/src/cegis/jsa/preprocessing/default_jsa_constant_strategy.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_DEFAULT_JSA_CONSTANT_STRATEGY_H_ -#define CEGIS_DEFAULT_JSA_CONSTANT_STRATEGY_H_ +#ifndef CPROVER_CEGIS_JSA_PREPROCESSING_DEFAULT_JSA_CONSTANT_STRATEGY_H +#define CPROVER_CEGIS_JSA_PREPROCESSING_DEFAULT_JSA_CONSTANT_STRATEGY_H #include @@ -24,4 +24,4 @@ goto_programt::targett default_jsa_constant_strategy( class symbol_tablet &st, class goto_functionst &gf); -#endif /* CEGIS_DEFAULT_JSA_CONSTANT_STRATEGY_H_ */ +#endif // CPROVER_CEGIS_JSA_PREPROCESSING_DEFAULT_JSA_CONSTANT_STRATEGY_H diff --git a/src/cegis/jsa/preprocessing/inline_user_program.h b/src/cegis/jsa/preprocessing/inline_user_program.h index 2ab4e749f4a..e9c60c75d07 100644 --- a/src/cegis/jsa/preprocessing/inline_user_program.h +++ b/src/cegis/jsa/preprocessing/inline_user_program.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_INLINE_USER_PROGRAM_H_ -#define CEGIS_INLINE_USER_PROGRAM_H_ +#ifndef CPROVER_CEGIS_JSA_PREPROCESSING_INLINE_USER_PROGRAM_H +#define CPROVER_CEGIS_JSA_PREPROCESSING_INLINE_USER_PROGRAM_H /** * @brief @@ -22,4 +22,4 @@ void inline_jsa_user_program( const class symbol_tablet &st, class goto_functionst &gf); -#endif /* CEGIS_INLINE_USER_PROGRAM_H_ */ +#endif // CPROVER_CEGIS_JSA_PREPROCESSING_INLINE_USER_PROGRAM_H diff --git a/src/cegis/jsa/preprocessing/jsa_preprocessing.h b/src/cegis/jsa/preprocessing/jsa_preprocessing.h index b0c1e8485d9..56706df86f5 100644 --- a/src/cegis/jsa/preprocessing/jsa_preprocessing.h +++ b/src/cegis/jsa/preprocessing/jsa_preprocessing.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_JSA_PREPROCESSING_H_ -#define CEGIS_JSA_PREPROCESSING_H_ +#ifndef CPROVER_CEGIS_JSA_PREPROCESSING_JSA_PREPROCESSING_H +#define CPROVER_CEGIS_JSA_PREPROCESSING_JSA_PREPROCESSING_H #include @@ -79,4 +79,4 @@ class jsa_preprocessingt const jsa_programt &get_jsa_program() const; }; -#endif /* CEGIS_JSA_PREPROCESSING_H_ */ +#endif // CPROVER_CEGIS_JSA_PREPROCESSING_JSA_PREPROCESSING_H diff --git a/src/cegis/jsa/preprocessing/remove_loop.h b/src/cegis/jsa/preprocessing/remove_loop.h index d2c5e1706d7..1d7a50ed94f 100644 --- a/src/cegis/jsa/preprocessing/remove_loop.h +++ b/src/cegis/jsa/preprocessing/remove_loop.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_JSA_REMOVE_LOOP_H_ -#define CEGIS_JSA_REMOVE_LOOP_H_ +#ifndef CPROVER_CEGIS_JSA_PREPROCESSING_REMOVE_LOOP_H +#define CPROVER_CEGIS_JSA_PREPROCESSING_REMOVE_LOOP_H /** * @brief @@ -19,4 +19,4 @@ Author: Daniel Kroening, kroening@kroening.com */ void remove_loop(class jsa_programt &prog); -#endif /* CEGIS_JSA_REMOVE_LOOP_H_ */ +#endif // CPROVER_CEGIS_JSA_PREPROCESSING_REMOVE_LOOP_H diff --git a/src/cegis/jsa/value/default_solution.h b/src/cegis/jsa/value/default_solution.h index 55b9002ad38..cd144d09a0e 100644 --- a/src/cegis/jsa/value/default_solution.h +++ b/src/cegis/jsa/value/default_solution.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_JSA_VALUE_DEFAULT_SOLUTION_H_ -#define CEGIS_JSA_VALUE_DEFAULT_SOLUTION_H_ +#ifndef CPROVER_CEGIS_JSA_VALUE_DEFAULT_SOLUTION_H +#define CPROVER_CEGIS_JSA_VALUE_DEFAULT_SOLUTION_H #include @@ -23,4 +23,4 @@ Author: Daniel Kroening, kroening@kroening.com */ jsa_solutiont default_jsa_solution(const class jsa_programt &prog); -#endif /* CEGIS_JSA_VALUE_DEFAULT_SOLUTION_H_ */ +#endif // CPROVER_CEGIS_JSA_VALUE_DEFAULT_SOLUTION_H diff --git a/src/cegis/jsa/value/jsa_counterexample.h b/src/cegis/jsa/value/jsa_counterexample.h index b0837477f32..c95c4355f5f 100644 --- a/src/cegis/jsa/value/jsa_counterexample.h +++ b/src/cegis/jsa/value/jsa_counterexample.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_JSA_COUNTEREXAMPLE_H_ -#define CEGIS_JSA_COUNTEREXAMPLE_H_ +#ifndef CPROVER_CEGIS_JSA_VALUE_JSA_COUNTEREXAMPLE_H +#define CPROVER_CEGIS_JSA_VALUE_JSA_COUNTEREXAMPLE_H #include #include @@ -24,4 +24,4 @@ typedef std::map jsa_counterexamplet; typedef std::deque jsa_counterexamplest; -#endif /* CEGIS_JSA_COUNTEREXAMPLE_H_ */ +#endif // CPROVER_CEGIS_JSA_VALUE_JSA_COUNTEREXAMPLE_H diff --git a/src/cegis/jsa/value/jsa_counterexample_printer.h b/src/cegis/jsa/value/jsa_counterexample_printer.h index 70e505e754e..12514946132 100644 --- a/src/cegis/jsa/value/jsa_counterexample_printer.h +++ b/src/cegis/jsa/value/jsa_counterexample_printer.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_JSA_COUNTEREXAMPLE_PRINTER_H_ -#define CEGIS_JSA_COUNTEREXAMPLE_PRINTER_H_ +#ifndef CPROVER_CEGIS_JSA_VALUE_JSA_COUNTEREXAMPLE_PRINTER_H +#define CPROVER_CEGIS_JSA_VALUE_JSA_COUNTEREXAMPLE_PRINTER_H #include @@ -43,4 +43,4 @@ void print_jsa_counterexample( #include -#endif /* CEGIS_JSA_COUNTEREXAMPLE_PRINTER_H_ */ +#endif // CPROVER_CEGIS_JSA_VALUE_JSA_COUNTEREXAMPLE_PRINTER_H diff --git a/src/cegis/jsa/value/jsa_genetic_counterexample.h b/src/cegis/jsa/value/jsa_genetic_counterexample.h index e7b7790772c..ecdf0de2faa 100644 --- a/src/cegis/jsa/value/jsa_genetic_counterexample.h +++ b/src/cegis/jsa/value/jsa_genetic_counterexample.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_JSA_GENETIC_COUNTEREXAMPLE_H_ -#define CEGIS_JSA_GENETIC_COUNTEREXAMPLE_H_ +#ifndef CPROVER_CEGIS_JSA_VALUE_JSA_GENETIC_COUNTEREXAMPLE_H +#define CPROVER_CEGIS_JSA_VALUE_JSA_GENETIC_COUNTEREXAMPLE_H #include #include @@ -31,4 +31,4 @@ class jsa_genetic_counterexamplet assignments_per_program_locationt assignments_per_program_location; }; -#endif /* CEGIS_JSA_GENETIC_COUNTEREXAMPLE_H_ */ +#endif // CPROVER_CEGIS_JSA_VALUE_JSA_GENETIC_COUNTEREXAMPLE_H diff --git a/src/cegis/jsa/value/jsa_genetic_solution.h b/src/cegis/jsa/value/jsa_genetic_solution.h index 71ac22bbff4..1a76a6bdc7a 100644 --- a/src/cegis/jsa/value/jsa_genetic_solution.h +++ b/src/cegis/jsa/value/jsa_genetic_solution.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_JSA_GENETIC_SOLUTION_H_ -#define CEGIS_JSA_GENETIC_SOLUTION_H_ +#ifndef CPROVER_CEGIS_JSA_VALUE_JSA_GENETIC_SOLUTION_H +#define CPROVER_CEGIS_JSA_VALUE_JSA_GENETIC_SOLUTION_H #include @@ -114,4 +114,4 @@ class jsa_genetic_solutiont */ typedef std::vector jsa_populationt; -#endif /* CEGIS_JSA_GENETIC_SOLUTION_H_ */ +#endif // CPROVER_CEGIS_JSA_VALUE_JSA_GENETIC_SOLUTION_H diff --git a/src/cegis/jsa/value/jsa_genetic_synthesis.h b/src/cegis/jsa/value/jsa_genetic_synthesis.h index 01f22491b2d..6678b3b71f6 100644 --- a/src/cegis/jsa/value/jsa_genetic_synthesis.h +++ b/src/cegis/jsa/value/jsa_genetic_synthesis.h @@ -1,5 +1,5 @@ -#ifndef CEGIS_JSA_GENETIC_SYNTHESIS_H_ -#define CEGIS_JSA_GENETIC_SYNTHESIS_H_ +#ifndef CPROVER_CEGIS_JSA_VALUE_JSA_GENETIC_SYNTHESIS_H +#define CPROVER_CEGIS_JSA_VALUE_JSA_GENETIC_SYNTHESIS_H #define __CPROVER_JSA_MAX_CONCRETE_NODES 3u #define __CPROVER_JSA_MAX_ABSTRACT_NODES 0u @@ -18,4 +18,4 @@ typedef bool _Bool; #include -#endif /* CEGIS_JSA_GENETIC_SYNTHESIS_H_ */ +#endif // CPROVER_CEGIS_JSA_VALUE_JSA_GENETIC_SYNTHESIS_H diff --git a/src/cegis/jsa/value/jsa_solution.h b/src/cegis/jsa/value/jsa_solution.h index a27dbb9b224..4ae3ba35bda 100644 --- a/src/cegis/jsa/value/jsa_solution.h +++ b/src/cegis/jsa/value/jsa_solution.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_JSA_SOLUTION_H_ -#define CEGIS_JSA_SOLUTION_H_ +#ifndef CPROVER_CEGIS_JSA_VALUE_JSA_SOLUTION_H +#define CPROVER_CEGIS_JSA_VALUE_JSA_SOLUTION_H #include @@ -83,4 +83,4 @@ class jsa_solutiont void clear(); }; -#endif /* CEGIS_JSA_SOLUTION_H_ */ +#endif // CPROVER_CEGIS_JSA_VALUE_JSA_SOLUTION_H diff --git a/src/cegis/jsa/value/jsa_solution_printer.h b/src/cegis/jsa/value/jsa_solution_printer.h index 1a30a6680c0..32eae1d30d6 100644 --- a/src/cegis/jsa/value/jsa_solution_printer.h +++ b/src/cegis/jsa/value/jsa_solution_printer.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_JSA_SOLUTION_PRINTER_H_ -#define CEGIS_JSA_SOLUTION_PRINTER_H_ +#ifndef CPROVER_CEGIS_JSA_VALUE_JSA_SOLUTION_PRINTER_H +#define CPROVER_CEGIS_JSA_VALUE_JSA_SOLUTION_PRINTER_H #include @@ -32,4 +32,4 @@ void print_jsa_solution( const pred_op_idst &op_ids, const pred_op_idst &const_op_ids); -#endif /* CEGIS_JSA_SOLUTION_PRINTER_H_ */ +#endif // CPROVER_CEGIS_JSA_VALUE_JSA_SOLUTION_PRINTER_H diff --git a/src/cegis/jsa/value/jsa_types.h b/src/cegis/jsa/value/jsa_types.h index 70851f442db..47ef22fe77f 100644 --- a/src/cegis/jsa/value/jsa_types.h +++ b/src/cegis/jsa/value/jsa_types.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_JSA_TYPES_H_ -#define CEGIS_JSA_TYPES_H_ +#ifndef CPROVER_CEGIS_JSA_VALUE_JSA_TYPES_H +#define CPROVER_CEGIS_JSA_VALUE_JSA_TYPES_H #include @@ -108,4 +108,4 @@ array_typet jsa_query_type(const exprt & size); */ symbol_typet jsa_heap_type(); -#endif /* CEGIS_JSA_TYPES_H_ */ +#endif // CPROVER_CEGIS_JSA_VALUE_JSA_TYPES_H diff --git a/src/cegis/jsa/value/pred_ops.h b/src/cegis/jsa/value/pred_ops.h index 8b875adae53..500c1ec5f7e 100644 --- a/src/cegis/jsa/value/pred_ops.h +++ b/src/cegis/jsa/value/pred_ops.h @@ -7,11 +7,11 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_JSA_PRED_OPS_H_ -#define CEGIS_JSA_PRED_OPS_H_ +#ifndef CPROVER_CEGIS_JSA_VALUE_PRED_OPS_H +#define CPROVER_CEGIS_JSA_VALUE_PRED_OPS_H #include typedef std::map pred_op_idst; -#endif /* CEGIS_JSA_PRED_OPS_H_ */ +#endif // CPROVER_CEGIS_JSA_VALUE_PRED_OPS_H diff --git a/src/cegis/jsa/verify/extract_counterexample.h b/src/cegis/jsa/verify/extract_counterexample.h index 5e88a87b488..315d66d9e51 100644 --- a/src/cegis/jsa/verify/extract_counterexample.h +++ b/src/cegis/jsa/verify/extract_counterexample.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_JSA_EXTRACT_COUNTEREXAMPLE_H_ -#define CEGIS_JSA_EXTRACT_COUNTEREXAMPLE_H_ +#ifndef CPROVER_CEGIS_JSA_VERIFY_EXTRACT_COUNTEREXAMPLE_H +#define CPROVER_CEGIS_JSA_VERIFY_EXTRACT_COUNTEREXAMPLE_H #include @@ -26,4 +26,4 @@ void extract( jsa_counterexamplet &ce, const class goto_tracet &trace); -#endif /* CEGIS_JSA_EXTRACT_COUNTEREXAMPLE_H_ */ +#endif // CPROVER_CEGIS_JSA_VERIFY_EXTRACT_COUNTEREXAMPLE_H diff --git a/src/cegis/jsa/verify/insert_solution.h b/src/cegis/jsa/verify/insert_solution.h index e0f73364804..0c9c9e150ae 100644 --- a/src/cegis/jsa/verify/insert_solution.h +++ b/src/cegis/jsa/verify/insert_solution.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_JSA_INSERT_SOLUTION_H_ -#define CEGIS_JSA_INSERT_SOLUTION_H_ +#ifndef CPROVER_CEGIS_JSA_VERIFY_INSERT_SOLUTION_H +#define CPROVER_CEGIS_JSA_VERIFY_INSERT_SOLUTION_H /** * @brief @@ -22,4 +22,4 @@ void insert_jsa_solution( class jsa_programt &prog, const class jsa_solutiont &solution); -#endif /* CEGIS_JSA_INSERT_SOLUTION_H_ */ +#endif // CPROVER_CEGIS_JSA_VERIFY_INSERT_SOLUTION_H diff --git a/src/cegis/jsa/verify/jsa_symex_verify.h b/src/cegis/jsa/verify/jsa_symex_verify.h index 3b17eca14e4..952a694ae71 100644 --- a/src/cegis/jsa/verify/jsa_symex_verify.h +++ b/src/cegis/jsa/verify/jsa_symex_verify.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_JSA_SYMEX_VERIFY_H_ -#define CEGIS_JSA_SYMEX_VERIFY_H_ +#ifndef CPROVER_CEGIS_JSA_VERIFY_JSA_SYMEX_VERIFY_H +#define CPROVER_CEGIS_JSA_VERIFY_JSA_SYMEX_VERIFY_H #include @@ -93,4 +93,4 @@ class jsa_symex_verifyt const counterexamplet &counterexample) const; }; -#endif /* CEGIS_JSA_SYMEX_VERIFY_H_ */ +#endif // CPROVER_CEGIS_JSA_VERIFY_JSA_SYMEX_VERIFY_H diff --git a/src/cegis/jsa/verify/renondet_inputs.h b/src/cegis/jsa/verify/renondet_inputs.h index 0d053dd9d31..2484407d311 100644 --- a/src/cegis/jsa/verify/renondet_inputs.h +++ b/src/cegis/jsa/verify/renondet_inputs.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_JSA_RENONDET_INPUTS_H_ -#define CEGIS_JSA_RENONDET_INPUTS_H_ +#ifndef CPROVER_CEGIS_JSA_VERIFY_RENONDET_INPUTS_H +#define CPROVER_CEGIS_JSA_VERIFY_RENONDET_INPUTS_H /** * @brief @@ -19,4 +19,4 @@ Author: Daniel Kroening, kroening@kroening.com */ void assume_renondet_inputs_valid(class jsa_programt &prog); -#endif /* CEGIS_JSA_RENONDET_INPUTS_H_ */ +#endif // CPROVER_CEGIS_JSA_VERIFY_RENONDET_INPUTS_H diff --git a/src/cegis/learn/concurrent_learn.h b/src/cegis/learn/concurrent_learn.h index d3d2b8d8ec4..25b00838941 100644 --- a/src/cegis/learn/concurrent_learn.h +++ b/src/cegis/learn/concurrent_learn.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_CONCURRENT_LEARN_H_ -#define CEGIS_CONCURRENT_LEARN_H_ +#ifndef CPROVER_CEGIS_LEARN_CONCURRENT_LEARN_H +#define CPROVER_CEGIS_LEARN_CONCURRENT_LEARN_H #include @@ -90,4 +90,4 @@ class concurrent_learnt #include "concurrent_learn.inc" -#endif /* CEGIS_CONCURRENT_LEARN_H_ */ +#endif // CPROVER_CEGIS_LEARN_CONCURRENT_LEARN_H diff --git a/src/cegis/learn/constraint_helper.h b/src/cegis/learn/constraint_helper.h index b599643d08d..7be5dc210e2 100644 --- a/src/cegis/learn/constraint_helper.h +++ b/src/cegis/learn/constraint_helper.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_LEARN_CONSTRAINT_HELPER_H_ -#define CEGIS_LEARN_CONSTRAINT_HELPER_H_ +#ifndef CPROVER_CEGIS_LEARN_CONSTRAINT_HELPER_H +#define CPROVER_CEGIS_LEARN_CONSTRAINT_HELPER_H /** * @brief @@ -19,4 +19,4 @@ */ void transform_asserts_to_assumes(class goto_functionst &gf); -#endif /* CEGIS_LEARN_CONSTRAINT_HELPER_H_ */ +#endif // CPROVER_CEGIS_LEARN_CONSTRAINT_HELPER_H diff --git a/src/cegis/learn/insert_counterexample.h b/src/cegis/learn/insert_counterexample.h index aa6e433bafa..d20d9f6809b 100644 --- a/src/cegis/learn/insert_counterexample.h +++ b/src/cegis/learn/insert_counterexample.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_LEARN_INSERT_COUNTEREXAMPLE_H_ -#define CEGIS_LEARN_INSERT_COUNTEREXAMPLE_H_ +#ifndef CPROVER_CEGIS_LEARN_INSERT_COUNTEREXAMPLE_H +#define CPROVER_CEGIS_LEARN_INSERT_COUNTEREXAMPLE_H #include @@ -112,4 +112,4 @@ std::string get_ce_array_name(const irep_idt &loc_id); */ std::string get_ce_value_index_name(const irep_idt &loc_id); -#endif /* CEGIS_LEARN_INSERT_COUNTEREXAMPLE_H_ */ +#endif // CPROVER_CEGIS_LEARN_INSERT_COUNTEREXAMPLE_H diff --git a/src/cegis/options/parameters.h b/src/cegis/options/parameters.h index 0682c142fd8..d97633f8272 100644 --- a/src/cegis/options/parameters.h +++ b/src/cegis/options/parameters.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_INVARIANT_PARAMETERS_H_ -#define CEGIS_INVARIANT_PARAMETERS_H_ +#ifndef CPROVER_CEGIS_OPTIONS_PARAMETERS_H +#define CPROVER_CEGIS_OPTIONS_PARAMETERS_H #define CEGIS_GENETIC "cegis-genetic" #define CEGIS_GENETIC_ONLY "cegis-genetic-only" @@ -28,4 +28,4 @@ #define CEGIS_REFACTOR "cegis-refactor" #define CEGIS_NULL_OBJECT_REFACTOR "cegis-refactor-null-object" -#endif /* CEGIS_INVARIANT_PARAMETERS_H_ */ +#endif // CPROVER_CEGIS_OPTIONS_PARAMETERS_H diff --git a/src/cegis/refactor/constraint/constraint_factory.h b/src/cegis/refactor/constraint/constraint_factory.h index 02342a38c26..ee25bdf1bed 100644 --- a/src/cegis/refactor/constraint/constraint_factory.h +++ b/src/cegis/refactor/constraint/constraint_factory.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_REFACTOR_CONSTRAINT_CONSTRAINT_FACTORY_H_ -#define CEGIS_REFACTOR_CONSTRAINT_CONSTRAINT_FACTORY_H_ +#ifndef CPROVER_CEGIS_REFACTOR_CONSTRAINT_CONSTRAINT_FACTORY_H +#define CPROVER_CEGIS_REFACTOR_CONSTRAINT_CONSTRAINT_FACTORY_H /** * @brief @@ -28,4 +28,4 @@ void create_constraint_function_caller(class refactor_programt &prog); */ void create_refactoring_constraint(refactor_programt &prog); -#endif /* CEGIS_REFACTOR_CONSTRAINT_CONSTRAINT_FACTORY_H_ */ +#endif // CPROVER_CEGIS_REFACTOR_CONSTRAINT_CONSTRAINT_FACTORY_H diff --git a/src/cegis/refactor/environment/instrument_state_vars.h b/src/cegis/refactor/environment/instrument_state_vars.h index b4f983c600b..64cdea270f1 100644 --- a/src/cegis/refactor/environment/instrument_state_vars.h +++ b/src/cegis/refactor/environment/instrument_state_vars.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_REFACTOR_ENVIRONMENT_INSTRUMENT_STATE_VARS_H_ -#define CEGIS_REFACTOR_ENVIRONMENT_INSTRUMENT_STATE_VARS_H_ +#ifndef CPROVER_CEGIS_REFACTOR_ENVIRONMENT_INSTRUMENT_STATE_VARS_H +#define CPROVER_CEGIS_REFACTOR_ENVIRONMENT_INSTRUMENT_STATE_VARS_H #include @@ -58,4 +58,4 @@ void instrument_program_ops( goto_programt::targett pos, const std::set &state_vars); -#endif /* CEGIS_REFACTOR_ENVIRONMENT_INSTRUMENT_STATE_VARS_H_ */ +#endif // CPROVER_CEGIS_REFACTOR_ENVIRONMENT_INSTRUMENT_STATE_VARS_H diff --git a/src/cegis/refactor/facade/refactor_runner.h b/src/cegis/refactor/facade/refactor_runner.h index a960b011a6b..f3ea91151db 100644 --- a/src/cegis/refactor/facade/refactor_runner.h +++ b/src/cegis/refactor/facade/refactor_runner.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_REFACTOR_FACADE_REFACTOR_RUNNER_H_ -#define CEGIS_REFACTOR_FACADE_REFACTOR_RUNNER_H_ +#ifndef CPROVER_CEGIS_REFACTOR_FACADE_REFACTOR_RUNNER_H +#define CPROVER_CEGIS_REFACTOR_FACADE_REFACTOR_RUNNER_H #include @@ -27,4 +27,4 @@ int run_refactor(class optionst &options, messaget::mstreamt &result, const class symbol_tablet &st, const class goto_functionst &gf); -#endif /* CEGIS_REFACTOR_FACADE_REFACTOR_RUNNER_H_ */ +#endif // CPROVER_CEGIS_REFACTOR_FACADE_REFACTOR_RUNNER_H diff --git a/src/cegis/refactor/instructionset/cegis_instruction_factory.h b/src/cegis/refactor/instructionset/cegis_instruction_factory.h index badbb4474e3..30bd64adb30 100644 --- a/src/cegis/refactor/instructionset/cegis_instruction_factory.h +++ b/src/cegis/refactor/instructionset/cegis_instruction_factory.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_REFACTOR_INSTRUCTIONSET_CEGIS_INSTRUCTION_FACTORY_H_ -#define CEGIS_REFACTOR_INSTRUCTIONSET_CEGIS_INSTRUCTION_FACTORY_H_ +#ifndef CPROVER_CEGIS_REFACTOR_INSTRUCTIONSET_CEGIS_INSTRUCTION_FACTORY_H +#define CPROVER_CEGIS_REFACTOR_INSTRUCTIONSET_CEGIS_INSTRUCTION_FACTORY_H #include #include @@ -39,4 +39,4 @@ ordered_instructionst get_instructions_for_types( instruction_descriptionst::size_type num_instrs( const ordered_instructionst &instrs); -#endif /* CEGIS_REFACTOR_INSTRUCTIONSET_CEGIS_INSTRUCTION_FACTORY_H_ */ +#endif // CPROVER_CEGIS_REFACTOR_INSTRUCTIONSET_CEGIS_INSTRUCTION_FACTORY_H diff --git a/src/cegis/refactor/instructionset/cegis_processor_body_factory.h b/src/cegis/refactor/instructionset/cegis_processor_body_factory.h index f76eae25006..a208b794fcf 100644 --- a/src/cegis/refactor/instructionset/cegis_processor_body_factory.h +++ b/src/cegis/refactor/instructionset/cegis_processor_body_factory.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_REFACTOR_INSTRUCTIONSET_CEGIS_PROCESSOR_BODY_FACTORY_H_ -#define CEGIS_REFACTOR_INSTRUCTIONSET_CEGIS_PROCESSOR_BODY_FACTORY_H_ +#ifndef CPROVER_CEGIS_REFACTOR_INSTRUCTIONSET_CEGIS_PROCESSOR_BODY_FACTORY_H +#define CPROVER_CEGIS_REFACTOR_INSTRUCTIONSET_CEGIS_PROCESSOR_BODY_FACTORY_H #include @@ -50,4 +50,4 @@ void generate_processor_body( const std::string &name, const cegis_operand_datat &slots); -#endif /* CEGIS_REFACTOR_INSTRUCTIONSET_CEGIS_PROCESSOR_BODY_FACTORY_H_ */ +#endif // CPROVER_CEGIS_REFACTOR_INSTRUCTIONSET_CEGIS_PROCESSOR_BODY_FACTORY_H diff --git a/src/cegis/refactor/instructionset/create_cegis_processor.h b/src/cegis/refactor/instructionset/create_cegis_processor.h index 05050da473d..50e5c5bbda8 100644 --- a/src/cegis/refactor/instructionset/create_cegis_processor.h +++ b/src/cegis/refactor/instructionset/create_cegis_processor.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_REFACTOR_INSTRUCTIONSET_CREATE_CEGIS_PROCESSOR_H_ -#define CEGIS_REFACTOR_INSTRUCTIONSET_CREATE_CEGIS_PROCESSOR_H_ +#ifndef CPROVER_CEGIS_REFACTOR_INSTRUCTIONSET_CREATE_CEGIS_PROCESSOR_H +#define CPROVER_CEGIS_REFACTOR_INSTRUCTIONSET_CREATE_CEGIS_PROCESSOR_H #include @@ -89,4 +89,4 @@ std::string create_cegis_processor( class goto_functionst &gf, const std::map &variable_slots_per_context_type); -#endif /* CEGIS_REFACTOR_INSTRUCTIONSET_CREATE_CEGIS_PROCESSOR_H_ */ +#endif // CPROVER_CEGIS_REFACTOR_INSTRUCTIONSET_CREATE_CEGIS_PROCESSOR_H diff --git a/src/cegis/refactor/instructionset/execute_cegis_program.h b/src/cegis/refactor/instructionset/execute_cegis_program.h index c85d435c7d2..999db14cc9c 100644 --- a/src/cegis/refactor/instructionset/execute_cegis_program.h +++ b/src/cegis/refactor/instructionset/execute_cegis_program.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_REFACTOR_INSTRUCTIONSET_EXECUTE_CEGIS_PROGRAM_H_ -#define CEGIS_REFACTOR_INSTRUCTIONSET_EXECUTE_CEGIS_PROGRAM_H_ +#ifndef CPROVER_CEGIS_REFACTOR_INSTRUCTIONSET_EXECUTE_CEGIS_PROGRAM_H +#define CPROVER_CEGIS_REFACTOR_INSTRUCTIONSET_EXECUTE_CEGIS_PROGRAM_H #include @@ -142,4 +142,4 @@ goto_programt::targett instrument_cegis_operand( size_t index, const irep_idt &var_name); -#endif /* CEGIS_REFACTOR_INSTRUCTIONSET_EXECUTE_CEGIS_PROGRAM_H_ */ +#endif // CPROVER_CEGIS_REFACTOR_INSTRUCTIONSET_EXECUTE_CEGIS_PROGRAM_H diff --git a/src/cegis/refactor/instructionset/instruction_description.h b/src/cegis/refactor/instructionset/instruction_description.h index 8b60f949f1f..281e94ec4e2 100644 --- a/src/cegis/refactor/instructionset/instruction_description.h +++ b/src/cegis/refactor/instructionset/instruction_description.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_REFACTOR_INSTRUCTIONSET_INSTRUCTIONDESCRIPTION_H_ -#define CEGIS_REFACTOR_INSTRUCTIONSET_INSTRUCTIONDESCRIPTION_H_ +#ifndef CPROVER_CEGIS_REFACTOR_INSTRUCTIONSET_INSTRUCTION_DESCRIPTION_H +#define CPROVER_CEGIS_REFACTOR_INSTRUCTIONSET_INSTRUCTION_DESCRIPTION_H #include @@ -98,4 +98,4 @@ class instruction_descriptiont { */ typedef std::vector instruction_descriptionst; -#endif /* CEGIS_REFACTOR_INSTRUCTIONSET_INSTRUCTIONDESCRIPTION_H_ */ +#endif // CPROVER_CEGIS_REFACTOR_INSTRUCTIONSET_INSTRUCTION_DESCRIPTION_H diff --git a/src/cegis/refactor/instructionset/operand_data.h b/src/cegis/refactor/instructionset/operand_data.h index 7a52213e21d..2e0f7870513 100644 --- a/src/cegis/refactor/instructionset/operand_data.h +++ b/src/cegis/refactor/instructionset/operand_data.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_REFACTOR_INSTRUCTIONSET_OPERAND_DATA_H_ -#define CEGIS_REFACTOR_INSTRUCTIONSET_OPERAND_DATA_H_ +#ifndef CPROVER_CEGIS_REFACTOR_INSTRUCTIONSET_OPERAND_DATA_H +#define CPROVER_CEGIS_REFACTOR_INSTRUCTIONSET_OPERAND_DATA_H #include @@ -19,4 +19,4 @@ Author: Daniel Kroening, kroening@kroening.com */ typedef std::map cegis_operand_datat; -#endif /* CEGIS_REFACTOR_INSTRUCTIONSET_OPERAND_DATA_H_ */ +#endif // CPROVER_CEGIS_REFACTOR_INSTRUCTIONSET_OPERAND_DATA_H diff --git a/src/cegis/refactor/instructionset/processor_symbols.h b/src/cegis/refactor/instructionset/processor_symbols.h index 896e58e3b73..ca34874c76a 100644 --- a/src/cegis/refactor/instructionset/processor_symbols.h +++ b/src/cegis/refactor/instructionset/processor_symbols.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_REFACTOR_INSTRUCTIONSET_PROCESSOR_SYMBOLS_H_ -#define CEGIS_REFACTOR_INSTRUCTIONSET_PROCESSOR_SYMBOLS_H_ +#ifndef CPROVER_CEGIS_REFACTOR_INSTRUCTIONSET_PROCESSOR_SYMBOLS_H +#define CPROVER_CEGIS_REFACTOR_INSTRUCTIONSET_PROCESSOR_SYMBOLS_H #include @@ -139,4 +139,4 @@ dereference_exprt cegis_operand( */ bool is_refactor_meta_var(const irep_idt &var); -#endif /* CEGIS_REFACTOR_INSTRUCTIONSET_PROCESSOR_SYMBOLS_H_ */ +#endif // CPROVER_CEGIS_REFACTOR_INSTRUCTIONSET_PROCESSOR_SYMBOLS_H diff --git a/src/cegis/refactor/instructionset/processor_types.h b/src/cegis/refactor/instructionset/processor_types.h index 91059cf74fb..adfb10d63e8 100644 --- a/src/cegis/refactor/instructionset/processor_types.h +++ b/src/cegis/refactor/instructionset/processor_types.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_REFACTOR_INSTRUCTIONSET_PROCESSOR_TYPES_H_ -#define CEGIS_REFACTOR_INSTRUCTIONSET_PROCESSOR_TYPES_H_ +#ifndef CPROVER_CEGIS_REFACTOR_INSTRUCTIONSET_PROCESSOR_TYPES_H +#define CPROVER_CEGIS_REFACTOR_INSTRUCTIONSET_PROCESSOR_TYPES_H #include @@ -50,4 +50,4 @@ typet cegis_size_type(); */ bool is_cegis_primitive(const typet &type); -#endif /* CEGIS_REFACTOR_INSTRUCTIONSET_PROCESSOR_TYPES_H_ */ +#endif // CPROVER_CEGIS_REFACTOR_INSTRUCTIONSET_PROCESSOR_TYPES_H diff --git a/src/cegis/refactor/learn/instrument_counterexamples.h b/src/cegis/refactor/learn/instrument_counterexamples.h index 1feb9ab713b..0f5734cb79a 100644 --- a/src/cegis/refactor/learn/instrument_counterexamples.h +++ b/src/cegis/refactor/learn/instrument_counterexamples.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_REFACTOR_LEARN_INSTRUMENT_COUNTEREXAMPLES_H_ -#define CEGIS_REFACTOR_LEARN_INSTRUMENT_COUNTEREXAMPLES_H_ +#ifndef CPROVER_CEGIS_REFACTOR_LEARN_INSTRUMENT_COUNTEREXAMPLES_H +#define CPROVER_CEGIS_REFACTOR_LEARN_INSTRUMENT_COUNTEREXAMPLES_H #include @@ -24,4 +24,4 @@ void instrument_counterexamples( class refactor_programt &prog, refactor_counterexamplest ces); -#endif /* CEGIS_REFACTOR_LEARN_INSTRUMENT_COUNTEREXAMPLES_H_ */ +#endif // CPROVER_CEGIS_REFACTOR_LEARN_INSTRUMENT_COUNTEREXAMPLES_H diff --git a/src/cegis/refactor/learn/refactor_candidate_printer.h b/src/cegis/refactor/learn/refactor_candidate_printer.h index f1044886e82..bbc36833498 100644 --- a/src/cegis/refactor/learn/refactor_candidate_printer.h +++ b/src/cegis/refactor/learn/refactor_candidate_printer.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_REFACTOR_LEARN_REFACTOR_CANDIDATE_PRINTER_H_ -#define CEGIS_REFACTOR_LEARN_REFACTOR_CANDIDATE_PRINTER_H_ +#ifndef CPROVER_CEGIS_REFACTOR_LEARN_REFACTOR_CANDIDATE_PRINTER_H +#define CPROVER_CEGIS_REFACTOR_LEARN_REFACTOR_CANDIDATE_PRINTER_H #include @@ -29,4 +29,4 @@ void print_refactor_candidate( const class goto_functionst &gf, const refactor_solutiont &candidate); -#endif /* CEGIS_REFACTOR_LEARN_REFACTOR_CANDIDATE_PRINTER_H_ */ +#endif // CPROVER_CEGIS_REFACTOR_LEARN_REFACTOR_CANDIDATE_PRINTER_H diff --git a/src/cegis/refactor/learn/refactor_symex_learn.h b/src/cegis/refactor/learn/refactor_symex_learn.h index 95d8be2b9b1..d335b2716be 100644 --- a/src/cegis/refactor/learn/refactor_symex_learn.h +++ b/src/cegis/refactor/learn/refactor_symex_learn.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_REFACTOR_LEARN_REFACTOR_SYMEX_LEARN_H_ -#define CEGIS_REFACTOR_LEARN_REFACTOR_SYMEX_LEARN_H_ +#ifndef CPROVER_CEGIS_REFACTOR_LEARN_REFACTOR_SYMEX_LEARN_H +#define CPROVER_CEGIS_REFACTOR_LEARN_REFACTOR_SYMEX_LEARN_H #include @@ -100,4 +100,4 @@ class refactor_symex_learnt const candidatet &candidate) const; }; -#endif /* CEGIS_REFACTOR_LEARN_REFACTOR_SYMEX_LEARN_H_ */ +#endif // CPROVER_CEGIS_REFACTOR_LEARN_REFACTOR_SYMEX_LEARN_H diff --git a/src/cegis/refactor/nullobject/nullable_analysis.h b/src/cegis/refactor/nullobject/nullable_analysis.h index 1b77b2c3e75..65c2c3da754 100644 --- a/src/cegis/refactor/nullobject/nullable_analysis.h +++ b/src/cegis/refactor/nullobject/nullable_analysis.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_REFACTOR_NULLOBJECT_NULLABLE_ANALYSIS_H_ -#define CEGIS_REFACTOR_NULLOBJECT_NULLABLE_ANALYSIS_H_ +#ifndef CPROVER_CEGIS_REFACTOR_NULLOBJECT_NULLABLE_ANALYSIS_H +#define CPROVER_CEGIS_REFACTOR_NULLOBJECT_NULLABLE_ANALYSIS_H #include @@ -72,4 +72,4 @@ void replace_method_call_by_processor( const std::string &processor, const std::string &prog); -#endif /* CEGIS_REFACTOR_NULLOBJECT_NULLABLE_ANALYSIS_H_ */ +#endif // CPROVER_CEGIS_REFACTOR_NULLOBJECT_NULLABLE_ANALYSIS_H diff --git a/src/cegis/refactor/nullobject/range_collector.h b/src/cegis/refactor/nullobject/range_collector.h index 8a401c4e8ac..f2c9780b1fb 100644 --- a/src/cegis/refactor/nullobject/range_collector.h +++ b/src/cegis/refactor/nullobject/range_collector.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_REFACTOR_NULLOBJECT_RANGE_COLLECTOR_H_ -#define CEGIS_REFACTOR_NULLOBJECT_RANGE_COLLECTOR_H_ +#ifndef CPROVER_CEGIS_REFACTOR_NULLOBJECT_RANGE_COLLECTOR_H +#define CPROVER_CEGIS_REFACTOR_NULLOBJECT_RANGE_COLLECTOR_H /** * @brief @@ -24,4 +24,4 @@ */ void collect_nullobject_ranges(class refactor_programt &prog); -#endif /* CEGIS_REFACTOR_NULLOBJECT_RANGE_COLLECTOR_H_ */ +#endif // CPROVER_CEGIS_REFACTOR_NULLOBJECT_RANGE_COLLECTOR_H diff --git a/src/cegis/refactor/options/refactor_program.h b/src/cegis/refactor/options/refactor_program.h index d0c7ccf5a1e..35282d347b3 100644 --- a/src/cegis/refactor/options/refactor_program.h +++ b/src/cegis/refactor/options/refactor_program.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_REFACTOR_OPTIONS_REFACTOR_PROGRAM_H_ -#define CEGIS_REFACTOR_OPTIONS_REFACTOR_PROGRAM_H_ +#ifndef CPROVER_CEGIS_REFACTOR_OPTIONS_REFACTOR_PROGRAM_H +#define CPROVER_CEGIS_REFACTOR_OPTIONS_REFACTOR_PROGRAM_H #include @@ -114,4 +114,4 @@ class refactor_programt refactor_programt &operator=(const refactor_programt &other); }; -#endif /* CEGIS_REFACTOR_OPTIONS_REFACTOR_PROGRAM_H_ */ +#endif // CPROVER_CEGIS_REFACTOR_OPTIONS_REFACTOR_PROGRAM_H diff --git a/src/cegis/refactor/options/refactoring_type.h b/src/cegis/refactor/options/refactoring_type.h index 4f01afdf951..022affe60a4 100644 --- a/src/cegis/refactor/options/refactoring_type.h +++ b/src/cegis/refactor/options/refactoring_type.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_REFACTOR_OPTIONS_REFACTORING_TYPE_H_ -#define CEGIS_REFACTOR_OPTIONS_REFACTORING_TYPE_H_ +#ifndef CPROVER_CEGIS_REFACTOR_OPTIONS_REFACTORING_TYPE_H +#define CPROVER_CEGIS_REFACTOR_OPTIONS_REFACTORING_TYPE_H typedef enum { @@ -26,4 +26,4 @@ typedef enum */ refactoring_typet get_refactoring_type(const class optionst &options); -#endif /* CEGIS_REFACTOR_OPTIONS_REFACTORING_TYPE_H_ */ +#endif // CPROVER_CEGIS_REFACTOR_OPTIONS_REFACTORING_TYPE_H diff --git a/src/cegis/refactor/preprocessing/collect_counterexamples.h b/src/cegis/refactor/preprocessing/collect_counterexamples.h index 843da586e36..cc0038bcf2c 100644 --- a/src/cegis/refactor/preprocessing/collect_counterexamples.h +++ b/src/cegis/refactor/preprocessing/collect_counterexamples.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_REFACTOR_PREPROCESSING_COLLECT_COUNTEREXAMPLES_H_ -#define CEGIS_REFACTOR_PREPROCESSING_COLLECT_COUNTEREXAMPLES_H_ +#ifndef CPROVER_CEGIS_REFACTOR_PREPROCESSING_COLLECT_COUNTEREXAMPLES_H +#define CPROVER_CEGIS_REFACTOR_PREPROCESSING_COLLECT_COUNTEREXAMPLES_H /** * @brief @@ -19,4 +19,4 @@ */ void collect_counterexamples(class refactor_programt &prog); -#endif /* CEGIS_REFACTOR_PREPROCESSING_COLLECT_COUNTEREXAMPLES_H_ */ +#endif // CPROVER_CEGIS_REFACTOR_PREPROCESSING_COLLECT_COUNTEREXAMPLES_H diff --git a/src/cegis/refactor/preprocessing/refactor_preprocessing.h b/src/cegis/refactor/preprocessing/refactor_preprocessing.h index 9a328c3b30e..155187dfea7 100644 --- a/src/cegis/refactor/preprocessing/refactor_preprocessing.h +++ b/src/cegis/refactor/preprocessing/refactor_preprocessing.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_REFACTOR_PREPROCESSING_REFACTOR_PREPROCESSING_H_ -#define CEGIS_REFACTOR_PREPROCESSING_REFACTOR_PREPROCESSING_H_ +#ifndef CPROVER_CEGIS_REFACTOR_PREPROCESSING_REFACTOR_PREPROCESSING_H +#define CPROVER_CEGIS_REFACTOR_PREPROCESSING_REFACTOR_PREPROCESSING_H #include @@ -72,4 +72,4 @@ class refactor_preprocessingt const refactor_programt &get_program() const; }; -#endif /* CEGIS_REFACTOR_PREPROCESSING_REFACTOR_PREPROCESSING_H_ */ +#endif // CPROVER_CEGIS_REFACTOR_PREPROCESSING_REFACTOR_PREPROCESSING_H diff --git a/src/cegis/refactor/value/refactor_counterexample.h b/src/cegis/refactor/value/refactor_counterexample.h index c006c9f73df..fe4a8344e65 100644 --- a/src/cegis/refactor/value/refactor_counterexample.h +++ b/src/cegis/refactor/value/refactor_counterexample.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_REFACTOR_VALUE_REFACTOR_COUNTERXAMPLE_H_ -#define CEGIS_REFACTOR_VALUE_REFACTOR_COUNTERXAMPLE_H_ +#ifndef CPROVER_CEGIS_REFACTOR_VALUE_REFACTOR_COUNTEREXAMPLE_H +#define CPROVER_CEGIS_REFACTOR_VALUE_REFACTOR_COUNTEREXAMPLE_H #include @@ -26,4 +26,4 @@ typedef labelled_assignmentst refactor_counterexamplet; */ typedef labelled_counterexamplest refactor_counterexamplest; -#endif /* CEGIS_REFACTOR_VALUE_REFACTOR_COUNTERXAMPLE_H_ */ +#endif // CPROVER_CEGIS_REFACTOR_VALUE_REFACTOR_COUNTEREXAMPLE_H diff --git a/src/cegis/refactor/value/refactor_solution.h b/src/cegis/refactor/value/refactor_solution.h index 3f504db943a..5cb538f5bfc 100644 --- a/src/cegis/refactor/value/refactor_solution.h +++ b/src/cegis/refactor/value/refactor_solution.h @@ -7,11 +7,11 @@ \*******************************************************************/ -#ifndef CEGIS_REFACTOR_VALUE_REFACTOR_SOLUTION_H_ -#define CEGIS_REFACTOR_VALUE_REFACTOR_SOLUTION_H_ +#ifndef CPROVER_CEGIS_REFACTOR_VALUE_REFACTOR_SOLUTION_H +#define CPROVER_CEGIS_REFACTOR_VALUE_REFACTOR_SOLUTION_H #include typedef std::map refactor_solutiont; -#endif /* CEGIS_REFACTOR_VALUE_REFACTOR_SOLUTION_H_ */ +#endif // CPROVER_CEGIS_REFACTOR_VALUE_REFACTOR_SOLUTION_H diff --git a/src/cegis/refactor/verify/refactor_symex_verify.h b/src/cegis/refactor/verify/refactor_symex_verify.h index f0932d9f52e..65be9d7fdf8 100644 --- a/src/cegis/refactor/verify/refactor_symex_verify.h +++ b/src/cegis/refactor/verify/refactor_symex_verify.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_REFACTOR_VERIFY_REFACTOR_SYMEX_VERIFY_H_ -#define CEGIS_REFACTOR_VERIFY_REFACTOR_SYMEX_VERIFY_H_ +#ifndef CPROVER_CEGIS_REFACTOR_VERIFY_REFACTOR_SYMEX_VERIFY_H +#define CPROVER_CEGIS_REFACTOR_VERIFY_REFACTOR_SYMEX_VERIFY_H #include @@ -91,4 +91,4 @@ class refactor_symex_verifyt const counterexamplet &counterexample) const; }; -#endif /* CEGIS_REFACTOR_VERIFY_REFACTOR_SYMEX_VERIFY_H_ */ +#endif // CPROVER_CEGIS_REFACTOR_VERIFY_REFACTOR_SYMEX_VERIFY_H diff --git a/src/cegis/runner/cegis_parse_options.h b/src/cegis/runner/cegis_parse_options.h index 87989964b86..87f6fb001d9 100644 --- a/src/cegis/runner/cegis_parse_options.h +++ b/src/cegis/runner/cegis_parse_options.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_CEGIS_PARSEOPTIONS_H -#define CPROVER_CEGIS_PARSEOPTIONS_H +#ifndef CPROVER_CEGIS_RUNNER_CEGIS_PARSE_OPTIONS_H +#define CPROVER_CEGIS_RUNNER_CEGIS_PARSE_OPTIONS_H #include @@ -35,4 +35,4 @@ class cegis_parse_optionst: public cbmc_parse_optionst virtual int do_bmc(bmct &bmc, const goto_functionst &goto_functions); }; -#endif +#endif // CPROVER_CEGIS_RUNNER_CEGIS_PARSE_OPTIONS_H diff --git a/src/cegis/safety/constraint/safety_constraint_factory.h b/src/cegis/safety/constraint/safety_constraint_factory.h index e3528c91171..07946afe437 100644 --- a/src/cegis/safety/constraint/safety_constraint_factory.h +++ b/src/cegis/safety/constraint/safety_constraint_factory.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_SAFETY_CONSTRAINT_FACTORY_H_ -#define CEGIS_SAFETY_CONSTRAINT_FACTORY_H_ +#ifndef CPROVER_CEGIS_SAFETY_CONSTRAINT_SAFETY_CONSTRAINT_FACTORY_H +#define CPROVER_CEGIS_SAFETY_CONSTRAINT_SAFETY_CONSTRAINT_FACTORY_H #include @@ -23,4 +23,4 @@ */ exprt create_safety_constraint(const size_t number_of_loops); -#endif /* CEGIS_SAFETY_CONSTRAINT_FACTORY_H_ */ +#endif // CPROVER_CEGIS_SAFETY_CONSTRAINT_SAFETY_CONSTRAINT_FACTORY_H diff --git a/src/cegis/safety/facade/safety_runner.h b/src/cegis/safety/facade/safety_runner.h index ed3b50425bc..cb2801b1f85 100644 --- a/src/cegis/safety/facade/safety_runner.h +++ b/src/cegis/safety/facade/safety_runner.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_SAFETY_RUNNER_H_ -#define CEGIS_SAFETY_RUNNER_H_ +#ifndef CPROVER_CEGIS_SAFETY_FACADE_SAFETY_RUNNER_H +#define CPROVER_CEGIS_SAFETY_FACADE_SAFETY_RUNNER_H #include @@ -28,4 +28,4 @@ Author: Daniel Kroening, kroening@kroening.com int run_safety(class optionst &options, messaget::mstreamt &result, const class symbol_tablet &st, const class goto_functionst &gf); -#endif /* CEGIS_SAFETY_RUNNER_H_ */ +#endif // CPROVER_CEGIS_SAFETY_FACADE_SAFETY_RUNNER_H diff --git a/src/cegis/safety/genetic/dynamic_safety_test_runner.h b/src/cegis/safety/genetic/dynamic_safety_test_runner.h index 6caf4df1551..499d8e659f4 100644 --- a/src/cegis/safety/genetic/dynamic_safety_test_runner.h +++ b/src/cegis/safety/genetic/dynamic_safety_test_runner.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_GENETIC_DYNAMIC_SAFETY_TEST_RUNNER_H_ -#define CEGIS_GENETIC_DYNAMIC_SAFETY_TEST_RUNNER_H_ +#ifndef CPROVER_CEGIS_SAFETY_GENETIC_DYNAMIC_SAFETY_TEST_RUNNER_H +#define CPROVER_CEGIS_SAFETY_GENETIC_DYNAMIC_SAFETY_TEST_RUNNER_H #include @@ -76,4 +76,4 @@ class dynamic_safety_test_runnert void join(); }; -#endif /* CEGIS_GENETIC_DYNAMIC_SAFETY_TEST_RUNNER_H_ */ +#endif // CPROVER_CEGIS_SAFETY_GENETIC_DYNAMIC_SAFETY_TEST_RUNNER_H diff --git a/src/cegis/safety/meta/meta_variable_names.h b/src/cegis/safety/meta/meta_variable_names.h index 49b126edbc0..23f07df3b58 100644 --- a/src/cegis/safety/meta/meta_variable_names.h +++ b/src/cegis/safety/meta/meta_variable_names.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_SAFETY_META_VARIABLE_NAMES_H_ -#define CEGIS_SAFETY_META_VARIABLE_NAMES_H_ +#ifndef CPROVER_CEGIS_SAFETY_META_META_VARIABLE_NAMES_H +#define CPROVER_CEGIS_SAFETY_META_META_VARIABLE_NAMES_H #include @@ -43,4 +43,4 @@ std::string get_Ix(const size_t loop_id); */ std::string get_Ix_prime(const size_t loop_id); -#endif /* CEGIS_DANGER_META_VARIABLE_NAMES_H_ */ +#endif // CPROVER_CEGIS_SAFETY_META_META_VARIABLE_NAMES_H diff --git a/src/cegis/safety/options/safety_program.h b/src/cegis/safety/options/safety_program.h index d5031ed4bfc..70f85b5e10b 100644 --- a/src/cegis/safety/options/safety_program.h +++ b/src/cegis/safety/options/safety_program.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_SAFETY_PROGRAM_H_ -#define CEGIS_SAFETY_PROGRAM_H_ +#ifndef CPROVER_CEGIS_SAFETY_OPTIONS_SAFETY_PROGRAM_H +#define CPROVER_CEGIS_SAFETY_OPTIONS_SAFETY_PROGRAM_H #include @@ -83,4 +83,4 @@ class safety_programt: public invariant_programt virtual invariant_loopt &add_loop(); }; -#endif /* CEGIS_SAFETY_PROGRAM_H_ */ +#endif // CPROVER_CEGIS_SAFETY_OPTIONS_SAFETY_PROGRAM_H diff --git a/src/cegis/safety/options/safety_program_genetic_settings.h b/src/cegis/safety/options/safety_program_genetic_settings.h index c3553828491..c1beb687c1d 100644 --- a/src/cegis/safety/options/safety_program_genetic_settings.h +++ b/src/cegis/safety/options/safety_program_genetic_settings.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_SAFETY_PROGRAM_GENETIC_SETTINGS_H_ -#define CEGIS_SAFETY_PROGRAM_GENETIC_SETTINGS_H_ +#ifndef CPROVER_CEGIS_SAFETY_OPTIONS_SAFETY_PROGRAM_GENETIC_SETTINGS_H +#define CPROVER_CEGIS_SAFETY_OPTIONS_SAFETY_PROGRAM_GENETIC_SETTINGS_H #include @@ -81,4 +81,4 @@ class safety_program_genetic_settingst: public genetic_settingst #include "safety_program_genetic_settings.inc" -#endif /* CEGIS_DANGER_PROGRAM_GENETIC_SETTINGS_H_ */ +#endif // CPROVER_CEGIS_SAFETY_OPTIONS_SAFETY_PROGRAM_GENETIC_SETTINGS_H diff --git a/src/cegis/safety/options/safety_program_printer.h b/src/cegis/safety/options/safety_program_printer.h index c02351833fc..6efcaf65225 100644 --- a/src/cegis/safety/options/safety_program_printer.h +++ b/src/cegis/safety/options/safety_program_printer.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_SAFETY_PROGRAM_PRINTER_H_ -#define CEGIS_SAFETY_PROGRAM_PRINTER_H_ +#ifndef CPROVER_CEGIS_SAFETY_OPTIONS_SAFETY_PROGRAM_PRINTER_H +#define CPROVER_CEGIS_SAFETY_OPTIONS_SAFETY_PROGRAM_PRINTER_H #include @@ -27,4 +27,4 @@ void print_safety_program(messaget::mstreamt &os, const class safety_programt &program, const safety_goto_solutiont &solution); -#endif /* CEGIS_DANGER_PROGRAM_PRINTER_H_ */ +#endif // CPROVER_CEGIS_SAFETY_OPTIONS_SAFETY_PROGRAM_PRINTER_H diff --git a/src/cegis/safety/preprocessing/safety_preprocessing.h b/src/cegis/safety/preprocessing/safety_preprocessing.h index ed3e03423d1..43a924a09c0 100644 --- a/src/cegis/safety/preprocessing/safety_preprocessing.h +++ b/src/cegis/safety/preprocessing/safety_preprocessing.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_SAFETY_PREPROCESSING_H_ -#define CEGIS_SAFETY_PREPROCESSING_H_ +#ifndef CPROVER_CEGIS_SAFETY_PREPROCESSING_SAFETY_PREPROCESSING_H +#define CPROVER_CEGIS_SAFETY_PREPROCESSING_SAFETY_PREPROCESSING_H #include #include @@ -79,4 +79,4 @@ class safety_preprocessingt const safety_programt &get_safety_program() const; }; -#endif /* CEGIS_SAFETY_PREPROCESSING_H_ */ +#endif // CPROVER_CEGIS_SAFETY_PREPROCESSING_SAFETY_PREPROCESSING_H diff --git a/src/cegis/safety/symex/fitness/safety_fitness_config.h b/src/cegis/safety/symex/fitness/safety_fitness_config.h index c171cd9e4c2..2e30a984ae9 100644 --- a/src/cegis/safety/symex/fitness/safety_fitness_config.h +++ b/src/cegis/safety/symex/fitness/safety_fitness_config.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_SAFETY_FITNESS_CONFIG_H_ -#define CEGIS_SAFETY_FITNESS_CONFIG_H_ +#ifndef CPROVER_CEGIS_SAFETY_SYMEX_FITNESS_SAFETY_FITNESS_CONFIG_H +#define CPROVER_CEGIS_SAFETY_SYMEX_FITNESS_SAFETY_FITNESS_CONFIG_H #include @@ -120,4 +120,4 @@ class safety_fitness_configt void show(messaget::mstreamt &os, const candidatet &candidate) const; }; -#endif /* CEGIS_SAFETY_FITNESS_CONFIG_H_ */ +#endif // CPROVER_CEGIS_SAFETY_SYMEX_FITNESS_SAFETY_FITNESS_CONFIG_H diff --git a/src/cegis/safety/symex/learn/add_counterexamples.h b/src/cegis/safety/symex/learn/add_counterexamples.h index f5d31860e41..eed757b2679 100644 --- a/src/cegis/safety/symex/learn/add_counterexamples.h +++ b/src/cegis/safety/symex/learn/add_counterexamples.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_SAFETY_LEARN_ADD_COUNTEREXAMPLES_H_ -#define CEGIS_SAFETY_LEARN_ADD_COUNTEREXAMPLES_H_ +#ifndef CPROVER_CEGIS_SAFETY_SYMEX_LEARN_ADD_COUNTEREXAMPLES_H +#define CPROVER_CEGIS_SAFETY_SYMEX_LEARN_ADD_COUNTEREXAMPLES_H #include #include @@ -34,4 +34,4 @@ typedef std::deque safety_goto_cest; void safety_add_learned_counterexamples(class safety_programt &prog, const safety_goto_cest &ces, constraint_factoryt constraint); -#endif /* CEGIS_SAFETY_LEARN_ADD_COUNTEREXAMPLES_H_ */ +#endif // CPROVER_CEGIS_SAFETY_SYMEX_LEARN_ADD_COUNTEREXAMPLES_H diff --git a/src/cegis/safety/symex/learn/add_variable_refs.h b/src/cegis/safety/symex/learn/add_variable_refs.h index 4adaf2e301b..147477b3606 100644 --- a/src/cegis/safety/symex/learn/add_variable_refs.h +++ b/src/cegis/safety/symex/learn/add_variable_refs.h @@ -1,5 +1,5 @@ -#ifndef CEGIS_SAFETY_ADD_VARIABLE_REFS_H_ -#define CEGIS_SAFETY_ADD_VARIABLE_REFS_H_ +#ifndef CPROVER_CEGIS_SAFETY_SYMEX_LEARN_ADD_VARIABLE_REFS_H +#define CPROVER_CEGIS_SAFETY_SYMEX_LEARN_ADD_VARIABLE_REFS_H #include @@ -17,4 +17,4 @@ typedef std::map operand_variable_idst; void add_safety_learning_variable_refs(class invariant_programt &prog, const operand_variable_idst &var_ids, size_t max_solution_size); -#endif /* CEGIS_SAFETY_ADD_VARIABLE_REFS_H_ */ +#endif // CPROVER_CEGIS_SAFETY_SYMEX_LEARN_ADD_VARIABLE_REFS_H diff --git a/src/cegis/safety/symex/learn/encoded_safety_learn_config.h b/src/cegis/safety/symex/learn/encoded_safety_learn_config.h index a8f39871404..68c6e697872 100644 --- a/src/cegis/safety/symex/learn/encoded_safety_learn_config.h +++ b/src/cegis/safety/symex/learn/encoded_safety_learn_config.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_ENCODED_SAFETY_LEARN_CONFIG_H_ -#define CEGIS_ENCODED_SAFETY_LEARN_CONFIG_H_ +#ifndef CPROVER_CEGIS_SAFETY_SYMEX_LEARN_ENCODED_SAFETY_LEARN_CONFIG_H +#define CPROVER_CEGIS_SAFETY_SYMEX_LEARN_ENCODED_SAFETY_LEARN_CONFIG_H #include @@ -122,4 +122,4 @@ class encoded_safety_learn_configt size_t get_num_consts() const; }; -#endif /* CEGIS_ENCODED_SAFETY_LEARN_CONFIG_H_ */ +#endif // CPROVER_CEGIS_SAFETY_SYMEX_LEARN_ENCODED_SAFETY_LEARN_CONFIG_H diff --git a/src/cegis/safety/symex/learn/safety_learn_config.h b/src/cegis/safety/symex/learn/safety_learn_config.h index 7c17ae56e08..c42ee3718ab 100644 --- a/src/cegis/safety/symex/learn/safety_learn_config.h +++ b/src/cegis/safety/symex/learn/safety_learn_config.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_SAFETY_LEARN_CONFIG_H_ -#define CEGIS_SAFETY_LEARN_CONFIG_H_ +#ifndef CPROVER_CEGIS_SAFETY_SYMEX_LEARN_SAFETY_LEARN_CONFIG_H +#define CPROVER_CEGIS_SAFETY_SYMEX_LEARN_SAFETY_LEARN_CONFIG_H #include @@ -176,4 +176,4 @@ class safety_learn_configt size_t get_num_consts() const; }; -#endif /* CEGIS_SAFETY_LEARN_CONFIG_H_ */ +#endif // CPROVER_CEGIS_SAFETY_SYMEX_LEARN_SAFETY_LEARN_CONFIG_H diff --git a/src/cegis/safety/symex/learn/solution_factory.h b/src/cegis/safety/symex/learn/solution_factory.h index 1337e009009..fd8b63d13c9 100644 --- a/src/cegis/safety/symex/learn/solution_factory.h +++ b/src/cegis/safety/symex/learn/solution_factory.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_SAFETY_SOLUTION_FACTORY_H_ -#define CEGIS_SAFETY_SOLUTION_FACTORY_H_ +#ifndef CPROVER_CEGIS_SAFETY_SYMEX_LEARN_SOLUTION_FACTORY_H +#define CPROVER_CEGIS_SAFETY_SYMEX_LEARN_SOLUTION_FACTORY_H #include @@ -63,4 +63,4 @@ void create_safety_solution(safety_goto_solutiont &solution, const operand_variable_idst &var_ids, class instruction_set_info_factoryt &info_fac); -#endif /* CEGIS_SAFETY_SOLUTION_FACTORY_H_ */ +#endif // CPROVER_CEGIS_SAFETY_SYMEX_LEARN_SOLUTION_FACTORY_H diff --git a/src/cegis/safety/symex/verify/insert_candidate.h b/src/cegis/safety/symex/verify/insert_candidate.h index 067afd4e672..163b4960c7e 100644 --- a/src/cegis/safety/symex/verify/insert_candidate.h +++ b/src/cegis/safety/symex/verify/insert_candidate.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_SAFETY_SYMEX_VERIFY_INSERT_CANDIDATE_H_ -#define CEGIS_SAFETY_SYMEX_VERIFY_INSERT_CANDIDATE_H_ +#ifndef CPROVER_CEGIS_SAFETY_SYMEX_VERIFY_INSERT_CANDIDATE_H +#define CPROVER_CEGIS_SAFETY_SYMEX_VERIFY_INSERT_CANDIDATE_H #include @@ -23,4 +23,4 @@ Author: Daniel Kroening, kroening@kroening.com void safety_insert_candidate(class safety_programt &program, const safety_goto_solutiont &candidate); -#endif /* CEGIS_SAFETY_SYMEX_VERIFY_INSERT_CANDIDATE_H_ */ +#endif // CPROVER_CEGIS_SAFETY_SYMEX_VERIFY_INSERT_CANDIDATE_H diff --git a/src/cegis/safety/symex/verify/safety_verify_config.h b/src/cegis/safety/symex/verify/safety_verify_config.h index 068e478cc8e..27259d6b6e5 100644 --- a/src/cegis/safety/symex/verify/safety_verify_config.h +++ b/src/cegis/safety/symex/verify/safety_verify_config.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_SAFETY_VERIFY_CONFIG_H_ -#define CEGIS_SAFETY_VERIFY_CONFIG_H_ +#ifndef CPROVER_CEGIS_SAFETY_SYMEX_VERIFY_SAFETY_VERIFY_CONFIG_H +#define CPROVER_CEGIS_SAFETY_SYMEX_VERIFY_SAFETY_VERIFY_CONFIG_H #include @@ -110,4 +110,4 @@ class safety_verify_configt const counterexamplet &counterexample) const; }; -#endif /* CEGIS_SAFETY_VERIFY_CONFIG_H_ */ +#endif // CPROVER_CEGIS_SAFETY_SYMEX_VERIFY_SAFETY_VERIFY_CONFIG_H diff --git a/src/cegis/safety/value/individual_to_safety_solution_deserialiser.h b/src/cegis/safety/value/individual_to_safety_solution_deserialiser.h index 31da7b624a3..1139b3bd5ec 100644 --- a/src/cegis/safety/value/individual_to_safety_solution_deserialiser.h +++ b/src/cegis/safety/value/individual_to_safety_solution_deserialiser.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_INDIVIDUAL_TO_SAFETY_SOLUTION_DESERIALISER_H_ -#define CEGIS_INDIVIDUAL_TO_SAFETY_SOLUTION_DESERIALISER_H_ +#ifndef CPROVER_CEGIS_SAFETY_VALUE_INDIVIDUAL_TO_SAFETY_SOLUTION_DESERIALISER_H +#define CPROVER_CEGIS_SAFETY_VALUE_INDIVIDUAL_TO_SAFETY_SOLUTION_DESERIALISER_H #include @@ -46,4 +46,4 @@ class individual_to_safety_solution_deserialisert void operator()(safety_goto_solutiont &entity, const irept &sdu) const; }; -#endif /* CEGIS_INDIVIDUAL_TO_SAFETY_SOLUTION_DESERIALISER_H_ */ +#endif // CPROVER_CEGIS_SAFETY_VALUE_INDIVIDUAL_TO_SAFETY_SOLUTION_DESERIALISER_H diff --git a/src/cegis/safety/value/safety_goto_ce.h b/src/cegis/safety/value/safety_goto_ce.h index 373ae6b4eb3..dcf5b8cf779 100644 --- a/src/cegis/safety/value/safety_goto_ce.h +++ b/src/cegis/safety/value/safety_goto_ce.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_SAFETY_GOTO_CE_H_ -#define CEGIS_SAFETY_GOTO_CE_H_ +#ifndef CPROVER_CEGIS_SAFETY_VALUE_SAFETY_GOTO_CE_H +#define CPROVER_CEGIS_SAFETY_VALUE_SAFETY_GOTO_CE_H #include @@ -50,4 +50,4 @@ class safety_goto_cet bool operator==(const safety_goto_cet &other) const; }; -#endif /* CEGIS_SAFETY_GOTO_CE_H_ */ +#endif // CPROVER_CEGIS_SAFETY_VALUE_SAFETY_GOTO_CE_H diff --git a/src/cegis/safety/value/safety_goto_solution.h b/src/cegis/safety/value/safety_goto_solution.h index e339e303b29..c2e740c66ae 100644 --- a/src/cegis/safety/value/safety_goto_solution.h +++ b/src/cegis/safety/value/safety_goto_solution.h @@ -7,11 +7,11 @@ \*******************************************************************/ -#ifndef CEGIS_SAFETY_GOTO_SOLUTION_H_ -#define CEGIS_SAFETY_GOTO_SOLUTION_H_ +#ifndef CPROVER_CEGIS_SAFETY_VALUE_SAFETY_GOTO_SOLUTION_H +#define CPROVER_CEGIS_SAFETY_VALUE_SAFETY_GOTO_SOLUTION_H #include typedef std::vector safety_goto_solutiont; -#endif /* CEGIS_SAFETY_GOTO_SOLUTION_H_ */ +#endif // CPROVER_CEGIS_SAFETY_VALUE_SAFETY_GOTO_SOLUTION_H diff --git a/src/cegis/seed/literals_seed.h b/src/cegis/seed/literals_seed.h index 5a6f0c5522a..6690773860e 100644 --- a/src/cegis/seed/literals_seed.h +++ b/src/cegis/seed/literals_seed.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_LITERALS_SEED_H_ -#define CEGIS_LITERALS_SEED_H_ +#ifndef CPROVER_CEGIS_SEED_LITERALS_SEED_H +#define CPROVER_CEGIS_SEED_LITERALS_SEED_H #include @@ -48,4 +48,4 @@ class danger_literals_seedt void operator()(danger_verify_configt::counterexamplest &ces); }; -#endif /* CEGIS_LITERALS_SEED_H_ */ +#endif // CPROVER_CEGIS_SEED_LITERALS_SEED_H diff --git a/src/cegis/seed/null_seed.h b/src/cegis/seed/null_seed.h index e034667fddb..4fa095a25f3 100644 --- a/src/cegis/seed/null_seed.h +++ b/src/cegis/seed/null_seed.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_NULL_SEED_H_ -#define CEGIS_NULL_SEED_H_ +#ifndef CPROVER_CEGIS_SEED_NULL_SEED_H +#define CPROVER_CEGIS_SEED_NULL_SEED_H #include @@ -34,4 +34,4 @@ class null_seedt #include "null_seed.inc" -#endif /* CEGIS_NULL_SEED_H_ */ +#endif // CPROVER_CEGIS_SEED_NULL_SEED_H diff --git a/src/cegis/statistics/cegis_statistics_wrapper.h b/src/cegis/statistics/cegis_statistics_wrapper.h index b04f99890f8..166074cbef4 100644 --- a/src/cegis/statistics/cegis_statistics_wrapper.h +++ b/src/cegis/statistics/cegis_statistics_wrapper.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_STATISTICS_WRAPPER_H_ -#define CEGIS_STATISTICS_WRAPPER_H_ +#ifndef CPROVER_CEGIS_STATISTICS_CEGIS_STATISTICS_WRAPPER_H +#define CPROVER_CEGIS_STATISTICS_CEGIS_STATISTICS_WRAPPER_H #include @@ -84,4 +84,4 @@ class cegis_statistics_wrappert #include "cegis_statistics_wrapper.inc" -#endif /* CEGIS_STATISTICS_WRAPPER_H_ */ +#endif // CPROVER_CEGIS_STATISTICS_CEGIS_STATISTICS_WRAPPER_H diff --git a/src/cegis/symex/cegis_symex_learn.h b/src/cegis/symex/cegis_symex_learn.h index a2123c3752e..cd6a7ac69c7 100644 --- a/src/cegis/symex/cegis_symex_learn.h +++ b/src/cegis/symex/cegis_symex_learn.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_DANGER_CEGIS_SYMEX_LEARN_H_ -#define CEGIS_DANGER_CEGIS_SYMEX_LEARN_H_ +#ifndef CPROVER_CEGIS_SYMEX_CEGIS_SYMEX_LEARN_H +#define CPROVER_CEGIS_SYMEX_CEGIS_SYMEX_LEARN_H #include @@ -138,4 +138,4 @@ class cegis_symex_learnt #include "cegis_symex_learn.inc" -#endif /* CEGIS_DANGER_CEGIS_SYMEX_LEARN_H_ */ +#endif // CPROVER_CEGIS_SYMEX_CEGIS_SYMEX_LEARN_H diff --git a/src/cegis/symex/cegis_symex_verify.h b/src/cegis/symex/cegis_symex_verify.h index d1688173813..97c485a4e0d 100644 --- a/src/cegis/symex/cegis_symex_verify.h +++ b/src/cegis/symex/cegis_symex_verify.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_SYMEX_CEGIS_SYMEX_VERIFY_H_ -#define CEGIS_SYMEX_CEGIS_SYMEX_VERIFY_H_ +#ifndef CPROVER_CEGIS_SYMEX_CEGIS_SYMEX_VERIFY_H +#define CPROVER_CEGIS_SYMEX_CEGIS_SYMEX_VERIFY_H #include #include @@ -109,4 +109,4 @@ class cegis_symex_verifyt #include "cegis_symex_verify.inc" -#endif /* CEGIS_SYMEX_CEGIS_SYMEX_VERIFY_H_ */ +#endif // CPROVER_CEGIS_SYMEX_CEGIS_SYMEX_VERIFY_H diff --git a/src/cegis/value/assignments_printer.h b/src/cegis/value/assignments_printer.h index 781fb1927d9..d4437c92e87 100644 --- a/src/cegis/value/assignments_printer.h +++ b/src/cegis/value/assignments_printer.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_ASSIGNMENTS_PRINTER_H_ -#define CEGIS_ASSIGNMENTS_PRINTER_H_ +#ifndef CPROVER_CEGIS_VALUE_ASSIGNMENTS_PRINTER_H +#define CPROVER_CEGIS_VALUE_ASSIGNMENTS_PRINTER_H #include #include @@ -27,4 +27,4 @@ void print_assignments( const class symbol_tablet &st, const std::map &assignments); -#endif /* CEGIS_ASSIGNMENTS_PRINTER_H_ */ +#endif // CPROVER_CEGIS_VALUE_ASSIGNMENTS_PRINTER_H diff --git a/src/cegis/value/program_individual.h b/src/cegis/value/program_individual.h index 4d0733f5e02..e7dd1745afc 100644 --- a/src/cegis/value/program_individual.h +++ b/src/cegis/value/program_individual.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_GENETIC_INDIVIDUAL_H_ -#define CEGIS_GENETIC_INDIVIDUAL_H_ +#ifndef CPROVER_CEGIS_VALUE_PROGRAM_INDIVIDUAL_H +#define CPROVER_CEGIS_VALUE_PROGRAM_INDIVIDUAL_H #include #include @@ -64,4 +64,4 @@ typedef std::vector program_populationt; */ typedef family_selectiont program_individual_selectiont; -#endif /* CEGIS_GENETIC_INDIVIDUAL_H_ */ +#endif // CPROVER_CEGIS_VALUE_PROGRAM_INDIVIDUAL_H diff --git a/src/cegis/value/program_individual_serialisation.h b/src/cegis/value/program_individual_serialisation.h index ab09685ca88..198578bb875 100644 --- a/src/cegis/value/program_individual_serialisation.h +++ b/src/cegis/value/program_individual_serialisation.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_PROGRAM_INDIVIDUAL_SERIALISATION_H_ -#define CEGIS_PROGRAM_INDIVIDUAL_SERIALISATION_H_ +#ifndef CPROVER_CEGIS_VALUE_PROGRAM_INDIVIDUAL_SERIALISATION_H +#define CPROVER_CEGIS_VALUE_PROGRAM_INDIVIDUAL_SERIALISATION_H #include @@ -122,4 +122,4 @@ class individual_to_danger_solution_deserialisert void operator()(class danger_goto_solutiont &result, const irept &sdu) const; }; -#endif /* CEGIS_PROGRAM_INDIVIDUAL_SERIALISATION_H_ */ +#endif // CPROVER_CEGIS_VALUE_PROGRAM_INDIVIDUAL_SERIALISATION_H diff --git a/src/cegis/wordsize/limited_wordsize_verify.h b/src/cegis/wordsize/limited_wordsize_verify.h index d06de6b1aed..6bd6d1b4d51 100644 --- a/src/cegis/wordsize/limited_wordsize_verify.h +++ b/src/cegis/wordsize/limited_wordsize_verify.h @@ -7,8 +7,8 @@ \*******************************************************************/ -#ifndef CEGIS_LIMITED_WORDSIZE_VERIFY_H_ -#define CEGIS_LIMITED_WORDSIZE_VERIFY_H_ +#ifndef CPROVER_CEGIS_WORDSIZE_LIMITED_WORDSIZE_VERIFY_H +#define CPROVER_CEGIS_WORDSIZE_LIMITED_WORDSIZE_VERIFY_H #include #include @@ -117,4 +117,4 @@ class limited_wordsize_verifyt #include "limited_wordsize_verify.inc" -#endif /* CEGIS_LIMITED_WORDSIZE_VERIFY_H_ */ +#endif // CPROVER_CEGIS_WORDSIZE_LIMITED_WORDSIZE_VERIFY_H diff --git a/src/cegis/wordsize/restrict_bv_size.h b/src/cegis/wordsize/restrict_bv_size.h index b675616a56a..b3c2937c2ae 100644 --- a/src/cegis/wordsize/restrict_bv_size.h +++ b/src/cegis/wordsize/restrict_bv_size.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CEGIS_WORDSIZE_RESTRICT_BV_SIZE_H_ -#define CEGIS_WORDSIZE_RESTRICT_BV_SIZE_H_ +#ifndef CPROVER_CEGIS_WORDSIZE_RESTRICT_BV_SIZE_H +#define CPROVER_CEGIS_WORDSIZE_RESTRICT_BV_SIZE_H #include @@ -44,4 +44,4 @@ void restrict_bv_size(class exprt &expr, size_t width_in_bits); */ bool restrict_bv_size(class typet &type, size_t width_in_bits); -#endif /* CEGIS_WORDSIZE_RESTRICT_BV_SIZE_H_ */ +#endif // CPROVER_CEGIS_WORDSIZE_RESTRICT_BV_SIZE_H diff --git a/src/clobber/clobber_parse_options.h b/src/clobber/clobber_parse_options.h index de74b73ff20..06e1f79843d 100644 --- a/src/clobber/clobber_parse_options.h +++ b/src/clobber/clobber_parse_options.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_CLOBBER_PARSEOPTIONS_H -#define CPROVER_CLOBBER_PARSEOPTIONS_H +#ifndef CPROVER_CLOBBER_CLOBBER_PARSE_OPTIONS_H +#define CPROVER_CLOBBER_CLOBBER_PARSE_OPTIONS_H #include #include @@ -63,4 +63,4 @@ class clobber_parse_optionst: void eval_verbosity(); }; -#endif +#endif // CPROVER_CLOBBER_CLOBBER_PARSE_OPTIONS_H diff --git a/src/cpp/cpp_convert_type.h b/src/cpp/cpp_convert_type.h index 15876d63890..9c690287fae 100644 --- a/src/cpp/cpp_convert_type.h +++ b/src/cpp/cpp_convert_type.h @@ -6,11 +6,11 @@ Author: Daniel Kroening, kroening@cs.cmu.edu \*******************************************************************/ -#ifndef CPROVER_CPP_CONVERT_TYPE_H -#define CPROVER_CPP_CONVERT_TYPE_H +#ifndef CPROVER_CPP_CPP_CONVERT_TYPE_H +#define CPROVER_CPP_CPP_CONVERT_TYPE_H #include void cpp_convert_plain_type(typet &type); -#endif +#endif // CPROVER_CPP_CPP_CONVERT_TYPE_H diff --git a/src/cpp/cpp_declaration.h b/src/cpp/cpp_declaration.h index f60bfc868b7..34ae1e796bc 100644 --- a/src/cpp/cpp_declaration.h +++ b/src/cpp/cpp_declaration.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@cs.cmu.edu \*******************************************************************/ -#ifndef CPROVER_CPP_DECLARATION_H -#define CPROVER_CPP_DECLARATION_H +#ifndef CPROVER_CPP_CPP_DECLARATION_H +#define CPROVER_CPP_CPP_DECLARATION_H #include @@ -152,4 +152,4 @@ extern inline const cpp_declarationt &to_cpp_declaration(const irept &irep) return static_cast(irep); } -#endif +#endif // CPROVER_CPP_CPP_DECLARATION_H diff --git a/src/cpp/cpp_declarator.h b/src/cpp/cpp_declarator.h index 464fdc9d9d9..08ed4121fad 100644 --- a/src/cpp/cpp_declarator.h +++ b/src/cpp/cpp_declarator.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@cs.cmu.edu \*******************************************************************/ -#ifndef CPROVER_CPP_DECLARATOR_H -#define CPROVER_CPP_DECLARATOR_H +#ifndef CPROVER_CPP_CPP_DECLARATOR_H +#define CPROVER_CPP_CPP_DECLARATOR_H #include @@ -54,4 +54,4 @@ class cpp_declaratort:public exprt typet merge_type(const typet &declaration_type) const; }; -#endif +#endif // CPROVER_CPP_CPP_DECLARATOR_H diff --git a/src/cpp/cpp_declarator_converter.h b/src/cpp/cpp_declarator_converter.h index 71cb3315ddc..850549a69d5 100644 --- a/src/cpp/cpp_declarator_converter.h +++ b/src/cpp/cpp_declarator_converter.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@cs.cmu.edu \*******************************************************************/ -#ifndef CPROVER_CPP_DECLARATOR_CONVERTER_H -#define CPROVER_CPP_DECLARATOR_CONVERTER_H +#ifndef CPROVER_CPP_CPP_DECLARATOR_CONVERTER_H +#define CPROVER_CPP_CPP_DECLARATOR_CONVERTER_H #include @@ -90,4 +90,4 @@ class cpp_declarator_convertert symbolt &symbol); }; -#endif +#endif // CPROVER_CPP_CPP_DECLARATOR_CONVERTER_H diff --git a/src/cpp/cpp_enum_type.h b/src/cpp/cpp_enum_type.h index 0a73d9c3d15..cb30d910e7b 100644 --- a/src/cpp/cpp_enum_type.h +++ b/src/cpp/cpp_enum_type.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@cs.cmu.edu \*******************************************************************/ -#ifndef CPROVER_CPP_ENUM_TYPE_H -#define CPROVER_CPP_ENUM_TYPE_H +#ifndef CPROVER_CPP_CPP_ENUM_TYPE_H +#define CPROVER_CPP_CPP_ENUM_TYPE_H #include @@ -70,4 +70,4 @@ extern inline cpp_enum_typet &to_cpp_enum_type(irept &irep) return static_cast(irep); } -#endif +#endif // CPROVER_CPP_CPP_ENUM_TYPE_H diff --git a/src/cpp/cpp_exception_id.h b/src/cpp/cpp_exception_id.h index 6547ac20316..38b675c76fb 100644 --- a/src/cpp/cpp_exception_id.h +++ b/src/cpp/cpp_exception_id.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@cs.cmu.edu \*******************************************************************/ -#ifndef CPROVER_CPP_EXCEPTION_ID_H -#define CPROVER_CPP_EXCEPTION_ID_H +#ifndef CPROVER_CPP_CPP_EXCEPTION_ID_H +#define CPROVER_CPP_CPP_EXCEPTION_ID_H // turns a type into an exception ID @@ -17,4 +17,4 @@ Author: Daniel Kroening, kroening@cs.cmu.edu irep_idt cpp_exception_id(const typet &, const namespacet &); irept cpp_exception_list(const typet &, const namespacet &); -#endif +#endif // CPROVER_CPP_CPP_EXCEPTION_ID_H diff --git a/src/cpp/cpp_id.h b/src/cpp/cpp_id.h index e680c518743..1994c52bc68 100644 --- a/src/cpp/cpp_id.h +++ b/src/cpp/cpp_id.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@cs.cmu.edu \*******************************************************************/ -#ifndef CPROVER_CPP_ID_H -#define CPROVER_CPP_ID_H +#ifndef CPROVER_CPP_CPP_ID_H +#define CPROVER_CPP_CPP_ID_H #include #include @@ -104,4 +104,4 @@ class cpp_idt std::ostream &operator<<(std::ostream &out, const cpp_idt &cpp_id); std::ostream &operator<<(std::ostream &out, const cpp_idt::id_classt &id_class); -#endif +#endif // CPROVER_CPP_CPP_ID_H diff --git a/src/cpp/cpp_internal_additions.h b/src/cpp/cpp_internal_additions.h index 1e0805213d2..54a2189e877 100644 --- a/src/cpp/cpp_internal_additions.h +++ b/src/cpp/cpp_internal_additions.h @@ -6,6 +6,11 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#ifndef CPROVER_CPP_CPP_INTERNAL_ADDITIONS_H +#define CPROVER_CPP_CPP_INTERNAL_ADDITIONS_H + #include void cpp_internal_additions(std::ostream &code); + +#endif // CPROVER_CPP_CPP_INTERNAL_ADDITIONS_H diff --git a/src/cpp/cpp_item.h b/src/cpp/cpp_item.h index 3a4a9d5450e..b0255220f1f 100644 --- a/src/cpp/cpp_item.h +++ b/src/cpp/cpp_item.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@cs.cmu.edu \*******************************************************************/ -#ifndef CPROVER_CPP_ITEM_H -#define CPROVER_CPP_ITEM_H +#ifndef CPROVER_CPP_CPP_ITEM_H +#define CPROVER_CPP_CPP_ITEM_H #include @@ -147,4 +147,4 @@ class cpp_itemt:public irept }; -#endif +#endif // CPROVER_CPP_CPP_ITEM_H diff --git a/src/cpp/cpp_language.h b/src/cpp/cpp_language.h index 4f041a1ace2..b28ad79ced6 100644 --- a/src/cpp/cpp_language.h +++ b/src/cpp/cpp_language.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@cs.cmu.edu \*******************************************************************/ -#ifndef CPROVER_CPP_LANGUAGE_H -#define CPROVER_CPP_LANGUAGE_H +#ifndef CPROVER_CPP_CPP_LANGUAGE_H +#define CPROVER_CPP_CPP_LANGUAGE_H /*! \defgroup gr_cpp C++ front-end */ @@ -96,4 +96,4 @@ class cpp_languaget:public languaget languaget *new_cpp_language(); -#endif +#endif // CPROVER_CPP_CPP_LANGUAGE_H diff --git a/src/cpp/cpp_linkage_spec.h b/src/cpp/cpp_linkage_spec.h index 3303ec1de4b..67cf2c93b63 100644 --- a/src/cpp/cpp_linkage_spec.h +++ b/src/cpp/cpp_linkage_spec.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@cs.cmu.edu \*******************************************************************/ -#ifndef CPROVER_CPP_LINKAGE_SPEC_H -#define CPROVER_CPP_LINKAGE_SPEC_H +#ifndef CPROVER_CPP_CPP_LINKAGE_SPEC_H +#define CPROVER_CPP_CPP_LINKAGE_SPEC_H class cpp_linkage_spect:public exprt { @@ -39,4 +39,4 @@ class cpp_linkage_spect:public exprt } }; -#endif +#endif // CPROVER_CPP_CPP_LINKAGE_SPEC_H diff --git a/src/cpp/cpp_member_spec.h b/src/cpp/cpp_member_spec.h index 5824b0e1b6a..714b84b684b 100644 --- a/src/cpp/cpp_member_spec.h +++ b/src/cpp/cpp_member_spec.h @@ -38,4 +38,4 @@ class cpp_member_spect:public irept } }; -#endif +#endif // CPROVER_CPP_CPP_MEMBER_SPEC_H diff --git a/src/cpp/cpp_name.h b/src/cpp/cpp_name.h index c5430b62002..d3d7da0fc15 100644 --- a/src/cpp/cpp_name.h +++ b/src/cpp/cpp_name.h @@ -149,4 +149,4 @@ inline const cpp_namet &to_cpp_name(const irept &cpp_name) return static_cast(cpp_name); } -#endif +#endif // CPROVER_CPP_CPP_NAME_H diff --git a/src/cpp/cpp_namespace_spec.h b/src/cpp/cpp_namespace_spec.h index 821fa526870..f9635d557d0 100644 --- a/src/cpp/cpp_namespace_spec.h +++ b/src/cpp/cpp_namespace_spec.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@cs.cmu.edu \*******************************************************************/ -#ifndef CPROVER_CPP_NAMESPACE_SPEC_H -#define CPROVER_CPP_NAMESPACE_SPEC_H +#ifndef CPROVER_CPP_CPP_NAMESPACE_SPEC_H +#define CPROVER_CPP_CPP_NAMESPACE_SPEC_H #include @@ -66,4 +66,4 @@ class cpp_namespace_spect:public exprt } }; -#endif +#endif // CPROVER_CPP_CPP_NAMESPACE_SPEC_H diff --git a/src/cpp/cpp_parse_tree.h b/src/cpp/cpp_parse_tree.h index bf1eb0ad5e4..9d620864247 100644 --- a/src/cpp/cpp_parse_tree.h +++ b/src/cpp/cpp_parse_tree.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@cs.cmu.edu \*******************************************************************/ -#ifndef CPROVER_CPP_PARSE_TREE_H -#define CPROVER_CPP_PARSE_TREE_H +#ifndef CPROVER_CPP_CPP_PARSE_TREE_H +#define CPROVER_CPP_CPP_PARSE_TREE_H #include "cpp_item.h" @@ -23,4 +23,4 @@ class cpp_parse_treet void clear(); }; -#endif +#endif // CPROVER_CPP_CPP_PARSE_TREE_H diff --git a/src/cpp/cpp_parser.h b/src/cpp/cpp_parser.h index 4656a0e93c5..6251c377f96 100644 --- a/src/cpp/cpp_parser.h +++ b/src/cpp/cpp_parser.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@cs.cmu.edu \*******************************************************************/ -#ifndef CPROVER_CPP_PARSER_H -#define CPROVER_CPP_PARSER_H +#ifndef CPROVER_CPP_CPP_PARSER_H +#define CPROVER_CPP_CPP_PARSER_H #include @@ -71,4 +71,4 @@ class cpp_parsert:public parsert extern cpp_parsert cpp_parser; -#endif +#endif // CPROVER_CPP_CPP_PARSER_H diff --git a/src/cpp/cpp_scope.h b/src/cpp/cpp_scope.h index 2d84de317e8..9e1bc6d352c 100644 --- a/src/cpp/cpp_scope.h +++ b/src/cpp/cpp_scope.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@cs.cmu.edu \*******************************************************************/ -#ifndef CPROVER_CPP_SCOPE_H -#define CPROVER_CPP_SCOPE_H +#ifndef CPROVER_CPP_CPP_SCOPE_H +#define CPROVER_CPP_CPP_SCOPE_H #include #include @@ -125,4 +125,4 @@ class cpp_root_scopet:public cpp_scopet std::ostream &operator << (std::ostream &out, cpp_scopet::lookup_kindt); -#endif +#endif // CPROVER_CPP_CPP_SCOPE_H diff --git a/src/cpp/cpp_scopes.h b/src/cpp/cpp_scopes.h index 70247aa8a8e..8ab73a98d15 100644 --- a/src/cpp/cpp_scopes.h +++ b/src/cpp/cpp_scopes.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@cs.cmu.edu \*******************************************************************/ -#ifndef CPROVER_CPP_SCOPES_H -#define CPROVER_CPP_SCOPES_H +#ifndef CPROVER_CPP_CPP_SCOPES_H +#define CPROVER_CPP_CPP_SCOPES_H #include @@ -147,4 +147,4 @@ class cpp_save_scopet cpp_scopet *saved_scope; }; -#endif +#endif // CPROVER_CPP_CPP_SCOPES_H diff --git a/src/cpp/cpp_static_assert.h b/src/cpp/cpp_static_assert.h index 56198527e8f..64b3d5bcf6a 100644 --- a/src/cpp/cpp_static_assert.h +++ b/src/cpp/cpp_static_assert.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@cs.cmu.edu \*******************************************************************/ -#ifndef CPROVER_CPP_STATIC_ASSERT_H -#define CPROVER_CPP_STATIC_ASSERT_H +#ifndef CPROVER_CPP_CPP_STATIC_ASSERT_H +#define CPROVER_CPP_CPP_STATIC_ASSERT_H #include @@ -40,4 +40,4 @@ class cpp_static_assertt:public exprt } }; -#endif +#endif // CPROVER_CPP_CPP_STATIC_ASSERT_H diff --git a/src/cpp/cpp_storage_spec.h b/src/cpp/cpp_storage_spec.h index c59f1834ae9..410319fde7a 100644 --- a/src/cpp/cpp_storage_spec.h +++ b/src/cpp/cpp_storage_spec.h @@ -52,4 +52,4 @@ class cpp_storage_spect:public irept } }; -#endif +#endif // CPROVER_CPP_CPP_STORAGE_SPEC_H diff --git a/src/cpp/cpp_template_args.h b/src/cpp/cpp_template_args.h index 48b0e330ecf..18c27b83cae 100644 --- a/src/cpp/cpp_template_args.h +++ b/src/cpp/cpp_template_args.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@cs.cmu.edu \*******************************************************************/ -#ifndef CPROVER_CPP_TEMPLATE_ARGS_H -#define CPROVER_CPP_TEMPLATE_ARGS_H +#ifndef CPROVER_CPP_CPP_TEMPLATE_ARGS_H +#define CPROVER_CPP_CPP_TEMPLATE_ARGS_H #include @@ -85,4 +85,4 @@ extern inline const cpp_template_args_tct &to_cpp_template_args_tc(const irept & return static_cast(irep); } -#endif +#endif // CPROVER_CPP_CPP_TEMPLATE_ARGS_H diff --git a/src/cpp/cpp_template_parameter.h b/src/cpp/cpp_template_parameter.h index 722cc5056bf..0a54a3a01a2 100644 --- a/src/cpp/cpp_template_parameter.h +++ b/src/cpp/cpp_template_parameter.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@cs.cmu.edu \*******************************************************************/ -#ifndef CPROVER_CPP_TEMPLATE_PARAMETER_H -#define CPROVER_CPP_TEMPLATE_PARAMETER_H +#ifndef CPROVER_CPP_CPP_TEMPLATE_PARAMETER_H +#define CPROVER_CPP_CPP_TEMPLATE_PARAMETER_H #include @@ -71,4 +71,4 @@ struct template_parametert:public exprt } }; -#endif +#endif // CPROVER_CPP_CPP_TEMPLATE_PARAMETER_H diff --git a/src/cpp/cpp_template_type.h b/src/cpp/cpp_template_type.h index 8926b5d5c14..32eb23d1814 100644 --- a/src/cpp/cpp_template_type.h +++ b/src/cpp/cpp_template_type.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@cs.cmu.edu \*******************************************************************/ -#ifndef CPROVER_CPP_TEMPLATE_TYPE_H -#define CPROVER_CPP_TEMPLATE_TYPE_H +#ifndef CPROVER_CPP_CPP_TEMPLATE_TYPE_H +#define CPROVER_CPP_CPP_TEMPLATE_TYPE_H #include #include @@ -62,4 +62,4 @@ inline typet &template_subtype(typet &type) return type; } -#endif +#endif // CPROVER_CPP_CPP_TEMPLATE_TYPE_H diff --git a/src/cpp/cpp_token.h b/src/cpp/cpp_token.h index 312506a1e65..a022cf92df2 100644 --- a/src/cpp/cpp_token.h +++ b/src/cpp/cpp_token.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@cs.cmu.edu \*******************************************************************/ -#ifndef CPROVER_CPP_TOKEN_H -#define CPROVER_CPP_TOKEN_H +#ifndef CPROVER_CPP_CPP_TOKEN_H +#define CPROVER_CPP_CPP_TOKEN_H #include @@ -41,4 +41,4 @@ class cpp_tokent } }; -#endif +#endif // CPROVER_CPP_CPP_TOKEN_H diff --git a/src/cpp/cpp_token_buffer.h b/src/cpp/cpp_token_buffer.h index 94ae0f041a9..e4e90422853 100644 --- a/src/cpp/cpp_token_buffer.h +++ b/src/cpp/cpp_token_buffer.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@cs.cmu.edu \*******************************************************************/ -#ifndef CPROVER_CPP_TOKEN_BUFFER_H -#define CPROVER_CPP_TOKEN_BUFFER_H +#ifndef CPROVER_CPP_CPP_TOKEN_BUFFER_H +#define CPROVER_CPP_CPP_TOKEN_BUFFER_H #include "cpp_token.h" @@ -56,4 +56,4 @@ class cpp_token_buffert void read_token(); }; -#endif +#endif // CPROVER_CPP_CPP_TOKEN_BUFFER_H diff --git a/src/cpp/cpp_type2name.h b/src/cpp/cpp_type2name.h index 42056ba3ab0..ffb2a99eef6 100644 --- a/src/cpp/cpp_type2name.h +++ b/src/cpp/cpp_type2name.h @@ -6,9 +6,14 @@ Author: Daniel Kroening, kroening@cs.cmu.edu \*******************************************************************/ +#ifndef CPROVER_CPP_CPP_TYPE2NAME_H +#define CPROVER_CPP_CPP_TYPE2NAME_H + #include #include std::string cpp_type2name(const typet &type); std::string cpp_expr2name(const exprt &expr); + +#endif // CPROVER_CPP_CPP_TYPE2NAME_H diff --git a/src/cpp/cpp_typecast.h b/src/cpp/cpp_typecast.h index db4543e4d62..8f242c61e6b 100644 --- a/src/cpp/cpp_typecast.h +++ b/src/cpp/cpp_typecast.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@cs.cmu.edu \*******************************************************************/ -#ifndef CPROVER_CPP_TYPECAST_H -#define CPROVER_CPP_TYPECAST_H +#ifndef CPROVER_CPP_CPP_TYPECAST_H +#define CPROVER_CPP_CPP_TYPECAST_H #include @@ -65,4 +65,4 @@ class cpp_typecastt:public c_typecastt cpp_typecheckt &cpp_typecheck; }; -#endif +#endif // CPROVER_CPP_CPP_TYPECAST_H diff --git a/src/cpp/cpp_typecheck.h b/src/cpp/cpp_typecheck.h index c296376dc18..2615996f52a 100644 --- a/src/cpp/cpp_typecheck.h +++ b/src/cpp/cpp_typecheck.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@cs.cmu.edu \*******************************************************************/ -#ifndef CPROVER_CPP_TYPECHECK_H -#define CPROVER_CPP_TYPECHECK_H +#ifndef CPROVER_CPP_CPP_TYPECHECK_H +#define CPROVER_CPP_CPP_TYPECHECK_H #include #include @@ -600,4 +600,4 @@ class cpp_typecheckt:public c_typecheck_baset bool disable_access_control; // Disable protect and private }; -#endif +#endif // CPROVER_CPP_CPP_TYPECHECK_H diff --git a/src/cpp/cpp_typecheck_fargs.h b/src/cpp/cpp_typecheck_fargs.h index e1b4a36ba7b..61efa7979b3 100644 --- a/src/cpp/cpp_typecheck_fargs.h +++ b/src/cpp/cpp_typecheck_fargs.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@cs.cmu.edu \*******************************************************************/ -#ifndef CPROVER_CPP_TYPECHECK_FARGS_H -#define CPROVER_CPP_TYPECHECK_FARGS_H +#ifndef CPROVER_CPP_CPP_TYPECHECK_FARGS_H +#define CPROVER_CPP_CPP_TYPECHECK_FARGS_H #include @@ -57,4 +57,4 @@ class cpp_typecheck_fargst // for function overloading } }; -#endif +#endif // CPROVER_CPP_CPP_TYPECHECK_FARGS_H diff --git a/src/cpp/cpp_typecheck_resolve.h b/src/cpp/cpp_typecheck_resolve.h index 3364671dfe0..108bb8c1db6 100644 --- a/src/cpp/cpp_typecheck_resolve.h +++ b/src/cpp/cpp_typecheck_resolve.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@cs.cmu.edu \*******************************************************************/ -#ifndef CPROVER_CPP_TYPECHECK_RESOLVE_H -#define CPROVER_CPP_TYPECHECK_RESOLVE_H +#ifndef CPROVER_CPP_CPP_TYPECHECK_RESOLVE_H +#define CPROVER_CPP_CPP_TYPECHECK_RESOLVE_H #include "cpp_typecheck_fargs.h" #include "cpp_name.h" @@ -155,4 +155,4 @@ class cpp_typecheck_resolvet }; -#endif +#endif // CPROVER_CPP_CPP_TYPECHECK_RESOLVE_H diff --git a/src/cpp/cpp_using.h b/src/cpp/cpp_using.h index 15693a7d8a9..fadc71accc4 100644 --- a/src/cpp/cpp_using.h +++ b/src/cpp/cpp_using.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@cs.cmu.edu \*******************************************************************/ -#ifndef CPROVER_CPP_USING_H -#define CPROVER_CPP_USING_H +#ifndef CPROVER_CPP_CPP_USING_H +#define CPROVER_CPP_CPP_USING_H #include "cpp_name.h" @@ -39,4 +39,4 @@ class cpp_usingt:public irept } }; -#endif +#endif // CPROVER_CPP_CPP_USING_H diff --git a/src/cpp/cpp_util.h b/src/cpp/cpp_util.h index f89f4eda69c..8bb50c9dc83 100644 --- a/src/cpp/cpp_util.h +++ b/src/cpp/cpp_util.h @@ -6,8 +6,8 @@ \*******************************************************************/ -#ifndef CPROVER_CPP_UTIL_H -#define CPROVER_CPP_UTIL_H +#ifndef CPROVER_CPP_CPP_UTIL_H +#define CPROVER_CPP_CPP_UTIL_H #include #include @@ -45,4 +45,4 @@ extern inline void already_typechecked(irept &irep) irep.swap(tmp); } -#endif +#endif // CPROVER_CPP_CPP_UTIL_H diff --git a/src/cpp/expr2cpp.h b/src/cpp/expr2cpp.h index cc37f443860..6b39188f977 100644 --- a/src/cpp/expr2cpp.h +++ b/src/cpp/expr2cpp.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@cs.cmu.edu \*******************************************************************/ -#ifndef CPROVER_EXPR2CPP_H -#define CPROVER_EXPR2CPP_H +#ifndef CPROVER_CPP_EXPR2CPP_H +#define CPROVER_CPP_EXPR2CPP_H #include @@ -18,4 +18,4 @@ class typet; std::string expr2cpp(const exprt &expr, const namespacet &ns); std::string type2cpp(const typet &type, const namespacet &ns); -#endif +#endif // CPROVER_CPP_EXPR2CPP_H diff --git a/src/cpp/recursion_counter.h b/src/cpp/recursion_counter.h index 1359da73849..9be4c188ae7 100644 --- a/src/cpp/recursion_counter.h +++ b/src/cpp/recursion_counter.h @@ -6,6 +6,9 @@ Author: Daniel Kroening, kroening@cs.cmu.edu \*******************************************************************/ +#ifndef CPROVER_CPP_RECURSION_COUNTER_H +#define CPROVER_CPP_RECURSION_COUNTER_H + class recursion_countert { public: @@ -22,3 +25,5 @@ class recursion_countert protected: unsigned &cnt; }; + +#endif // CPROVER_CPP_RECURSION_COUNTER_H diff --git a/src/cpp/template_map.h b/src/cpp/template_map.h index b9cc6d23bb4..dcdee42e849 100644 --- a/src/cpp/template_map.h +++ b/src/cpp/template_map.h @@ -83,4 +83,4 @@ class cpp_saved_template_mapt template_mapt ↦ }; -#endif +#endif // CPROVER_CPP_TEMPLATE_MAP_H diff --git a/src/goto-analyzer/goto_analyzer_parse_options.h b/src/goto-analyzer/goto_analyzer_parse_options.h index eecf0930c76..19b44c21910 100644 --- a/src/goto-analyzer/goto_analyzer_parse_options.h +++ b/src/goto-analyzer/goto_analyzer_parse_options.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_GOTO_ANALYZER_PARSEOPTIONS_H -#define CPROVER_GOTO_ANALYZER_PARSEOPTIONS_H +#ifndef CPROVER_GOTO_ANALYZER_GOTO_ANALYZER_PARSE_OPTIONS_H +#define CPROVER_GOTO_ANALYZER_GOTO_ANALYZER_PARSE_OPTIONS_H #include #include @@ -64,4 +64,4 @@ class goto_analyzer_parse_optionst: bool has_entry_point; }; -#endif +#endif // CPROVER_GOTO_ANALYZER_GOTO_ANALYZER_PARSE_OPTIONS_H diff --git a/src/goto-analyzer/static_analyzer.h b/src/goto-analyzer/static_analyzer.h index eab55a9a9fa..3d964a2964a 100644 --- a/src/goto-analyzer/static_analyzer.h +++ b/src/goto-analyzer/static_analyzer.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_STATIC_ANALYZER_H -#define CPROVER_STATIC_ANALYZER_H +#ifndef CPROVER_GOTO_ANALYZER_STATIC_ANALYZER_H +#define CPROVER_GOTO_ANALYZER_STATIC_ANALYZER_H #include @@ -26,4 +26,4 @@ void show_intervals( const goto_modelt &, std::ostream &); -#endif +#endif // CPROVER_GOTO_ANALYZER_STATIC_ANALYZER_H diff --git a/src/goto-analyzer/taint_analysis.h b/src/goto-analyzer/taint_analysis.h index 14b212113eb..a47a974b009 100644 --- a/src/goto-analyzer/taint_analysis.h +++ b/src/goto-analyzer/taint_analysis.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_TAINT_ANALYSIS_H -#define CPROVER_TAINT_ANALYSIS_H +#ifndef CPROVER_GOTO_ANALYZER_TAINT_ANALYSIS_H +#define CPROVER_GOTO_ANALYZER_TAINT_ANALYSIS_H #include #include @@ -21,4 +21,4 @@ bool taint_analysis( bool show_full, const std::string &json_file_name); -#endif +#endif // CPROVER_GOTO_ANALYZER_TAINT_ANALYSIS_H diff --git a/src/goto-analyzer/taint_parser.h b/src/goto-analyzer/taint_parser.h index 8ebcf55eabe..783fa922de5 100644 --- a/src/goto-analyzer/taint_parser.h +++ b/src/goto-analyzer/taint_parser.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_TAINT_PARSER_H -#define CPROVER_TAINT_PARSER_H +#ifndef CPROVER_GOTO_ANALYZER_TAINT_PARSER_H +#define CPROVER_GOTO_ANALYZER_TAINT_PARSER_H #include #include @@ -64,4 +64,4 @@ bool taint_parser( taint_parse_treet &, message_handlert &); -#endif +#endif // CPROVER_GOTO_ANALYZER_TAINT_PARSER_H diff --git a/src/goto-analyzer/unreachable_instructions.h b/src/goto-analyzer/unreachable_instructions.h index 5cd9af89e8d..137e6a62040 100644 --- a/src/goto-analyzer/unreachable_instructions.h +++ b/src/goto-analyzer/unreachable_instructions.h @@ -8,8 +8,8 @@ Date: April 2016 \*******************************************************************/ -#ifndef CPROVER_UNREACHABLE_INSTRUCTIONS_H -#define CPROVER_UNREACHABLE_INSTRUCTIONS_H +#ifndef CPROVER_GOTO_ANALYZER_UNREACHABLE_INSTRUCTIONS_H +#define CPROVER_GOTO_ANALYZER_UNREACHABLE_INSTRUCTIONS_H #include @@ -20,4 +20,4 @@ void unreachable_instructions( const bool json, std::ostream &os); -#endif +#endif // CPROVER_GOTO_ANALYZER_UNREACHABLE_INSTRUCTIONS_H diff --git a/src/goto-cc/armcc_cmdline.h b/src/goto-cc/armcc_cmdline.h index b9e1cdd4758..3cb108b1791 100644 --- a/src/goto-cc/armcc_cmdline.h +++ b/src/goto-cc/armcc_cmdline.h @@ -8,8 +8,8 @@ Date: June 2006 \*******************************************************************/ -#ifndef GOTO_CC_ARMCC_CMDLINE_H -#define GOTO_CC_ARMCC_CMDLINE_H +#ifndef CPROVER_GOTO_CC_ARMCC_CMDLINE_H +#define CPROVER_GOTO_CC_ARMCC_CMDLINE_H #include "goto_cc_cmdline.h" @@ -23,4 +23,4 @@ class armcc_cmdlinet:public goto_cc_cmdlinet } }; -#endif /* GOTO_CC_ARMCC_CMDLINE_H */ +#endif // CPROVER_GOTO_CC_ARMCC_CMDLINE_H diff --git a/src/goto-cc/armcc_mode.h b/src/goto-cc/armcc_mode.h index fe0e7e2edc7..11cc4be2ad2 100644 --- a/src/goto-cc/armcc_mode.h +++ b/src/goto-cc/armcc_mode.h @@ -8,8 +8,8 @@ Date: June 2006 \*******************************************************************/ -#ifndef GOTO_CC_ARMCC_MODE_H -#define GOTO_CC_ARMCC_MODE_H +#ifndef CPROVER_GOTO_CC_ARMCC_MODE_H +#define CPROVER_GOTO_CC_ARMCC_MODE_H #include "goto_cc_mode.h" #include "armcc_cmdline.h" @@ -30,4 +30,4 @@ class armcc_modet:public goto_cc_modet armcc_cmdlinet &cmdline; }; -#endif /* GOTO_CC_ARMCC_MODE_H */ +#endif // CPROVER_GOTO_CC_ARMCC_MODE_H diff --git a/src/goto-cc/compile.h b/src/goto-cc/compile.h index f56bd2d2323..6c752036f6e 100644 --- a/src/goto-cc/compile.h +++ b/src/goto-cc/compile.h @@ -8,8 +8,8 @@ Date: June 2006 \*******************************************************************/ -#ifndef GOTO_CC_COMPILE_H -#define GOTO_CC_COMPILE_H +#ifndef CPROVER_GOTO_CC_COMPILE_H +#define CPROVER_GOTO_CC_COMPILE_H #include #include @@ -76,4 +76,4 @@ class compilet:public language_uit void convert_symbols(goto_functionst &dest); }; -#endif /*COMPILE_H_*/ +#endif // CPROVER_GOTO_CC_COMPILE_H diff --git a/src/goto-cc/cw_mode.h b/src/goto-cc/cw_mode.h index 1d18174dc16..e82615dc828 100644 --- a/src/goto-cc/cw_mode.h +++ b/src/goto-cc/cw_mode.h @@ -8,8 +8,8 @@ Date: June 2006 \*******************************************************************/ -#ifndef GOTO_CC_CW_MODE_H -#define GOTO_CC_CW_MODE_H +#ifndef CPROVER_GOTO_CC_CW_MODE_H +#define CPROVER_GOTO_CC_CW_MODE_H #include "goto_cc_mode.h" #include "gcc_cmdline.h" @@ -30,4 +30,4 @@ class cw_modet:public goto_cc_modet gcc_cmdlinet &cmdline; }; -#endif /* GOTO_CC_CW_MODE_H */ +#endif // CPROVER_GOTO_CC_CW_MODE_H diff --git a/src/goto-cc/gcc_cmdline.h b/src/goto-cc/gcc_cmdline.h index 6ec68e2ce64..43e47dd3563 100644 --- a/src/goto-cc/gcc_cmdline.h +++ b/src/goto-cc/gcc_cmdline.h @@ -8,8 +8,8 @@ Date: June 2006 \*******************************************************************/ -#ifndef GOTO_CC_GCC_CMDLINE_H -#define GOTO_CC_GCC_CMDLINE_H +#ifndef CPROVER_GOTO_CC_GCC_CMDLINE_H +#define CPROVER_GOTO_CC_GCC_CMDLINE_H #include "goto_cc_cmdline.h" @@ -24,4 +24,4 @@ class gcc_cmdlinet:public goto_cc_cmdlinet } }; -#endif /* GOTO_CC_GCC_CMDLINE_H */ +#endif // CPROVER_GOTO_CC_GCC_CMDLINE_H diff --git a/src/goto-cc/gcc_mode.h b/src/goto-cc/gcc_mode.h index 2fbc30a437d..a0a41be9ed8 100644 --- a/src/goto-cc/gcc_mode.h +++ b/src/goto-cc/gcc_mode.h @@ -8,8 +8,8 @@ Date: June 2006 \*******************************************************************/ -#ifndef GOTO_CC_GCC_MODE_H -#define GOTO_CC_GCC_MODE_H +#ifndef CPROVER_GOTO_CC_GCC_MODE_H +#define CPROVER_GOTO_CC_GCC_MODE_H #include "goto_cc_mode.h" #include "gcc_cmdline.h" @@ -93,4 +93,4 @@ class gcc_modet:public goto_cc_modet } }; -#endif /* GOTO_CC_GCC_MODE_H */ +#endif // CPROVER_GOTO_CC_GCC_MODE_H diff --git a/src/goto-cc/goto_cc_cmdline.h b/src/goto-cc/goto_cc_cmdline.h index 5ced5de0c6d..c59adc699dc 100644 --- a/src/goto-cc/goto_cc_cmdline.h +++ b/src/goto-cc/goto_cc_cmdline.h @@ -8,8 +8,8 @@ Date: April 2010 \*******************************************************************/ -#ifndef GOTO_CC_CMDLINE_H -#define GOTO_CC_CMDLINE_H +#ifndef CPROVER_GOTO_CC_GOTO_CC_CMDLINE_H +#define CPROVER_GOTO_CC_GOTO_CC_CMDLINE_H #include @@ -78,4 +78,4 @@ class goto_cc_cmdlinet:public cmdlinet void add_infile_arg(const std::string &arg); }; -#endif /* GOTO_CC_CMDLINE_H */ +#endif // CPROVER_GOTO_CC_GOTO_CC_CMDLINE_H diff --git a/src/goto-cc/goto_cc_mode.h b/src/goto-cc/goto_cc_mode.h index 854f5297db5..28459da42de 100644 --- a/src/goto-cc/goto_cc_mode.h +++ b/src/goto-cc/goto_cc_mode.h @@ -8,8 +8,8 @@ Date: June 2006 \*******************************************************************/ -#ifndef GOTO_CC_MODE_H -#define GOTO_CC_MODE_H +#ifndef CPROVER_GOTO_CC_GOTO_CC_MODE_H +#define CPROVER_GOTO_CC_GOTO_CC_MODE_H #include @@ -35,4 +35,4 @@ class goto_cc_modet:public language_uit goto_cc_cmdlinet &cmdline; }; -#endif /* GOTO_CC_MODE_H */ +#endif // CPROVER_GOTO_CC_GOTO_CC_MODE_H diff --git a/src/goto-cc/ld_cmdline.h b/src/goto-cc/ld_cmdline.h index d16adcd7271..449d0104427 100644 --- a/src/goto-cc/ld_cmdline.h +++ b/src/goto-cc/ld_cmdline.h @@ -8,8 +8,8 @@ Date: Feb 2013 \*******************************************************************/ -#ifndef GOTO_CC_LD_CMDLINE_H -#define GOTO_CC_LD_CMDLINE_H +#ifndef CPROVER_GOTO_CC_LD_CMDLINE_H +#define CPROVER_GOTO_CC_LD_CMDLINE_H #include "goto_cc_cmdline.h" @@ -24,4 +24,4 @@ class ld_cmdlinet:public goto_cc_cmdlinet } }; -#endif /* GOTO_CC_LD_CMDLINE_H */ +#endif // CPROVER_GOTO_CC_LD_CMDLINE_H diff --git a/src/goto-cc/ld_mode.h b/src/goto-cc/ld_mode.h index 9369bdbbe22..7ef8ee3d683 100644 --- a/src/goto-cc/ld_mode.h +++ b/src/goto-cc/ld_mode.h @@ -8,8 +8,8 @@ Date: June 2006 \*******************************************************************/ -#ifndef GOTO_CC_LD_MODE_H -#define GOTO_CC_LD_MODE_H +#ifndef CPROVER_GOTO_CC_LD_MODE_H +#define CPROVER_GOTO_CC_LD_MODE_H #include "goto_cc_mode.h" #include "ld_cmdline.h" @@ -36,4 +36,4 @@ class ld_modet:public goto_cc_modet //static bool is_supported_source_file(const std::string &); }; -#endif /* GOTO_CC_LD_MODE_H */ +#endif // CPROVER_GOTO_CC_LD_MODE_H diff --git a/src/goto-cc/ms_cl_cmdline.h b/src/goto-cc/ms_cl_cmdline.h index 03cead644a6..627309ea6ef 100644 --- a/src/goto-cc/ms_cl_cmdline.h +++ b/src/goto-cc/ms_cl_cmdline.h @@ -8,8 +8,8 @@ Date: June 2006 \*******************************************************************/ -#ifndef GOTO_CC_MS_CL_CMDLINE_H -#define GOTO_CC_MS_CL_CMDLINE_H +#ifndef CPROVER_GOTO_CC_MS_CL_CMDLINE_H +#define CPROVER_GOTO_CC_MS_CL_CMDLINE_H #include "goto_cc_cmdline.h" @@ -32,4 +32,4 @@ class ms_cl_cmdlinet:public goto_cc_cmdlinet bool parse(const std::vector &); }; -#endif /*MS_CL_CMDLINE_H_*/ +#endif // CPROVER_GOTO_CC_MS_CL_CMDLINE_H diff --git a/src/goto-cc/ms_cl_mode.h b/src/goto-cc/ms_cl_mode.h index 4e8fd2f21a4..8a446c332c1 100644 --- a/src/goto-cc/ms_cl_mode.h +++ b/src/goto-cc/ms_cl_mode.h @@ -8,8 +8,8 @@ Date: June 2006 \*******************************************************************/ -#ifndef GOTO_CC_MS_CL_MODE_H -#define GOTO_CC_MS_CL_MODE_H +#ifndef CPROVER_GOTO_CC_MS_CL_MODE_H +#define CPROVER_GOTO_CC_MS_CL_MODE_H #include "goto_cc_mode.h" #include "ms_cl_cmdline.h" @@ -30,4 +30,4 @@ class ms_cl_modet:public goto_cc_modet ms_cl_cmdlinet &cmdline; }; -#endif /* GOTO_CC_MS_CL_MODE_H */ +#endif // CPROVER_GOTO_CC_MS_CL_MODE_H diff --git a/src/goto-cc/xml_binaries/read_goto_object.h b/src/goto-cc/xml_binaries/read_goto_object.h index 7b1f67d9252..15589dba852 100644 --- a/src/goto-cc/xml_binaries/read_goto_object.h +++ b/src/goto-cc/xml_binaries/read_goto_object.h @@ -8,8 +8,8 @@ Date: June 2006 \*******************************************************************/ -#ifndef CPROVER_READ_GOTO_OBJECT_H -#define CPROVER_READ_GOTO_OBJECT_H +#ifndef CPROVER_GOTO_CC_XML_BINARIES_READ_GOTO_OBJECT_H +#define CPROVER_GOTO_CC_XML_BINARIES_READ_GOTO_OBJECT_H #include #include @@ -22,4 +22,4 @@ bool read_goto_object( goto_functionst &functions, message_handlert &msg_hndlr); -#endif /* CPROVER_READ_GOTO_OBJECT_H */ +#endif // CPROVER_GOTO_CC_XML_BINARIES_READ_GOTO_OBJECT_H diff --git a/src/goto-cc/xml_binaries/xml_goto_function.h b/src/goto-cc/xml_binaries/xml_goto_function.h index b9abaae4f32..09ddd0cb41a 100644 --- a/src/goto-cc/xml_binaries/xml_goto_function.h +++ b/src/goto-cc/xml_binaries/xml_goto_function.h @@ -8,8 +8,8 @@ Date: June 2006 \*******************************************************************/ -#ifndef XML_GOTO_FUNCTION_H_ -#define XML_GOTO_FUNCTION_H_ +#ifndef CPROVER_GOTO_CC_XML_BINARIES_XML_GOTO_FUNCTION_H +#define CPROVER_GOTO_CC_XML_BINARIES_XML_GOTO_FUNCTION_H #include #include @@ -17,4 +17,4 @@ Date: June 2006 void convert( const xmlt&, goto_functionst::goto_functiont& ); void convert( const goto_functionst::goto_functiont&, xmlt& ); -#endif /*XML_GOTO_FUNCTION_H_*/ +#endif // CPROVER_GOTO_CC_XML_BINARIES_XML_GOTO_FUNCTION_H diff --git a/src/goto-cc/xml_binaries/xml_goto_function_hashing.h b/src/goto-cc/xml_binaries/xml_goto_function_hashing.h index 88919a82c67..f826bdeed65 100644 --- a/src/goto-cc/xml_binaries/xml_goto_function_hashing.h +++ b/src/goto-cc/xml_binaries/xml_goto_function_hashing.h @@ -9,8 +9,8 @@ Date: July 2006 \*******************************************************************/ -#ifndef XML_GOTO_FUNCTION_H_ -#define XML_GOTO_FUNCTION_H_ +#ifndef CPROVER_GOTO_CC_XML_BINARIES_XML_GOTO_FUNCTION_HASHING_H +#define CPROVER_GOTO_CC_XML_BINARIES_XML_GOTO_FUNCTION_HASHING_H #include #include @@ -28,4 +28,4 @@ class xml_goto_function_convertt { void convert( const goto_functionst::goto_functiont&, xmlt& ); }; -#endif /*XML_GOTO_FUNCTION_H_*/ +#endif // CPROVER_GOTO_CC_XML_BINARIES_XML_GOTO_FUNCTION_HASHING_H diff --git a/src/goto-cc/xml_binaries/xml_goto_program.h b/src/goto-cc/xml_binaries/xml_goto_program.h index 1819bef843c..04bab08af3e 100644 --- a/src/goto-cc/xml_binaries/xml_goto_program.h +++ b/src/goto-cc/xml_binaries/xml_goto_program.h @@ -8,8 +8,8 @@ Date: June 2006 \*******************************************************************/ -#ifndef XML_GOTO_PROGRAM_H_ -#define XML_GOTO_PROGRAM_H_ +#ifndef CPROVER_GOTO_CC_XML_BINARIES_XML_GOTO_PROGRAM_H +#define CPROVER_GOTO_CC_XML_BINARIES_XML_GOTO_PROGRAM_H #include #include @@ -27,4 +27,4 @@ goto_programt::targett find_instruction( goto_programt::instructionst &, const irep_idt &); -#endif /*XML_GOTO_PROGRAM_H_*/ +#endif // CPROVER_GOTO_CC_XML_BINARIES_XML_GOTO_PROGRAM_H diff --git a/src/goto-cc/xml_binaries/xml_goto_program_hashing.h b/src/goto-cc/xml_binaries/xml_goto_program_hashing.h index b8a8a72494c..52f0e796db9 100644 --- a/src/goto-cc/xml_binaries/xml_goto_program_hashing.h +++ b/src/goto-cc/xml_binaries/xml_goto_program_hashing.h @@ -9,8 +9,8 @@ Date: July 2006 \*******************************************************************/ -#ifndef XML_GOTO_PROGRAM_H_ -#define XML_GOTO_PROGRAM_H_ +#ifndef CPROVER_GOTO_CC_XML_BINARIES_XML_GOTO_PROGRAM_HASHING_H +#define CPROVER_GOTO_CC_XML_BINARIES_XML_GOTO_PROGRAM_HASHING_H #include #include @@ -36,4 +36,4 @@ class xml_goto_program_convertt { -#endif /*XML_GOTO_PROGRAM_H_*/ +#endif // CPROVER_GOTO_CC_XML_BINARIES_XML_GOTO_PROGRAM_HASHING_H diff --git a/src/goto-cc/xml_binaries/xml_irep_hashing.h b/src/goto-cc/xml_binaries/xml_irep_hashing.h index 78d263469cc..d329bfceee0 100644 --- a/src/goto-cc/xml_binaries/xml_irep_hashing.h +++ b/src/goto-cc/xml_binaries/xml_irep_hashing.h @@ -8,8 +8,8 @@ Date: July 2006 \*******************************************************************/ -#ifndef XML_IREP_HASHING_H_ -#define XML_IREP_HASHING_H_ +#ifndef CPROVER_GOTO_CC_XML_BINARIES_XML_IREP_HASHING_H +#define CPROVER_GOTO_CC_XML_BINARIES_XML_IREP_HASHING_H #include #include @@ -92,4 +92,4 @@ class xml_irep_convertt { unsigned long add_with_childs(const irept&); }; -#endif /*XML_IREP_HASHING_H_*/ +#endif // CPROVER_GOTO_CC_XML_BINARIES_XML_IREP_HASHING_H diff --git a/src/goto-cc/xml_binaries/xml_symbol.h b/src/goto-cc/xml_binaries/xml_symbol.h index b946a05a10c..d50f8b75610 100644 --- a/src/goto-cc/xml_binaries/xml_symbol.h +++ b/src/goto-cc/xml_binaries/xml_symbol.h @@ -8,8 +8,8 @@ Date: June 2006 \*******************************************************************/ -#ifndef XML_SYMBOL_H_ -#define XML_SYMBOL_H_ +#ifndef CPROVER_GOTO_CC_XML_BINARIES_XML_SYMBOL_H +#define CPROVER_GOTO_CC_XML_BINARIES_XML_SYMBOL_H #include #include @@ -17,4 +17,4 @@ Date: June 2006 void convert(const symbolt &, xmlt &); void convert(const xmlt &, symbolt &); -#endif /*XML_SYMBOL_H_*/ +#endif // CPROVER_GOTO_CC_XML_BINARIES_XML_SYMBOL_H diff --git a/src/goto-cc/xml_binaries/xml_symbol_hashing.h b/src/goto-cc/xml_binaries/xml_symbol_hashing.h index 606bb14d9da..e09b4389121 100644 --- a/src/goto-cc/xml_binaries/xml_symbol_hashing.h +++ b/src/goto-cc/xml_binaries/xml_symbol_hashing.h @@ -8,8 +8,8 @@ Date: July 2006 \*******************************************************************/ -#ifndef XML_SYMBOL_HASHING_H_ -#define XML_SYMBOL_HASHING_H_ +#ifndef CPROVER_GOTO_CC_XML_BINARIES_XML_SYMBOL_HASHING_H +#define CPROVER_GOTO_CC_XML_BINARIES_XML_SYMBOL_HASHING_H #include #include @@ -29,4 +29,4 @@ class xml_symbol_convertt { void convert(const xmlt &, symbolt &); }; -#endif /*XML_SYMBOL_HASHING_H_*/ +#endif // CPROVER_GOTO_CC_XML_BINARIES_XML_SYMBOL_HASHING_H diff --git a/src/goto-diff/change_impact.h b/src/goto-diff/change_impact.h index 7e99eb034ce..e86867303c1 100644 --- a/src/goto-diff/change_impact.h +++ b/src/goto-diff/change_impact.h @@ -8,8 +8,8 @@ Date: April 2016 \*******************************************************************/ -#ifndef CPROVER_CHANGE_IMPACT_H -#define CPROVER_CHANGE_IMPACT_H +#ifndef CPROVER_GOTO_DIFF_CHANGE_IMPACT_H +#define CPROVER_GOTO_DIFF_CHANGE_IMPACT_H class goto_modelt; typedef enum {FORWARD, BACKWARD, BOTH} impact_modet; @@ -20,4 +20,4 @@ void change_impact( impact_modet impact_mode, bool compact_output); -#endif +#endif // CPROVER_GOTO_DIFF_CHANGE_IMPACT_H diff --git a/src/goto-diff/goto_diff.h b/src/goto-diff/goto_diff.h index 94c013b386e..65d9324364d 100644 --- a/src/goto-diff/goto_diff.h +++ b/src/goto-diff/goto_diff.h @@ -6,8 +6,8 @@ Author: Peter Schrammel \*******************************************************************/ -#ifndef CPROVER_GOTO_DIFF_BASE_H -#define CPROVER_GOTO_DIFF_BASE_H +#ifndef CPROVER_GOTO_DIFF_GOTO_DIFF_H +#define CPROVER_GOTO_DIFF_GOTO_DIFF_H #include #include @@ -56,4 +56,4 @@ class goto_difft : public messaget }; -#endif +#endif // CPROVER_GOTO_DIFF_GOTO_DIFF_H diff --git a/src/goto-diff/goto_diff_languages.h b/src/goto-diff/goto_diff_languages.h index e6e10db18b6..251c3ce1a91 100644 --- a/src/goto-diff/goto_diff_languages.h +++ b/src/goto-diff/goto_diff_languages.h @@ -6,8 +6,8 @@ Author: Peter Schrammel \*******************************************************************/ -#ifndef CPROVER_GOTO_DIFF_LANGUAGES_H -#define CPROVER_GOTO_DIFF_LANGUAGES_H +#ifndef CPROVER_GOTO_DIFF_GOTO_DIFF_LANGUAGES_H +#define CPROVER_GOTO_DIFF_GOTO_DIFF_LANGUAGES_H #include #include @@ -29,4 +29,4 @@ class goto_diff_languagest : }; -#endif +#endif // CPROVER_GOTO_DIFF_GOTO_DIFF_LANGUAGES_H diff --git a/src/goto-diff/goto_diff_parse_options.h b/src/goto-diff/goto_diff_parse_options.h index 5dd10f54b5a..822fd59a678 100644 --- a/src/goto-diff/goto_diff_parse_options.h +++ b/src/goto-diff/goto_diff_parse_options.h @@ -6,8 +6,8 @@ Author: Peter Schrammel \*******************************************************************/ -#ifndef CPROVER_GOTO_DIFF_PARSEOPTIONS_H -#define CPROVER_GOTO_DIFF_PARSEOPTIONS_H +#ifndef CPROVER_GOTO_DIFF_GOTO_DIFF_PARSE_OPTIONS_H +#define CPROVER_GOTO_DIFF_GOTO_DIFF_PARSE_OPTIONS_H #include #include @@ -62,4 +62,4 @@ class goto_diff_parse_optionst: void preprocessing(); }; -#endif +#endif // CPROVER_GOTO_DIFF_GOTO_DIFF_PARSE_OPTIONS_H diff --git a/src/goto-diff/syntactic_diff.h b/src/goto-diff/syntactic_diff.h index 2e7be7e2e8f..3ffc28fd722 100644 --- a/src/goto-diff/syntactic_diff.h +++ b/src/goto-diff/syntactic_diff.h @@ -6,8 +6,8 @@ Author: Peter Schrammel \*******************************************************************/ -#ifndef CPROVER_GOTO_DIFF_SYNTACTIC_H -#define CPROVER_GOTO_DIFF_SYNTACTIC_H +#ifndef CPROVER_GOTO_DIFF_SYNTACTIC_DIFF_H +#define CPROVER_GOTO_DIFF_SYNTACTIC_DIFF_H #include "goto_diff.h" @@ -27,4 +27,4 @@ class syntactic_difft : public goto_difft }; -#endif +#endif // CPROVER_GOTO_DIFF_SYNTACTIC_DIFF_H diff --git a/src/goto-diff/unified_diff.h b/src/goto-diff/unified_diff.h index e2a30540e68..ba93d3e6134 100644 --- a/src/goto-diff/unified_diff.h +++ b/src/goto-diff/unified_diff.h @@ -8,8 +8,8 @@ Date: April 2016 \*******************************************************************/ -#ifndef CPROVER_UNIFIED_DIFF_H -#define CPROVER_UNIFIED_DIFF_H +#ifndef CPROVER_GOTO_DIFF_UNIFIED_DIFF_H +#define CPROVER_GOTO_DIFF_UNIFIED_DIFF_H #include #include @@ -103,4 +103,4 @@ class unified_difft } }; -#endif +#endif // CPROVER_GOTO_DIFF_UNIFIED_DIFF_H diff --git a/src/goto-instrument/accelerate/accelerate.h b/src/goto-instrument/accelerate/accelerate.h index 47dac27c4f4..4f2c10be9a9 100644 --- a/src/goto-instrument/accelerate/accelerate.h +++ b/src/goto-instrument/accelerate/accelerate.h @@ -1,3 +1,6 @@ +#ifndef CPROVER_GOTO_INSTRUMENT_ACCELERATE_ACCELERATE_H +#define CPROVER_GOTO_INSTRUMENT_ACCELERATE_ACCELERATE_H + #include #include #include @@ -105,3 +108,5 @@ void accelerate_functions( goto_functionst &functions, symbol_tablet &ns, bool use_z3); + +#endif // CPROVER_GOTO_INSTRUMENT_ACCELERATE_ACCELERATE_H diff --git a/src/goto-instrument/accelerate/acceleration_utils.h b/src/goto-instrument/accelerate/acceleration_utils.h index c5d2bc69ac9..3275a25c687 100644 --- a/src/goto-instrument/accelerate/acceleration_utils.h +++ b/src/goto-instrument/accelerate/acceleration_utils.h @@ -1,5 +1,5 @@ -#ifndef ACCELERATION_UTILS_H -#define ACCELERATION_UTILS_H +#ifndef CPROVER_GOTO_INSTRUMENT_ACCELERATE_ACCELERATION_UTILS_H +#define CPROVER_GOTO_INSTRUMENT_ACCELERATE_ACCELERATION_UTILS_H #include #include @@ -125,4 +125,4 @@ class acceleration_utilst { static int num_symbols; }; -#endif // ACCELERATION_UTILS_H +#endif // CPROVER_GOTO_INSTRUMENT_ACCELERATE_ACCELERATION_UTILS_H diff --git a/src/goto-instrument/accelerate/accelerator.h b/src/goto-instrument/accelerate/accelerator.h index 6263edc9f70..f1efad64bf9 100644 --- a/src/goto-instrument/accelerate/accelerator.h +++ b/src/goto-instrument/accelerate/accelerator.h @@ -1,5 +1,5 @@ -#ifndef PATH_ACCELERATOR_H -#define PATH_ACCELERATOR_H +#ifndef CPROVER_GOTO_INSTRUMENT_ACCELERATE_ACCELERATOR_H +#define CPROVER_GOTO_INSTRUMENT_ACCELERATE_ACCELERATOR_H #include "path.h" @@ -53,4 +53,4 @@ class path_acceleratort { std::set dirty_vars; }; -#endif // PATH_ACCELERATOR_H +#endif // CPROVER_GOTO_INSTRUMENT_ACCELERATE_ACCELERATOR_H diff --git a/src/goto-instrument/accelerate/all_paths_enumerator.h b/src/goto-instrument/accelerate/all_paths_enumerator.h index 12231ffb331..ab5af066d14 100644 --- a/src/goto-instrument/accelerate/all_paths_enumerator.h +++ b/src/goto-instrument/accelerate/all_paths_enumerator.h @@ -1,5 +1,5 @@ -#ifndef ALL_PATHS_ENUMERATOR_H -#define ALL_PATHS_ENUMERATOR_H +#ifndef CPROVER_GOTO_INSTRUMENT_ACCELERATE_ALL_PATHS_ENUMERATOR_H +#define CPROVER_GOTO_INSTRUMENT_ACCELERATE_ALL_PATHS_ENUMERATOR_H #include @@ -34,4 +34,4 @@ class all_paths_enumeratort : public path_enumeratort { patht last_path; }; -#endif // ALL_PATHS_ENUMERATOR_H +#endif // CPROVER_GOTO_INSTRUMENT_ACCELERATE_ALL_PATHS_ENUMERATOR_H diff --git a/src/goto-instrument/accelerate/cone_of_influence.h b/src/goto-instrument/accelerate/cone_of_influence.h index 0500bb96611..cc8ebd1cdde 100644 --- a/src/goto-instrument/accelerate/cone_of_influence.h +++ b/src/goto-instrument/accelerate/cone_of_influence.h @@ -1,5 +1,5 @@ -#ifndef CONE_OF_INFLUENCE_H -#define CONE_OF_INFLUENCE_H +#ifndef CPROVER_GOTO_INSTRUMENT_ACCELERATE_CONE_OF_INFLUENCE_H +#define CPROVER_GOTO_INSTRUMENT_ACCELERATE_CONE_OF_INFLUENCE_H #include @@ -41,4 +41,4 @@ class cone_of_influencet { const namespacet ns; }; -#endif // CONE_OF_INFLUENCE_H +#endif // CPROVER_GOTO_INSTRUMENT_ACCELERATE_CONE_OF_INFLUENCE_H diff --git a/src/goto-instrument/accelerate/disjunctive_polynomial_acceleration.h b/src/goto-instrument/accelerate/disjunctive_polynomial_acceleration.h index 3e597df5d74..97701c9ab9f 100644 --- a/src/goto-instrument/accelerate/disjunctive_polynomial_acceleration.h +++ b/src/goto-instrument/accelerate/disjunctive_polynomial_acceleration.h @@ -1,5 +1,5 @@ -#ifndef DISJUNCTIVE_POLYNOMIAL_ACCELERATION_H -#define DISJUNCTIVE_POLYNOMIAL_ACCELERATION_H +#ifndef CPROVER_GOTO_INSTRUMENT_ACCELERATE_DISJUNCTIVE_POLYNOMIAL_ACCELERATION_H +#define CPROVER_GOTO_INSTRUMENT_ACCELERATE_DISJUNCTIVE_POLYNOMIAL_ACCELERATION_H #include #include @@ -85,4 +85,4 @@ class disjunctive_polynomial_accelerationt : public loop_accelerationt { std::list accelerated_paths; }; -#endif // DISJUNCTIVE_POLYNOMIAL_ACCELERATION_H +#endif // CPROVER_GOTO_INSTRUMENT_ACCELERATE_DISJUNCTIVE_POLYNOMIAL_ACCELERATION_H diff --git a/src/goto-instrument/accelerate/enumerating_loop_acceleration.h b/src/goto-instrument/accelerate/enumerating_loop_acceleration.h index 8d17368d8ba..6db30c89027 100644 --- a/src/goto-instrument/accelerate/enumerating_loop_acceleration.h +++ b/src/goto-instrument/accelerate/enumerating_loop_acceleration.h @@ -1,5 +1,5 @@ -#ifndef ENUMERATING_LOOP_ACCELERATION_H -#define ENUMERATING_LOOP_ACCELERATION_H +#ifndef CPROVER_GOTO_INSTRUMENT_ACCELERATE_ENUMERATING_LOOP_ACCELERATION_H +#define CPROVER_GOTO_INSTRUMENT_ACCELERATE_ENUMERATING_LOOP_ACCELERATION_H #include @@ -52,4 +52,4 @@ class enumerating_loop_accelerationt : public loop_accelerationt { path_enumeratort *path_enumerator; }; -#endif // ENUMERATING_LOOP_ACCELERATION_H +#endif // CPROVER_GOTO_INSTRUMENT_ACCELERATE_ENUMERATING_LOOP_ACCELERATION_H diff --git a/src/goto-instrument/accelerate/linearize.h b/src/goto-instrument/accelerate/linearize.h index 3fa0da08e2c..5cc52261368 100644 --- a/src/goto-instrument/accelerate/linearize.h +++ b/src/goto-instrument/accelerate/linearize.h @@ -1,5 +1,5 @@ -#ifndef LINEARIZE_H -#define LINEARIZE_H +#ifndef CPROVER_GOTO_INSTRUMENT_ACCELERATE_LINEARIZE_H +#define CPROVER_GOTO_INSTRUMENT_ACCELERATE_LINEARIZE_H #include @@ -26,4 +26,4 @@ typedef struct linear_recurrence { bool linearize(symex_target_equationt &equation, linear_recurrencet &recurrence); -#endif // LINEARIZE_H +#endif // CPROVER_GOTO_INSTRUMENT_ACCELERATE_LINEARIZE_H diff --git a/src/goto-instrument/accelerate/loop_acceleration.h b/src/goto-instrument/accelerate/loop_acceleration.h index 7906e24f394..ab886d91c7c 100644 --- a/src/goto-instrument/accelerate/loop_acceleration.h +++ b/src/goto-instrument/accelerate/loop_acceleration.h @@ -1,5 +1,5 @@ -#ifndef LOOP_ACCELERATION_H -#define LOOP_ACCELERATION_H +#ifndef CPROVER_GOTO_INSTRUMENT_ACCELERATE_LOOP_ACCELERATION_H +#define CPROVER_GOTO_INSTRUMENT_ACCELERATE_LOOP_ACCELERATION_H #include "path.h" #include "accelerator.h" @@ -9,4 +9,4 @@ class loop_accelerationt { virtual bool accelerate(path_acceleratort &accelerator) = 0; }; -#endif // LOOP_ACCELERATION_H +#endif // CPROVER_GOTO_INSTRUMENT_ACCELERATE_LOOP_ACCELERATION_H diff --git a/src/goto-instrument/accelerate/overflow_instrumenter.h b/src/goto-instrument/accelerate/overflow_instrumenter.h index 785742fc14f..dc3d50818d4 100644 --- a/src/goto-instrument/accelerate/overflow_instrumenter.h +++ b/src/goto-instrument/accelerate/overflow_instrumenter.h @@ -1,5 +1,5 @@ -#ifndef OVERFLOW_INSTRUMENTER_H -#define OVERFLOW_INSTRUMENTER_H +#ifndef CPROVER_GOTO_INSTRUMENT_ACCELERATE_OVERFLOW_INSTRUMENTER_H +#define CPROVER_GOTO_INSTRUMENT_ACCELERATE_OVERFLOW_INSTRUMENTER_H #include #include @@ -47,4 +47,4 @@ class overflow_instrumentert { std::set checked; }; -#endif +#endif // CPROVER_GOTO_INSTRUMENT_ACCELERATE_OVERFLOW_INSTRUMENTER_H diff --git a/src/goto-instrument/accelerate/path.h b/src/goto-instrument/accelerate/path.h index 890252de218..0c24ff2681f 100644 --- a/src/goto-instrument/accelerate/path.h +++ b/src/goto-instrument/accelerate/path.h @@ -1,5 +1,5 @@ -#ifndef PATH_H -#define PATH_H +#ifndef CPROVER_GOTO_INSTRUMENT_ACCELERATE_PATH_H +#define CPROVER_GOTO_INSTRUMENT_ACCELERATE_PATH_H #include #include @@ -36,4 +36,4 @@ typedef std::list pathst; void output_path(patht &path, goto_programt &program, namespacet &ns, std::ostream &str); -#endif // PATH_H +#endif // CPROVER_GOTO_INSTRUMENT_ACCELERATE_PATH_H diff --git a/src/goto-instrument/accelerate/path_acceleration.h b/src/goto-instrument/accelerate/path_acceleration.h index e5531f68a7b..ca71f8bca6d 100644 --- a/src/goto-instrument/accelerate/path_acceleration.h +++ b/src/goto-instrument/accelerate/path_acceleration.h @@ -1,5 +1,5 @@ -#ifndef PATH_ACCELERATION_H -#define PATH_ACCELERATION_H +#ifndef CPROVER_GOTO_INSTRUMENT_ACCELERATE_PATH_ACCELERATION_H +#define CPROVER_GOTO_INSTRUMENT_ACCELERATE_PATH_ACCELERATION_H #include "path.h" #include "accelerator.h" @@ -9,4 +9,4 @@ class path_accelerationt { virtual bool accelerate(patht &loop, path_acceleratort &accelerator) = 0; }; -#endif // PATH_ACCELERATION_H +#endif // CPROVER_GOTO_INSTRUMENT_ACCELERATE_PATH_ACCELERATION_H diff --git a/src/goto-instrument/accelerate/path_enumerator.h b/src/goto-instrument/accelerate/path_enumerator.h index 0cd70468f29..dbceeaa8750 100644 --- a/src/goto-instrument/accelerate/path_enumerator.h +++ b/src/goto-instrument/accelerate/path_enumerator.h @@ -1,5 +1,5 @@ -#ifndef PATH_ENUMERATOR_H -#define PATH_ENUMERATOR_H +#ifndef CPROVER_GOTO_INSTRUMENT_ACCELERATE_PATH_ENUMERATOR_H +#define CPROVER_GOTO_INSTRUMENT_ACCELERATE_PATH_ENUMERATOR_H #include @@ -15,4 +15,4 @@ class path_enumeratort { virtual bool next(patht &path) = 0; }; -#endif // PATH_ENUMERATOR_H +#endif // CPROVER_GOTO_INSTRUMENT_ACCELERATE_PATH_ENUMERATOR_H diff --git a/src/goto-instrument/accelerate/polynomial.h b/src/goto-instrument/accelerate/polynomial.h index ec40a7f2b7e..5d3be16d59a 100644 --- a/src/goto-instrument/accelerate/polynomial.h +++ b/src/goto-instrument/accelerate/polynomial.h @@ -1,5 +1,5 @@ -#ifndef POLYNOMIAL_H -#define POLYNOMIAL_H +#ifndef CPROVER_GOTO_INSTRUMENT_ACCELERATE_POLYNOMIAL_H +#define CPROVER_GOTO_INSTRUMENT_ACCELERATE_POLYNOMIAL_H #include #include @@ -50,4 +50,4 @@ class polynomialt typedef std::vector polynomialst; -#endif // POLYNOMIAL_H +#endif // CPROVER_GOTO_INSTRUMENT_ACCELERATE_POLYNOMIAL_H diff --git a/src/goto-instrument/accelerate/polynomial_accelerator.h b/src/goto-instrument/accelerate/polynomial_accelerator.h index f74c14246c2..73da28f6ecf 100644 --- a/src/goto-instrument/accelerate/polynomial_accelerator.h +++ b/src/goto-instrument/accelerate/polynomial_accelerator.h @@ -1,5 +1,5 @@ -#ifndef POLYNOMIAL_ACCELERATOR_H -#define POLYNOMIAL_ACCELERATOR_H +#ifndef CPROVER_GOTO_INSTRUMENT_ACCELERATE_POLYNOMIAL_ACCELERATOR_H +#define CPROVER_GOTO_INSTRUMENT_ACCELERATE_POLYNOMIAL_ACCELERATOR_H #include #include @@ -129,4 +129,4 @@ class polynomial_acceleratort : public path_accelerationt { expr_sett find_modified(goto_programt::instructionst &body); -#endif // POLYNOMIAL_ACCELERATOR_H +#endif // CPROVER_GOTO_INSTRUMENT_ACCELERATE_POLYNOMIAL_ACCELERATOR_H diff --git a/src/goto-instrument/accelerate/sat_path_enumerator.h b/src/goto-instrument/accelerate/sat_path_enumerator.h index 39bb0bca82c..e472a67cd08 100644 --- a/src/goto-instrument/accelerate/sat_path_enumerator.h +++ b/src/goto-instrument/accelerate/sat_path_enumerator.h @@ -1,5 +1,5 @@ -#ifndef DISJUNCTIVE_POLYNOMIAL_ACCELERATION_H -#define DISJUNCTIVE_POLYNOMIAL_ACCELERATION_H +#ifndef CPROVER_GOTO_INSTRUMENT_ACCELERATE_SAT_PATH_ENUMERATOR_H +#define CPROVER_GOTO_INSTRUMENT_ACCELERATE_SAT_PATH_ENUMERATOR_H #include #include @@ -68,4 +68,4 @@ class sat_path_enumeratort : public path_enumeratort { std::list accelerated_paths; }; -#endif // DISJUNCTIVE_POLYNOMIAL_ACCELERATION_H +#endif // CPROVER_GOTO_INSTRUMENT_ACCELERATE_SAT_PATH_ENUMERATOR_H diff --git a/src/goto-instrument/accelerate/scratch_program.h b/src/goto-instrument/accelerate/scratch_program.h index 4730a1a5f71..30c009501dd 100644 --- a/src/goto-instrument/accelerate/scratch_program.h +++ b/src/goto-instrument/accelerate/scratch_program.h @@ -1,5 +1,5 @@ -#ifndef SCRATCH_PROGRAM_H -#define SCRATCH_PROGRAM_H +#ifndef CPROVER_GOTO_INSTRUMENT_ACCELERATE_SCRATCH_PROGRAM_H +#define CPROVER_GOTO_INSTRUMENT_ACCELERATE_SCRATCH_PROGRAM_H #include @@ -74,4 +74,4 @@ class scratch_programt : public goto_programt { prop_convt *checker; }; -#endif // SCRATCH_PROGRAM_H +#endif // CPROVER_GOTO_INSTRUMENT_ACCELERATE_SCRATCH_PROGRAM_H diff --git a/src/goto-instrument/accelerate/subsumed.h b/src/goto-instrument/accelerate/subsumed.h index 38284520b1c..5b06211b2e9 100644 --- a/src/goto-instrument/accelerate/subsumed.h +++ b/src/goto-instrument/accelerate/subsumed.h @@ -1,5 +1,5 @@ -#ifndef SUBSUMED_H -#define SUBSUMED_H +#ifndef CPROVER_GOTO_INSTRUMENT_ACCELERATE_SUBSUMED_H +#define CPROVER_GOTO_INSTRUMENT_ACCELERATE_SUBSUMED_H #include "path.h" @@ -20,4 +20,4 @@ class subsumed_patht typedef std::list subsumed_pathst; -#endif // SUBSUMED_H +#endif // CPROVER_GOTO_INSTRUMENT_ACCELERATE_SUBSUMED_H diff --git a/src/goto-instrument/accelerate/trace_automaton.h b/src/goto-instrument/accelerate/trace_automaton.h index 93162c44f9e..54685f4bf68 100644 --- a/src/goto-instrument/accelerate/trace_automaton.h +++ b/src/goto-instrument/accelerate/trace_automaton.h @@ -1,5 +1,5 @@ -#ifndef TRACE_AUTOMATON_H -#define TRACE_AUTOMATON_H +#ifndef CPROVER_GOTO_INSTRUMENT_ACCELERATE_TRACE_AUTOMATON_H +#define CPROVER_GOTO_INSTRUMENT_ACCELERATE_TRACE_AUTOMATON_H #include "path.h" @@ -135,4 +135,4 @@ class trace_automatont { automatont dta; }; -#endif // TRACE_AUTOMATON_H +#endif // CPROVER_GOTO_INSTRUMENT_ACCELERATE_TRACE_AUTOMATON_H diff --git a/src/goto-instrument/accelerate/util.h b/src/goto-instrument/accelerate/util.h index 1e9684a81a3..b1b44c0f56f 100644 --- a/src/goto-instrument/accelerate/util.h +++ b/src/goto-instrument/accelerate/util.h @@ -1,5 +1,5 @@ -#ifndef ACCELERATE_UTIL_H -#define ACCELERATE_UTIL_H +#ifndef CPROVER_GOTO_INSTRUMENT_ACCELERATE_UTIL_H +#define CPROVER_GOTO_INSTRUMENT_ACCELERATE_UTIL_H #include @@ -9,4 +9,4 @@ unsignedbv_typet unsigned_poly_type(); bool is_bitvector(const typet &t); typet join_types(const typet &t1, const typet &t2); -#endif // ACCELERATE_UTIL_H +#endif // CPROVER_GOTO_INSTRUMENT_ACCELERATE_UTIL_H diff --git a/src/goto-instrument/alignment_checks.h b/src/goto-instrument/alignment_checks.h index b2ee6bddf6c..37324939844 100644 --- a/src/goto-instrument/alignment_checks.h +++ b/src/goto-instrument/alignment_checks.h @@ -6,8 +6,8 @@ Module: Alignment Checks \*******************************************************************/ -#ifndef CPROVER_ALIGNMENT_CHECKS_H -#define CPROVER_ALIGNMENT_CHECKS_H +#ifndef CPROVER_GOTO_INSTRUMENT_ALIGNMENT_CHECKS_H +#define CPROVER_GOTO_INSTRUMENT_ALIGNMENT_CHECKS_H #include @@ -17,4 +17,4 @@ void print_struct_alignment_problems( const symbol_tablet &symbol_table, std::ostream &out); -#endif +#endif // CPROVER_GOTO_INSTRUMENT_ALIGNMENT_CHECKS_H diff --git a/src/goto-instrument/branch.h b/src/goto-instrument/branch.h index 434b1ca523b..acb014b1d93 100644 --- a/src/goto-instrument/branch.h +++ b/src/goto-instrument/branch.h @@ -16,4 +16,4 @@ void branch( goto_functionst &goto_functions, const irep_idt &id); -#endif +#endif // CPROVER_GOTO_INSTRUMENT_BRANCH_H diff --git a/src/goto-instrument/call_sequences.h b/src/goto-instrument/call_sequences.h index 73d7d7ec3a7..5036d5bc845 100644 --- a/src/goto-instrument/call_sequences.h +++ b/src/goto-instrument/call_sequences.h @@ -16,4 +16,4 @@ Date: September 2011 void show_call_sequences(const goto_functionst &goto_functions); void check_call_sequence(const goto_functionst &goto_functions); -#endif +#endif // CPROVER_GOTO_INSTRUMENT_CALL_SEQUENCES_H diff --git a/src/goto-instrument/code_contracts.h b/src/goto-instrument/code_contracts.h index c466b9a8536..8886bd29545 100644 --- a/src/goto-instrument/code_contracts.h +++ b/src/goto-instrument/code_contracts.h @@ -8,8 +8,8 @@ Date: February 2016 \*******************************************************************/ -#ifndef CPROVER_CODE_CONTRACTS_H -#define CPROVER_CODE_CONTRACTS_H +#ifndef CPROVER_GOTO_INSTRUMENT_CODE_CONTRACTS_H +#define CPROVER_GOTO_INSTRUMENT_CODE_CONTRACTS_H class goto_functionst; class symbol_tablet; @@ -18,4 +18,4 @@ void code_contracts( symbol_tablet &symbol_table, goto_functionst &goto_functions); -#endif +#endif // CPROVER_GOTO_INSTRUMENT_CODE_CONTRACTS_H diff --git a/src/goto-instrument/concurrency.h b/src/goto-instrument/concurrency.h index 32c9404401f..e751a62f3d4 100644 --- a/src/goto-instrument/concurrency.h +++ b/src/goto-instrument/concurrency.h @@ -19,4 +19,4 @@ void concurrency( class symbol_tablet &symbol_table, goto_functionst &goto_functions); -#endif +#endif // CPROVER_GOTO_INSTRUMENT_CONCURRENCY_H diff --git a/src/goto-instrument/count_eloc.h b/src/goto-instrument/count_eloc.h index f3417606f5b..c51a154a2a7 100644 --- a/src/goto-instrument/count_eloc.h +++ b/src/goto-instrument/count_eloc.h @@ -17,4 +17,4 @@ void count_eloc(const goto_functionst &goto_functions); void list_eloc(const goto_functionst &goto_functions); -#endif +#endif // CPROVER_GOTO_INSTRUMENT_COUNT_ELOC_H diff --git a/src/goto-instrument/cover.h b/src/goto-instrument/cover.h index cf51972f6e6..8081ad77396 100644 --- a/src/goto-instrument/cover.h +++ b/src/goto-instrument/cover.h @@ -8,8 +8,8 @@ Date: May 2016 \*******************************************************************/ -#ifndef CPROVER_COVER_H -#define CPROVER_COVER_H +#ifndef CPROVER_GOTO_INSTRUMENT_COVER_H +#define CPROVER_GOTO_INSTRUMENT_COVER_H #include @@ -27,4 +27,4 @@ void instrument_cover_goals( goto_functionst &goto_functions, coverage_criteriont); -#endif +#endif // CPROVER_GOTO_INSTRUMENT_COVER_H diff --git a/src/goto-instrument/document_properties.h b/src/goto-instrument/document_properties.h index 5ec406e25f1..deeae63b645 100644 --- a/src/goto-instrument/document_properties.h +++ b/src/goto-instrument/document_properties.h @@ -6,6 +6,9 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#ifndef CPROVER_GOTO_INSTRUMENT_DOCUMENT_PROPERTIES_H +#define CPROVER_GOTO_INSTRUMENT_DOCUMENT_PROPERTIES_H + #include #include @@ -17,3 +20,5 @@ void document_properties_latex( void document_properties_html( const goto_functionst &goto_functions, std::ostream &out); + +#endif // CPROVER_GOTO_INSTRUMENT_DOCUMENT_PROPERTIES_H diff --git a/src/goto-instrument/dot.h b/src/goto-instrument/dot.h index 3aa209e3c52..9624a804785 100644 --- a/src/goto-instrument/dot.h +++ b/src/goto-instrument/dot.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_DOT_H -#define CPROVER_DOT_H +#ifndef CPROVER_GOTO_INSTRUMENT_DOT_H +#define CPROVER_GOTO_INSTRUMENT_DOT_H #include @@ -16,4 +16,4 @@ void dot( const namespacet &ns, std::ostream &out); -#endif +#endif // CPROVER_GOTO_INSTRUMENT_DOT_H diff --git a/src/goto-instrument/dump_c.h b/src/goto-instrument/dump_c.h index 8392181503d..ff0efd496a6 100644 --- a/src/goto-instrument/dump_c.h +++ b/src/goto-instrument/dump_c.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_GOTO_PROGRAM_DUMP_C_H -#define CPROVER_GOTO_PROGRAM_DUMP_C_H +#ifndef CPROVER_GOTO_INSTRUMENT_DUMP_C_H +#define CPROVER_GOTO_INSTRUMENT_DUMP_C_H #include @@ -23,4 +23,4 @@ void dump_cpp( const namespacet &ns, std::ostream &out); -#endif +#endif // CPROVER_GOTO_INSTRUMENT_DUMP_C_H diff --git a/src/goto-instrument/dump_c_class.h b/src/goto-instrument/dump_c_class.h index b3681ef3f94..a84841ca9b9 100644 --- a/src/goto-instrument/dump_c_class.h +++ b/src/goto-instrument/dump_c_class.h @@ -6,6 +6,9 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#ifndef CPROVER_GOTO_INSTRUMENT_DUMP_C_CLASS_H +#define CPROVER_GOTO_INSTRUMENT_DUMP_C_CLASS_H + #include #include @@ -131,3 +134,5 @@ class dump_ct std::list &local_static, std::list &local_type_decls); }; + +#endif // CPROVER_GOTO_INSTRUMENT_DUMP_C_CLASS_H diff --git a/src/goto-instrument/full_slicer.h b/src/goto-instrument/full_slicer.h index c361c0ae49b..d590025c8c4 100644 --- a/src/goto-instrument/full_slicer.h +++ b/src/goto-instrument/full_slicer.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_GOTO_PROGRAMS_FULL_SLICER_H -#define CPROVER_GOTO_PROGRAMS_FULL_SLICER_H +#ifndef CPROVER_GOTO_INSTRUMENT_FULL_SLICER_H +#define CPROVER_GOTO_INSTRUMENT_FULL_SLICER_H #include @@ -32,4 +32,4 @@ void full_slicer( const namespacet &ns, slicing_criteriont &criterion); -#endif +#endif // CPROVER_GOTO_INSTRUMENT_FULL_SLICER_H diff --git a/src/goto-instrument/full_slicer_class.h b/src/goto-instrument/full_slicer_class.h index 888eeab982d..5ba76686d3f 100644 --- a/src/goto-instrument/full_slicer_class.h +++ b/src/goto-instrument/full_slicer_class.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_GOTO_PROGRAM_FULL_SLICER_CLASS_H -#define CPROVER_GOTO_PROGRAM_FULL_SLICER_CLASS_H +#ifndef CPROVER_GOTO_INSTRUMENT_FULL_SLICER_CLASS_H +#define CPROVER_GOTO_INSTRUMENT_FULL_SLICER_CLASS_H #include #include @@ -149,4 +149,4 @@ class properties_criteriont:public slicing_criteriont const std::list &property_ids; }; -#endif +#endif // CPROVER_GOTO_INSTRUMENT_FULL_SLICER_CLASS_H diff --git a/src/goto-instrument/function.h b/src/goto-instrument/function.h index d1f7eb8a6cd..207555a7cb5 100644 --- a/src/goto-instrument/function.h +++ b/src/goto-instrument/function.h @@ -26,4 +26,4 @@ void function_exit( goto_functionst &goto_functions, const irep_idt &id); -#endif +#endif // CPROVER_GOTO_INSTRUMENT_FUNCTION_H diff --git a/src/goto-instrument/function_modifies.h b/src/goto-instrument/function_modifies.h index 95e17109856..baf68f301cc 100644 --- a/src/goto-instrument/function_modifies.h +++ b/src/goto-instrument/function_modifies.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_MODIFIES_H -#define CPROVER_MODIFIES_H +#ifndef CPROVER_GOTO_INSTRUMENT_FUNCTION_MODIFIES_H +#define CPROVER_GOTO_INSTRUMENT_FUNCTION_MODIFIES_H #include #include @@ -49,4 +49,4 @@ class function_modifiest function_mapt function_map; }; -#endif +#endif // CPROVER_GOTO_INSTRUMENT_FUNCTION_MODIFIES_H diff --git a/src/goto-instrument/goto_instrument_parse_options.h b/src/goto-instrument/goto_instrument_parse_options.h index da9c266bf86..fbc31e1a78f 100644 --- a/src/goto-instrument/goto_instrument_parse_options.h +++ b/src/goto-instrument/goto_instrument_parse_options.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_GOTO_INSTRUMENT_PARSEOPTIONS_H -#define CPROVER_GOTO_INSTRUMENT_PARSEOPTIONS_H +#ifndef CPROVER_GOTO_INSTRUMENT_GOTO_INSTRUMENT_PARSE_OPTIONS_H +#define CPROVER_GOTO_INSTRUMENT_GOTO_INSTRUMENT_PARSE_OPTIONS_H #include #include @@ -101,4 +101,4 @@ class goto_instrument_parse_optionst: goto_functionst goto_functions; }; -#endif +#endif // CPROVER_GOTO_INSTRUMENT_GOTO_INSTRUMENT_PARSE_OPTIONS_H diff --git a/src/goto-instrument/goto_program2code.h b/src/goto-instrument/goto_program2code.h index e852a1598ce..02346e388ef 100644 --- a/src/goto-instrument/goto_program2code.h +++ b/src/goto-instrument/goto_program2code.h @@ -6,6 +6,9 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#ifndef CPROVER_GOTO_INSTRUMENT_GOTO_PROGRAM2CODE_H +#define CPROVER_GOTO_INSTRUMENT_GOTO_PROGRAM2CODE_H + #include #include @@ -209,3 +212,5 @@ class goto_program2codet goto_programt::const_targett upper_bound, codet &dest); }; + +#endif // CPROVER_GOTO_INSTRUMENT_GOTO_PROGRAM2CODE_H diff --git a/src/goto-instrument/havoc_loops.h b/src/goto-instrument/havoc_loops.h index bf58e12b019..901e75d4fe5 100644 --- a/src/goto-instrument/havoc_loops.h +++ b/src/goto-instrument/havoc_loops.h @@ -6,11 +6,11 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_HAVOC_LOOPS_H -#define CPROVER_HAVOC_LOOPS_H +#ifndef CPROVER_GOTO_INSTRUMENT_HAVOC_LOOPS_H +#define CPROVER_GOTO_INSTRUMENT_HAVOC_LOOPS_H #include void havoc_loops(goto_functionst &goto_functions); -#endif +#endif // CPROVER_GOTO_INSTRUMENT_HAVOC_LOOPS_H diff --git a/src/goto-instrument/horn_encoding.h b/src/goto-instrument/horn_encoding.h index 5c6a0704a9b..e6db93159be 100644 --- a/src/goto-instrument/horn_encoding.h +++ b/src/goto-instrument/horn_encoding.h @@ -6,8 +6,8 @@ Module: Horn-clause Encoding \*******************************************************************/ -#ifndef CPROVER_HORN_ENCODING_H -#define CPROVER_HORN_ENCODING_H +#ifndef CPROVER_GOTO_INSTRUMENT_HORN_ENCODING_H +#define CPROVER_GOTO_INSTRUMENT_HORN_ENCODING_H #include @@ -18,4 +18,4 @@ void horn_encoding( const namespacet &, std::ostream &out); -#endif +#endif // CPROVER_GOTO_INSTRUMENT_HORN_ENCODING_H diff --git a/src/goto-instrument/interrupt.h b/src/goto-instrument/interrupt.h index a5a81670064..b37cfcf8854 100644 --- a/src/goto-instrument/interrupt.h +++ b/src/goto-instrument/interrupt.h @@ -22,4 +22,4 @@ void interrupt( goto_functionst &goto_functions, const irep_idt &interrupt_handler); -#endif +#endif // CPROVER_GOTO_INSTRUMENT_INTERRUPT_H diff --git a/src/goto-instrument/k_induction.h b/src/goto-instrument/k_induction.h index 207270d533f..5c5918f923a 100644 --- a/src/goto-instrument/k_induction.h +++ b/src/goto-instrument/k_induction.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_K_INDUCTION_H -#define CPROVER_K_INDUCTION_H +#ifndef CPROVER_GOTO_INSTRUMENT_K_INDUCTION_H +#define CPROVER_GOTO_INSTRUMENT_K_INDUCTION_H #include @@ -16,4 +16,4 @@ void k_induction( bool base_case, bool step_case, unsigned k); -#endif +#endif // CPROVER_GOTO_INSTRUMENT_K_INDUCTION_H diff --git a/src/goto-instrument/loop_utils.h b/src/goto-instrument/loop_utils.h index 1a4410d63b2..e6558291c4d 100644 --- a/src/goto-instrument/loop_utils.h +++ b/src/goto-instrument/loop_utils.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_LOOP_UTILS_H -#define CPROVER_LOOP_UTILS_H +#ifndef CPROVER_GOTO_INSTRUMENT_LOOP_UTILS_H +#define CPROVER_GOTO_INSTRUMENT_LOOP_UTILS_H #include @@ -28,4 +28,4 @@ void build_havoc_code( goto_programt::targett get_loop_exit(const loopt &); -#endif +#endif // CPROVER_GOTO_INSTRUMENT_LOOP_UTILS_H diff --git a/src/goto-instrument/mmio.h b/src/goto-instrument/mmio.h index 79c22f2ba4d..bb3684c4a34 100644 --- a/src/goto-instrument/mmio.h +++ b/src/goto-instrument/mmio.h @@ -20,4 +20,4 @@ void mmio( class symbol_tablet &symbol_table, goto_functionst &goto_functions); -#endif +#endif // CPROVER_GOTO_INSTRUMENT_MMIO_H diff --git a/src/goto-instrument/nondet_static.h b/src/goto-instrument/nondet_static.h index 98e51926288..274b9cc5c91 100644 --- a/src/goto-instrument/nondet_static.h +++ b/src/goto-instrument/nondet_static.h @@ -9,8 +9,8 @@ Date: November 2011 \*******************************************************************/ -#ifndef CPROVER_NONDET_STATIC_H -#define CPROVER_NONDET_STATIC_H +#ifndef CPROVER_GOTO_INSTRUMENT_NONDET_STATIC_H +#define CPROVER_GOTO_INSTRUMENT_NONDET_STATIC_H class goto_functionst; class namespacet; @@ -19,4 +19,4 @@ void nondet_static( const namespacet &ns, goto_functionst &goto_functions); -#endif +#endif // CPROVER_GOTO_INSTRUMENT_NONDET_STATIC_H diff --git a/src/goto-instrument/nondet_volatile.h b/src/goto-instrument/nondet_volatile.h index 5c69523effa..1a4457d6842 100644 --- a/src/goto-instrument/nondet_volatile.h +++ b/src/goto-instrument/nondet_volatile.h @@ -19,4 +19,4 @@ void nondet_volatile( symbol_tablet &symbol_table, goto_functionst &goto_functions); -#endif +#endif // CPROVER_GOTO_INSTRUMENT_NONDET_VOLATILE_H diff --git a/src/goto-instrument/object_id.h b/src/goto-instrument/object_id.h index a83baf84e79..eb804de26d7 100644 --- a/src/goto-instrument/object_id.h +++ b/src/goto-instrument/object_id.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_OBJECT_ID_H -#define CPROVER_OBJECT_ID_H +#ifndef CPROVER_GOTO_INSTRUMENT_OBJECT_ID_H +#define CPROVER_GOTO_INSTRUMENT_OBJECT_ID_H #include #include @@ -55,4 +55,4 @@ void get_objects_w(const code_assignt &assign, object_id_sett &); void get_objects_w_lhs(const exprt &lhs, object_id_sett &); void get_objects_r_lhs(const exprt &lhs, object_id_sett &); -#endif +#endif // CPROVER_GOTO_INSTRUMENT_OBJECT_ID_H diff --git a/src/goto-instrument/points_to.h b/src/goto-instrument/points_to.h index b8995645162..5b605cee337 100644 --- a/src/goto-instrument/points_to.h +++ b/src/goto-instrument/points_to.h @@ -71,4 +71,4 @@ class points_tot std::ostream &operator << (std::ostream &, const points_tot &); -#endif +#endif // CPROVER_GOTO_INSTRUMENT_POINTS_TO_H diff --git a/src/goto-instrument/race_check.h b/src/goto-instrument/race_check.h index 560174a9b03..75495c87f78 100644 --- a/src/goto-instrument/race_check.h +++ b/src/goto-instrument/race_check.h @@ -8,8 +8,8 @@ Date: February 2006 \*******************************************************************/ -#ifndef CPROVER_GOTO_PROGRAMS_RACE_DETECTION_H -#define CPROVER_GOTO_PROGRAMS_RACE_DETECTION_H +#ifndef CPROVER_GOTO_INSTRUMENT_RACE_CHECK_H +#define CPROVER_GOTO_INSTRUMENT_RACE_CHECK_H #include #include @@ -30,4 +30,4 @@ void race_check( class symbol_tablet &symbol_table, goto_functionst &goto_functions); -#endif +#endif // CPROVER_GOTO_INSTRUMENT_RACE_CHECK_H diff --git a/src/goto-instrument/reachability_slicer.h b/src/goto-instrument/reachability_slicer.h index 316f2766856..7ce03a1d612 100644 --- a/src/goto-instrument/reachability_slicer.h +++ b/src/goto-instrument/reachability_slicer.h @@ -6,11 +6,11 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_GOTO_PROGRAMS_SLICER_H -#define CPROVER_GOTO_PROGRAMS_SLICER_H +#ifndef CPROVER_GOTO_INSTRUMENT_REACHABILITY_SLICER_H +#define CPROVER_GOTO_INSTRUMENT_REACHABILITY_SLICER_H #include void reachability_slicer(goto_functionst &goto_functions); -#endif +#endif // CPROVER_GOTO_INSTRUMENT_REACHABILITY_SLICER_H diff --git a/src/goto-instrument/reachability_slicer_class.h b/src/goto-instrument/reachability_slicer_class.h index fd7a71a2370..85f1e62a345 100644 --- a/src/goto-instrument/reachability_slicer_class.h +++ b/src/goto-instrument/reachability_slicer_class.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_GOTO_PROGRAM_SLICER_CLASS_H -#define CPROVER_GOTO_PROGRAM_SLICER_CLASS_H +#ifndef CPROVER_GOTO_INSTRUMENT_REACHABILITY_SLICER_CLASS_H +#define CPROVER_GOTO_INSTRUMENT_REACHABILITY_SLICER_CLASS_H #include #include @@ -53,4 +53,4 @@ class reachability_slicert void slice(goto_functionst &goto_functions); }; -#endif +#endif // CPROVER_GOTO_INSTRUMENT_REACHABILITY_SLICER_CLASS_H diff --git a/src/goto-instrument/rw_set.h b/src/goto-instrument/rw_set.h index 34df614d3db..129607487a0 100644 --- a/src/goto-instrument/rw_set.h +++ b/src/goto-instrument/rw_set.h @@ -8,8 +8,8 @@ Date: February 2006 \*******************************************************************/ -#ifndef CPROVER_GOTO_PROGRAMS_RW_SET -#define CPROVER_GOTO_PROGRAMS_RW_SET +#ifndef CPROVER_GOTO_INSTRUMENT_RW_SET_H +#define CPROVER_GOTO_INSTRUMENT_RW_SET_H #include #include @@ -272,4 +272,4 @@ class rw_set_with_trackt:public _rw_set_loct } }; -#endif +#endif // CPROVER_GOTO_INSTRUMENT_RW_SET_H diff --git a/src/goto-instrument/show_locations.h b/src/goto-instrument/show_locations.h index 8d4312c7e06..60861add675 100644 --- a/src/goto-instrument/show_locations.h +++ b/src/goto-instrument/show_locations.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_GOTO_PROGRAMS_SHOW_LOCATIONS_H -#define CPROVER_GOTO_PROGRAMS_SHOW_LOCATIONS_H +#ifndef CPROVER_GOTO_INSTRUMENT_SHOW_LOCATIONS_H +#define CPROVER_GOTO_INSTRUMENT_SHOW_LOCATIONS_H #include @@ -17,4 +17,4 @@ void show_locations( ui_message_handlert::uit ui, const goto_functionst &goto_functions); -#endif +#endif // CPROVER_GOTO_INSTRUMENT_SHOW_LOCATIONS_H diff --git a/src/goto-instrument/skip_loops.h b/src/goto-instrument/skip_loops.h index dfe18ac0b28..d2c9af8996f 100644 --- a/src/goto-instrument/skip_loops.h +++ b/src/goto-instrument/skip_loops.h @@ -8,8 +8,8 @@ Date: January 2016 \*******************************************************************/ -#ifndef CPROVER_SKIP_LOOPS_H -#define CPROVER_SKIP_LOOPS_H +#ifndef CPROVER_GOTO_INSTRUMENT_SKIP_LOOPS_H +#define CPROVER_GOTO_INSTRUMENT_SKIP_LOOPS_H #include @@ -21,4 +21,4 @@ bool skip_loops( const std::string &loop_ids, message_handlert &message_handler); -#endif +#endif // CPROVER_GOTO_INSTRUMENT_SKIP_LOOPS_H diff --git a/src/goto-instrument/stack_depth.h b/src/goto-instrument/stack_depth.h index fc09e40bcba..f24964ff611 100644 --- a/src/goto-instrument/stack_depth.h +++ b/src/goto-instrument/stack_depth.h @@ -8,8 +8,8 @@ Date: November 2011 \*******************************************************************/ -#ifndef CPROVER_STACK_DEPTH_H -#define CPROVER_STACK_DEPTH_H +#ifndef CPROVER_GOTO_INSTRUMENT_STACK_DEPTH_H +#define CPROVER_GOTO_INSTRUMENT_STACK_DEPTH_H class symbol_tablet; class goto_functionst; @@ -19,4 +19,4 @@ void stack_depth( goto_functionst &goto_functions, const int depth); -#endif +#endif // CPROVER_GOTO_INSTRUMENT_STACK_DEPTH_H diff --git a/src/goto-instrument/thread_instrumentation.h b/src/goto-instrument/thread_instrumentation.h index c4ca11dcb3d..eb9e159b206 100644 --- a/src/goto-instrument/thread_instrumentation.h +++ b/src/goto-instrument/thread_instrumentation.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_THREAD_EXIT_INSTRUMENTATION_H -#define CPROVER_THREAD_EXIT_INSTRUMENTATION_H +#ifndef CPROVER_GOTO_INSTRUMENT_THREAD_INSTRUMENTATION_H +#define CPROVER_GOTO_INSTRUMENT_THREAD_INSTRUMENTATION_H #include @@ -15,4 +15,4 @@ void thread_exit_instrumentation(goto_functionst &); void mutex_init_instrumentation(const symbol_tablet &, goto_functionst &); -#endif +#endif // CPROVER_GOTO_INSTRUMENT_THREAD_INSTRUMENTATION_H diff --git a/src/goto-instrument/uninitialized.h b/src/goto-instrument/uninitialized.h index a316df53bd6..1f4b27b5964 100644 --- a/src/goto-instrument/uninitialized.h +++ b/src/goto-instrument/uninitialized.h @@ -8,8 +8,8 @@ Date: January 2010 \*******************************************************************/ -#ifndef CPROVER_UNINITALIZED_H -#define CPROVER_UNINITALIZED_H +#ifndef CPROVER_GOTO_INSTRUMENT_UNINITIALIZED_H +#define CPROVER_GOTO_INSTRUMENT_UNINITIALIZED_H #include @@ -24,4 +24,4 @@ void show_uninitialized( const goto_functionst &goto_functions, std::ostream &out); -#endif +#endif // CPROVER_GOTO_INSTRUMENT_UNINITIALIZED_H diff --git a/src/goto-instrument/unwind.h b/src/goto-instrument/unwind.h index ac93496a842..b68adee5866 100644 --- a/src/goto-instrument/unwind.h +++ b/src/goto-instrument/unwind.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_UNWIND_H -#define CPROVER_UNWIND_H +#ifndef CPROVER_GOTO_INSTRUMENT_UNWIND_H +#define CPROVER_GOTO_INSTRUMENT_UNWIND_H #include @@ -28,4 +28,4 @@ void goto_unwind( goto_functionst &goto_functions, const unsigned k); -#endif +#endif // CPROVER_GOTO_INSTRUMENT_UNWIND_H diff --git a/src/goto-instrument/wmm/abstract_event.h b/src/goto-instrument/wmm/abstract_event.h index 6d0a5e0f6e0..c94708f30fe 100644 --- a/src/goto-instrument/wmm/abstract_event.h +++ b/src/goto-instrument/wmm/abstract_event.h @@ -8,8 +8,8 @@ Date: 2012 \*******************************************************************/ -#ifndef ABSTRACT_EVENT_H -#define ABSTRACT_EVENT_H +#ifndef CPROVER_GOTO_INSTRUMENT_WMM_ABSTRACT_EVENT_H +#define CPROVER_GOTO_INSTRUMENT_WMM_ABSTRACT_EVENT_H #include #include @@ -152,4 +152,4 @@ class abstract_eventt:public graph_nodet return value; } }; -#endif +#endif // CPROVER_GOTO_INSTRUMENT_WMM_ABSTRACT_EVENT_H diff --git a/src/goto-instrument/wmm/data_dp.h b/src/goto-instrument/wmm/data_dp.h index 0b4bc78c02c..14b594fd913 100644 --- a/src/goto-instrument/wmm/data_dp.h +++ b/src/goto-instrument/wmm/data_dp.h @@ -8,8 +8,8 @@ Date: 2012 \*******************************************************************/ -#ifndef DATA_DEP_H -#define DATA_DEP_H +#ifndef CPROVER_GOTO_INSTRUMENT_WMM_DATA_DP_H +#define CPROVER_GOTO_INSTRUMENT_WMM_DATA_DP_H #include @@ -69,4 +69,4 @@ class data_dpt :public std::set void print(messaget& message); }; -#endif +#endif // CPROVER_GOTO_INSTRUMENT_WMM_DATA_DP_H diff --git a/src/goto-instrument/wmm/event_graph.h b/src/goto-instrument/wmm/event_graph.h index c4e9a98a966..7c0bac7f8b6 100644 --- a/src/goto-instrument/wmm/event_graph.h +++ b/src/goto-instrument/wmm/event_graph.h @@ -8,8 +8,8 @@ Date: 2012 \*******************************************************************/ -#ifndef EVENT_GRAPH_H -#define EVENT_GRAPH_H +#ifndef CPROVER_GOTO_INSTRUMENT_WMM_EVENT_GRAPH_H +#define CPROVER_GOTO_INSTRUMENT_WMM_EVENT_GRAPH_H #include #include @@ -543,4 +543,4 @@ class event_grapht exploration.collect_pairs(ns); } }; -#endif +#endif // CPROVER_GOTO_INSTRUMENT_WMM_EVENT_GRAPH_H diff --git a/src/goto-instrument/wmm/fence.h b/src/goto-instrument/wmm/fence.h index a363f713534..5d14c2cc7a3 100644 --- a/src/goto-instrument/wmm/fence.h +++ b/src/goto-instrument/wmm/fence.h @@ -8,8 +8,8 @@ Date: February 2012 \*******************************************************************/ -#ifndef FENCE_H -#define FENCE_H +#ifndef CPROVER_GOTO_INSTRUMENT_WMM_FENCE_H +#define CPROVER_GOTO_INSTRUMENT_WMM_FENCE_H #include @@ -23,4 +23,4 @@ bool is_lwfence( const goto_programt::instructiont &instruction, const namespacet &ns); -#endif +#endif // CPROVER_GOTO_INSTRUMENT_WMM_FENCE_H diff --git a/src/goto-instrument/wmm/goto2graph.h b/src/goto-instrument/wmm/goto2graph.h index 8eea136dcc5..8c66a8a4f63 100644 --- a/src/goto-instrument/wmm/goto2graph.h +++ b/src/goto-instrument/wmm/goto2graph.h @@ -8,8 +8,8 @@ Date: 2012 \*******************************************************************/ -#ifndef INSTRUMENTER_H -#define INSTRUMENTER_H +#ifndef CPROVER_GOTO_INSTRUMENT_WMM_GOTO2GRAPH_H +#define CPROVER_GOTO_INSTRUMENT_WMM_GOTO2GRAPH_H #include @@ -389,4 +389,4 @@ class instrumentert void print_outputs(memory_modelt model, bool hide_internals); }; -#endif +#endif // CPROVER_GOTO_INSTRUMENT_WMM_GOTO2GRAPH_H diff --git a/src/goto-instrument/wmm/instrumenter_pensieve.h b/src/goto-instrument/wmm/instrumenter_pensieve.h index e655f5037b9..2af65a8d4ee 100644 --- a/src/goto-instrument/wmm/instrumenter_pensieve.h +++ b/src/goto-instrument/wmm/instrumenter_pensieve.h @@ -6,8 +6,8 @@ Module: Instrumenter \*******************************************************************/ -#ifndef INSTRUMENTER_PENSIEVE_H -#define INSTRUMENTER_PENSIEVE_H +#ifndef CPROVER_GOTO_INSTRUMENT_WMM_INSTRUMENTER_PENSIEVE_H +#define CPROVER_GOTO_INSTRUMENT_WMM_INSTRUMENTER_PENSIEVE_H #include "event_graph.h" #include "goto2graph.h" @@ -37,4 +37,4 @@ class instrumenter_pensievet:public instrumentert } }; -#endif +#endif // CPROVER_GOTO_INSTRUMENT_WMM_INSTRUMENTER_PENSIEVE_H diff --git a/src/goto-instrument/wmm/shared_buffers.h b/src/goto-instrument/wmm/shared_buffers.h index 347b2c43d06..05a1400e8e7 100644 --- a/src/goto-instrument/wmm/shared_buffers.h +++ b/src/goto-instrument/wmm/shared_buffers.h @@ -1,3 +1,6 @@ +#ifndef CPROVER_GOTO_INSTRUMENT_WMM_SHARED_BUFFERS_H +#define CPROVER_GOTO_INSTRUMENT_WMM_SHARED_BUFFERS_H + #include #include @@ -261,3 +264,5 @@ class shared_bufferst void add_initialization(goto_programt &goto_program); }; + +#endif // CPROVER_GOTO_INSTRUMENT_WMM_SHARED_BUFFERS_H diff --git a/src/goto-instrument/wmm/weak_memory.h b/src/goto-instrument/wmm/weak_memory.h index 5826bb65a92..a440a10bd82 100644 --- a/src/goto-instrument/wmm/weak_memory.h +++ b/src/goto-instrument/wmm/weak_memory.h @@ -8,8 +8,8 @@ Date: September 2011 \*******************************************************************/ -#ifndef CPROVER_WEAK_MEMORY_H -#define CPROVER_WEAK_MEMORY_H +#ifndef CPROVER_GOTO_INSTRUMENT_WMM_WEAK_MEMORY_H +#define CPROVER_GOTO_INSTRUMENT_WMM_WEAK_MEMORY_H #include "wmm.h" @@ -49,4 +49,4 @@ void introduce_temporaries( #endif messaget& message); -#endif +#endif // CPROVER_GOTO_INSTRUMENT_WMM_WEAK_MEMORY_H diff --git a/src/goto-instrument/wmm/wmm.h b/src/goto-instrument/wmm/wmm.h index 88d52fa773d..9fa924e8693 100644 --- a/src/goto-instrument/wmm/wmm.h +++ b/src/goto-instrument/wmm/wmm.h @@ -8,8 +8,8 @@ Date: 2012 \*******************************************************************/ -#ifndef MEMORY_MODEL -#define MEMORY_MODEL +#ifndef CPROVER_GOTO_INSTRUMENT_WMM_WMM_H +#define CPROVER_GOTO_INSTRUMENT_WMM_WMM_H typedef enum { Unknown=-1, @@ -34,4 +34,4 @@ typedef enum { no_loop=2 } loop_strategyt; -#endif +#endif // CPROVER_GOTO_INSTRUMENT_WMM_WMM_H diff --git a/src/goto-programs/basic_blocks.h b/src/goto-programs/basic_blocks.h index 342ba4acb5a..9759697a09e 100644 --- a/src/goto-programs/basic_blocks.h +++ b/src/goto-programs/basic_blocks.h @@ -6,12 +6,12 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_GOTO_PROGRAM_BASIC_BLOCKS_H -#define CPROVER_GOTO_PROGRAM_BASIC_BLOCKS_H +#ifndef CPROVER_GOTO_PROGRAMS_BASIC_BLOCKS_H +#define CPROVER_GOTO_PROGRAMS_BASIC_BLOCKS_H #include "goto_program.h" void basic_blocks(goto_programt &goto_program, unsigned max_block_size=0); -#endif +#endif // CPROVER_GOTO_PROGRAMS_BASIC_BLOCKS_H diff --git a/src/goto-programs/cfg.h b/src/goto-programs/cfg.h index f134866b03d..bbba1120574 100644 --- a/src/goto-programs/cfg.h +++ b/src/goto-programs/cfg.h @@ -567,4 +567,4 @@ void cfg_baset::compute_edges( compute_edges(goto_functions, it->second.body); } -#endif +#endif // CPROVER_GOTO_PROGRAMS_CFG_H diff --git a/src/goto-programs/class_hierarchy.h b/src/goto-programs/class_hierarchy.h index d64d361f84e..bef2c7ec7eb 100644 --- a/src/goto-programs/class_hierarchy.h +++ b/src/goto-programs/class_hierarchy.h @@ -8,8 +8,8 @@ Date: April 2016 \*******************************************************************/ -#ifndef CPROVER_CLASS_HIERARCHY_H -#define CPROVER_CLASS_HIERARCHY_H +#ifndef CPROVER_GOTO_PROGRAMS_CLASS_HIERARCHY_H +#define CPROVER_GOTO_PROGRAMS_CLASS_HIERARCHY_H #include #include @@ -55,4 +55,4 @@ class class_hierarchyt void get_parents_trans_rec(const irep_idt &, idst &) const; }; -#endif +#endif // CPROVER_GOTO_PROGRAMS_CLASS_HIERARCHY_H diff --git a/src/goto-programs/compute_called_functions.h b/src/goto-programs/compute_called_functions.h index 3b1de09cf0c..40dba2b894e 100644 --- a/src/goto-programs/compute_called_functions.h +++ b/src/goto-programs/compute_called_functions.h @@ -34,4 +34,4 @@ void compute_called_functions( const goto_modelt &, std::set &functions); -#endif +#endif // CPROVER_GOTO_PROGRAMS_COMPUTE_CALLED_FUNCTIONS_H diff --git a/src/goto-programs/destructor.h b/src/goto-programs/destructor.h index a1b1ac5c663..2ea310361f3 100644 --- a/src/goto-programs/destructor.h +++ b/src/goto-programs/destructor.h @@ -16,4 +16,4 @@ code_function_callt get_destructor( const namespacet &ns, const typet &type); -#endif +#endif // CPROVER_GOTO_PROGRAMS_DESTRUCTOR_H diff --git a/src/goto-programs/elf_reader.h b/src/goto-programs/elf_reader.h index 8b7806e41ee..9dbf52dce23 100644 --- a/src/goto-programs/elf_reader.h +++ b/src/goto-programs/elf_reader.h @@ -6,8 +6,8 @@ Module: Read ELF \*******************************************************************/ -#ifndef CPROVER_ELF_READER_H -#define CPROVER_ELF_READER_H +#ifndef CPROVER_GOTO_PROGRAMS_ELF_READER_H +#define CPROVER_GOTO_PROGRAMS_ELF_READER_H #include #include @@ -151,4 +151,4 @@ class elf_readert std::istream ∈ }; -#endif +#endif // CPROVER_GOTO_PROGRAMS_ELF_READER_H diff --git a/src/goto-programs/format_strings.h b/src/goto-programs/format_strings.h index e04d5be0bc0..157a8bf96f4 100644 --- a/src/goto-programs/format_strings.h +++ b/src/goto-programs/format_strings.h @@ -52,4 +52,4 @@ format_token_listt parse_format_string(const std::string &); typet get_type(const format_tokent &); -#endif /*CPROVER_GOTO_PROGRAMS_FORMAT_STRINGS_H_*/ +#endif // CPROVER_GOTO_PROGRAMS_FORMAT_STRINGS_H diff --git a/src/goto-programs/get_goto_model.h b/src/goto-programs/get_goto_model.h index d740a6bed39..84c6c00c7a5 100644 --- a/src/goto-programs/get_goto_model.h +++ b/src/goto-programs/get_goto_model.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_GET_GOTO_MODEL_H -#define CPROVER_GET_GOTO_MODEL_H +#ifndef CPROVER_GOTO_PROGRAMS_GET_GOTO_MODEL_H +#define CPROVER_GOTO_PROGRAMS_GET_GOTO_MODEL_H #include @@ -19,4 +19,4 @@ class get_goto_modelt:public goto_modelt, public messaget bool operator()(const std::vector &); }; -#endif +#endif // CPROVER_GOTO_PROGRAMS_GET_GOTO_MODEL_H diff --git a/src/goto-programs/goto_convert.h b/src/goto-programs/goto_convert.h index b50e963f613..499c24aa572 100644 --- a/src/goto-programs/goto_convert.h +++ b/src/goto-programs/goto_convert.h @@ -27,4 +27,4 @@ void goto_convert( goto_programt &dest, message_handlert &message_handler); -#endif +#endif // CPROVER_GOTO_PROGRAMS_GOTO_CONVERT_H diff --git a/src/goto-programs/goto_convert_class.h b/src/goto-programs/goto_convert_class.h index db6d0c54bd0..daea6f6571f 100644 --- a/src/goto-programs/goto_convert_class.h +++ b/src/goto-programs/goto_convert_class.h @@ -469,4 +469,4 @@ class goto_convertt:public messaget exprt get_array_argument(const exprt &src); }; -#endif +#endif // CPROVER_GOTO_PROGRAMS_GOTO_CONVERT_CLASS_H diff --git a/src/goto-programs/goto_convert_functions.h b/src/goto-programs/goto_convert_functions.h index 32072255f57..9678c928609 100644 --- a/src/goto-programs/goto_convert_functions.h +++ b/src/goto-programs/goto_convert_functions.h @@ -8,8 +8,8 @@ Date: June 2003 \*******************************************************************/ -#ifndef CPROVER_GOTO_CONVERT_FUNCTIONS_H -#define CPROVER_GOTO_CONVERT_FUNCTIONS_H +#ifndef CPROVER_GOTO_PROGRAMS_GOTO_CONVERT_FUNCTIONS_H +#define CPROVER_GOTO_PROGRAMS_GOTO_CONVERT_FUNCTIONS_H #include "goto_model.h" #include "goto_convert_class.h" @@ -59,4 +59,4 @@ class goto_convert_functionst:public goto_convertt const source_locationt &); }; -#endif +#endif // CPROVER_GOTO_PROGRAMS_GOTO_CONVERT_FUNCTIONS_H diff --git a/src/goto-programs/goto_functions.h b/src/goto-programs/goto_functions.h index c2c95e7f85e..6abb68ea5a4 100644 --- a/src/goto-programs/goto_functions.h +++ b/src/goto-programs/goto_functions.h @@ -8,8 +8,8 @@ Date: June 2003 \*******************************************************************/ -#ifndef CPROVER_GOTO_FUNCTIONS_H -#define CPROVER_GOTO_FUNCTIONS_H +#ifndef CPROVER_GOTO_PROGRAMS_GOTO_FUNCTIONS_H +#define CPROVER_GOTO_PROGRAMS_GOTO_FUNCTIONS_H #include "goto_program.h" #include "goto_functions_template.h" @@ -31,4 +31,4 @@ void get_local_identifiers( const goto_function_templatet &goto_function, std::set &dest); -#endif +#endif // CPROVER_GOTO_PROGRAMS_GOTO_FUNCTIONS_H diff --git a/src/goto-programs/goto_functions_template.h b/src/goto-programs/goto_functions_template.h index 73876c607b5..6f33cfc1613 100644 --- a/src/goto-programs/goto_functions_template.h +++ b/src/goto-programs/goto_functions_template.h @@ -8,8 +8,8 @@ Date: June 2003 \*******************************************************************/ -#ifndef CPROVER_GOTO_FUNCTIONS_TEMPLATE_H -#define CPROVER_GOTO_FUNCTIONS_TEMPLATE_H +#ifndef CPROVER_GOTO_PROGRAMS_GOTO_FUNCTIONS_TEMPLATE_H +#define CPROVER_GOTO_PROGRAMS_GOTO_FUNCTIONS_TEMPLATE_H #include #include @@ -266,4 +266,4 @@ void goto_functions_templatet::compute_loop_numbers() it->second.body.compute_loop_numbers(); } -#endif +#endif // CPROVER_GOTO_PROGRAMS_GOTO_FUNCTIONS_TEMPLATE_H diff --git a/src/goto-programs/goto_inline.h b/src/goto-programs/goto_inline.h index a5543c1058f..da4cdb22ae2 100644 --- a/src/goto-programs/goto_inline.h +++ b/src/goto-programs/goto_inline.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_GOTO_INLINE_H -#define CPROVER_GOTO_INLINE_H +#ifndef CPROVER_GOTO_PROGRAMS_GOTO_INLINE_H +#define CPROVER_GOTO_PROGRAMS_GOTO_INLINE_H #include "goto_model.h" @@ -39,4 +39,4 @@ void goto_partial_inline( message_handlert &message_handler, unsigned _smallfunc_limit = 0); -#endif +#endif // CPROVER_GOTO_PROGRAMS_GOTO_INLINE_H diff --git a/src/goto-programs/goto_inline_class.h b/src/goto-programs/goto_inline_class.h index 1006d6fb66c..88053ef932c 100644 --- a/src/goto-programs/goto_inline_class.h +++ b/src/goto-programs/goto_inline_class.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_GOTO_PROGRAMS_GOTO_INLINE_CLASS -#define CPROVER_GOTO_PROGRAMS_GOTO_INLINE_CLASS +#ifndef CPROVER_GOTO_PROGRAMS_GOTO_INLINE_CLASS_H +#define CPROVER_GOTO_PROGRAMS_GOTO_INLINE_CLASS_H #include @@ -86,4 +86,4 @@ class goto_inlinet:public messaget finished_inlining_sett finished_inlining_set; }; -#endif +#endif // CPROVER_GOTO_PROGRAMS_GOTO_INLINE_CLASS_H diff --git a/src/goto-programs/goto_model.h b/src/goto-programs/goto_model.h index 96261aeb2cb..3829d4936f2 100644 --- a/src/goto-programs/goto_model.h +++ b/src/goto-programs/goto_model.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_GOTO_MODEL_H -#define CPROVER_GOTO_MODEL_H +#ifndef CPROVER_GOTO_PROGRAMS_GOTO_MODEL_H +#define CPROVER_GOTO_PROGRAMS_GOTO_MODEL_H #include @@ -48,4 +48,4 @@ class goto_modelt goto_modelt(const goto_modelt &) = delete; }; -#endif +#endif // CPROVER_GOTO_PROGRAMS_GOTO_MODEL_H diff --git a/src/goto-programs/goto_program.h b/src/goto-programs/goto_program.h index c7f859545c4..1098582ee2f 100644 --- a/src/goto-programs/goto_program.h +++ b/src/goto-programs/goto_program.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_GOTO_PROGRAM_H -#define CPROVER_GOTO_PROGRAM_H +#ifndef CPROVER_GOTO_PROGRAMS_GOTO_PROGRAM_H +#define CPROVER_GOTO_PROGRAMS_GOTO_PROGRAM_H #include @@ -63,4 +63,4 @@ std::string as_string( const namespacet &ns, const goto_programt::instructiont &); -#endif +#endif // CPROVER_GOTO_PROGRAMS_GOTO_PROGRAM_H diff --git a/src/goto-programs/goto_program_irep.h b/src/goto-programs/goto_program_irep.h index 799469992df..aef5c1f9f0a 100644 --- a/src/goto-programs/goto_program_irep.h +++ b/src/goto-programs/goto_program_irep.h @@ -8,8 +8,8 @@ Date: May 2007 \*******************************************************************/ -#ifndef GOTO_PROGRAM_IREP_H -#define GOTO_PROGRAM_IREP_H +#ifndef CPROVER_GOTO_PROGRAMS_GOTO_PROGRAM_IREP_H +#define CPROVER_GOTO_PROGRAMS_GOTO_PROGRAM_IREP_H #include @@ -19,4 +19,4 @@ void convert(const irept &irep, goto_programt::instructiont &instruction); void convert(const goto_programt &program, irept &irep); void convert(const irept &irep, goto_programt &program); -#endif /* GOTO_PROGRAM_IREP_H */ +#endif // CPROVER_GOTO_PROGRAMS_GOTO_PROGRAM_IREP_H diff --git a/src/goto-programs/goto_program_template.h b/src/goto-programs/goto_program_template.h index 4de571933f7..54f7a6ba4ce 100644 --- a/src/goto-programs/goto_program_template.h +++ b/src/goto-programs/goto_program_template.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_GOTO_PROGRAM_TEMPLATE_H -#define CPROVER_GOTO_PROGRAM_TEMPLATE_H +#ifndef CPROVER_GOTO_PROGRAMS_GOTO_PROGRAM_TEMPLATE_H +#define CPROVER_GOTO_PROGRAMS_GOTO_PROGRAM_TEMPLATE_H /*! \defgroup gr_goto_programs Goto programs */ @@ -696,4 +696,4 @@ struct const_target_hash_templatet { return t->location_number; } }; -#endif +#endif // CPROVER_GOTO_PROGRAMS_GOTO_PROGRAM_TEMPLATE_H diff --git a/src/goto-programs/goto_trace.h b/src/goto-programs/goto_trace.h index 04b50b77dab..fcaca39ba76 100644 --- a/src/goto-programs/goto_trace.h +++ b/src/goto-programs/goto_trace.h @@ -177,4 +177,4 @@ void trace_value( const exprt &full_lhs, const exprt &value); -#endif +#endif // CPROVER_GOTO_PROGRAMS_GOTO_TRACE_H diff --git a/src/goto-programs/graphml_witness.h b/src/goto-programs/graphml_witness.h index 412091a0c64..c68e8b8d4cb 100644 --- a/src/goto-programs/graphml_witness.h +++ b/src/goto-programs/graphml_witness.h @@ -39,4 +39,4 @@ class graphml_witnesst }; -#endif +#endif // CPROVER_GOTO_PROGRAMS_GRAPHML_WITNESS_H diff --git a/src/goto-programs/interpreter.h b/src/goto-programs/interpreter.h index 2d9ef8a0569..bf909502793 100644 --- a/src/goto-programs/interpreter.h +++ b/src/goto-programs/interpreter.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_INTERPRETER_H -#define CPROVER_INTERPRETER_H +#ifndef CPROVER_GOTO_PROGRAMS_INTERPRETER_H +#define CPROVER_GOTO_PROGRAMS_INTERPRETER_H #include "goto_functions.h" @@ -15,4 +15,4 @@ void interpreter( const symbol_tablet &symbol_table, const goto_functionst &goto_functions); -#endif +#endif // CPROVER_GOTO_PROGRAMS_INTERPRETER_H diff --git a/src/goto-programs/interpreter_class.h b/src/goto-programs/interpreter_class.h index 340e3394cf1..94fab6ed8d4 100644 --- a/src/goto-programs/interpreter_class.h +++ b/src/goto-programs/interpreter_class.h @@ -1,9 +1,3 @@ -#include - -#include - -#include "goto_functions.h" - /*******************************************************************\ Class: interpretert @@ -12,6 +6,15 @@ \*******************************************************************/ +#ifndef CPROVER_GOTO_PROGRAMS_INTERPRETER_CLASS_H +#define CPROVER_GOTO_PROGRAMS_INTERPRETER_CLASS_H + +#include + +#include + +#include "goto_functions.h" + class interpretert { public: @@ -105,3 +108,5 @@ class interpretert void show_state(); }; + +#endif // CPROVER_GOTO_PROGRAMS_INTERPRETER_CLASS_H diff --git a/src/goto-programs/json_goto_trace.h b/src/goto-programs/json_goto_trace.h index 949e1007283..a4a3f2757fe 100644 --- a/src/goto-programs/json_goto_trace.h +++ b/src/goto-programs/json_goto_trace.h @@ -20,4 +20,4 @@ void convert( const goto_tracet &, jsont &); -#endif +#endif // CPROVER_GOTO_PROGRAMS_JSON_GOTO_TRACE_H diff --git a/src/goto-programs/link_to_library.h b/src/goto-programs/link_to_library.h index 5d21204c53d..cb266e5d8fa 100644 --- a/src/goto-programs/link_to_library.h +++ b/src/goto-programs/link_to_library.h @@ -22,4 +22,4 @@ void link_to_library( goto_modelt &, message_handlert &); -#endif +#endif // CPROVER_GOTO_PROGRAMS_LINK_TO_LIBRARY_H diff --git a/src/goto-programs/loop_ids.h b/src/goto-programs/loop_ids.h index bb7b3322677..da17118698c 100644 --- a/src/goto-programs/loop_ids.h +++ b/src/goto-programs/loop_ids.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_LOOP_IDS_H -#define CPROVER_LOOP_IDS_H +#ifndef CPROVER_GOTO_PROGRAMS_LOOP_IDS_H +#define CPROVER_GOTO_PROGRAMS_LOOP_IDS_H #include @@ -25,4 +25,4 @@ void show_loop_ids( ui_message_handlert::uit, const goto_programt &); -#endif +#endif // CPROVER_GOTO_PROGRAMS_LOOP_IDS_H diff --git a/src/goto-programs/osx_fat_reader.h b/src/goto-programs/osx_fat_reader.h index c98e75ebd62..83c64de13ca 100644 --- a/src/goto-programs/osx_fat_reader.h +++ b/src/goto-programs/osx_fat_reader.h @@ -6,8 +6,8 @@ Module: Read OS X Fat Binaries \*******************************************************************/ -#ifndef CPROVER_OSX_FAT_READER_H -#define CPROVER_OSX_FAT_READER_H +#ifndef CPROVER_GOTO_PROGRAMS_OSX_FAT_READER_H +#define CPROVER_GOTO_PROGRAMS_OSX_FAT_READER_H #include #include @@ -32,4 +32,4 @@ class osx_fat_readert bool is_osx_fat_magic(char hdr[4]); -#endif +#endif // CPROVER_GOTO_PROGRAMS_OSX_FAT_READER_H diff --git a/src/goto-programs/parameter_assignments.h b/src/goto-programs/parameter_assignments.h index daeda44444d..b9cafe8f932 100644 --- a/src/goto-programs/parameter_assignments.h +++ b/src/goto-programs/parameter_assignments.h @@ -8,8 +8,8 @@ Date: September 2015 \*******************************************************************/ -#ifndef CPROVER_PARAMETER_ASSIGNMENTS_H -#define CPROVER_PARAMETER_ASSIGNMENTS_H +#ifndef CPROVER_GOTO_PROGRAMS_PARAMETER_ASSIGNMENTS_H +#define CPROVER_GOTO_PROGRAMS_PARAMETER_ASSIGNMENTS_H #include @@ -17,4 +17,4 @@ void parameter_assignments(symbol_tablet &, goto_functionst &); void parameter_assignments(goto_modelt &); -#endif +#endif // CPROVER_GOTO_PROGRAMS_PARAMETER_ASSIGNMENTS_H diff --git a/src/goto-programs/pointer_arithmetic.h b/src/goto-programs/pointer_arithmetic.h index cd18d61ff15..646223dc99c 100644 --- a/src/goto-programs/pointer_arithmetic.h +++ b/src/goto-programs/pointer_arithmetic.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_POINTER_ARITHMETIC_H -#define CPROVER_POINTER_ARITHMETIC_H +#ifndef CPROVER_GOTO_PROGRAMS_POINTER_ARITHMETIC_H +#define CPROVER_GOTO_PROGRAMS_POINTER_ARITHMETIC_H #include @@ -23,4 +23,4 @@ struct pointer_arithmetict void make_pointer(const exprt &src); }; -#endif +#endif // CPROVER_GOTO_PROGRAMS_POINTER_ARITHMETIC_H diff --git a/src/goto-programs/property_checker.h b/src/goto-programs/property_checker.h index 3566e188667..95c209f2430 100644 --- a/src/goto-programs/property_checker.h +++ b/src/goto-programs/property_checker.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_PROPERTY_CHECKER_H -#define CPROVER_PROPERTY_CHECKER_H +#ifndef CPROVER_GOTO_PROGRAMS_PROPERTY_CHECKER_H +#define CPROVER_GOTO_PROGRAMS_PROPERTY_CHECKER_H // this is just an interface -- it won't actually do any checking! @@ -49,4 +49,4 @@ class property_checkert:public messaget void initialize_property_map(const goto_functionst &); }; -#endif +#endif // CPROVER_GOTO_PROGRAMS_PROPERTY_CHECKER_H diff --git a/src/goto-programs/read_bin_goto_object.h b/src/goto-programs/read_bin_goto_object.h index f9864036764..a4b679427d7 100644 --- a/src/goto-programs/read_bin_goto_object.h +++ b/src/goto-programs/read_bin_goto_object.h @@ -8,8 +8,8 @@ Date: May 2007 \*******************************************************************/ -#ifndef CPROVER_READ_BIN_GOTO_OBJECT_H -#define CPROVER_READ_BIN_GOTO_OBJECT_H +#ifndef CPROVER_GOTO_PROGRAMS_READ_BIN_GOTO_OBJECT_H +#define CPROVER_GOTO_PROGRAMS_READ_BIN_GOTO_OBJECT_H #include #include @@ -25,4 +25,4 @@ bool read_bin_goto_object( goto_functionst &goto_functions, message_handlert &message_handler); -#endif /*READ_BIN_GOTO_OBJECT_H_*/ +#endif // CPROVER_GOTO_PROGRAMS_READ_BIN_GOTO_OBJECT_H diff --git a/src/goto-programs/read_goto_binary.h b/src/goto-programs/read_goto_binary.h index 0a4593987d3..f926179b134 100644 --- a/src/goto-programs/read_goto_binary.h +++ b/src/goto-programs/read_goto_binary.h @@ -40,4 +40,4 @@ bool read_object_and_link( goto_modelt &, message_handlert &); -#endif +#endif // CPROVER_GOTO_PROGRAMS_READ_GOTO_BINARY_H diff --git a/src/goto-programs/remove_asm.h b/src/goto-programs/remove_asm.h index 877fd1a7e25..a0de50fc699 100644 --- a/src/goto-programs/remove_asm.h +++ b/src/goto-programs/remove_asm.h @@ -18,4 +18,4 @@ void remove_asm(symbol_tablet &, goto_functionst &); void remove_asm(goto_modelt &); -#endif +#endif // CPROVER_GOTO_PROGRAMS_REMOVE_ASM_H diff --git a/src/goto-programs/remove_complex.h b/src/goto-programs/remove_complex.h index 7f5c4277208..c42784318cf 100644 --- a/src/goto-programs/remove_complex.h +++ b/src/goto-programs/remove_complex.h @@ -8,8 +8,8 @@ Date: September 2014 \*******************************************************************/ -#ifndef CPROVER_REMOVE_COMPLEX_H -#define CPROVER_REMOVE_COMPLEX_H +#ifndef CPROVER_GOTO_PROGRAMS_REMOVE_COMPLEX_H +#define CPROVER_GOTO_PROGRAMS_REMOVE_COMPLEX_H #include @@ -17,4 +17,4 @@ void remove_complex(symbol_tablet &, goto_functionst &); void remove_complex(goto_modelt &); -#endif +#endif // CPROVER_GOTO_PROGRAMS_REMOVE_COMPLEX_H diff --git a/src/goto-programs/remove_function_pointers.h b/src/goto-programs/remove_function_pointers.h index e345471c7f6..6f1f26984df 100644 --- a/src/goto-programs/remove_function_pointers.h +++ b/src/goto-programs/remove_function_pointers.h @@ -8,8 +8,8 @@ Date: June 2003 \*******************************************************************/ -#ifndef CPROVER_REMOVE_FUNCTION_POINTERS_H -#define CPROVER_REMOVE_FUNCTION_POINTERS_H +#ifndef CPROVER_GOTO_PROGRAMS_REMOVE_FUNCTION_POINTERS_H +#define CPROVER_GOTO_PROGRAMS_REMOVE_FUNCTION_POINTERS_H #include "goto_model.h" @@ -30,4 +30,4 @@ bool remove_function_pointers( goto_programt &goto_program, bool add_safety_assertion); -#endif +#endif // CPROVER_GOTO_PROGRAMS_REMOVE_FUNCTION_POINTERS_H diff --git a/src/goto-programs/remove_returns.h b/src/goto-programs/remove_returns.h index 4eb106f1a0b..3f68d3e89e2 100644 --- a/src/goto-programs/remove_returns.h +++ b/src/goto-programs/remove_returns.h @@ -8,8 +8,8 @@ Date: September 2009 \*******************************************************************/ -#ifndef CPROVER_REMOVE_RETURNS_H -#define CPROVER_REMOVE_RETURNS_H +#ifndef CPROVER_GOTO_PROGRAMS_REMOVE_RETURNS_H +#define CPROVER_GOTO_PROGRAMS_REMOVE_RETURNS_H #include @@ -26,4 +26,4 @@ void remove_returns(goto_modelt &); // reverse the above operations void restore_returns(symbol_tablet &, goto_functionst &); -#endif +#endif // CPROVER_GOTO_PROGRAMS_REMOVE_RETURNS_H diff --git a/src/goto-programs/remove_skip.h b/src/goto-programs/remove_skip.h index d5ffff78fb9..00fb5b7cccd 100644 --- a/src/goto-programs/remove_skip.h +++ b/src/goto-programs/remove_skip.h @@ -14,4 +14,4 @@ Author: Daniel Kroening, kroening@kroening.com void remove_skip(goto_programt &goto_program); void remove_skip(goto_functionst &goto_functions); -#endif +#endif // CPROVER_GOTO_PROGRAMS_REMOVE_SKIP_H diff --git a/src/goto-programs/remove_unreachable.h b/src/goto-programs/remove_unreachable.h index c40b0ded93f..694cd8c0af8 100644 --- a/src/goto-programs/remove_unreachable.h +++ b/src/goto-programs/remove_unreachable.h @@ -13,4 +13,4 @@ Author: Daniel Kroening, kroening@kroening.com void remove_unreachable(goto_programt &goto_program); -#endif +#endif // CPROVER_GOTO_PROGRAMS_REMOVE_UNREACHABLE_H diff --git a/src/goto-programs/remove_unused_functions.h b/src/goto-programs/remove_unused_functions.h index 24f5a896d00..b571de4e059 100644 --- a/src/goto-programs/remove_unused_functions.h +++ b/src/goto-programs/remove_unused_functions.h @@ -22,4 +22,4 @@ void find_used_functions( goto_functionst &functions, std::set &seen); -#endif /* CPROVER_LOOPFROG_REMOVE_FUNCTIONS_H */ +#endif // CPROVER_GOTO_PROGRAMS_REMOVE_UNUSED_FUNCTIONS_H diff --git a/src/goto-programs/remove_vector.h b/src/goto-programs/remove_vector.h index f29195ca5a5..ffcb58421b4 100644 --- a/src/goto-programs/remove_vector.h +++ b/src/goto-programs/remove_vector.h @@ -17,4 +17,4 @@ void remove_vector(symbol_tablet &, goto_functionst &); void remove_vector(goto_modelt &); -#endif +#endif // CPROVER_GOTO_PROGRAMS_REMOVE_VECTOR_H diff --git a/src/goto-programs/remove_virtual_functions.h b/src/goto-programs/remove_virtual_functions.h index 8434646858d..0fec71a318f 100644 --- a/src/goto-programs/remove_virtual_functions.h +++ b/src/goto-programs/remove_virtual_functions.h @@ -8,8 +8,8 @@ Date: April 2016 \*******************************************************************/ -#ifndef CPROVER_REMOVE_VIRTUAL_FUNCTIONS_H -#define CPROVER_REMOVE_VIRTUAL_FUNCTIONS_H +#ifndef CPROVER_GOTO_PROGRAMS_REMOVE_VIRTUAL_FUNCTIONS_H +#define CPROVER_GOTO_PROGRAMS_REMOVE_VIRTUAL_FUNCTIONS_H #include "goto_model.h" @@ -22,4 +22,4 @@ void remove_virtual_functions( const symbol_tablet &symbol_table, goto_functionst &goto_functions); -#endif +#endif // CPROVER_GOTO_PROGRAMS_REMOVE_VIRTUAL_FUNCTIONS_H diff --git a/src/goto-programs/safety_checker.h b/src/goto-programs/safety_checker.h index 43b768c9a34..f4c4c3694ba 100644 --- a/src/goto-programs/safety_checker.h +++ b/src/goto-programs/safety_checker.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_SAFETY_CHECKER_H -#define CPROVER_SAFETY_CHECKER_H +#ifndef CPROVER_GOTO_PROGRAMS_SAFETY_CHECKER_H +#define CPROVER_GOTO_PROGRAMS_SAFETY_CHECKER_H // this is just an interface -- it won't actually do any checking! @@ -42,4 +42,4 @@ class safety_checkert:public messaget const namespacet &ns; }; -#endif +#endif // CPROVER_GOTO_PROGRAMS_SAFETY_CHECKER_H diff --git a/src/goto-programs/set_properties.h b/src/goto-programs/set_properties.h index 216a12727fb..8f302b79bee 100644 --- a/src/goto-programs/set_properties.h +++ b/src/goto-programs/set_properties.h @@ -26,4 +26,4 @@ void label_properties(goto_functionst &); void label_properties(goto_programt &); void label_properties(goto_modelt &); -#endif +#endif // CPROVER_GOTO_PROGRAMS_SET_PROPERTIES_H diff --git a/src/goto-programs/show_goto_functions.h b/src/goto-programs/show_goto_functions.h index 1071db77842..1ce37a4cee9 100644 --- a/src/goto-programs/show_goto_functions.h +++ b/src/goto-programs/show_goto_functions.h @@ -24,4 +24,4 @@ void show_goto_functions( const goto_modelt &, ui_message_handlert::uit ui); -#endif +#endif // CPROVER_GOTO_PROGRAMS_SHOW_GOTO_FUNCTIONS_H diff --git a/src/goto-programs/show_properties.h b/src/goto-programs/show_properties.h index 4e30a9ebc97..0feff5f6a3d 100644 --- a/src/goto-programs/show_properties.h +++ b/src/goto-programs/show_properties.h @@ -24,4 +24,4 @@ void show_properties( const goto_modelt &, ui_message_handlert::uit ui); -#endif +#endif // CPROVER_GOTO_PROGRAMS_SHOW_PROPERTIES_H diff --git a/src/goto-programs/show_symbol_table.h b/src/goto-programs/show_symbol_table.h index 5c7afead0e5..a7cc99ec9ba 100644 --- a/src/goto-programs/show_symbol_table.h +++ b/src/goto-programs/show_symbol_table.h @@ -15,4 +15,4 @@ void show_symbol_table( const goto_modelt &, ui_message_handlert::uit ui); -#endif +#endif // CPROVER_GOTO_PROGRAMS_SHOW_SYMBOL_TABLE_H diff --git a/src/goto-programs/string_abstraction.h b/src/goto-programs/string_abstraction.h index 2442174bd88..12e66893092 100644 --- a/src/goto-programs/string_abstraction.h +++ b/src/goto-programs/string_abstraction.h @@ -181,4 +181,4 @@ void string_abstraction( message_handlert &message_handler, goto_functionst &dest); -#endif +#endif // CPROVER_GOTO_PROGRAMS_STRING_ABSTRACTION_H diff --git a/src/goto-programs/string_instrumentation.h b/src/goto-programs/string_instrumentation.h index da3ff99e93f..cd52bb54a84 100644 --- a/src/goto-programs/string_instrumentation.h +++ b/src/goto-programs/string_instrumentation.h @@ -25,4 +25,4 @@ exprt is_zero_string(const exprt &what, bool write=false); exprt zero_string_length(const exprt &what, bool write=false); exprt buffer_size(const exprt &what); -#endif +#endif // CPROVER_GOTO_PROGRAMS_STRING_INSTRUMENTATION_H diff --git a/src/goto-programs/vcd_goto_trace.h b/src/goto-programs/vcd_goto_trace.h index 93f1ef6e136..5b9a3680cb6 100644 --- a/src/goto-programs/vcd_goto_trace.h +++ b/src/goto-programs/vcd_goto_trace.h @@ -22,4 +22,4 @@ void output_vcd( const goto_tracet &goto_trace, std::ostream &out); -#endif +#endif // CPROVER_GOTO_PROGRAMS_VCD_GOTO_TRACE_H diff --git a/src/goto-programs/wp.h b/src/goto-programs/wp.h index 4572e79776e..741298b9507 100644 --- a/src/goto-programs/wp.h +++ b/src/goto-programs/wp.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_WP_H -#define CPROVER_WP_H +#ifndef CPROVER_GOTO_PROGRAMS_WP_H +#define CPROVER_GOTO_PROGRAMS_WP_H class codet; class exprt; @@ -36,4 +36,4 @@ exprt wp( void approximate_nondet(exprt &dest); -#endif +#endif // CPROVER_GOTO_PROGRAMS_WP_H diff --git a/src/goto-programs/write_goto_binary.h b/src/goto-programs/write_goto_binary.h index d2b0aa6fd63..5b5f0aef18c 100644 --- a/src/goto-programs/write_goto_binary.h +++ b/src/goto-programs/write_goto_binary.h @@ -32,4 +32,4 @@ bool write_goto_binary( const goto_functionst &goto_functions, message_handlert &message_handler); -#endif +#endif // CPROVER_GOTO_PROGRAMS_WRITE_GOTO_BINARY_H diff --git a/src/goto-programs/xml_goto_trace.h b/src/goto-programs/xml_goto_trace.h index 1b47c0c97ba..123e0d69877 100644 --- a/src/goto-programs/xml_goto_trace.h +++ b/src/goto-programs/xml_goto_trace.h @@ -20,4 +20,4 @@ void convert( const goto_tracet &goto_trace, xmlt &xml); -#endif +#endif // CPROVER_GOTO_PROGRAMS_XML_GOTO_TRACE_H diff --git a/src/goto-symex/adjust_float_expressions.h b/src/goto-symex/adjust_float_expressions.h index ed4bde1c905..c8c87260996 100644 --- a/src/goto-symex/adjust_float_expressions.h +++ b/src/goto-symex/adjust_float_expressions.h @@ -6,9 +6,14 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#ifndef CPROVER_GOTO_SYMEX_ADJUST_FLOAT_EXPRESSIONS_H +#define CPROVER_GOTO_SYMEX_ADJUST_FLOAT_EXPRESSIONS_H + #include #include void adjust_float_expressions( exprt &expr, const namespacet &ns); + +#endif // CPROVER_GOTO_SYMEX_ADJUST_FLOAT_EXPRESSIONS_H diff --git a/src/goto-symex/build_goto_trace.h b/src/goto-symex/build_goto_trace.h index b4e6a6ef50d..f7350d41ffe 100644 --- a/src/goto-symex/build_goto_trace.h +++ b/src/goto-symex/build_goto_trace.h @@ -29,4 +29,4 @@ void build_goto_trace( const namespacet &ns, goto_tracet &goto_trace); -#endif +#endif // CPROVER_GOTO_SYMEX_BUILD_GOTO_TRACE_H diff --git a/src/goto-symex/goto_symex.h b/src/goto-symex/goto_symex.h index 09efe7cadac..067f8ae0097 100644 --- a/src/goto-symex/goto_symex.h +++ b/src/goto-symex/goto_symex.h @@ -274,4 +274,4 @@ class goto_symext void rewrite_quantifiers(exprt &expr, statet &state); }; -#endif +#endif // CPROVER_GOTO_SYMEX_GOTO_SYMEX_H diff --git a/src/goto-symex/goto_symex_state.h b/src/goto-symex/goto_symex_state.h index 0e3ea4ecdcb..2063d210764 100644 --- a/src/goto-symex/goto_symex_state.h +++ b/src/goto-symex/goto_symex_state.h @@ -333,4 +333,4 @@ class goto_symex_statet bool record_events; }; -#endif +#endif // CPROVER_GOTO_SYMEX_GOTO_SYMEX_STATE_H diff --git a/src/goto-symex/memory_model.h b/src/goto-symex/memory_model.h index 86ea7932810..b72c3672613 100644 --- a/src/goto-symex/memory_model.h +++ b/src/goto-symex/memory_model.h @@ -6,8 +6,8 @@ Author: Michael Tautschnig, michael.tautschnig@cs.ox.ac.uk \*******************************************************************/ -#ifndef CPROVER_MEMORY_MODEL_H -#define CPROVER_MEMORY_MODEL_H +#ifndef CPROVER_GOTO_SYMEX_MEMORY_MODEL_H +#define CPROVER_GOTO_SYMEX_MEMORY_MODEL_H #include "partial_order_concurrency.h" @@ -39,4 +39,4 @@ class memory_model_baset:public partial_order_concurrencyt typedef std::map per_thread_mapt; }; -#endif +#endif // CPROVER_GOTO_SYMEX_MEMORY_MODEL_H diff --git a/src/goto-symex/memory_model_pso.h b/src/goto-symex/memory_model_pso.h index dd26924161d..bc66f0e2aa2 100644 --- a/src/goto-symex/memory_model_pso.h +++ b/src/goto-symex/memory_model_pso.h @@ -6,8 +6,8 @@ Author: Michael Tautschnig, michael.tautschnig@cs.ox.ac.uk \*******************************************************************/ -#ifndef CPROVER_MEMORY_MODEL_PSO_H -#define CPROVER_MEMORY_MODEL_PSO_H +#ifndef CPROVER_GOTO_SYMEX_MEMORY_MODEL_PSO_H +#define CPROVER_GOTO_SYMEX_MEMORY_MODEL_PSO_H #include "memory_model_tso.h" @@ -27,4 +27,4 @@ class memory_model_psot:public memory_model_tsot partial_order_concurrencyt::event_it e2) const; }; -#endif +#endif // CPROVER_GOTO_SYMEX_MEMORY_MODEL_PSO_H diff --git a/src/goto-symex/memory_model_sc.h b/src/goto-symex/memory_model_sc.h index e0b13f3c9fe..9d665f86f8d 100644 --- a/src/goto-symex/memory_model_sc.h +++ b/src/goto-symex/memory_model_sc.h @@ -6,8 +6,8 @@ Author: Michael Tautschnig, michael.tautschnig@cs.ox.ac.uk \*******************************************************************/ -#ifndef CPROVER_MEMORY_MODEL_SC_H -#define CPROVER_MEMORY_MODEL_SC_H +#ifndef CPROVER_GOTO_SYMEX_MEMORY_MODEL_SC_H +#define CPROVER_GOTO_SYMEX_MEMORY_MODEL_SC_H #include "memory_model.h" @@ -38,4 +38,4 @@ class memory_model_sct:public memory_model_baset void write_serialization_external(symex_target_equationt &equation); }; -#endif +#endif // CPROVER_GOTO_SYMEX_MEMORY_MODEL_SC_H diff --git a/src/goto-symex/memory_model_tso.h b/src/goto-symex/memory_model_tso.h index 216d0d1bddc..6cd2639acef 100644 --- a/src/goto-symex/memory_model_tso.h +++ b/src/goto-symex/memory_model_tso.h @@ -6,8 +6,8 @@ Author: Michael Tautschnig, michael.tautschnig@cs.ox.ac.uk \*******************************************************************/ -#ifndef CPROVER_MEMORY_MODEL_TSO_H -#define CPROVER_MEMORY_MODEL_TSO_H +#ifndef CPROVER_GOTO_SYMEX_MEMORY_MODEL_TSO_H +#define CPROVER_GOTO_SYMEX_MEMORY_MODEL_TSO_H #include "memory_model_sc.h" @@ -29,4 +29,4 @@ class memory_model_tsot:public memory_model_sct void program_order(symex_target_equationt &equation); }; -#endif +#endif // CPROVER_GOTO_SYMEX_MEMORY_MODEL_TSO_H diff --git a/src/goto-symex/partial_order_concurrency.h b/src/goto-symex/partial_order_concurrency.h index e50559e8759..631dc4c658c 100644 --- a/src/goto-symex/partial_order_concurrency.h +++ b/src/goto-symex/partial_order_concurrency.h @@ -6,8 +6,8 @@ Author: Michael Tautschnig, michael.tautschnig@cs.ox.ac.uk \*******************************************************************/ -#ifndef CPROVER_PARTIAL_ORDER_CONCURRENCY_H -#define CPROVER_PARTIAL_ORDER_CONCURRENCY_H +#ifndef CPROVER_GOTO_SYMEX_PARTIAL_ORDER_CONCURRENCY_H +#define CPROVER_GOTO_SYMEX_PARTIAL_ORDER_CONCURRENCY_H #include @@ -374,4 +374,4 @@ class partial_order_concurrencyt }; #endif -#endif +#endif // CPROVER_GOTO_SYMEX_PARTIAL_ORDER_CONCURRENCY_H diff --git a/src/goto-symex/postcondition.h b/src/goto-symex/postcondition.h index 30888393011..3e84235da47 100644 --- a/src/goto-symex/postcondition.h +++ b/src/goto-symex/postcondition.h @@ -20,4 +20,4 @@ void postcondition( const class goto_symex_statet &s, exprt &dest); -#endif +#endif // CPROVER_GOTO_SYMEX_POSTCONDITION_H diff --git a/src/goto-symex/precondition.h b/src/goto-symex/precondition.h index 03539b89361..0d8b0caa23d 100644 --- a/src/goto-symex/precondition.h +++ b/src/goto-symex/precondition.h @@ -21,4 +21,4 @@ void precondition( const class goto_symex_statet &s, exprt &dest); -#endif +#endif // CPROVER_GOTO_SYMEX_PRECONDITION_H diff --git a/src/goto-symex/rewrite_union.h b/src/goto-symex/rewrite_union.h index 3f02c50e904..8f406960bc2 100644 --- a/src/goto-symex/rewrite_union.h +++ b/src/goto-symex/rewrite_union.h @@ -6,9 +6,14 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#ifndef CPROVER_GOTO_SYMEX_REWRITE_UNION_H +#define CPROVER_GOTO_SYMEX_REWRITE_UNION_H + #include #include void rewrite_union( exprt &expr, const namespacet &ns); + +#endif // CPROVER_GOTO_SYMEX_REWRITE_UNION_H diff --git a/src/goto-symex/slice.h b/src/goto-symex/slice.h index 11de168a875..410725b5a59 100644 --- a/src/goto-symex/slice.h +++ b/src/goto-symex/slice.h @@ -29,4 +29,4 @@ void collect_open_variables( const symex_target_equationt &equation, symbol_sett &open_variables); -#endif +#endif // CPROVER_GOTO_SYMEX_SLICE_H diff --git a/src/goto-symex/slice_by_trace.h b/src/goto-symex/slice_by_trace.h index 4df27cb1708..841f8bb1a47 100644 --- a/src/goto-symex/slice_by_trace.h +++ b/src/goto-symex/slice_by_trace.h @@ -74,4 +74,4 @@ class symex_slice_by_tracet bool implies_false (exprt e); }; -#endif +#endif // CPROVER_GOTO_SYMEX_SLICE_BY_TRACE_H diff --git a/src/goto-symex/symex_dereference_state.h b/src/goto-symex/symex_dereference_state.h index 19f987bd911..0afaf8a696f 100644 --- a/src/goto-symex/symex_dereference_state.h +++ b/src/goto-symex/symex_dereference_state.h @@ -6,6 +6,9 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#ifndef CPROVER_GOTO_SYMEX_SYMEX_DEREFERENCE_STATE_H +#define CPROVER_GOTO_SYMEX_SYMEX_DEREFERENCE_STATE_H + #include #include "goto_symex.h" @@ -51,3 +54,5 @@ class symex_dereference_statet: const exprt &expr, const symbolt *&symbol); }; + +#endif // CPROVER_GOTO_SYMEX_SYMEX_DEREFERENCE_STATE_H diff --git a/src/goto-symex/symex_slice_class.h b/src/goto-symex/symex_slice_class.h index fa229e4f8e4..c669ded9ed2 100644 --- a/src/goto-symex/symex_slice_class.h +++ b/src/goto-symex/symex_slice_class.h @@ -6,6 +6,9 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#ifndef CPROVER_GOTO_SYMEX_SYMEX_SLICE_CLASS_H +#define CPROVER_GOTO_SYMEX_SYMEX_SLICE_CLASS_H + #include "symex_target_equation.h" #include "slice.h" @@ -39,3 +42,5 @@ class symex_slicet void slice_assignment(symex_target_equationt::SSA_stept &SSA_step); void slice_decl(symex_target_equationt::SSA_stept &SSA_step); }; + +#endif // CPROVER_GOTO_SYMEX_SYMEX_SLICE_CLASS_H diff --git a/src/goto-symex/symex_target.h b/src/goto-symex/symex_target.h index 4f80ad5a582..6f33b97046e 100644 --- a/src/goto-symex/symex_target.h +++ b/src/goto-symex/symex_target.h @@ -181,4 +181,4 @@ bool operator < ( const symex_targett::sourcet &a, const symex_targett::sourcet &b); -#endif +#endif // CPROVER_GOTO_SYMEX_SYMEX_TARGET_H diff --git a/src/goto-symex/symex_target_equation.h b/src/goto-symex/symex_target_equation.h index 43addb8324c..6fe33428f82 100644 --- a/src/goto-symex/symex_target_equation.h +++ b/src/goto-symex/symex_target_equation.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_BASIC_SYMEX_EQUATION_H -#define CPROVER_BASIC_SYMEX_EQUATION_H +#ifndef CPROVER_GOTO_SYMEX_SYMEX_TARGET_EQUATION_H +#define CPROVER_GOTO_SYMEX_SYMEX_TARGET_EQUATION_H #include #include @@ -311,4 +311,4 @@ extern inline bool operator<( std::ostream &operator<<(std::ostream &out, const symex_target_equationt::SSA_stept &step); std::ostream &operator<<(std::ostream &out, const symex_target_equationt &equation); -#endif +#endif // CPROVER_GOTO_SYMEX_SYMEX_TARGET_EQUATION_H diff --git a/src/java_bytecode/bytecode_info.h b/src/java_bytecode/bytecode_info.h index 8604342864e..9822710e719 100644 --- a/src/java_bytecode/bytecode_info.h +++ b/src/java_bytecode/bytecode_info.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef CPROVER_JAVA_BYTECODE_BYTECODE_INFO_H +#define CPROVER_JAVA_BYTECODE_BYTECODE_INFO_H #include @@ -50,3 +51,5 @@ typedef int8_t s1; typedef int16_t s2; typedef int32_t s4; typedef int64_t s8; + +#endif // CPROVER_JAVA_BYTECODE_BYTECODE_INFO_H diff --git a/src/java_bytecode/expr2java.h b/src/java_bytecode/expr2java.h index 9b96af9f5cd..f69563a3697 100644 --- a/src/java_bytecode/expr2java.h +++ b/src/java_bytecode/expr2java.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@cs.cmu.edu \*******************************************************************/ -#ifndef CPROVER_EXPR2JAVA_H -#define CPROVER_EXPR2JAVA_H +#ifndef CPROVER_JAVA_BYTECODE_EXPR2JAVA_H +#define CPROVER_JAVA_BYTECODE_EXPR2JAVA_H #include @@ -18,4 +18,4 @@ class typet; std::string expr2java(const exprt &expr, const namespacet &ns); std::string type2java(const typet &type, const namespacet &ns); -#endif +#endif // CPROVER_JAVA_BYTECODE_EXPR2JAVA_H diff --git a/src/java_bytecode/jar_file.h b/src/java_bytecode/jar_file.h index 0119dfbd0c7..881d8090227 100644 --- a/src/java_bytecode/jar_file.h +++ b/src/java_bytecode/jar_file.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_JAVA_JAR_FILE_H -#define CPROVER_JAVA_JAR_FILE_H +#ifndef CPROVER_JAVA_BYTECODE_JAR_FILE_H +#define CPROVER_JAVA_BYTECODE_JAR_FILE_H #include #include @@ -63,4 +63,4 @@ class jar_poolt file_mapt file_map; }; -#endif +#endif // CPROVER_JAVA_BYTECODE_JAR_FILE_H diff --git a/src/java_bytecode/java_bytecode_convert_class.h b/src/java_bytecode/java_bytecode_convert_class.h index da80e3c9359..cae00f571d0 100644 --- a/src/java_bytecode/java_bytecode_convert_class.h +++ b/src/java_bytecode/java_bytecode_convert_class.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_JAVA_BYTECODE_CONVERT_H -#define CPROVER_JAVA_BYTECODE_CONVERT_H +#ifndef CPROVER_JAVA_BYTECODE_JAVA_BYTECODE_CONVERT_CLASS_H +#define CPROVER_JAVA_BYTECODE_JAVA_BYTECODE_CONVERT_CLASS_H #include #include @@ -19,4 +19,4 @@ bool java_bytecode_convert_class( symbol_tablet &symbol_table, message_handlert &message_handler); -#endif +#endif // CPROVER_JAVA_BYTECODE_JAVA_BYTECODE_CONVERT_CLASS_H diff --git a/src/java_bytecode/java_bytecode_convert_method.h b/src/java_bytecode/java_bytecode_convert_method.h index e951d9c0aea..ff652b3fe91 100644 --- a/src/java_bytecode/java_bytecode_convert_method.h +++ b/src/java_bytecode/java_bytecode_convert_method.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_JAVA_BYTECODE_CONVERT_METHOD_H -#define CPROVER_JAVA_BYTECODE_CONVERT_METHOD_H +#ifndef CPROVER_JAVA_BYTECODE_JAVA_BYTECODE_CONVERT_METHOD_H +#define CPROVER_JAVA_BYTECODE_JAVA_BYTECODE_CONVERT_METHOD_H #include #include @@ -20,4 +20,4 @@ void java_bytecode_convert_method( symbol_tablet &symbol_table, message_handlert &message_handler); -#endif +#endif // CPROVER_JAVA_BYTECODE_JAVA_BYTECODE_CONVERT_METHOD_H diff --git a/src/java_bytecode/java_bytecode_language.h b/src/java_bytecode/java_bytecode_language.h index e29d737860a..4dc3d085ceb 100644 --- a/src/java_bytecode/java_bytecode_language.h +++ b/src/java_bytecode/java_bytecode_language.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_JAVA_BYTECODE_LANGUAGE_H -#define CPROVER_JAVA_BYTECODE_LANGUAGE_H +#ifndef CPROVER_JAVA_BYTECODE_JAVA_BYTECODE_LANGUAGE_H +#define CPROVER_JAVA_BYTECODE_JAVA_BYTECODE_LANGUAGE_H #include @@ -69,4 +69,4 @@ class java_bytecode_languaget:public languaget languaget *new_java_bytecode_language(); -#endif +#endif // CPROVER_JAVA_BYTECODE_JAVA_BYTECODE_LANGUAGE_H diff --git a/src/java_bytecode/java_bytecode_parse_tree.h b/src/java_bytecode/java_bytecode_parse_tree.h index 8cb7b4307d8..35e6b768b41 100644 --- a/src/java_bytecode/java_bytecode_parse_tree.h +++ b/src/java_bytecode/java_bytecode_parse_tree.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_JAVA_BYTECODE_PARSE_TREE_H -#define CPROVER_JAVA_BYTECODE_PARSE_TREE_H +#ifndef CPROVER_JAVA_BYTECODE_JAVA_BYTECODE_PARSE_TREE_H +#define CPROVER_JAVA_BYTECODE_JAVA_BYTECODE_PARSE_TREE_H #include @@ -199,4 +199,4 @@ class java_bytecode_parse_treet } }; -#endif +#endif // CPROVER_JAVA_BYTECODE_JAVA_BYTECODE_PARSE_TREE_H diff --git a/src/java_bytecode/java_bytecode_parser.h b/src/java_bytecode/java_bytecode_parser.h index 080e6c4a38a..d0732866789 100644 --- a/src/java_bytecode/java_bytecode_parser.h +++ b/src/java_bytecode/java_bytecode_parser.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_JAVA_BYTECODE_PARSE_H -#define CPROVER_JAVA_BYTECODE_PARSE_H +#ifndef CPROVER_JAVA_BYTECODE_JAVA_BYTECODE_PARSER_H +#define CPROVER_JAVA_BYTECODE_JAVA_BYTECODE_PARSER_H #include #include @@ -22,4 +22,4 @@ bool java_bytecode_parse( class java_bytecode_parse_treet &, class message_handlert &); -#endif +#endif // CPROVER_JAVA_BYTECODE_JAVA_BYTECODE_PARSER_H diff --git a/src/java_bytecode/java_bytecode_typecheck.h b/src/java_bytecode/java_bytecode_typecheck.h index 9638f5100cb..56d43c15f02 100644 --- a/src/java_bytecode/java_bytecode_typecheck.h +++ b/src/java_bytecode/java_bytecode_typecheck.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_JAVA_BYTECODE_TYPECHECK_H -#define CPROVER_JAVA_BYTECODE_TYPECHECK_H +#ifndef CPROVER_JAVA_BYTECODE_JAVA_BYTECODE_TYPECHECK_H +#define CPROVER_JAVA_BYTECODE_JAVA_BYTECODE_TYPECHECK_H #include @@ -65,4 +65,4 @@ class java_bytecode_typecheckt:public typecheckt std::set already_typechecked; }; -#endif +#endif // CPROVER_JAVA_BYTECODE_JAVA_BYTECODE_TYPECHECK_H diff --git a/src/java_bytecode/java_bytecode_vtable.h b/src/java_bytecode/java_bytecode_vtable.h index f42b1a884a5..3e33d408a6e 100644 --- a/src/java_bytecode/java_bytecode_vtable.h +++ b/src/java_bytecode/java_bytecode_vtable.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_JAVA_BYTECODE_VTABLE_H -#define CPROVER_JAVA_BYTECODE_VTABLE_H +#ifndef CPROVER_JAVA_BYTECODE_JAVA_BYTECODE_VTABLE_H +#define CPROVER_JAVA_BYTECODE_JAVA_BYTECODE_VTABLE_H #include @@ -33,4 +33,4 @@ bool java_bytecode_vtable( symbol_tablet &symbol_table, const std::string &module); -#endif /* CPROVER_JAVA_BYTECODE_VTABLE_H */ +#endif // CPROVER_JAVA_BYTECODE_JAVA_BYTECODE_VTABLE_H diff --git a/src/java_bytecode/java_class_loader.h b/src/java_bytecode/java_class_loader.h index bb5a8d5e76f..d3fcdd62810 100644 --- a/src/java_bytecode/java_class_loader.h +++ b/src/java_bytecode/java_class_loader.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_JAVA_CLASS_LOADER_H -#define CPROVER_JAVA_CLASS_LOADER_H +#ifndef CPROVER_JAVA_BYTECODE_JAVA_CLASS_LOADER_H +#define CPROVER_JAVA_BYTECODE_JAVA_CLASS_LOADER_H #include @@ -63,4 +63,4 @@ class java_class_loadert:public messaget std::list jar_files; }; -#endif +#endif // CPROVER_JAVA_BYTECODE_JAVA_CLASS_LOADER_H diff --git a/src/java_bytecode/java_entry_point.h b/src/java_bytecode/java_entry_point.h index 52585b52896..5cbee65febb 100644 --- a/src/java_bytecode/java_entry_point.h +++ b/src/java_bytecode/java_entry_point.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_JAVA_ENTRY_POINT_H -#define CPROVER_JAVA_ENTRY_POINT_H +#ifndef CPROVER_JAVA_BYTECODE_JAVA_ENTRY_POINT_H +#define CPROVER_JAVA_BYTECODE_JAVA_ENTRY_POINT_H #include @@ -16,4 +16,4 @@ bool java_entry_point( const irep_idt &main_class, class message_handlert &message_handler); -#endif +#endif // CPROVER_JAVA_BYTECODE_JAVA_ENTRY_POINT_H diff --git a/src/java_bytecode/java_object_factory.h b/src/java_bytecode/java_object_factory.h index 26c119a9470..5797cb20aed 100644 --- a/src/java_bytecode/java_object_factory.h +++ b/src/java_bytecode/java_object_factory.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_JAVA_OBJECT_FACTORY_H -#define CPROVER_JAVA_OBJECT_FACTORY_H +#ifndef CPROVER_JAVA_BYTECODE_JAVA_OBJECT_FACTORY_H +#define CPROVER_JAVA_BYTECODE_JAVA_OBJECT_FACTORY_H #include #include @@ -18,4 +18,4 @@ exprt object_factory( bool allow_null, symbol_tablet &symbol_table); -#endif +#endif // CPROVER_JAVA_BYTECODE_JAVA_OBJECT_FACTORY_H diff --git a/src/java_bytecode/java_root_class.h b/src/java_bytecode/java_root_class.h index f8b9b96c2f9..e0ce4f7dddc 100644 --- a/src/java_bytecode/java_root_class.h +++ b/src/java_bytecode/java_root_class.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_JAVA_ROOT_CLASS_H -#define CPROVER_JAVA_ROOT_CLASS_H +#ifndef CPROVER_JAVA_BYTECODE_JAVA_ROOT_CLASS_H +#define CPROVER_JAVA_BYTECODE_JAVA_ROOT_CLASS_H #include @@ -17,4 +17,4 @@ Author: Daniel Kroening, kroening@kroening.com void java_root_class( class symbolt &class_symbol); -#endif /* CPROVER_JAVA_ROOT_CLASS_H */ +#endif // CPROVER_JAVA_BYTECODE_JAVA_ROOT_CLASS_H diff --git a/src/java_bytecode/java_types.h b/src/java_bytecode/java_types.h index 9c01e70cbd3..41f68bdda01 100644 --- a/src/java_bytecode/java_types.h +++ b/src/java_bytecode/java_types.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_JAVA_TYPES_H -#define CPROVER_JAVA_TYPES_H +#ifndef CPROVER_JAVA_BYTECODE_JAVA_TYPES_H +#define CPROVER_JAVA_BYTECODE_JAVA_TYPES_H #include #include @@ -44,4 +44,4 @@ char java_char_from_type(const typet &type); typet java_bytecode_promotion(const typet &); exprt java_bytecode_promotion(const exprt &); -#endif +#endif // CPROVER_JAVA_BYTECODE_JAVA_TYPES_H diff --git a/src/jsil/expr2jsil.h b/src/jsil/expr2jsil.h index 816c8e8e221..b1b41df2198 100644 --- a/src/jsil/expr2jsil.h +++ b/src/jsil/expr2jsil.h @@ -6,8 +6,8 @@ Author: Michael Tautschnig, tautschn@amazon.com \*******************************************************************/ -#ifndef CPROVER_EXPR2JSIL_H -#define CPROVER_EXPR2JSIL_H +#ifndef CPROVER_JSIL_EXPR2JSIL_H +#define CPROVER_JSIL_EXPR2JSIL_H #include @@ -18,4 +18,4 @@ class typet; std::string expr2jsil(const exprt &expr, const namespacet &ns); std::string type2jsil(const typet &type, const namespacet &ns); -#endif +#endif // CPROVER_JSIL_EXPR2JSIL_H diff --git a/src/jsil/jsil_convert.h b/src/jsil/jsil_convert.h index 4f84c943ae9..7c50b694ecd 100644 --- a/src/jsil/jsil_convert.h +++ b/src/jsil/jsil_convert.h @@ -6,8 +6,8 @@ Author: Michael Tautschnig, tautschn@amazon.com \*******************************************************************/ -#ifndef CPROVER_JSIL_CONVERT_H -#define CPROVER_JSIL_CONVERT_H +#ifndef CPROVER_JSIL_JSIL_CONVERT_H +#define CPROVER_JSIL_JSIL_CONVERT_H class jsil_parse_treet; class message_handlert; @@ -18,4 +18,4 @@ bool jsil_convert( symbol_tablet &symbol_table, message_handlert &message_handler); -#endif +#endif // CPROVER_JSIL_JSIL_CONVERT_H diff --git a/src/jsil/jsil_entry_point.h b/src/jsil/jsil_entry_point.h index f050cbc6697..c374d395626 100644 --- a/src/jsil/jsil_entry_point.h +++ b/src/jsil/jsil_entry_point.h @@ -6,8 +6,8 @@ Author: Michael Tautschnig, tautschn@amazon.com \*******************************************************************/ -#ifndef CPROVER_JSIL_ENTRY_POINT_H -#define CPROVER_JSIL_ENTRY_POINT_H +#ifndef CPROVER_JSIL_JSIL_ENTRY_POINT_H +#define CPROVER_JSIL_JSIL_ENTRY_POINT_H class message_handlert; class symbol_tablet; @@ -16,4 +16,4 @@ bool jsil_entry_point( class symbol_tablet &symbol_table, class message_handlert &message_handler); -#endif +#endif // CPROVER_JSIL_JSIL_ENTRY_POINT_H diff --git a/src/jsil/jsil_language.h b/src/jsil/jsil_language.h index 3b9f154fb4b..349f0b58740 100644 --- a/src/jsil/jsil_language.h +++ b/src/jsil/jsil_language.h @@ -6,8 +6,8 @@ Author: Michael Tautschnig, tautschn@amazon.com \*******************************************************************/ -#ifndef CPROVER_JSIL_LANGUAGE_H -#define CPROVER_JSIL_LANGUAGE_H +#ifndef CPROVER_JSIL_JSIL_LANGUAGE_H +#define CPROVER_JSIL_JSIL_LANGUAGE_H #include @@ -71,4 +71,4 @@ class jsil_languaget:public languaget languaget *new_jsil_language(); -#endif +#endif // CPROVER_JSIL_JSIL_LANGUAGE_H diff --git a/src/jsil/jsil_parse_tree.h b/src/jsil/jsil_parse_tree.h index 201ffb15542..5a83cf18e8b 100644 --- a/src/jsil/jsil_parse_tree.h +++ b/src/jsil/jsil_parse_tree.h @@ -6,8 +6,8 @@ Author: Michael Tautschnig, tautschn@amazon.com \*******************************************************************/ -#ifndef CPROVER_JSIL_PARSE_TREE_H -#define CPROVER_JSIL_PARSE_TREE_H +#ifndef CPROVER_JSIL_JSIL_PARSE_TREE_H +#define CPROVER_JSIL_JSIL_PARSE_TREE_H #include #include @@ -114,4 +114,4 @@ class jsil_parse_treet void output(std::ostream &out) const; }; -#endif +#endif // CPROVER_JSIL_JSIL_PARSE_TREE_H diff --git a/src/jsil/jsil_parser.h b/src/jsil/jsil_parser.h index 1a3a1937c89..7cf55a32f69 100644 --- a/src/jsil/jsil_parser.h +++ b/src/jsil/jsil_parser.h @@ -6,8 +6,8 @@ Author: Michael Tautschnig, tautschn@amazon.com \*******************************************************************/ -#ifndef CPROVER_JSIL_PARSER_H -#define CPROVER_JSIL_PARSER_H +#ifndef CPROVER_JSIL_JSIL_PARSER_H +#define CPROVER_JSIL_JSIL_PARSER_H #include @@ -43,4 +43,4 @@ extern jsil_parsert jsil_parser; int yyjsilerror(const std::string &error); void jsil_scanner_init(); -#endif +#endif // CPROVER_JSIL_JSIL_PARSER_H diff --git a/src/jsil/jsil_typecheck.h b/src/jsil/jsil_typecheck.h index c12a4525c9c..c8fa8c1a3b1 100644 --- a/src/jsil/jsil_typecheck.h +++ b/src/jsil/jsil_typecheck.h @@ -6,8 +6,8 @@ Author: Michael Tautschnig, tautschn@amazon.com \*******************************************************************/ -#ifndef CPROVER_JSIL_TYPECHECK_H -#define CPROVER_JSIL_TYPECHECK_H +#ifndef CPROVER_JSIL_JSIL_TYPECHECK_H +#define CPROVER_JSIL_JSIL_TYPECHECK_H #include #include @@ -92,4 +92,4 @@ class jsil_typecheckt:public typecheckt hash_set_cont already_typechecked; }; -#endif +#endif // CPROVER_JSIL_JSIL_TYPECHECK_H diff --git a/src/jsil/jsil_types.h b/src/jsil/jsil_types.h index 57950ef340e..d76f73873d4 100644 --- a/src/jsil/jsil_types.h +++ b/src/jsil/jsil_types.h @@ -6,8 +6,8 @@ Author: Daiva Naudziuniene, daivan@amazon.com \*******************************************************************/ -#ifndef CPROVER_JSIL_TYPES_H -#define CPROVER_JSIL_TYPES_H +#ifndef CPROVER_JSIL_JSIL_TYPES_H +#define CPROVER_JSIL_JSIL_TYPES_H #include #include @@ -110,4 +110,4 @@ extern inline const jsil_union_typet &to_jsil_union_type( return static_cast(type); } -#endif +#endif // CPROVER_JSIL_JSIL_TYPES_H diff --git a/src/json/json_parser.h b/src/json/json_parser.h index fd8e56913e9..6d26b77802c 100644 --- a/src/json/json_parser.h +++ b/src/json/json_parser.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef JSON_PARSER_H -#define JSON_PARSER_H +#ifndef CPROVER_JSON_JSON_PARSER_H +#define CPROVER_JSON_JSON_PARSER_H #include #include @@ -64,4 +64,4 @@ bool parse_json( message_handlert &message_handler, jsont &dest); -#endif +#endif // CPROVER_JSON_JSON_PARSER_H diff --git a/src/langapi/language_ui.h b/src/langapi/language_ui.h index 88b5aa79140..90c1de3e5cb 100644 --- a/src/langapi/language_ui.h +++ b/src/langapi/language_ui.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@cs.cmu.edu \*******************************************************************/ -#ifndef CPROVER_LANGUAGE_UI_H -#define CPROVER_LANGUAGE_UI_H +#ifndef CPROVER_LANGAPI_LANGUAGE_UI_H +#define CPROVER_LANGAPI_LANGUAGE_UI_H #include #include @@ -54,4 +54,4 @@ class language_uit:public messaget const cmdlinet &_cmdline; }; -#endif +#endif // CPROVER_LANGAPI_LANGUAGE_UI_H diff --git a/src/langapi/language_util.h b/src/langapi/language_util.h index eab46db99b7..ded56e9ba04 100644 --- a/src/langapi/language_util.h +++ b/src/langapi/language_util.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@cs.cmu.edu \*******************************************************************/ -#ifndef CPROVER_LANGUAGE_UTIL_H -#define CPROVER_LANGUAGE_UTIL_H +#ifndef CPROVER_LANGAPI_LANGUAGE_UTIL_H +#define CPROVER_LANGAPI_LANGUAGE_UTIL_H #include @@ -41,4 +41,4 @@ std::string type_to_name( std::string type_to_name(const typet &type); -#endif +#endif // CPROVER_LANGAPI_LANGUAGE_UTIL_H diff --git a/src/langapi/languages.h b/src/langapi/languages.h index 99bf768c0c1..0c8dda97ada 100644 --- a/src/langapi/languages.h +++ b/src/langapi/languages.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@cs.cmu.edu \*******************************************************************/ -#ifndef CPROVER_LANGUAGES_H -#define CPROVER_LANGUAGES_H +#ifndef CPROVER_LANGAPI_LANGUAGES_H +#define CPROVER_LANGAPI_LANGUAGES_H #include @@ -44,4 +44,4 @@ class languagest languaget *language; }; -#endif +#endif // CPROVER_LANGAPI_LANGUAGES_H diff --git a/src/langapi/mode.h b/src/langapi/mode.h index 862bea586e9..5e0f8cf83f6 100644 --- a/src/langapi/mode.h +++ b/src/langapi/mode.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@cs.cmu.edu \*******************************************************************/ -#ifndef CPROVER_MODE_H -#define CPROVER_MODE_H +#ifndef CPROVER_LANGAPI_MODE_H +#define CPROVER_LANGAPI_MODE_H #include @@ -20,4 +20,4 @@ languaget *get_default_language(); typedef languaget *(*language_factoryt)(); void register_language(language_factoryt factory); -#endif +#endif // CPROVER_LANGAPI_MODE_H diff --git a/src/linking/linking.h b/src/linking/linking.h index 78bf9fff578..22b54e55613 100644 --- a/src/linking/linking.h +++ b/src/linking/linking.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_LINKING_H -#define CPROVER_LINKING_H +#ifndef CPROVER_LINKING_LINKING_H +#define CPROVER_LINKING_LINKING_H #include #include @@ -21,4 +21,4 @@ bool linking( symbol_tablet &new_symbol_table, message_handlert &message_handler); -#endif +#endif // CPROVER_LINKING_LINKING_H diff --git a/src/linking/linking_class.h b/src/linking/linking_class.h index 59068a4af2c..c40ce92530c 100644 --- a/src/linking/linking_class.h +++ b/src/linking/linking_class.h @@ -178,4 +178,4 @@ class linkingt:public typecheckt id_sett renamed_ids; }; -#endif +#endif // CPROVER_LINKING_LINKING_CLASS_H diff --git a/src/linking/remove_internal_symbols.h b/src/linking/remove_internal_symbols.h index 1591679073d..40711162e73 100644 --- a/src/linking/remove_internal_symbols.h +++ b/src/linking/remove_internal_symbols.h @@ -12,4 +12,4 @@ Author: Daniel Kroening void remove_internal_symbols( class symbol_tablet &symbol_table); -#endif +#endif // CPROVER_LINKING_REMOVE_INTERNAL_SYMBOLS_H diff --git a/src/linking/static_lifetime_init.h b/src/linking/static_lifetime_init.h index 650cf5e196d..da9543addf6 100644 --- a/src/linking/static_lifetime_init.h +++ b/src/linking/static_lifetime_init.h @@ -21,4 +21,4 @@ bool static_lifetime_init( #define INITIALIZE_FUNCTION CPROVER_PREFIX "initialize" -#endif +#endif // CPROVER_LINKING_STATIC_LIFETIME_INIT_H diff --git a/src/linking/zero_initializer.h b/src/linking/zero_initializer.h index 1ed57afeb8e..0768a15056d 100644 --- a/src/linking/zero_initializer.h +++ b/src/linking/zero_initializer.h @@ -6,6 +6,9 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#ifndef CPROVER_LINKING_ZERO_INITIALIZER_H +#define CPROVER_LINKING_ZERO_INITIALIZER_H + #include #include #include @@ -15,3 +18,5 @@ exprt zero_initializer( const source_locationt &, const namespacet &, message_handlert &); + +#endif // CPROVER_LINKING_ZERO_INITIALIZER_H diff --git a/src/memory-models/mm2cpp.h b/src/memory-models/mm2cpp.h index 9d13f88508f..1d6c45ee2b7 100644 --- a/src/memory-models/mm2cpp.h +++ b/src/memory-models/mm2cpp.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_MM2CPP_H -#define CPROVER_MM2CPP_H +#ifndef CPROVER_MEMORY_MODELS_MM2CPP_H +#define CPROVER_MEMORY_MODELS_MM2CPP_H #include @@ -16,4 +16,4 @@ void mm2cpp( const irept &, std::ostream &); -#endif +#endif // CPROVER_MEMORY_MODELS_MM2CPP_H diff --git a/src/memory-models/mm_parser.h b/src/memory-models/mm_parser.h index 94615cf9861..11240cf8786 100644 --- a/src/memory-models/mm_parser.h +++ b/src/memory-models/mm_parser.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_MM_PARSER_H -#define CPROVER_MM_PARSER_H +#ifndef CPROVER_MEMORY_MODELS_MM_PARSER_H +#define CPROVER_MEMORY_MODELS_MM_PARSER_H #include #include @@ -34,4 +34,4 @@ class mm_parsert:public parsert extern mm_parsert mm_parser; -#endif +#endif // CPROVER_MEMORY_MODELS_MM_PARSER_H diff --git a/src/memory-models/mmcc_parse_options.h b/src/memory-models/mmcc_parse_options.h index 3af5f29a6a8..07745b47944 100644 --- a/src/memory-models/mmcc_parse_options.h +++ b/src/memory-models/mmcc_parse_options.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_CBMC_PARSEOPTIONS_H -#define CPROVER_CBMC_PARSEOPTIONS_H +#ifndef CPROVER_MEMORY_MODELS_MMCC_PARSE_OPTIONS_H +#define CPROVER_MEMORY_MODELS_MMCC_PARSE_OPTIONS_H #include @@ -28,4 +28,4 @@ class mmcc_parse_optionst:public parse_options_baset int convert(std::istream &, const std::string &); }; -#endif +#endif // CPROVER_MEMORY_MODELS_MMCC_PARSE_OPTIONS_H diff --git a/src/musketeer/cycles_visitor.h b/src/musketeer/cycles_visitor.h index 5ee75ed6d3e..064bf378244 100644 --- a/src/musketeer/cycles_visitor.h +++ b/src/musketeer/cycles_visitor.h @@ -6,8 +6,8 @@ Author: Vincent Nimal \*******************************************************************/ -#ifndef CYCLES_VISITOR_H -#define CYCLES_VISITOR_H +#ifndef CPROVER_MUSKETEER_CYCLES_VISITOR_H +#define CPROVER_MUSKETEER_CYCLES_VISITOR_H #include @@ -44,4 +44,4 @@ class cycles_visitort std::set& edges); }; -#endif +#endif // CPROVER_MUSKETEER_CYCLES_VISITOR_H diff --git a/src/musketeer/fence_assert.h b/src/musketeer/fence_assert.h index afb527e6473..c8e20c5a57b 100644 --- a/src/musketeer/fence_assert.h +++ b/src/musketeer/fence_assert.h @@ -7,8 +7,8 @@ Author: Vincent Nimal \*******************************************************************/ -#ifndef CPROVER_FENCE_ASSERT_H -#define CPROVER_FENCE_ASSERT_H +#ifndef CPROVER_MUSKETEER_FENCE_ASSERT_H +#define CPROVER_MUSKETEER_FENCE_ASSERT_H #include @@ -46,4 +46,4 @@ class fence_assert_insertert : public fence_insertert } }; -#endif +#endif // CPROVER_MUSKETEER_FENCE_ASSERT_H diff --git a/src/musketeer/fence_inserter.h b/src/musketeer/fence_inserter.h index 1ed6c116e96..2723f22dd89 100644 --- a/src/musketeer/fence_inserter.h +++ b/src/musketeer/fence_inserter.h @@ -6,8 +6,8 @@ Author: Vincent Nimal \*******************************************************************/ -#ifndef CPROVER_FENCE_INSERTER_H -#define CPROVER_FENCE_INSERTER_H +#ifndef CPROVER_MUSKETEER_FENCE_INSERTER_H +#define CPROVER_MUSKETEER_FENCE_INSERTER_H #include #include @@ -185,4 +185,4 @@ class fence_insertert const typet &type); }; -#endif +#endif // CPROVER_MUSKETEER_FENCE_INSERTER_H diff --git a/src/musketeer/fence_shared.h b/src/musketeer/fence_shared.h index 730d3f933df..0b0d38c7bbd 100644 --- a/src/musketeer/fence_shared.h +++ b/src/musketeer/fence_shared.h @@ -8,8 +8,8 @@ Author: Vincent Nimal \*******************************************************************/ -#ifndef CPROVER_FENCE_SHARED_H -#define CPROVER_FENCE_SHARED_H +#ifndef CPROVER_MUSKETEER_FENCE_SHARED_H +#define CPROVER_MUSKETEER_FENCE_SHARED_H class value_setst; class goto_functionst; @@ -37,4 +37,4 @@ void fence_volatile( symbol_tablet &symbol_table, goto_functionst &goto_functions); -#endif +#endif // CPROVER_MUSKETEER_FENCE_SHARED_H diff --git a/src/musketeer/fence_user_def.h b/src/musketeer/fence_user_def.h index c09634244c9..e8ed32022d3 100644 --- a/src/musketeer/fence_user_def.h +++ b/src/musketeer/fence_user_def.h @@ -7,8 +7,8 @@ Author: Vincent Nimal \*******************************************************************/ -#ifndef CPROVER_FENCE_USER_DEF_H -#define CPROVER_FENCE_USER_DEF_H +#ifndef CPROVER_MUSKETEER_FENCE_USER_DEF_H +#define CPROVER_MUSKETEER_FENCE_USER_DEF_H #include @@ -44,4 +44,4 @@ class fence_user_def_insertert : public fence_insertert } }; -#endif +#endif // CPROVER_MUSKETEER_FENCE_USER_DEF_H diff --git a/src/musketeer/fencer.h b/src/musketeer/fencer.h index ea628af10f1..1c3b236eb4f 100644 --- a/src/musketeer/fencer.h +++ b/src/musketeer/fencer.h @@ -6,8 +6,8 @@ Author: Vincent Nimal \*******************************************************************/ -#ifndef CPROVER_FENCER_H -#define CPROVER_FENCER_H +#ifndef CPROVER_MUSKETEER_FENCER_H +#define CPROVER_MUSKETEER_FENCER_H #include #include @@ -42,4 +42,4 @@ void fence_weak_memory( message_handlert& message_handler, bool ignore_arrays); -#endif +#endif // CPROVER_MUSKETEER_FENCER_H diff --git a/src/musketeer/graph_visitor.h b/src/musketeer/graph_visitor.h index 0e26f32f363..ac5ffbadff3 100644 --- a/src/musketeer/graph_visitor.h +++ b/src/musketeer/graph_visitor.h @@ -6,8 +6,8 @@ Author: Vincent Nimal \*******************************************************************/ -#ifndef CONST_GRAPH_VISITOR_H -#define CONST_GRAPH_VISITOR_H +#ifndef CPROVER_MUSKETEER_GRAPH_VISITOR_H +#define CPROVER_MUSKETEER_GRAPH_VISITOR_H #include #include @@ -58,4 +58,4 @@ class const_graph_visitort {} }; -#endif +#endif // CPROVER_MUSKETEER_GRAPH_VISITOR_H diff --git a/src/musketeer/ilp.h b/src/musketeer/ilp.h index 5633e2e13df..8e8a0283458 100644 --- a/src/musketeer/ilp.h +++ b/src/musketeer/ilp.h @@ -12,8 +12,8 @@ Author: Vincent Nimal #include -#ifndef ILP_H -#define ILP_H +#ifndef CPROVER_MUSKETEER_ILP_H +#define CPROVER_MUSKETEER_ILP_H #ifdef HAVE_GLPK class ilpt @@ -69,4 +69,4 @@ class ilpt class ilpt {}; #endif -#endif +#endif // CPROVER_MUSKETEER_ILP_H diff --git a/src/musketeer/infer_mode.h b/src/musketeer/infer_mode.h index 643bc1278ab..f98aaa1c32a 100644 --- a/src/musketeer/infer_mode.h +++ b/src/musketeer/infer_mode.h @@ -6,8 +6,8 @@ \*******************************************************************/ -#ifndef CPROVER_INFER_MODE_H -#define CPROVER_INFER_MODE_H +#ifndef CPROVER_MUSKETEER_INFER_MODE_H +#define CPROVER_MUSKETEER_INFER_MODE_H typedef enum { INFER=0, @@ -15,4 +15,4 @@ typedef enum { USER_ASSERT=2 } infer_modet; -#endif +#endif // CPROVER_MUSKETEER_INFER_MODE_H diff --git a/src/musketeer/musketeer_parse_options.h b/src/musketeer/musketeer_parse_options.h index 69995caf5ee..ca93c9de488 100644 --- a/src/musketeer/musketeer_parse_options.h +++ b/src/musketeer/musketeer_parse_options.h @@ -6,8 +6,8 @@ Module: Command Line Parsing \*******************************************************************/ -#ifndef CPROVER_GOTO_FENCE_INSERTER_PARSEOPTIONS_H -#define CPROVER_GOTO_FENCE_INSERTER_PARSEOPTIONS_H +#ifndef CPROVER_MUSKETEER_MUSKETEER_PARSE_OPTIONS_H +#define CPROVER_MUSKETEER_MUSKETEER_PARSE_OPTIONS_H #include #include @@ -53,4 +53,4 @@ class goto_fence_inserter_parse_optionst: void set_verbosity(); }; -#endif +#endif // CPROVER_MUSKETEER_MUSKETEER_PARSE_OPTIONS_H diff --git a/src/musketeer/pensieve.h b/src/musketeer/pensieve.h index 200624f8e6e..f4010513e5e 100644 --- a/src/musketeer/pensieve.h +++ b/src/musketeer/pensieve.h @@ -6,8 +6,8 @@ Author: Vincent Nimal \*******************************************************************/ -#ifndef CPROVER_PENSIEVE_H -#define CPROVER_PENSIEVE_H +#ifndef CPROVER_MUSKETEER_PENSIEVE_H +#define CPROVER_MUSKETEER_PENSIEVE_H #include #include @@ -29,4 +29,4 @@ void fence_pensieve( bool naive_mode, message_handlert& message_handler); -#endif +#endif // CPROVER_MUSKETEER_PENSIEVE_H diff --git a/src/musketeer/propagate_const_function_pointers.h b/src/musketeer/propagate_const_function_pointers.h index a0c7e0e74d1..7d518c5dec5 100644 --- a/src/musketeer/propagate_const_function_pointers.h +++ b/src/musketeer/propagate_const_function_pointers.h @@ -6,8 +6,8 @@ Author: Vincent Nimal \*******************************************************************/ -#ifndef PROPAGATE_CONST_FUNCTION_POINTERS_H -#define PROPAGATE_CONST_FUNCTION_POINTERS_H +#ifndef CPROVER_MUSKETEER_PROPAGATE_CONST_FUNCTION_POINTERS_H +#define CPROVER_MUSKETEER_PROPAGATE_CONST_FUNCTION_POINTERS_H class symbol_tablet; class goto_functionst; @@ -25,4 +25,4 @@ void propagate_const_function_pointers( goto_functionst& goto_functions, message_handlert& message_handler); -#endif +#endif // CPROVER_MUSKETEER_PROPAGATE_CONST_FUNCTION_POINTERS_H diff --git a/src/musketeer/replace_async.h b/src/musketeer/replace_async.h index f032483e52e..ade210725aa 100644 --- a/src/musketeer/replace_async.h +++ b/src/musketeer/replace_async.h @@ -8,8 +8,8 @@ Date: December 2013 \*******************************************************************/ -#ifndef REPLACE_ASYNC_H -#define REPLACE_ASYNC_H +#ifndef CPROVER_MUSKETEER_REPLACE_ASYNC_H +#define CPROVER_MUSKETEER_REPLACE_ASYNC_H #include #include @@ -78,4 +78,4 @@ void replace_async( } } -#endif +#endif // CPROVER_MUSKETEER_REPLACE_ASYNC_H diff --git a/src/musketeer/version.h b/src/musketeer/version.h index 3fe6ad81948..fde0c82ecea 100644 --- a/src/musketeer/version.h +++ b/src/musketeer/version.h @@ -1 +1,6 @@ +#ifndef CPROVER_MUSKETEER_VERSION_H +#define CPROVER_MUSKETEER_VERSION_H + #define MUSKETEER_VERSION "0.37" + +#endif // CPROVER_MUSKETEER_VERSION_H diff --git a/src/path-symex/build_goto_trace.h b/src/path-symex/build_goto_trace.h index cffd2cf7059..67c9a2ad720 100644 --- a/src/path-symex/build_goto_trace.h +++ b/src/path-symex/build_goto_trace.h @@ -19,4 +19,4 @@ void build_goto_trace( const decision_proceduret &decision_procedure, goto_tracet &goto_trace); -#endif +#endif // CPROVER_PATH_SYMEX_BUILD_GOTO_TRACE_H diff --git a/src/path-symex/loc_ref.h b/src/path-symex/loc_ref.h index fa4e292e9d7..72e407c2a56 100644 --- a/src/path-symex/loc_ref.h +++ b/src/path-symex/loc_ref.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_LOC_REF_H -#define CPROVER_LOC_REF_H +#ifndef CPROVER_PATH_SYMEX_LOC_REF_H +#define CPROVER_PATH_SYMEX_LOC_REF_H #include @@ -83,4 +83,4 @@ static inline std::ostream &operator << (std::ostream &out, loc_reft l) return out << l.loc_number; } -#endif +#endif // CPROVER_PATH_SYMEX_LOC_REF_H diff --git a/src/path-symex/locs.h b/src/path-symex/locs.h index a7a36bc899c..5978fae2d01 100644 --- a/src/path-symex/locs.h +++ b/src/path-symex/locs.h @@ -117,4 +117,4 @@ class target_to_loc_mapt for(exprt::operandst::iterator it=(expr).loc_vector.begin(); \ it!=(locs).loc_vector.end(); it++) -#endif +#endif // CPROVER_PATH_SYMEX_LOCS_H diff --git a/src/path-symex/path_replay.h b/src/path-symex/path_replay.h index 666c0757ed2..754355be37b 100644 --- a/src/path-symex/path_replay.h +++ b/src/path-symex/path_replay.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_PATH_REPLAY_H -#define CPROVER_PATH_REPLAY_H +#ifndef CPROVER_PATH_SYMEX_PATH_REPLAY_H +#define CPROVER_PATH_SYMEX_PATH_REPLAY_H #include "path_symex_state.h" @@ -35,4 +35,4 @@ class path_replayt void path_replay(path_symex_step_reft history); -#endif +#endif // CPROVER_PATH_SYMEX_PATH_REPLAY_H diff --git a/src/path-symex/path_symex.h b/src/path-symex/path_symex.h index 1dede9b9407..d78e8f042bb 100644 --- a/src/path-symex/path_symex.h +++ b/src/path-symex/path_symex.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_PATH_SYMEX_H -#define CPROVER_PATH_SYMEX_H +#ifndef CPROVER_PATH_SYMEX_PATH_SYMEX_H +#define CPROVER_PATH_SYMEX_PATH_SYMEX_H #include "locs.h" #include "path_symex_state.h" @@ -36,4 +36,4 @@ void path_symex_goto( void path_symex_assert_fail( path_symex_statet &state); -#endif +#endif // CPROVER_PATH_SYMEX_PATH_SYMEX_H diff --git a/src/path-symex/path_symex_class.h b/src/path-symex/path_symex_class.h index 634a778ac44..f6d91ae82ed 100644 --- a/src/path-symex/path_symex_class.h +++ b/src/path-symex/path_symex_class.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_PATH_SYMEX_CLASS_H -#define CPROVER_PATH_SYMEX_CLASS_H +#ifndef CPROVER_PATH_SYMEX_PATH_SYMEX_CLASS_H +#define CPROVER_PATH_SYMEX_PATH_SYMEX_CLASS_H #include "path_symex.h" @@ -92,4 +92,4 @@ class path_symext }; -#endif +#endif // CPROVER_PATH_SYMEX_PATH_SYMEX_CLASS_H diff --git a/src/path-symex/path_symex_history.h b/src/path-symex/path_symex_history.h index d80076bf362..d7018f1a0e6 100644 --- a/src/path-symex/path_symex_history.h +++ b/src/path-symex/path_symex_history.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_PATH_SYMEX_HISTORY_H -#define CPROVER_PATH_SYMEX_HISTORY_H +#ifndef CPROVER_PATH_SYMEX_PATH_SYMEX_HISTORY_H +#define CPROVER_PATH_SYMEX_PATH_SYMEX_HISTORY_H #include #include @@ -164,4 +164,4 @@ inline path_symex_stept &path_symex_step_reft::get() const return history->step_container[index]; } -#endif +#endif // CPROVER_PATH_SYMEX_PATH_SYMEX_HISTORY_H diff --git a/src/path-symex/path_symex_state.h b/src/path-symex/path_symex_state.h index ddc05e10db9..46d71306618 100644 --- a/src/path-symex/path_symex_state.h +++ b/src/path-symex/path_symex_state.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_PATH_SYMEX_STATE_H -#define CPROVER_PATH_SYMEX_STATE_H +#ifndef CPROVER_PATH_SYMEX_PATH_SYMEX_STATE_H +#define CPROVER_PATH_SYMEX_PATH_SYMEX_STATE_H #include "locs.h" #include "var_map.h" @@ -240,4 +240,4 @@ path_symex_statet initial_state( const locst &locs, path_symex_historyt &); -#endif +#endif // CPROVER_PATH_SYMEX_PATH_SYMEX_STATE_H diff --git a/src/path-symex/var_map.h b/src/path-symex/var_map.h index 423cf1e5539..08bd6e7208e 100644 --- a/src/path-symex/var_map.h +++ b/src/path-symex/var_map.h @@ -92,4 +92,4 @@ class var_mapt unsigned dynamic_count; // memory allocation }; -#endif +#endif // CPROVER_PATH_SYMEX_VAR_MAP_H diff --git a/src/pointer-analysis/add_failed_symbols.h b/src/pointer-analysis/add_failed_symbols.h index e0ccc25cdd3..ce1a3b97c9a 100644 --- a/src/pointer-analysis/add_failed_symbols.h +++ b/src/pointer-analysis/add_failed_symbols.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_POINTER_ANALYSIS_FAILED_SYMBOLS_H -#define CPROVER_POINTER_ANALYSIS_FAILED_SYMBOLS_H +#ifndef CPROVER_POINTER_ANALYSIS_ADD_FAILED_SYMBOLS_H +#define CPROVER_POINTER_ANALYSIS_ADD_FAILED_SYMBOLS_H #include @@ -24,4 +24,4 @@ exprt get_failed_symbol( const symbol_exprt &expr, const namespacet &ns); -#endif +#endif // CPROVER_POINTER_ANALYSIS_ADD_FAILED_SYMBOLS_H diff --git a/src/pointer-analysis/dereference.h b/src/pointer-analysis/dereference.h index ae822e525c4..c52ac9b0f05 100644 --- a/src/pointer-analysis/dereference.h +++ b/src/pointer-analysis/dereference.h @@ -88,4 +88,4 @@ static inline exprt dereference(const exprt &pointer, const namespacet &ns) return dereference_object(pointer); } -#endif +#endif // CPROVER_POINTER_ANALYSIS_DEREFERENCE_H diff --git a/src/pointer-analysis/dereference_callback.h b/src/pointer-analysis/dereference_callback.h index 60e2190049a..9d9d1b69449 100644 --- a/src/pointer-analysis/dereference_callback.h +++ b/src/pointer-analysis/dereference_callback.h @@ -38,4 +38,4 @@ class dereference_callbackt const symbolt *&symbol)=0; }; -#endif +#endif // CPROVER_POINTER_ANALYSIS_DEREFERENCE_CALLBACK_H diff --git a/src/pointer-analysis/goto_program_dereference.h b/src/pointer-analysis/goto_program_dereference.h index 5dfcd3123a8..cd2b3c977f3 100644 --- a/src/pointer-analysis/goto_program_dereference.h +++ b/src/pointer-analysis/goto_program_dereference.h @@ -111,4 +111,4 @@ void pointer_checks( const optionst &options, value_setst &value_sets); -#endif +#endif // CPROVER_POINTER_ANALYSIS_GOTO_PROGRAM_DEREFERENCE_H diff --git a/src/pointer-analysis/object_numbering.h b/src/pointer-analysis/object_numbering.h index 207094143f3..714f3190252 100644 --- a/src/pointer-analysis/object_numbering.h +++ b/src/pointer-analysis/object_numbering.h @@ -15,4 +15,4 @@ Author: Daniel Kroening, kroening@kroening.com typedef hash_numbering object_numberingt; -#endif +#endif // CPROVER_POINTER_ANALYSIS_OBJECT_NUMBERING_H diff --git a/src/pointer-analysis/pointer_offset_sum.h b/src/pointer-analysis/pointer_offset_sum.h index 07c67b5f647..c5569cf1685 100644 --- a/src/pointer-analysis/pointer_offset_sum.h +++ b/src/pointer-analysis/pointer_offset_sum.h @@ -13,4 +13,4 @@ Author: Daniel Kroening, kroening@kroening.com exprt pointer_offset_sum(const exprt &a, const exprt &b); -#endif +#endif // CPROVER_POINTER_ANALYSIS_POINTER_OFFSET_SUM_H diff --git a/src/pointer-analysis/rewrite_index.h b/src/pointer-analysis/rewrite_index.h index 111c34c0b36..ee5f3b9bbfa 100644 --- a/src/pointer-analysis/rewrite_index.h +++ b/src/pointer-analysis/rewrite_index.h @@ -16,4 +16,4 @@ class index_exprt; dereference_exprt rewrite_index(const index_exprt &index_expr); -#endif +#endif // CPROVER_POINTER_ANALYSIS_REWRITE_INDEX_H diff --git a/src/pointer-analysis/show_value_sets.h b/src/pointer-analysis/show_value_sets.h index 99ac68b6c55..b98acbacd93 100644 --- a/src/pointer-analysis/show_value_sets.h +++ b/src/pointer-analysis/show_value_sets.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_GOTO_PROGRAMS_SHOW_VALUE_SETS_H -#define CPROVER_GOTO_PROGRAMS_SHOW_VALUE_SETS_H +#ifndef CPROVER_POINTER_ANALYSIS_SHOW_VALUE_SETS_H +#define CPROVER_POINTER_ANALYSIS_SHOW_VALUE_SETS_H #include @@ -25,4 +25,4 @@ void show_value_sets( const goto_programt &goto_program, const value_set_analysist &value_set_analysis); -#endif +#endif // CPROVER_POINTER_ANALYSIS_SHOW_VALUE_SETS_H diff --git a/src/pointer-analysis/value_set.h b/src/pointer-analysis/value_set.h index 625e5e2b1a3..7902fc04fb8 100644 --- a/src/pointer-analysis/value_set.h +++ b/src/pointer-analysis/value_set.h @@ -241,4 +241,4 @@ class value_sett const namespacet &ns); }; -#endif +#endif // CPROVER_POINTER_ANALYSIS_VALUE_SET_H diff --git a/src/pointer-analysis/value_set_analysis.h b/src/pointer-analysis/value_set_analysis.h index 8c93452d1da..4b843e6c4d1 100644 --- a/src/pointer-analysis/value_set_analysis.h +++ b/src/pointer-analysis/value_set_analysis.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_POINTER_ANALYSIS_VALUE_PROPAGATION_H -#define CPROVER_POINTER_ANALYSIS_VALUE_PROPAGATION_H +#ifndef CPROVER_POINTER_ANALYSIS_VALUE_SET_ANALYSIS_H +#define CPROVER_POINTER_ANALYSIS_VALUE_SET_ANALYSIS_H #define USE_DEPRECATED_STATIC_ANALYSIS_H #include @@ -59,4 +59,4 @@ class value_set_analysist: } }; -#endif +#endif // CPROVER_POINTER_ANALYSIS_VALUE_SET_ANALYSIS_H diff --git a/src/pointer-analysis/value_set_analysis_fi.h b/src/pointer-analysis/value_set_analysis_fi.h index 3cd986fe9fc..edc14075976 100644 --- a/src/pointer-analysis/value_set_analysis_fi.h +++ b/src/pointer-analysis/value_set_analysis_fi.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_POINTER_ANALYSIS_VALUE_PROPAGATION_FI_H -#define CPROVER_POINTER_ANALYSIS_VALUE_PROPAGATION_FI_H +#ifndef CPROVER_POINTER_ANALYSIS_VALUE_SET_ANALYSIS_FI_H +#define CPROVER_POINTER_ANALYSIS_VALUE_SET_ANALYSIS_FI_H #include @@ -70,4 +70,4 @@ class value_set_analysis_fit : } }; -#endif /*VALUE_PROPAGATION_FUI_H_*/ +#endif // CPROVER_POINTER_ANALYSIS_VALUE_SET_ANALYSIS_FI_H diff --git a/src/pointer-analysis/value_set_analysis_fivr.h b/src/pointer-analysis/value_set_analysis_fivr.h index e6a1058e35a..543ced1eac8 100644 --- a/src/pointer-analysis/value_set_analysis_fivr.h +++ b/src/pointer-analysis/value_set_analysis_fivr.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_POINTER_ANALYSIS_VALUE_PROPAGATION_FIVR_H -#define CPROVER_POINTER_ANALYSIS_VALUE_PROPAGATION_FIVR_H +#ifndef CPROVER_POINTER_ANALYSIS_VALUE_SET_ANALYSIS_FIVR_H +#define CPROVER_POINTER_ANALYSIS_VALUE_SET_ANALYSIS_FIVR_H #include @@ -90,4 +90,4 @@ class value_set_analysis_fivrt : } }; -#endif /*VALUE_PROPAGATION_INCR_H_*/ +#endif // CPROVER_POINTER_ANALYSIS_VALUE_SET_ANALYSIS_FIVR_H diff --git a/src/pointer-analysis/value_set_analysis_fivrns.h b/src/pointer-analysis/value_set_analysis_fivrns.h index 60c6ec5b7fc..8cf8e23f93e 100644 --- a/src/pointer-analysis/value_set_analysis_fivrns.h +++ b/src/pointer-analysis/value_set_analysis_fivrns.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com, \*******************************************************************/ -#ifndef __CPROVER_VALUE_SET_ANALYSIS_FIVRNS_H_ -#define __CPROVER_VALUE_SET_ANALYSIS_FIVRNS_H_ +#ifndef CPROVER_POINTER_ANALYSIS_VALUE_SET_ANALYSIS_FIVRNS_H +#define CPROVER_POINTER_ANALYSIS_VALUE_SET_ANALYSIS_FIVRNS_H #include @@ -92,4 +92,4 @@ class value_set_analysis_fivrnst : } }; -#endif /*__CPROVER_VALUE_SET_ANALYSIS_FIVRNS_H_*/ +#endif // CPROVER_POINTER_ANALYSIS_VALUE_SET_ANALYSIS_FIVRNS_H diff --git a/src/pointer-analysis/value_set_dereference.h b/src/pointer-analysis/value_set_dereference.h index 9e43f799e04..5fc40f6fe25 100644 --- a/src/pointer-analysis/value_set_dereference.h +++ b/src/pointer-analysis/value_set_dereference.h @@ -138,4 +138,4 @@ class value_set_dereferencet const exprt &offset); }; -#endif +#endif // CPROVER_POINTER_ANALYSIS_VALUE_SET_DEREFERENCE_H diff --git a/src/pointer-analysis/value_set_domain.h b/src/pointer-analysis/value_set_domain.h index 67baeb4d430..088157227f6 100644 --- a/src/pointer-analysis/value_set_domain.h +++ b/src/pointer-analysis/value_set_domain.h @@ -56,4 +56,4 @@ class value_set_domaint:public domain_baset }; -#endif +#endif // CPROVER_POINTER_ANALYSIS_VALUE_SET_DOMAIN_H diff --git a/src/pointer-analysis/value_set_domain_fi.h b/src/pointer-analysis/value_set_domain_fi.h index d450af408e7..a78bad49488 100644 --- a/src/pointer-analysis/value_set_domain_fi.h +++ b/src/pointer-analysis/value_set_domain_fi.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef VALUE_SET_DOMAIN_FI_H_ -#define VALUE_SET_DOMAIN_FI_H_ +#ifndef CPROVER_POINTER_ANALYSIS_VALUE_SET_DOMAIN_FI_H +#define CPROVER_POINTER_ANALYSIS_VALUE_SET_DOMAIN_FI_H #include @@ -59,4 +59,4 @@ class value_set_domain_fit:public flow_insensitive_abstract_domain_baset }; -#endif /*VALUE_SET_DOMAIN_FI_H_*/ +#endif // CPROVER_POINTER_ANALYSIS_VALUE_SET_DOMAIN_FI_H diff --git a/src/pointer-analysis/value_set_domain_fivr.h b/src/pointer-analysis/value_set_domain_fivr.h index 7db219dc9e1..21a7087402a 100644 --- a/src/pointer-analysis/value_set_domain_fivr.h +++ b/src/pointer-analysis/value_set_domain_fivr.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef VALUE_SET_DOMAIN_INCR_H_ -#define VALUE_SET_DOMAIN_INCR_H_ +#ifndef CPROVER_POINTER_ANALYSIS_VALUE_SET_DOMAIN_FIVR_H +#define CPROVER_POINTER_ANALYSIS_VALUE_SET_DOMAIN_FIVR_H #include @@ -54,4 +54,4 @@ class value_set_domain_fivrt:public flow_insensitive_abstract_domain_baset }; -#endif /*VALUE_SET_DOMAIN_INCR_H_*/ +#endif // CPROVER_POINTER_ANALYSIS_VALUE_SET_DOMAIN_FIVR_H diff --git a/src/pointer-analysis/value_set_domain_fivrns.h b/src/pointer-analysis/value_set_domain_fivrns.h index 8d22ec25113..70ddedb0818 100644 --- a/src/pointer-analysis/value_set_domain_fivrns.h +++ b/src/pointer-analysis/value_set_domain_fivrns.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef __CPROVER_VALUE_SET_DOMAIN_FIVRNS_H_ -#define __CPROVER_VALUE_SET_DOMAIN_FIVRNS_H_ +#ifndef CPROVER_POINTER_ANALYSIS_VALUE_SET_DOMAIN_FIVRNS_H +#define CPROVER_POINTER_ANALYSIS_VALUE_SET_DOMAIN_FIVRNS_H #include @@ -55,4 +55,4 @@ class value_set_domain_fivrnst : }; -#endif /*__CPROVER_VALUE_SET_DOMAIN_FIVRNS_H_*/ +#endif // CPROVER_POINTER_ANALYSIS_VALUE_SET_DOMAIN_FIVRNS_H diff --git a/src/pointer-analysis/value_set_fi.h b/src/pointer-analysis/value_set_fi.h index 7c74315496e..83affdb4ad4 100644 --- a/src/pointer-analysis/value_set_fi.h +++ b/src/pointer-analysis/value_set_fi.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef VALUE_SET_FI_H_ -#define VALUE_SET_FI_H_ +#ifndef CPROVER_POINTER_ANALYSIS_VALUE_SET_FI_H +#define CPROVER_POINTER_ANALYSIS_VALUE_SET_FI_H #include @@ -316,4 +316,4 @@ class value_set_fit flatten_seent&) const; }; -#endif /*VALUE_SET_FI_H_*/ +#endif // CPROVER_POINTER_ANALYSIS_VALUE_SET_FI_H diff --git a/src/pointer-analysis/value_set_fivr.h b/src/pointer-analysis/value_set_fivr.h index cc157b210ca..d93aab134bc 100644 --- a/src/pointer-analysis/value_set_fivr.h +++ b/src/pointer-analysis/value_set_fivr.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef VALUE_SET_FIVR_H_ -#define VALUE_SET_FIVR_H_ +#ifndef CPROVER_POINTER_ANALYSIS_VALUE_SET_FIVR_H +#define CPROVER_POINTER_ANALYSIS_VALUE_SET_FIVR_H #include #include @@ -374,4 +374,4 @@ class value_set_fivrt recfind_recursion_sett &recursion_set) const; }; -#endif /*VALUE_SET_INCR_H_*/ +#endif // CPROVER_POINTER_ANALYSIS_VALUE_SET_FIVR_H diff --git a/src/pointer-analysis/value_set_fivrns.h b/src/pointer-analysis/value_set_fivrns.h index 392f071b798..b6b02f3c93b 100644 --- a/src/pointer-analysis/value_set_fivrns.h +++ b/src/pointer-analysis/value_set_fivrns.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef __CPROVER_VALUE_SET_FIVRNS_H_ -#define __CPROVER_VALUE_SET_FIVRNS_H_ +#ifndef CPROVER_POINTER_ANALYSIS_VALUE_SET_FIVRNS_H +#define CPROVER_POINTER_ANALYSIS_VALUE_SET_FIVRNS_H #include #include @@ -347,4 +347,4 @@ class value_set_fivrnst const namespacet &ns); }; -#endif /*__CPROVER_VALUE_SET_FIVR_H_*/ +#endif // CPROVER_POINTER_ANALYSIS_VALUE_SET_FIVRNS_H diff --git a/src/pointer-analysis/value_sets.h b/src/pointer-analysis/value_sets.h index ca7b4a8372f..5e39997b7e1 100644 --- a/src/pointer-analysis/value_sets.h +++ b/src/pointer-analysis/value_sets.h @@ -35,4 +35,4 @@ class value_setst } }; -#endif +#endif // CPROVER_POINTER_ANALYSIS_VALUE_SETS_H diff --git a/src/solvers/cvc/cvc_conv.h b/src/solvers/cvc/cvc_conv.h index 005ad58157f..87f8a1c65ca 100644 --- a/src/solvers/cvc/cvc_conv.h +++ b/src/solvers/cvc/cvc_conv.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_PROP_CVC_CONV_H -#define CPROVER_PROP_CVC_CONV_H +#ifndef CPROVER_SOLVERS_CVC_CVC_CONV_H +#define CPROVER_SOLVERS_CVC_CVC_CONV_H #include @@ -78,4 +78,4 @@ class cvc_convt:public prop_convt static std::string cvc_pointer_type(); }; -#endif +#endif // CPROVER_SOLVERS_CVC_CVC_CONV_H diff --git a/src/solvers/cvc/cvc_dec.h b/src/solvers/cvc/cvc_dec.h index bfdbffff2aa..e819edc2755 100644 --- a/src/solvers/cvc/cvc_dec.h +++ b/src/solvers/cvc/cvc_dec.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_PROP_CVC_DEC_H -#define CPROVER_PROP_CVC_DEC_H +#ifndef CPROVER_SOLVERS_CVC_CVC_DEC_H +#define CPROVER_SOLVERS_CVC_CVC_DEC_H #include @@ -38,4 +38,4 @@ class cvc_dect:protected cvc_temp_filet, public cvc_convt void read_assert(std::istream &in, std::string &line); }; -#endif +#endif // CPROVER_SOLVERS_CVC_CVC_DEC_H diff --git a/src/solvers/cvc/cvc_prop.h b/src/solvers/cvc/cvc_prop.h index 3d41ec9ac32..2222b8c9e29 100644 --- a/src/solvers/cvc/cvc_prop.h +++ b/src/solvers/cvc/cvc_prop.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_PROP_CVC_PROP_H -#define CPROVER_PROP_CVC_PROP_H +#ifndef CPROVER_SOLVERS_CVC_CVC_PROP_H +#define CPROVER_SOLVERS_CVC_CVC_PROP_H #include @@ -83,4 +83,4 @@ class cvc_propt:virtual public propt std::vector assignment; }; -#endif +#endif // CPROVER_SOLVERS_CVC_CVC_PROP_H diff --git a/src/solvers/dplib/dplib_conv.h b/src/solvers/dplib/dplib_conv.h index 0ff9c1ea86e..494bcb1fb12 100644 --- a/src/solvers/dplib/dplib_conv.h +++ b/src/solvers/dplib/dplib_conv.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_PROP_DPLIB_CONV_H -#define CPROVER_PROP_DPLIB_CONV_H +#ifndef CPROVER_SOLVERS_DPLIB_DPLIB_CONV_H +#define CPROVER_SOLVERS_DPLIB_DPLIB_CONV_H #include @@ -70,4 +70,4 @@ class dplib_convt:public prop_convt identifier_mapt identifier_map; }; -#endif +#endif // CPROVER_SOLVERS_DPLIB_DPLIB_CONV_H diff --git a/src/solvers/dplib/dplib_dec.h b/src/solvers/dplib/dplib_dec.h index 5e66209b337..6f722569ec4 100644 --- a/src/solvers/dplib/dplib_dec.h +++ b/src/solvers/dplib/dplib_dec.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_PROP_DPLIB_DEC_H -#define CPROVER_PROP_DPLIB_DEC_H +#ifndef CPROVER_SOLVERS_DPLIB_DPLIB_DEC_H +#define CPROVER_SOLVERS_DPLIB_DPLIB_DEC_H #include @@ -39,4 +39,4 @@ class dplib_dect:protected dplib_temp_filet, public dplib_convt void read_assert(std::istream &in, std::string &line); }; -#endif +#endif // CPROVER_SOLVERS_DPLIB_DPLIB_DEC_H diff --git a/src/solvers/dplib/dplib_prop.h b/src/solvers/dplib/dplib_prop.h index 01c50a2b587..5abdc41aaba 100644 --- a/src/solvers/dplib/dplib_prop.h +++ b/src/solvers/dplib/dplib_prop.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_PROP_DPLIB_PROP_H -#define CPROVER_PROP_DPLIB_PROP_H +#ifndef CPROVER_SOLVERS_DPLIB_DPLIB_PROP_H +#define CPROVER_SOLVERS_DPLIB_DPLIB_PROP_H #include @@ -86,4 +86,4 @@ class dplib_propt:virtual public propt void finish(); }; -#endif +#endif // CPROVER_SOLVERS_DPLIB_DPLIB_PROP_H diff --git a/src/solvers/flattening/arrays.h b/src/solvers/flattening/arrays.h index 80d63fc837e..62022053558 100644 --- a/src/solvers/flattening/arrays.h +++ b/src/solvers/flattening/arrays.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_ARRAYS_H -#define CPROVER_ARRAYS_H +#ifndef CPROVER_SOLVERS_FLATTENING_ARRAYS_H +#define CPROVER_SOLVERS_FLATTENING_ARRAYS_H #include @@ -108,4 +108,4 @@ class arrayst:public equalityt // (maybe this function should be partially moved here from boolbv) }; -#endif +#endif // CPROVER_SOLVERS_FLATTENING_ARRAYS_H diff --git a/src/solvers/flattening/boolbv.h b/src/solvers/flattening/boolbv.h index c5258035d4d..4d2a6fd6367 100644 --- a/src/solvers/flattening/boolbv.h +++ b/src/solvers/flattening/boolbv.h @@ -251,4 +251,4 @@ class boolbvt:public arrayst numbering string_numbering; }; -#endif +#endif // CPROVER_SOLVERS_FLATTENING_BOOLBV_H diff --git a/src/solvers/flattening/boolbv_map.h b/src/solvers/flattening/boolbv_map.h index 7d284026068..0d4bc2e1c4d 100644 --- a/src/solvers/flattening/boolbv_map.h +++ b/src/solvers/flattening/boolbv_map.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_BOOLBV_MAP_H -#define CPROVER_BOOLBV_MAP_H +#ifndef CPROVER_SOLVERS_FLATTENING_BOOLBV_MAP_H +#define CPROVER_SOLVERS_FLATTENING_BOOLBV_MAP_H #include @@ -81,4 +81,4 @@ class boolbv_mapt const boolbv_widtht &boolbv_width; }; -#endif +#endif // CPROVER_SOLVERS_FLATTENING_BOOLBV_MAP_H diff --git a/src/solvers/flattening/boolbv_type.h b/src/solvers/flattening/boolbv_type.h index be259f5c212..71b55f7c9e1 100644 --- a/src/solvers/flattening/boolbv_type.h +++ b/src/solvers/flattening/boolbv_type.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_BOOLBV_TYPE_H -#define CPROVER_BOOLBV_TYPE_H +#ifndef CPROVER_SOLVERS_FLATTENING_BOOLBV_TYPE_H +#define CPROVER_SOLVERS_FLATTENING_BOOLBV_TYPE_H #include @@ -21,4 +21,4 @@ typedef enum bvtypet get_bvtype(const typet &type); -#endif +#endif // CPROVER_SOLVERS_FLATTENING_BOOLBV_TYPE_H diff --git a/src/solvers/flattening/boolbv_width.h b/src/solvers/flattening/boolbv_width.h index e6799ebf14c..80e27d03e5c 100644 --- a/src/solvers/flattening/boolbv_width.h +++ b/src/solvers/flattening/boolbv_width.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_BOOLBV_WIDTH_H -#define CPROVER_BOOLBV_WIDTH_H +#ifndef CPROVER_SOLVERS_FLATTENING_BOOLBV_WIDTH_H +#define CPROVER_SOLVERS_FLATTENING_BOOLBV_WIDTH_H #include #include @@ -50,4 +50,4 @@ class boolbv_widtht const entryt &get_entry(const typet &type) const; }; -#endif +#endif // CPROVER_SOLVERS_FLATTENING_BOOLBV_WIDTH_H diff --git a/src/solvers/flattening/bv_minimize.h b/src/solvers/flattening/bv_minimize.h index 203d1f752d7..03ba354e0d8 100644 --- a/src/solvers/flattening/bv_minimize.h +++ b/src/solvers/flattening/bv_minimize.h @@ -11,8 +11,8 @@ Purpose: Find a satisfying assignment that minimizes a given set \*******************************************************************/ -#ifndef CPROVER_BV_MINIMIZER_H -#define CPROVER_BV_MINIMIZER_H +#ifndef CPROVER_SOLVERS_FLATTENING_BV_MINIMIZE_H +#define CPROVER_SOLVERS_FLATTENING_BV_MINIMIZE_H #include #include @@ -60,4 +60,4 @@ class bv_minimizing_dect:public bv_pointerst satcheckt satcheck; }; -#endif +#endif // CPROVER_SOLVERS_FLATTENING_BV_MINIMIZE_H diff --git a/src/solvers/flattening/bv_pointers.h b/src/solvers/flattening/bv_pointers.h index f1f91cd92e7..eafed0e6dfb 100644 --- a/src/solvers/flattening/bv_pointers.h +++ b/src/solvers/flattening/bv_pointers.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_BV_POINTERS_H -#define CPROVER_BV_POINTERS_H +#ifndef CPROVER_SOLVERS_FLATTENING_BV_POINTERS_H +#define CPROVER_SOLVERS_FLATTENING_BV_POINTERS_H #include @@ -70,4 +70,4 @@ class bv_pointerst:public boolbvt } }; -#endif +#endif // CPROVER_SOLVERS_FLATTENING_BV_POINTERS_H diff --git a/src/solvers/flattening/bv_utils.h b/src/solvers/flattening/bv_utils.h index fbe17abe6f1..f0d728e7734 100644 --- a/src/solvers/flattening/bv_utils.h +++ b/src/solvers/flattening/bv_utils.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_BV_UTILS_H -#define CPROVER_BV_UTILS_H +#ifndef CPROVER_SOLVERS_FLATTENING_BV_UTILS_H +#define CPROVER_SOLVERS_FLATTENING_BV_UTILS_H #include #include @@ -212,4 +212,4 @@ class bv_utilst bvt wallace_tree(const std::vector &pps); }; -#endif +#endif // CPROVER_SOLVERS_FLATTENING_BV_UTILS_H diff --git a/src/solvers/flattening/c_bit_field_replacement_type.h b/src/solvers/flattening/c_bit_field_replacement_type.h index 3384591a68a..6f0f78e2c8c 100644 --- a/src/solvers/flattening/c_bit_field_replacement_type.h +++ b/src/solvers/flattening/c_bit_field_replacement_type.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_C_BIT_FIELD_REPLACEMENT_TYPE_H -#define CPROVER_C_BIT_FIELD_REPLACEMENT_TYPE_H +#ifndef CPROVER_SOLVERS_FLATTENING_C_BIT_FIELD_REPLACEMENT_TYPE_H +#define CPROVER_SOLVERS_FLATTENING_C_BIT_FIELD_REPLACEMENT_TYPE_H #include #include @@ -16,4 +16,4 @@ typet c_bit_field_replacement_type( const c_bit_field_typet &, const namespacet &); -#endif +#endif // CPROVER_SOLVERS_FLATTENING_C_BIT_FIELD_REPLACEMENT_TYPE_H diff --git a/src/solvers/flattening/equality.h b/src/solvers/flattening/equality.h index 6dc6bb6ecee..533f406e010 100644 --- a/src/solvers/flattening/equality.h +++ b/src/solvers/flattening/equality.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_SOLVER_FLATTENING_EQUALITY_H -#define CPROVER_SOLVER_FLATTENING_EQUALITY_H +#ifndef CPROVER_SOLVERS_FLATTENING_EQUALITY_H +#define CPROVER_SOLVERS_FLATTENING_EQUALITY_H #include @@ -53,4 +53,4 @@ class equalityt:public prop_conv_solvert virtual void add_equality_constraints(const typestructt &typestruct); }; -#endif +#endif // CPROVER_SOLVERS_FLATTENING_EQUALITY_H diff --git a/src/solvers/flattening/flatten_byte_operators.h b/src/solvers/flattening/flatten_byte_operators.h index 6348c0fda95..0a615198b9d 100644 --- a/src/solvers/flattening/flatten_byte_operators.h +++ b/src/solvers/flattening/flatten_byte_operators.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_FLATTEN_BYTE_OPERATORS_H -#define CPROVER_FLATTEN_BYTE_OPERATORS_H +#ifndef CPROVER_SOLVERS_FLATTENING_FLATTEN_BYTE_OPERATORS_H +#define CPROVER_SOLVERS_FLATTENING_FLATTEN_BYTE_OPERATORS_H class byte_extract_exprt; class byte_update_exprt; @@ -26,4 +26,4 @@ exprt flatten_byte_operators(const exprt &src, const namespacet &ns); bool has_byte_operator(const exprt &src); -#endif +#endif // CPROVER_SOLVERS_FLATTENING_FLATTEN_BYTE_OPERATORS_H diff --git a/src/solvers/flattening/functions.h b/src/solvers/flattening/functions.h index b2b3bb227ed..1708862e946 100644 --- a/src/solvers/flattening/functions.h +++ b/src/solvers/flattening/functions.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_FUNCTIONS_H -#define CPROVER_FUNCTIONS_H +#ifndef CPROVER_SOLVERS_FLATTENING_FUNCTIONS_H +#define CPROVER_SOLVERS_FLATTENING_FUNCTIONS_H #include @@ -53,4 +53,4 @@ class functionst const exprt::operandst &o2); }; -#endif +#endif // CPROVER_SOLVERS_FLATTENING_FUNCTIONS_H diff --git a/src/solvers/flattening/pointer_logic.h b/src/solvers/flattening/pointer_logic.h index 608635c3a1a..88232ef5e32 100644 --- a/src/solvers/flattening/pointer_logic.h +++ b/src/solvers/flattening/pointer_logic.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_POINTER_LOGIC_H -#define CPROVER_POINTER_LOGIC_H +#ifndef CPROVER_SOLVERS_FLATTENING_POINTER_LOGIC_H +#define CPROVER_SOLVERS_FLATTENING_POINTER_LOGIC_H #include #include @@ -82,4 +82,4 @@ class pointer_logict const exprt &src) const; }; -#endif +#endif // CPROVER_SOLVERS_FLATTENING_POINTER_LOGIC_H diff --git a/src/solvers/floatbv/float_approximation.h b/src/solvers/floatbv/float_approximation.h index 43fbd64159c..dd0a495db39 100644 --- a/src/solvers/floatbv/float_approximation.h +++ b/src/solvers/floatbv/float_approximation.h @@ -6,8 +6,8 @@ Module: Floating Point with under/over-approximation \*******************************************************************/ -#ifndef CPROVER_FLOAT_APPROXIMATION_H -#define CPROVER_FLOAT_APPROXIMATION_H +#ifndef CPROVER_SOLVERS_FLOATBV_FLOAT_APPROXIMATION_H +#define CPROVER_SOLVERS_FLOATBV_FLOAT_APPROXIMATION_H #include @@ -34,4 +34,4 @@ class float_approximationt:public float_utilst typedef float_utilst SUB; }; -#endif +#endif // CPROVER_SOLVERS_FLOATBV_FLOAT_APPROXIMATION_H diff --git a/src/solvers/floatbv/float_bv.h b/src/solvers/floatbv/float_bv.h index 1742ee4fda4..10c2b4089e8 100644 --- a/src/solvers/floatbv/float_bv.h +++ b/src/solvers/floatbv/float_bv.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_FLOAT_BV_H -#define CPROVER_FLOAT_BV_H +#ifndef CPROVER_SOLVERS_FLOATBV_FLOAT_BV_H +#define CPROVER_SOLVERS_FLOATBV_FLOAT_BV_H #include #include @@ -156,4 +156,4 @@ static inline exprt float_bv(const exprt &src) return float_bvt()(src); } -#endif +#endif // CPROVER_SOLVERS_FLOATBV_FLOAT_BV_H diff --git a/src/solvers/floatbv/float_utils.h b/src/solvers/floatbv/float_utils.h index 3de2dbf8a7f..a0204236e91 100644 --- a/src/solvers/floatbv/float_utils.h +++ b/src/solvers/floatbv/float_utils.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_FLOAT_UTILS_H -#define CPROVER_FLOAT_UTILS_H +#ifndef CPROVER_SOLVERS_FLOATBV_FLOAT_UTILS_H +#define CPROVER_SOLVERS_FLOATBV_FLOAT_UTILS_H #include @@ -201,4 +201,4 @@ class float_utilst literalt &sticky); }; -#endif +#endif // CPROVER_SOLVERS_FLOATBV_FLOAT_UTILS_H diff --git a/src/solvers/miniBDD/miniBDD.h b/src/solvers/miniBDD/miniBDD.h index 02ce2a853d9..eb1a6ea0da2 100644 --- a/src/solvers/miniBDD/miniBDD.h +++ b/src/solvers/miniBDD/miniBDD.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_MINIBDD_H -#define CPROVER_MINIBDD_H +#ifndef CPROVER_SOLVERS_MINIBDD_MINIBDD_H +#define CPROVER_SOLVERS_MINIBDD_MINIBDD_H /*! \file solvers/miniBDD/miniBDD.h * \brief Small BDD implementation @@ -142,4 +142,4 @@ bool OneSat(const BDD &v, std::map &assignment); // inline functions #include "miniBDD.inc" -#endif +#endif // CPROVER_SOLVERS_MINIBDD_MINIBDD_H diff --git a/src/solvers/prop/aig.h b/src/solvers/prop/aig.h index 86cb778660f..a32728de7e6 100644 --- a/src/solvers/prop/aig.h +++ b/src/solvers/prop/aig.h @@ -150,4 +150,4 @@ class aig_plus_constraintst:public aigt } }; -#endif +#endif // CPROVER_SOLVERS_PROP_AIG_H diff --git a/src/solvers/prop/aig_prop.h b/src/solvers/prop/aig_prop.h index ba023ecf466..a867514cfbe 100644 --- a/src/solvers/prop/aig_prop.h +++ b/src/solvers/prop/aig_prop.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_PROPSOLVE_AIG_PROP_H -#define CPROVER_PROPSOLVE_AIG_PROP_H +#ifndef CPROVER_SOLVERS_PROP_AIG_PROP_H +#define CPROVER_SOLVERS_PROP_AIG_PROP_H #include @@ -119,4 +119,4 @@ class aig_prop_solvert:public aig_prop_constraintt void convert_node(unsigned n, const aigt::nodet &node, bool n_pos, bool n_neg, std::vector &p_usage_count, std::vector &n_usage_count); }; -#endif +#endif // CPROVER_SOLVERS_PROP_AIG_PROP_H diff --git a/src/solvers/prop/bdd_expr.h b/src/solvers/prop/bdd_expr.h index eced03357c8..d34372b300b 100644 --- a/src/solvers/prop/bdd_expr.h +++ b/src/solvers/prop/bdd_expr.h @@ -6,8 +6,8 @@ Author: Michael Tautschnig, michael.tautschnig@qmul.ac.uk \*******************************************************************/ -#ifndef CPROVER_BDD_EXPR_H -#define CPROVER_BDD_EXPR_H +#ifndef CPROVER_SOLVERS_PROP_BDD_EXPR_H +#define CPROVER_SOLVERS_PROP_BDD_EXPR_H /*! \file solvers/prop/bdd_expr.h * \brief Binary decision diagram @@ -48,4 +48,4 @@ class bdd_exprt exprt as_expr(const BDDt &r) const; }; -#endif +#endif // CPROVER_SOLVERS_PROP_BDD_EXPR_H diff --git a/src/solvers/prop/bformula.h b/src/solvers/prop/bformula.h index 80c02050e9f..a0ae99220bf 100644 --- a/src/solvers/prop/bformula.h +++ b/src/solvers/prop/bformula.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_PROPDEC_BFORMULA_H -#define CPROVER_PROPDEC_BFORMULA_H +#ifndef CPROVER_SOLVERS_PROP_BFORMULA_H +#define CPROVER_SOLVERS_PROP_BFORMULA_H #include "prop.h" @@ -125,4 +125,4 @@ bformulat const_bformula(bool value); //typedef std::vector bvt; -#endif +#endif // CPROVER_SOLVERS_PROP_BFORMULA_H diff --git a/src/solvers/prop/cover_goals.h b/src/solvers/prop/cover_goals.h index 862912028ee..ed97ea22dd7 100644 --- a/src/solvers/prop/cover_goals.h +++ b/src/solvers/prop/cover_goals.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_COVER_GOALS_H -#define CPROVER_COVER_GOALS_H +#ifndef CPROVER_SOLVERS_PROP_COVER_GOALS_H +#define CPROVER_SOLVERS_PROP_COVER_GOALS_H #include @@ -105,4 +105,4 @@ class cover_goalst:public messaget void freeze_goal_variables(); }; -#endif +#endif // CPROVER_SOLVERS_PROP_COVER_GOALS_H diff --git a/src/solvers/prop/literal.h b/src/solvers/prop/literal.h index b5dfd6cfc86..a15cb3aabc8 100644 --- a/src/solvers/prop/literal.h +++ b/src/solvers/prop/literal.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_PROPDEC_LITERAL_H -#define CPROVER_PROPDEC_LITERAL_H +#ifndef CPROVER_SOLVERS_PROP_LITERAL_H +#define CPROVER_SOLVERS_PROP_LITERAL_H #include #include @@ -206,4 +206,4 @@ typedef std::vector bvt; for(bvt::iterator it=(bv).begin(); \ it!=(bv).end(); ++it) -#endif +#endif // CPROVER_SOLVERS_PROP_LITERAL_H diff --git a/src/solvers/prop/literal_expr.h b/src/solvers/prop/literal_expr.h index f1fc1dcb7b3..ebfb908b9ac 100644 --- a/src/solvers/prop/literal_expr.h +++ b/src/solvers/prop/literal_expr.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_LITERAL_EXPR_H -#define CPROVER_LITERAL_EXPR_H +#ifndef CPROVER_SOLVERS_PROP_LITERAL_EXPR_H +#define CPROVER_SOLVERS_PROP_LITERAL_EXPR_H #include @@ -60,4 +60,4 @@ extern inline literal_exprt &to_literal_expr(exprt &expr) return static_cast(expr); } -#endif +#endif // CPROVER_SOLVERS_PROP_LITERAL_EXPR_H diff --git a/src/solvers/prop/minimize.h b/src/solvers/prop/minimize.h index 3196524f77d..1e170aa0ce0 100644 --- a/src/solvers/prop/minimize.h +++ b/src/solvers/prop/minimize.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_PROP_MINIMIZE_H -#define CPROVER_PROP_MINIMIZE_H +#ifndef CPROVER_SOLVERS_PROP_MINIMIZE_H +#define CPROVER_SOLVERS_PROP_MINIMIZE_H #include @@ -88,4 +88,4 @@ class prop_minimizet:public messaget objectivest::reverse_iterator current; }; -#endif +#endif // CPROVER_SOLVERS_PROP_MINIMIZE_H diff --git a/src/solvers/prop/prop.h b/src/solvers/prop/prop.h index 6f22192e476..e557ccef098 100644 --- a/src/solvers/prop/prop.h +++ b/src/solvers/prop/prop.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_PROP_H -#define CPROVER_PROP_H +#ifndef CPROVER_SOLVERS_PROP_PROP_H +#define CPROVER_SOLVERS_PROP_PROP_H // decision procedure wrapper for boolean propositional logics @@ -99,4 +99,4 @@ class propt:public messaget, public prop_assignmentt bvt lcnf_bv; }; -#endif +#endif // CPROVER_SOLVERS_PROP_PROP_H diff --git a/src/solvers/prop/prop_assignment.h b/src/solvers/prop/prop_assignment.h index 69f62dd40d7..0de6dcdc4ef 100644 --- a/src/solvers/prop/prop_assignment.h +++ b/src/solvers/prop/prop_assignment.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_PROP_ASSIGNMENT_H -#define CPROVER_PROP_ASSIGNMENT_H +#ifndef CPROVER_SOLVERS_PROP_PROP_ASSIGNMENT_H +#define CPROVER_SOLVERS_PROP_PROP_ASSIGNMENT_H #include "literal.h" @@ -27,4 +27,4 @@ class prop_assignmentt virtual void copy_assignment_from(const propt &prop)=0; }; -#endif +#endif // CPROVER_SOLVERS_PROP_PROP_ASSIGNMENT_H diff --git a/src/solvers/prop/prop_conv.h b/src/solvers/prop/prop_conv.h index baaa3ded8c5..76b496be13a 100644 --- a/src/solvers/prop/prop_conv.h +++ b/src/solvers/prop/prop_conv.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_PROP_CONV_H -#define CPROVER_PROP_CONV_H +#ifndef CPROVER_SOLVERS_PROP_PROP_CONV_H +#define CPROVER_SOLVERS_PROP_PROP_CONV_H #include #include @@ -138,4 +138,4 @@ class prop_conv_solvert:public prop_convt propt ∝ }; -#endif +#endif // CPROVER_SOLVERS_PROP_PROP_CONV_H diff --git a/src/solvers/prop/prop_conv_store.h b/src/solvers/prop/prop_conv_store.h index a424be8bbca..675bda541ac 100644 --- a/src/solvers/prop/prop_conv_store.h +++ b/src/solvers/prop/prop_conv_store.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_PROP_CONV_STORE_H -#define CPROVER_PROP_CONV_STORE_H +#ifndef CPROVER_SOLVERS_PROP_PROP_CONV_STORE_H +#define CPROVER_SOLVERS_PROP_PROP_CONV_STORE_H #include "prop_conv.h" @@ -64,4 +64,4 @@ class prop_conv_storet:public prop_convt constraintst constraints; }; -#endif +#endif // CPROVER_SOLVERS_PROP_PROP_CONV_STORE_H diff --git a/src/solvers/prop/prop_wrapper.h b/src/solvers/prop/prop_wrapper.h index 5d4f6f558de..ac40bc81d1c 100644 --- a/src/solvers/prop/prop_wrapper.h +++ b/src/solvers/prop/prop_wrapper.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_PROP_WRAPPER_H -#define CPROVER_PROP_WRAPPER_H +#ifndef CPROVER_SOLVERS_PROP_PROP_WRAPPER_H +#define CPROVER_SOLVERS_PROP_PROP_WRAPPER_H #include "prop.h" @@ -82,4 +82,4 @@ class prop_wrappert:public virtual propt propt &p; }; -#endif +#endif // CPROVER_SOLVERS_PROP_PROP_WRAPPER_H diff --git a/src/solvers/qbf/qbf_bdd_core.h b/src/solvers/qbf/qbf_bdd_core.h index 95c7f07feea..801cf4417e9 100644 --- a/src/solvers/qbf/qbf_bdd_core.h +++ b/src/solvers/qbf/qbf_bdd_core.h @@ -6,8 +6,8 @@ Author: CM Wintersteiger \*******************************************************************/ -#ifndef CPROVER_QBF_BDD_CORE_H -#define CPROVER_QBF_BDD_CORE_H +#ifndef CPROVER_SOLVERS_QBF_QBF_BDD_CORE_H +#define CPROVER_SOLVERS_QBF_QBF_BDD_CORE_H #include @@ -69,4 +69,4 @@ class qbf_bdd_coret:public qbf_bdd_certificatet void compress_certificate(void); }; -#endif /* QBF_BDD_CORE_H_ */ +#endif // CPROVER_SOLVERS_QBF_QBF_BDD_CORE_H diff --git a/src/solvers/qbf/qbf_core.h b/src/solvers/qbf/qbf_core.h index 7fbe949f7f7..79758f83daa 100644 --- a/src/solvers/qbf/qbf_core.h +++ b/src/solvers/qbf/qbf_core.h @@ -7,8 +7,8 @@ Author: Daniel Kroening, kroening@kroening.com, \*******************************************************************/ -#ifndef CPROVER_QBFCHECK_CORE_H -#define CPROVER_QBFCHECK_CORE_H +#ifndef CPROVER_SOLVERS_QBF_QBF_CORE_H +#define CPROVER_SOLVERS_QBF_QBF_CORE_H #ifdef HAVE_QBF_CORE #define QBF_CORE_SKIZZO @@ -40,4 +40,4 @@ typedef qbf_bdd_coret qbf_coret; #endif #endif -#endif +#endif // CPROVER_SOLVERS_QBF_QBF_CORE_H diff --git a/src/solvers/qbf/qbf_quantor.h b/src/solvers/qbf/qbf_quantor.h index 575e474bec8..e5f302fbea8 100644 --- a/src/solvers/qbf/qbf_quantor.h +++ b/src/solvers/qbf/qbf_quantor.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_QBF_QUANTOR_H -#define CPROVER_QBF_QUANTOR_H +#ifndef CPROVER_SOLVERS_QBF_QBF_QUANTOR_H +#define CPROVER_SOLVERS_QBF_QBF_QUANTOR_H #include "qdimacs_cnf.h" @@ -22,4 +22,4 @@ class qbf_quantort:public qdimacs_cnft virtual tvt l_get(literalt a) const; }; -#endif +#endif // CPROVER_SOLVERS_QBF_QBF_QUANTOR_H diff --git a/src/solvers/qbf/qbf_qube.h b/src/solvers/qbf/qbf_qube.h index bed1b1b583a..10331e09fee 100644 --- a/src/solvers/qbf/qbf_qube.h +++ b/src/solvers/qbf/qbf_qube.h @@ -6,8 +6,8 @@ Author: CM Wintersteiger \*******************************************************************/ -#ifndef CPROVER_QBF_QUBE_H -#define CPROVER_QBF_QUBE_H +#ifndef CPROVER_SOLVERS_QBF_QBF_QUBE_H +#define CPROVER_SOLVERS_QBF_QBF_QUBE_H #include "qdimacs_cnf.h" @@ -22,4 +22,4 @@ class qbf_qubet:public qdimacs_cnft virtual tvt l_get(literalt a) const; }; -#endif +#endif // CPROVER_SOLVERS_QBF_QBF_QUBE_H diff --git a/src/solvers/qbf/qbf_qube_core.h b/src/solvers/qbf/qbf_qube_core.h index 67e075eb2b5..55dd915296c 100644 --- a/src/solvers/qbf/qbf_qube_core.h +++ b/src/solvers/qbf/qbf_qube_core.h @@ -6,8 +6,8 @@ Author: CM Wintersteiger \*******************************************************************/ -#ifndef CPROVER_QBF_QUBE_CORE_H -#define CPROVER_QBF_QUBE_CORE_H +#ifndef CPROVER_SOLVERS_QBF_QBF_QUBE_CORE_H +#define CPROVER_SOLVERS_QBF_QBF_QUBE_CORE_H #include "qdimacs_core.h" @@ -54,4 +54,4 @@ class qbf_qube_coret : public qdimacs_coret } }; -#endif +#endif // CPROVER_SOLVERS_QBF_QBF_QUBE_CORE_H diff --git a/src/solvers/qbf/qbf_skizzo.h b/src/solvers/qbf/qbf_skizzo.h index a278bd39200..bfc21ca4d43 100644 --- a/src/solvers/qbf/qbf_skizzo.h +++ b/src/solvers/qbf/qbf_skizzo.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_QBF_SKIZZO_H -#define CPROVER_QBF_SKIZZO_H +#ifndef CPROVER_SOLVERS_QBF_QBF_SKIZZO_H +#define CPROVER_SOLVERS_QBF_QBF_SKIZZO_H #include "qdimacs_cnf.h" @@ -22,4 +22,4 @@ class qbf_skizzot:public qdimacs_cnft virtual tvt l_get(literalt a) const; }; -#endif +#endif // CPROVER_SOLVERS_QBF_QBF_SKIZZO_H diff --git a/src/solvers/qbf/qbf_skizzo_core.h b/src/solvers/qbf/qbf_skizzo_core.h index 7c594c9d716..376936de4e5 100644 --- a/src/solvers/qbf/qbf_skizzo_core.h +++ b/src/solvers/qbf/qbf_skizzo_core.h @@ -6,8 +6,8 @@ Author: CM Wintersteiger \*******************************************************************/ -#ifndef CPROVER_QBF_SKIZZO_CORE_H -#define CPROVER_QBF_SKIZZO_CORE_H +#ifndef CPROVER_SOLVERS_QBF_QBF_SKIZZO_CORE_H +#define CPROVER_SOLVERS_QBF_QBF_SKIZZO_CORE_H #include "qbf_bdd_core.h" @@ -30,4 +30,4 @@ class qbf_skizzo_coret : bool get_certificate(void); }; -#endif +#endif // CPROVER_SOLVERS_QBF_QBF_SKIZZO_CORE_H diff --git a/src/solvers/qbf/qbf_squolem.h b/src/solvers/qbf/qbf_squolem.h index 844e014c57b..1780528fb32 100644 --- a/src/solvers/qbf/qbf_squolem.h +++ b/src/solvers/qbf/qbf_squolem.h @@ -6,8 +6,8 @@ Author: CM Wintersteiger \*******************************************************************/ -#ifndef CPROVER_QBF_SQUOLEM_H -#define CPROVER_QBF_SQUOLEM_H +#ifndef CPROVER_SOLVERS_QBF_QBF_SQUOLEM_H +#define CPROVER_SOLVERS_QBF_QBF_SQUOLEM_H #include @@ -34,4 +34,4 @@ class qbf_squolemt:public qdimacs_cnft virtual size_t no_clauses() const { return squolem.clauses(); } }; -#endif /*_CPROVER_QBF_SQUOLEM_H_*/ +#endif // CPROVER_SOLVERS_QBF_QBF_SQUOLEM_H diff --git a/src/solvers/qbf/qbf_squolem_core.h b/src/solvers/qbf/qbf_squolem_core.h index dd81babdf1c..7227e5dee27 100644 --- a/src/solvers/qbf/qbf_squolem_core.h +++ b/src/solvers/qbf/qbf_squolem_core.h @@ -6,8 +6,8 @@ Author: CM Wintersteiger \*******************************************************************/ -#ifndef CPROVER_QBF_SQUOLEM_CORE_H -#define CPROVER_QBF_SQUOLEM_CORE_H +#ifndef CPROVER_SOLVERS_QBF_QBF_SQUOLEM_CORE_H +#define CPROVER_SOLVERS_QBF_QBF_SQUOLEM_CORE_H #include #include @@ -56,4 +56,4 @@ class qbf_squolem_coret:public qdimacs_coret void setup(void); }; -#endif /*_CPROVER_QBF_SQUOLEM_CORE_H_*/ +#endif // CPROVER_SOLVERS_QBF_QBF_SQUOLEM_CORE_H diff --git a/src/solvers/qbf/qdimacs_cnf.h b/src/solvers/qbf/qdimacs_cnf.h index 4d4778210fb..5e4b342836a 100644 --- a/src/solvers/qbf/qdimacs_cnf.h +++ b/src/solvers/qbf/qdimacs_cnf.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_QBF_QDIMACS_CNF_H -#define CPROVER_QBF_QDIMACS_CNF_H +#ifndef CPROVER_SOLVERS_QBF_QDIMACS_CNF_H +#define CPROVER_SOLVERS_QBF_QDIMACS_CNF_H #include #include @@ -92,4 +92,4 @@ class qdimacs_cnft:public dimacs_cnft void write_prefix(std::ostream &out) const; }; -#endif +#endif // CPROVER_SOLVERS_QBF_QDIMACS_CNF_H diff --git a/src/solvers/qbf/qdimacs_core.h b/src/solvers/qbf/qdimacs_core.h index 634e2c3cb1f..4f4a7c70a18 100644 --- a/src/solvers/qbf/qdimacs_core.h +++ b/src/solvers/qbf/qdimacs_core.h @@ -6,8 +6,8 @@ Author: CM Wintersteiger \*******************************************************************/ -#ifndef CPROVER_QDIMACS_CORE_H -#define CPROVER_QDIMACS_CORE_H +#ifndef CPROVER_SOLVERS_QBF_QDIMACS_CORE_H +#define CPROVER_SOLVERS_QBF_QDIMACS_CORE_H #include @@ -32,4 +32,4 @@ class qdimacs_coret:public qdimacs_cnft void simplify_extractbits(exprt &expr) const; }; -#endif /*CPROVER_QDIMACS_CORE_H*/ +#endif // CPROVER_SOLVERS_QBF_QDIMACS_CORE_H diff --git a/src/solvers/refinement/bv_refinement.h b/src/solvers/refinement/bv_refinement.h index 5474a8f1af3..de18da27361 100644 --- a/src/solvers/refinement/bv_refinement.h +++ b/src/solvers/refinement/bv_refinement.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_SOLVER_BV_REFINEMENT_H -#define CPROVER_SOLVER_BV_REFINEMENT_H +#ifndef CPROVER_SOLVERS_REFINEMENT_BV_REFINEMENT_H +#define CPROVER_SOLVERS_REFINEMENT_BV_REFINEMENT_H #include @@ -111,4 +111,4 @@ class bv_refinementt:public bv_pointerst }; -#endif +#endif // CPROVER_SOLVERS_REFINEMENT_BV_REFINEMENT_H diff --git a/src/solvers/sat/cnf.h b/src/solvers/sat/cnf.h index e6ac768336e..e9519fb8d79 100644 --- a/src/solvers/sat/cnf.h +++ b/src/solvers/sat/cnf.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_PROP_CNF_H -#define CPROVER_PROP_CNF_H +#ifndef CPROVER_SOLVERS_SAT_CNF_H +#define CPROVER_SOLVERS_SAT_CNF_H #include @@ -76,4 +76,4 @@ class cnf_solvert:public cnft size_t clause_counter; }; -#endif +#endif // CPROVER_SOLVERS_SAT_CNF_H diff --git a/src/solvers/sat/cnf_clause_list.h b/src/solvers/sat/cnf_clause_list.h index 41ce1d2112f..78cc650ff6e 100644 --- a/src/solvers/sat/cnf_clause_list.h +++ b/src/solvers/sat/cnf_clause_list.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_PROP_CNF_CLAUSE_LIST_H -#define CPROVER_PROP_CNF_CLAUSE_LIST_H +#ifndef CPROVER_SOLVERS_SAT_CNF_CLAUSE_LIST_H +#define CPROVER_SOLVERS_SAT_CNF_CLAUSE_LIST_H #include @@ -107,4 +107,4 @@ class cnf_clause_list_assignmentt:public cnf_clause_listt assignmentt assignment; }; -#endif +#endif // CPROVER_SOLVERS_SAT_CNF_CLAUSE_LIST_H diff --git a/src/solvers/sat/dimacs_cnf.h b/src/solvers/sat/dimacs_cnf.h index 7456d27e907..1dac83b4a89 100644 --- a/src/solvers/sat/dimacs_cnf.h +++ b/src/solvers/sat/dimacs_cnf.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_DIMACS_CNF_H -#define CPROVER_DIMACS_CNF_H +#ifndef CPROVER_SOLVERS_SAT_DIMACS_CNF_H +#define CPROVER_SOLVERS_SAT_DIMACS_CNF_H #include @@ -67,4 +67,4 @@ class dimacs_cnf_dumpt:public cnft std::ostream &out; }; -#endif +#endif // CPROVER_SOLVERS_SAT_DIMACS_CNF_H diff --git a/src/solvers/sat/pbs_dimacs_cnf.h b/src/solvers/sat/pbs_dimacs_cnf.h index 2ab03289067..915429016e7 100644 --- a/src/solvers/sat/pbs_dimacs_cnf.h +++ b/src/solvers/sat/pbs_dimacs_cnf.h @@ -6,8 +6,8 @@ Author: Alex Groce \*******************************************************************/ -#ifndef CPROVER_PBS_DIMACS_CNF_H -#define CPROVER_PBS_DIMACS_CNF_H +#ifndef CPROVER_SOLVERS_SAT_PBS_DIMACS_CNF_H +#define CPROVER_SOLVERS_SAT_PBS_DIMACS_CNF_H #include #include @@ -60,4 +60,4 @@ class pbs_dimacs_cnft:public dimacs_cnft std::set assigned; }; -#endif +#endif // CPROVER_SOLVERS_SAT_PBS_DIMACS_CNF_H diff --git a/src/solvers/sat/read_dimacs_cnf.h b/src/solvers/sat/read_dimacs_cnf.h index 13c34b5b84e..2a0c0cb3950 100644 --- a/src/solvers/sat/read_dimacs_cnf.h +++ b/src/solvers/sat/read_dimacs_cnf.h @@ -6,11 +6,11 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef __CPROVER_READ_DIMACS_CNF_H -#define __CPROVER_READ_DIMACS_CNF_H +#ifndef CPROVER_SOLVERS_SAT_READ_DIMACS_CNF_H +#define CPROVER_SOLVERS_SAT_READ_DIMACS_CNF_H #include "cnf.h" void read_dimacs_cnf(std::istream &in, cnft &dest); -#endif +#endif // CPROVER_SOLVERS_SAT_READ_DIMACS_CNF_H diff --git a/src/solvers/sat/resolution_proof.h b/src/solvers/sat/resolution_proof.h index 2dc95099dfb..dc810620aaf 100644 --- a/src/solvers/sat/resolution_proof.h +++ b/src/solvers/sat/resolution_proof.h @@ -45,4 +45,4 @@ class resolution_prooft typedef resolution_prooft simple_prooft; -#endif +#endif // CPROVER_SOLVERS_SAT_RESOLUTION_PROOF_H diff --git a/src/solvers/sat/satcheck.h b/src/solvers/sat/satcheck.h index 06ae6e9e650..69d75fbabec 100644 --- a/src/solvers/sat/satcheck.h +++ b/src/solvers/sat/satcheck.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_SATCHECK_H -#define CPROVER_SATCHECK_H +#ifndef CPROVER_SOLVERS_SAT_SATCHECK_H +#define CPROVER_SOLVERS_SAT_SATCHECK_H // this picks the "default" SAT solver @@ -78,4 +78,4 @@ typedef satcheck_glucose_no_simplifiert satcheck_no_simplifiert; #endif -#endif +#endif // CPROVER_SOLVERS_SAT_SATCHECK_H diff --git a/src/solvers/sat/satcheck_booleforce.h b/src/solvers/sat/satcheck_booleforce.h index faa24dbfdec..6dd3ac69ffd 100644 --- a/src/solvers/sat/satcheck_booleforce.h +++ b/src/solvers/sat/satcheck_booleforce.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_SATCHECK_BOOLEFORCE_H -#define CPROVER_SATCHECK_BOOLEFORCE_H +#ifndef CPROVER_SOLVERS_SAT_SATCHECK_BOOLEFORCE_H +#define CPROVER_SOLVERS_SAT_SATCHECK_BOOLEFORCE_H #include #include @@ -40,4 +40,4 @@ class satcheck_booleforce_coret:public satcheck_booleforce_baset bool is_in_core(literalt l) const; }; -#endif +#endif // CPROVER_SOLVERS_SAT_SATCHECK_BOOLEFORCE_H diff --git a/src/solvers/sat/satcheck_core.h b/src/solvers/sat/satcheck_core.h index a279136ba3e..0c9c4550b8e 100644 --- a/src/solvers/sat/satcheck_core.h +++ b/src/solvers/sat/satcheck_core.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_SATCHECK_CORE_H -#define CPROVER_SATCHECK_CORE_H +#ifndef CPROVER_SOLVERS_SAT_SATCHECK_CORE_H +#define CPROVER_SOLVERS_SAT_SATCHECK_CORE_H //#define SATCHECK_CORE_ZCHAFF //#define SATCHECK_CORE_MINISAT1 @@ -40,4 +40,4 @@ typedef satcheck_minisat1_coret satcheck_coret; #endif #endif -#endif +#endif // CPROVER_SOLVERS_SAT_SATCHECK_CORE_H diff --git a/src/solvers/sat/satcheck_glucose.h b/src/solvers/sat/satcheck_glucose.h index 4764aa28372..12f1ec8f32f 100644 --- a/src/solvers/sat/satcheck_glucose.h +++ b/src/solvers/sat/satcheck_glucose.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_SATCHECK_GLUCOSE_H -#define CPROVER_SATCHECK_GLUCOSE_H +#ifndef CPROVER_SOLVERS_SAT_SATCHECK_GLUCOSE_H +#define CPROVER_SOLVERS_SAT_SATCHECK_GLUCOSE_H #include "cnf.h" @@ -70,4 +70,4 @@ class satcheck_glucose_simplifiert: bool is_eliminated(literalt a) const; }; -#endif +#endif // CPROVER_SOLVERS_SAT_SATCHECK_GLUCOSE_H diff --git a/src/solvers/sat/satcheck_limmat.h b/src/solvers/sat/satcheck_limmat.h index 9fcbc67459f..1ef88177176 100644 --- a/src/solvers/sat/satcheck_limmat.h +++ b/src/solvers/sat/satcheck_limmat.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_SATCHECK_LIMMAT_H -#define CPROVER_SATCHECK_LIMMAT_H +#ifndef CPROVER_SOLVERS_SAT_SATCHECK_LIMMAT_H +#define CPROVER_SOLVERS_SAT_SATCHECK_LIMMAT_H #include #include "dimacs_cnf.h" @@ -29,4 +29,4 @@ class satcheck_limmatt:public dimacs_cnft std::vector assignment; }; -#endif +#endif // CPROVER_SOLVERS_SAT_SATCHECK_LIMMAT_H diff --git a/src/solvers/sat/satcheck_lingeling.h b/src/solvers/sat/satcheck_lingeling.h index 61abefb9d60..e98c46179a3 100644 --- a/src/solvers/sat/satcheck_lingeling.h +++ b/src/solvers/sat/satcheck_lingeling.h @@ -6,8 +6,8 @@ Author: Michael Tautschnig, michael.tautschnig@cs.ox.ac.uk \*******************************************************************/ -#ifndef CPROVER_satcheck_lingeling_H -#define CPROVER_satcheck_lingeling_H +#ifndef CPROVER_SOLVERS_SAT_SATCHECK_LINGELING_H +#define CPROVER_SOLVERS_SAT_SATCHECK_LINGELING_H #include "cnf.h" @@ -37,4 +37,4 @@ class satcheck_lingelingt:public cnf_solvert bvt assumptions; }; -#endif +#endif // CPROVER_SOLVERS_SAT_SATCHECK_LINGELING_H diff --git a/src/solvers/sat/satcheck_minisat.h b/src/solvers/sat/satcheck_minisat.h index a755ff2023b..d818e91ec7d 100644 --- a/src/solvers/sat/satcheck_minisat.h +++ b/src/solvers/sat/satcheck_minisat.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_SATCHECK_MINISAT_H -#define CPROVER_SATCHECK_MINISAT_H +#ifndef CPROVER_SOLVERS_SAT_SATCHECK_MINISAT_H +#define CPROVER_SOLVERS_SAT_SATCHECK_MINISAT_H #include @@ -88,4 +88,4 @@ class satcheck_minisat1_coret:public satcheck_minisat1_prooft protected: std::vector in_core; }; -#endif +#endif // CPROVER_SOLVERS_SAT_SATCHECK_MINISAT_H diff --git a/src/solvers/sat/satcheck_minisat2.h b/src/solvers/sat/satcheck_minisat2.h index b5b7e301d3e..d7b72bd0425 100644 --- a/src/solvers/sat/satcheck_minisat2.h +++ b/src/solvers/sat/satcheck_minisat2.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_SATCHECK_MINISAT2_H -#define CPROVER_SATCHECK_MINISAT2_H +#ifndef CPROVER_SOLVERS_SAT_SATCHECK_MINISAT2_H +#define CPROVER_SOLVERS_SAT_SATCHECK_MINISAT2_H #include "cnf.h" @@ -70,4 +70,4 @@ class satcheck_minisat_simplifiert: bool is_eliminated(literalt a) const; }; -#endif +#endif // CPROVER_SOLVERS_SAT_SATCHECK_MINISAT2_H diff --git a/src/solvers/sat/satcheck_picosat.h b/src/solvers/sat/satcheck_picosat.h index c52ccddc89b..8c684d15568 100644 --- a/src/solvers/sat/satcheck_picosat.h +++ b/src/solvers/sat/satcheck_picosat.h @@ -6,8 +6,8 @@ Author: Michael Tautschnig, michael.tautschnig@cs.ox.ac.uk \*******************************************************************/ -#ifndef CPROVER_SATCHECK_PICOSAT_H -#define CPROVER_SATCHECK_PICOSAT_H +#ifndef CPROVER_SOLVERS_SAT_SATCHECK_PICOSAT_H +#define CPROVER_SOLVERS_SAT_SATCHECK_PICOSAT_H #include "cnf.h" @@ -38,4 +38,4 @@ class satcheck_picosatt:public cnf_solvert PicoSAT *picosat; }; -#endif +#endif // CPROVER_SOLVERS_SAT_SATCHECK_PICOSAT_H diff --git a/src/solvers/sat/satcheck_precosat.h b/src/solvers/sat/satcheck_precosat.h index a62e44edd58..9f28d22b10b 100644 --- a/src/solvers/sat/satcheck_precosat.h +++ b/src/solvers/sat/satcheck_precosat.h @@ -6,8 +6,8 @@ Author: Michael Tautschnig, michael.tautschnig@cs.ox.ac.uk \*******************************************************************/ -#ifndef CPROVER_SATCHECK_PRECOSAT_H -#define CPROVER_SATCHECK_PRECOSAT_H +#ifndef CPROVER_SOLVERS_SAT_SATCHECK_PRECOSAT_H +#define CPROVER_SOLVERS_SAT_SATCHECK_PRECOSAT_H #include "cnf.h" @@ -40,4 +40,4 @@ class satcheck_precosatt:public cnf_solvert // bvt assumptions; }; -#endif +#endif // CPROVER_SOLVERS_SAT_SATCHECK_PRECOSAT_H diff --git a/src/solvers/sat/satcheck_smvsat.h b/src/solvers/sat/satcheck_smvsat.h index 03c65bd0c49..a4079794b14 100644 --- a/src/solvers/sat/satcheck_smvsat.h +++ b/src/solvers/sat/satcheck_smvsat.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_SATCHECK_SMVSAT_H -#define CPROVER_SATCHECK_SMVSAT_H +#ifndef CPROVER_SOLVERS_SAT_SATCHECK_SMVSAT_H +#define CPROVER_SOLVERS_SAT_SATCHECK_SMVSAT_H #include #include @@ -85,4 +85,4 @@ class satcheck_smvsat_interpolatort:public satcheck_smvsatt }; -#endif +#endif // CPROVER_SOLVERS_SAT_SATCHECK_SMVSAT_H diff --git a/src/solvers/sat/satcheck_zchaff.h b/src/solvers/sat/satcheck_zchaff.h index 24805248b20..d86a426be9f 100644 --- a/src/solvers/sat/satcheck_zchaff.h +++ b/src/solvers/sat/satcheck_zchaff.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_SATCHECK_ZCHAFF_H -#define CPROVER_SATCHECK_ZCHAFF_H +#ifndef CPROVER_SOLVERS_SAT_SATCHECK_ZCHAFF_H +#define CPROVER_SOLVERS_SAT_SATCHECK_ZCHAFF_H #include "cnf_clause_list.h" @@ -46,4 +46,4 @@ class satcheck_zchafft:public satcheck_zchaff_baset virtual ~satcheck_zchafft(); }; -#endif +#endif // CPROVER_SOLVERS_SAT_SATCHECK_ZCHAFF_H diff --git a/src/solvers/sat/satcheck_zcore.h b/src/solvers/sat/satcheck_zcore.h index 34acaeb1656..fdd152bfdc9 100644 --- a/src/solvers/sat/satcheck_zcore.h +++ b/src/solvers/sat/satcheck_zcore.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_SATCHECK_ZCORE_H -#define CPROVER_SATCHECK_ZCORE_H +#ifndef CPROVER_SOLVERS_SAT_SATCHECK_ZCORE_H +#define CPROVER_SOLVERS_SAT_SATCHECK_ZCORE_H #include @@ -32,4 +32,4 @@ class satcheck_zcoret:public dimacs_cnft std::set in_core; }; -#endif +#endif // CPROVER_SOLVERS_SAT_SATCHECK_ZCORE_H diff --git a/src/solvers/smt1/smt1_conv.h b/src/solvers/smt1/smt1_conv.h index f4c6404e21f..8785f3f70c0 100644 --- a/src/solvers/smt1/smt1_conv.h +++ b/src/solvers/smt1/smt1_conv.h @@ -7,8 +7,8 @@ Revision: Roberto Bruttomesso, roberto.bruttomesso@unisi.ch \*******************************************************************/ -#ifndef CPROVER_SOLVER_SMT_CONV_H -#define CPROVER_SOLVER_SMT_CONV_H +#ifndef CPROVER_SOLVERS_SMT1_SMT1_CONV_H +#define CPROVER_SOLVERS_SMT1_SMT1_CONV_H #include #include @@ -199,4 +199,4 @@ class smt1_convt:public prop_convt std::vector boolean_assignment; }; -#endif +#endif // CPROVER_SOLVERS_SMT1_SMT1_CONV_H diff --git a/src/solvers/smt1/smt1_dec.h b/src/solvers/smt1/smt1_dec.h index e1e9d66b90e..3cc6de03d46 100644 --- a/src/solvers/smt1/smt1_dec.h +++ b/src/solvers/smt1/smt1_dec.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_PROP_SMT_DEC_H -#define CPROVER_PROP_SMT_DEC_H +#ifndef CPROVER_SOLVERS_SMT1_SMT1_DEC_H +#define CPROVER_SOLVERS_SMT1_SMT1_DEC_H /*! \defgroup gr_smt1 SMT-LIB 1.x Interface */ @@ -74,4 +74,4 @@ class smt1_dect:protected smt1_temp_filet, public smt1_convt }; }; -#endif +#endif // CPROVER_SOLVERS_SMT1_SMT1_DEC_H diff --git a/src/solvers/smt1/smt1_prop.h b/src/solvers/smt1/smt1_prop.h index f9ca8507a91..1a7a5b86ddf 100644 --- a/src/solvers/smt1/smt1_prop.h +++ b/src/solvers/smt1/smt1_prop.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_PROP_SMT_PROP_H -#define CPROVER_PROP_SMT_PROP_H +#ifndef CPROVER_SOLVERS_SMT1_SMT1_PROP_H +#define CPROVER_SOLVERS_SMT1_SMT1_PROP_H #include @@ -77,4 +77,4 @@ class smt1_propt:public propt std::vector assignment; }; -#endif +#endif // CPROVER_SOLVERS_SMT1_SMT1_PROP_H diff --git a/src/solvers/smt2/smt2_conv.h b/src/solvers/smt2/smt2_conv.h index ddd91243723..cd82485d875 100644 --- a/src/solvers/smt2/smt2_conv.h +++ b/src/solvers/smt2/smt2_conv.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_SOLVER_SMT2_CONV_H -#define CPROVER_SOLVER_SMT2_CONV_H +#ifndef CPROVER_SOLVERS_SMT2_SMT2_CONV_H +#define CPROVER_SOLVERS_SMT2_SMT2_CONV_H #include #include @@ -294,4 +294,4 @@ class smt2_convt:public prop_convt std::vector boolean_assignment; }; -#endif +#endif // CPROVER_SOLVERS_SMT2_SMT2_CONV_H diff --git a/src/solvers/smt2/smt2_dec.h b/src/solvers/smt2/smt2_dec.h index 009ba538b12..30bf18f8796 100644 --- a/src/solvers/smt2/smt2_dec.h +++ b/src/solvers/smt2/smt2_dec.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_PROP_SMT2_DEC_H -#define CPROVER_PROP_SMT2_DEC_H +#ifndef CPROVER_SOLVERS_SMT2_SMT2_DEC_H +#define CPROVER_SOLVERS_SMT2_SMT2_DEC_H /*! \defgroup gr_smt2 SMT-LIB 2.x Interface */ @@ -57,4 +57,4 @@ class smt2_dect:protected smt2_stringstreamt, public smt2_convt resultt read_result(std::istream &in); }; -#endif +#endif // CPROVER_SOLVERS_SMT2_SMT2_DEC_H diff --git a/src/solvers/smt2/smt2_parser.h b/src/solvers/smt2/smt2_parser.h index 0037b7bc9de..41e95a45ffe 100644 --- a/src/solvers/smt2/smt2_parser.h +++ b/src/solvers/smt2/smt2_parser.h @@ -6,6 +6,9 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#ifndef CPROVER_SOLVERS_SMT2_SMT2_PARSER_H +#define CPROVER_SOLVERS_SMT2_SMT2_PARSER_H + #include #include @@ -43,3 +46,5 @@ class smt2_parsert void get_string_literal(); bool is_simple_symbol_character(char ch); }; + +#endif // CPROVER_SOLVERS_SMT2_SMT2_PARSER_H diff --git a/src/solvers/smt2/smt2_prop.h b/src/solvers/smt2/smt2_prop.h index 8dd8dd04958..e417adbafbe 100644 --- a/src/solvers/smt2/smt2_prop.h +++ b/src/solvers/smt2/smt2_prop.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_PROP_SMT2_PROP_H -#define CPROVER_PROP_SMT2_PROP_H +#ifndef CPROVER_SOLVERS_SMT2_SMT2_PROP_H +#define CPROVER_SOLVERS_SMT2_SMT2_PROP_H #include #include @@ -86,4 +86,4 @@ class smt2_propt:public propt bool core_enabled; }; -#endif +#endif // CPROVER_SOLVERS_SMT2_SMT2_PROP_H diff --git a/src/solvers/smt2/smt2irep.h b/src/solvers/smt2/smt2irep.h index d910760ec87..52791c69783 100644 --- a/src/solvers/smt2/smt2irep.h +++ b/src/solvers/smt2/smt2irep.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_SOLVER_SMT2IREP_H -#define CPROVER_SOLVER_SMT2IREP_H +#ifndef CPROVER_SOLVERS_SMT2_SMT2IREP_H +#define CPROVER_SOLVERS_SMT2_SMT2IREP_H #include @@ -15,4 +15,4 @@ Author: Daniel Kroening, kroening@kroening.com irept smt2irep(std::istream &); -#endif +#endif // CPROVER_SOLVERS_SMT2_SMT2IREP_H diff --git a/src/symex/path_search.h b/src/symex/path_search.h index 40c3b1241a7..bebe91a5ea7 100644 --- a/src/symex/path_search.h +++ b/src/symex/path_search.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_PATH_SEARCH_H -#define CPROVER_PATH_SEARCH_H +#ifndef CPROVER_SYMEX_PATH_SEARCH_H +#define CPROVER_SYMEX_PATH_SEARCH_H #include #include @@ -136,4 +136,4 @@ class path_searcht:public safety_checkert enum class search_heuristict { DFS, BFS, LOCS } search_heuristic; }; -#endif +#endif // CPROVER_SYMEX_PATH_SEARCH_H diff --git a/src/symex/symex_parse_options.h b/src/symex/symex_parse_options.h index 0a84fa98b32..0ae56a9c6b8 100644 --- a/src/symex/symex_parse_options.h +++ b/src/symex/symex_parse_options.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_SYMEX_PARSE_OPTIONS_H -#define CPROVER_SYMEX_PARSE_OPTIONS_H +#ifndef CPROVER_SYMEX_SYMEX_PARSE_OPTIONS_H +#define CPROVER_SYMEX_SYMEX_PARSE_OPTIONS_H #include #include @@ -73,4 +73,4 @@ class symex_parse_optionst: std::string get_test(const goto_tracet &goto_trace); }; -#endif +#endif // CPROVER_SYMEX_SYMEX_PARSE_OPTIONS_H diff --git a/src/util/arith_tools.h b/src/util/arith_tools.h index ac597d9ec63..227910b0674 100644 --- a/src/util/arith_tools.h +++ b/src/util/arith_tools.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_ARITH_TOOLS_H -#define CPROVER_ARITH_TOOLS_H +#ifndef CPROVER_UTIL_ARITH_TOOLS_H +#define CPROVER_UTIL_ARITH_TOOLS_H #include "mp_arith.h" @@ -33,4 +33,4 @@ mp_integer power(const mp_integer &base, const mp_integer &exponent); void mp_min(mp_integer &a, const mp_integer &b); void mp_max(mp_integer &a, const mp_integer &b); -#endif +#endif // CPROVER_UTIL_ARITH_TOOLS_H diff --git a/src/util/array_name.h b/src/util/array_name.h index 4f093a69cd7..8c797668a65 100644 --- a/src/util/array_name.h +++ b/src/util/array_name.h @@ -6,9 +6,14 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#ifndef CPROVER_UTIL_ARRAY_NAME_H +#define CPROVER_UTIL_ARRAY_NAME_H + #include class namespacet; class exprt; std::string array_name(const namespacet &ns, const exprt &expr); + +#endif // CPROVER_UTIL_ARRAY_NAME_H diff --git a/src/util/base_type.h b/src/util/base_type.h index a00c57c3827..b456f417de4 100644 --- a/src/util/base_type.h +++ b/src/util/base_type.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_BASE_TYPE_H -#define CPROVER_BASE_TYPE_H +#ifndef CPROVER_UTIL_BASE_TYPE_H +#define CPROVER_UTIL_BASE_TYPE_H #include "union_find.h" #include "irep.h" @@ -66,4 +66,4 @@ class base_type_eqt identifierst identifiers; }; -#endif +#endif // CPROVER_UTIL_BASE_TYPE_H diff --git a/src/util/bv_arithmetic.h b/src/util/bv_arithmetic.h index 9850bf43845..888cdd2606c 100644 --- a/src/util/bv_arithmetic.h +++ b/src/util/bv_arithmetic.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_BV_ARITHMETIC_H -#define CPROVER_BV_ARITHMETIC_H +#ifndef CPROVER_UTIL_BV_ARITHMETIC_H +#define CPROVER_UTIL_BV_ARITHMETIC_H #include @@ -127,4 +127,4 @@ bool operator ==(const bv_arithmetict &a, const bv_arithmetict &b); bool operator !=(const bv_arithmetict &a, const bv_arithmetict &b); std::ostream& operator << (std::ostream &, const bv_arithmetict &); -#endif +#endif // CPROVER_UTIL_BV_ARITHMETIC_H diff --git a/src/util/byte_operators.h b/src/util/byte_operators.h index d6f5c3207dd..6b1878b9a0e 100644 --- a/src/util/byte_operators.h +++ b/src/util/byte_operators.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_BYTE_OPERATORS_H -#define CPROVER_BYTE_OPERATORS_H +#ifndef CPROVER_UTIL_BYTE_OPERATORS_H +#define CPROVER_UTIL_BYTE_OPERATORS_H /*! \file util/byte_operators.h * \brief Expression classes for byte-level operators @@ -222,4 +222,4 @@ extern inline byte_update_big_endian_exprt &to_byte_update_big_endian_expr(exprt return static_cast(expr); } -#endif +#endif // CPROVER_UTIL_BYTE_OPERATORS_H diff --git a/src/util/c_misc.h b/src/util/c_misc.h index d7641392381..b40f186db1f 100644 --- a/src/util/c_misc.h +++ b/src/util/c_misc.h @@ -6,12 +6,12 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_C_MISC_H -#define CPROVER_C_MISC_H +#ifndef CPROVER_UTIL_C_MISC_H +#define CPROVER_UTIL_C_MISC_H #include std::string MetaChar(char c); std::string MetaString(const std::string &in); -#endif +#endif // CPROVER_UTIL_C_MISC_H diff --git a/src/util/cmdline.h b/src/util/cmdline.h index ce14c2d72e2..1fb10dd298a 100644 --- a/src/util/cmdline.h +++ b/src/util/cmdline.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_CMDLINE_H -#define CPROVER_CMDLINE_H +#ifndef CPROVER_UTIL_CMDLINE_H +#define CPROVER_UTIL_CMDLINE_H #include #include @@ -51,4 +51,4 @@ class cmdlinet int getoptnr(const std::string &option) const; }; -#endif +#endif // CPROVER_UTIL_CMDLINE_H diff --git a/src/util/config.h b/src/util/config.h index 468989d3cff..49aebffc173 100644 --- a/src/util/config.h +++ b/src/util/config.h @@ -160,4 +160,4 @@ class configt extern configt config; -#endif +#endif // CPROVER_UTIL_CONFIG_H diff --git a/src/util/cout_message.h b/src/util/cout_message.h index ae066fdc8df..0cedb2b790c 100644 --- a/src/util/cout_message.h +++ b/src/util/cout_message.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_COUT_MESSAGE_H -#define CPROVER_COUT_MESSAGE_H +#ifndef CPROVER_UTIL_COUT_MESSAGE_H +#define CPROVER_UTIL_COUT_MESSAGE_H #include "message.h" @@ -32,4 +32,4 @@ class console_message_handlert:public message_handlert virtual void print(unsigned level, const std::string &message); }; -#endif +#endif // CPROVER_UTIL_COUT_MESSAGE_H diff --git a/src/util/cprover_prefix.h b/src/util/cprover_prefix.h index 299ee16cd66..e9090a3b808 100644 --- a/src/util/cprover_prefix.h +++ b/src/util/cprover_prefix.h @@ -1,3 +1,8 @@ +#ifndef CPROVER_UTIL_CPROVER_PREFIX_H +#define CPROVER_UTIL_CPROVER_PREFIX_H + #define CPROVER_PREFIX "__CPROVER_" #define CPROVER_FKT_PREFIX "__CPROVER_fkt_" #define CPROVER_MACRO_PREFIX "__CPROVER_macro_" + +#endif // CPROVER_UTIL_CPROVER_PREFIX_H diff --git a/src/util/decision_procedure.h b/src/util/decision_procedure.h index 663b5856d4a..c2e07d0081a 100644 --- a/src/util/decision_procedure.h +++ b/src/util/decision_procedure.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_DECISION_PROCEDURE_H -#define CPROVER_DECISION_PROCEDURE_H +#ifndef CPROVER_UTIL_DECISION_PROCEDURE_H +#define CPROVER_UTIL_DECISION_PROCEDURE_H #include "message.h" @@ -67,4 +67,4 @@ static inline decision_proceduret & operator << ( return dest; } -#endif +#endif // CPROVER_UTIL_DECISION_PROCEDURE_H diff --git a/src/util/dstring.h b/src/util/dstring.h index 1146ad4b9d2..cddf885265b 100644 --- a/src/util/dstring.h +++ b/src/util/dstring.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef DSTRING_H -#define DSTRING_H +#ifndef CPROVER_UTIL_DSTRING_H +#define CPROVER_UTIL_DSTRING_H #include @@ -163,4 +163,4 @@ size_t hash_string(const dstring &s); std::ostream &operator << (std::ostream &out, const dstring &a); -#endif +#endif // CPROVER_UTIL_DSTRING_H diff --git a/src/util/endianness_map.h b/src/util/endianness_map.h index 4f0b6266634..4d5fd9825b6 100644 --- a/src/util/endianness_map.h +++ b/src/util/endianness_map.h @@ -69,4 +69,4 @@ extern inline std::ostream &operator << ( return out; } -#endif +#endif // CPROVER_UTIL_ENDIANNESS_MAP_H diff --git a/src/util/error.h b/src/util/error.h index cb901c90de2..5b22b1a861f 100644 --- a/src/util/error.h +++ b/src/util/error.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_ERROR_H -#define CPROVER_ERROR_H +#ifndef CPROVER_UTIL_ERROR_H +#define CPROVER_UTIL_ERROR_H #include #include @@ -81,4 +81,4 @@ class error_str:public error_baset, public std::ostringstream } }; -#endif +#endif // CPROVER_UTIL_ERROR_H diff --git a/src/util/expanding_vector.h b/src/util/expanding_vector.h index b467a7148d9..919f91888fc 100644 --- a/src/util/expanding_vector.h +++ b/src/util/expanding_vector.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_EXPANDING_VECTOR_H -#define CPROVER_EXPANDING_VECTOR_H +#ifndef CPROVER_UTIL_EXPANDING_VECTOR_H +#define CPROVER_UTIL_EXPANDING_VECTOR_H #include @@ -38,4 +38,4 @@ class expanding_vector:public std::vector } }; -#endif +#endif // CPROVER_UTIL_EXPANDING_VECTOR_H diff --git a/src/util/expr.h b/src/util/expr.h index b12fcd0b984..620d23316f6 100644 --- a/src/util/expr.h +++ b/src/util/expr.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_EXPR_H -#define CPROVER_EXPR_H +#ifndef CPROVER_UTIL_EXPR_H +#define CPROVER_UTIL_EXPR_H #define OPERANDS_IN_GETSUB @@ -172,4 +172,4 @@ class const_expr_visitort virtual void operator()(const exprt &expr) { } }; -#endif +#endif // CPROVER_UTIL_EXPR_H diff --git a/src/util/expr_util.h b/src/util/expr_util.h index 1b1b5178bac..513b7cfb342 100644 --- a/src/util/expr_util.h +++ b/src/util/expr_util.h @@ -6,6 +6,9 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#ifndef CPROVER_UTIL_EXPR_UTIL_H +#define CPROVER_UTIL_EXPR_UTIL_H + /*! \file util/expr_util.h * \brief Deprecated expression utility functions * @@ -59,3 +62,5 @@ bool has_subexpr(const exprt &, const irep_idt &); /*! lift up an if_exprt one level */ if_exprt lift_if(const exprt &, std::size_t operand_number); + +#endif // CPROVER_UTIL_EXPR_UTIL_H diff --git a/src/util/file_util.h b/src/util/file_util.h index 94939c9d6ec..f1bd21b37e2 100644 --- a/src/util/file_util.h +++ b/src/util/file_util.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_FILE_UTIL_H -#define CPROVER_FILE_UTIL_H +#ifndef CPROVER_UTIL_FILE_UTIL_H +#define CPROVER_UTIL_FILE_UTIL_H #include @@ -18,4 +18,4 @@ std::string get_current_working_directory(); std::string concat_dir_file(const std::string &directory, const std::string &file_name); -#endif +#endif // CPROVER_UTIL_FILE_UTIL_H diff --git a/src/util/find_macros.h b/src/util/find_macros.h index abaa138921c..86f56e2ef8c 100644 --- a/src/util/find_macros.h +++ b/src/util/find_macros.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_FIND_MACROS_H -#define CPROVER_FIND_MACROS_H +#ifndef CPROVER_UTIL_FIND_MACROS_H +#define CPROVER_UTIL_FIND_MACROS_H #include "hash_cont.h" #include "irep.h" @@ -22,4 +22,4 @@ void find_macros( const namespacet &ns, find_macros_sett &dest); -#endif +#endif // CPROVER_UTIL_FIND_MACROS_H diff --git a/src/util/find_symbols.h b/src/util/find_symbols.h index 29471e178b4..6f53cdc21b1 100644 --- a/src/util/find_symbols.h +++ b/src/util/find_symbols.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_FIND_SYMBOLS_H -#define CPROVER_FIND_SYMBOLS_H +#ifndef CPROVER_UTIL_FIND_SYMBOLS_H +#define CPROVER_UTIL_FIND_SYMBOLS_H #include @@ -66,4 +66,4 @@ void find_type_and_expr_symbols( const exprt &src, find_symbols_sett &dest); -#endif +#endif // CPROVER_UTIL_FIND_SYMBOLS_H diff --git a/src/util/fixedbv.h b/src/util/fixedbv.h index 58ce3068c63..3ea681f6aa3 100644 --- a/src/util/fixedbv.h +++ b/src/util/fixedbv.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_FIXEDBV_UTIL_H -#define CPROVER_FIXEDBV_UTIL_H +#ifndef CPROVER_UTIL_FIXEDBV_H +#define CPROVER_UTIL_FIXEDBV_H #include "mp_arith.h" #include "format_spec.h" @@ -96,4 +96,4 @@ bool operator >=(const fixedbvt &a, const fixedbvt &b); bool operator ==(const fixedbvt &a, const fixedbvt &b); bool operator !=(const fixedbvt &a, const fixedbvt &b); -#endif +#endif // CPROVER_UTIL_FIXEDBV_H diff --git a/src/util/format_constant.h b/src/util/format_constant.h index 36d896d0bc1..08702096596 100644 --- a/src/util/format_constant.h +++ b/src/util/format_constant.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_FORMAT_CONSTANT_H -#define CPROVER_FORMAT_CONSTANT_H +#ifndef CPROVER_UTIL_FORMAT_CONSTANT_H +#define CPROVER_UTIL_FORMAT_CONSTANT_H #include @@ -21,4 +21,4 @@ class format_constantt:public format_spect std::string operator()(const exprt &expr); }; -#endif +#endif // CPROVER_UTIL_FORMAT_CONSTANT_H diff --git a/src/util/format_spec.h b/src/util/format_spec.h index 1623a3f2cca..495d364d5cf 100644 --- a/src/util/format_spec.h +++ b/src/util/format_spec.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_FORMAT_SPEC_H -#define CPROVER_FORMAT_SPEC_H +#ifndef CPROVER_UTIL_FORMAT_SPEC_H +#define CPROVER_UTIL_FORMAT_SPEC_H // this mimics the 'printf' format string for a single 'directive' @@ -53,4 +53,4 @@ class format_spect } }; -#endif +#endif // CPROVER_UTIL_FORMAT_SPEC_H diff --git a/src/util/gcd.h b/src/util/gcd.h index f2d5d1fe117..1c23bb1e483 100644 --- a/src/util/gcd.h +++ b/src/util/gcd.h @@ -6,11 +6,11 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_GCD_H -#define CPROVER_GCD_H +#ifndef CPROVER_UTIL_GCD_H +#define CPROVER_UTIL_GCD_H #include "mp_arith.h" //mp_integer gcd(const mp_integer &a, const mp_integer &b); -#endif +#endif // CPROVER_UTIL_GCD_H diff --git a/src/util/get_base_name.h b/src/util/get_base_name.h index 42615df8d4c..648b4689dc8 100644 --- a/src/util/get_base_name.h +++ b/src/util/get_base_name.h @@ -8,6 +8,11 @@ Author: CM Wintersteiger \*******************************************************************/ +#ifndef CPROVER_UTIL_GET_BASE_NAME_H +#define CPROVER_UTIL_GET_BASE_NAME_H + #include std::string get_base_name(const std::string &in, bool strip_suffix); + +#endif // CPROVER_UTIL_GET_BASE_NAME_H diff --git a/src/util/get_module.h b/src/util/get_module.h index 854219b3e3d..1f1063c073c 100644 --- a/src/util/get_module.h +++ b/src/util/get_module.h @@ -6,6 +6,9 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#ifndef CPROVER_UTIL_GET_MODULE_H +#define CPROVER_UTIL_GET_MODULE_H + #include class symbol_tablet; @@ -16,3 +19,5 @@ const symbolt &get_module( const symbol_tablet &symbol_table, const std::string &module, message_handlert &message_handler); + +#endif // CPROVER_UTIL_GET_MODULE_H diff --git a/src/util/graph.h b/src/util/graph.h index da8ae6bc66e..26b8a835e6e 100644 --- a/src/util/graph.h +++ b/src/util/graph.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef __GRAPH_H -#define __GRAPH_H +#ifndef CPROVER_UTIL_GRAPH_H +#define CPROVER_UTIL_GRAPH_H #include #include @@ -723,4 +723,4 @@ void graph::output_dot_node(std::ostream &out, node_indext n) const out << n << " -> " << it->first << '\n'; } -#endif +#endif // CPROVER_UTIL_GRAPH_H diff --git a/src/util/guard.h b/src/util/guard.h index 2259f61c7f1..8a8508520fd 100644 --- a/src/util/guard.h +++ b/src/util/guard.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_GUARD_H -#define CPROVER_GUARD_H +#ifndef CPROVER_UTIL_GUARD_H +#define CPROVER_UTIL_GUARD_H #include @@ -98,4 +98,4 @@ class guardt:public exprt it!=(guard_list).end(); ++it) #endif -#endif +#endif // CPROVER_UTIL_GUARD_H diff --git a/src/util/hash_cont.h b/src/util/hash_cont.h index 606b8d9c08c..d6365bab7b1 100644 --- a/src/util/hash_cont.h +++ b/src/util/hash_cont.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_HASH_CONT_H -#define CPROVER_HASH_CONT_H +#ifndef CPROVER_UTIL_HASH_CONT_H +#define CPROVER_UTIL_HASH_CONT_H // You need to pick one of the following options: // @@ -90,4 +90,4 @@ typedef std::multiset hash_multiset_cont; #endif -#endif +#endif // CPROVER_UTIL_HASH_CONT_H diff --git a/src/util/i2string.h b/src/util/i2string.h index 6b87afcdfed..71f8eafbab0 100644 --- a/src/util/i2string.h +++ b/src/util/i2string.h @@ -6,6 +6,9 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#ifndef CPROVER_UTIL_I2STRING_H +#define CPROVER_UTIL_I2STRING_H + #include // One day, the below will be replaced by C++11's std::to_string. @@ -16,3 +19,5 @@ std::string i2string(signed long long int i); std::string i2string(unsigned int i); std::string i2string(unsigned long int i); std::string i2string(unsigned long long int i); + +#endif // CPROVER_UTIL_I2STRING_H diff --git a/src/util/identifier.h b/src/util/identifier.h index 502fa55342f..94dad2ecf13 100644 --- a/src/util/identifier.h +++ b/src/util/identifier.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_IDENTIFIER_H -#define CPROVER_IDENTIFIER_H +#ifndef CPROVER_UTIL_IDENTIFIER_H +#define CPROVER_UTIL_IDENTIFIER_H #include #include @@ -32,4 +32,4 @@ class identifiert void parse(const std::string &s); }; -#endif +#endif // CPROVER_UTIL_IDENTIFIER_H diff --git a/src/util/ieee_float.h b/src/util/ieee_float.h index 07d4a89a49b..ba6ea14bfec 100644 --- a/src/util/ieee_float.h +++ b/src/util/ieee_float.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_IEEE_FLOAT_H -#define CPROVER_IEEE_FLOAT_H +#ifndef CPROVER_UTIL_IEEE_FLOAT_H +#define CPROVER_UTIL_IEEE_FLOAT_H #include @@ -300,4 +300,4 @@ std::ostream& operator << (std::ostream &, const ieee_floatt &); bool ieee_equal(const ieee_floatt &a, const ieee_floatt &b); bool ieee_not_equal(const ieee_floatt &a, const ieee_floatt &b); -#endif +#endif // CPROVER_UTIL_IEEE_FLOAT_H diff --git a/src/util/interval_template.h b/src/util/interval_template.h index 76c08b68b0c..068edb83e5c 100644 --- a/src/util/interval_template.h +++ b/src/util/interval_template.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_INTERVAL_H -#define CPROVER_INTERVAL_H +#ifndef CPROVER_UTIL_INTERVAL_TEMPLATE_H +#define CPROVER_UTIL_INTERVAL_TEMPLATE_H #include #include @@ -231,4 +231,4 @@ std::ostream &operator << (std::ostream &out, const interval_template &i) return out; } -#endif +#endif // CPROVER_UTIL_INTERVAL_TEMPLATE_H diff --git a/src/util/irep.h b/src/util/irep.h index b912ee4be0b..dfdf9d38897 100644 --- a/src/util/irep.h +++ b/src/util/irep.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_IREP_H -#define CPROVER_IREP_H +#ifndef CPROVER_UTIL_IREP_H +#define CPROVER_UTIL_IREP_H #include #include @@ -384,4 +384,4 @@ struct irep_full_eq } }; -#endif +#endif // CPROVER_UTIL_IREP_H diff --git a/src/util/irep_hash.h b/src/util/irep_hash.h index 48962a92cbb..8af53d7d7a4 100644 --- a/src/util/irep_hash.h +++ b/src/util/irep_hash.h @@ -6,8 +6,8 @@ Author: Michael Tautschnig, mt@eecs.qmul.ac.uk \*******************************************************************/ -#ifndef CPROVER_IREP_HASH_H -#define CPROVER_IREP_HASH_H +#ifndef CPROVER_UTIL_IREP_HASH_H +#define CPROVER_UTIL_IREP_HASH_H // you need to pick one of the following options @@ -470,4 +470,4 @@ inline std::size_t murmurhash3_hash_finalize<64>( #endif -#endif +#endif // CPROVER_UTIL_IREP_HASH_H diff --git a/src/util/irep_hash_container.h b/src/util/irep_hash_container.h index c261a3e3dce..6e9025da16c 100644 --- a/src/util/irep_hash_container.h +++ b/src/util/irep_hash_container.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_IREP_HASH_H -#define CPROVER_IREP_HASH_H +#ifndef CPROVER_UTIL_IREP_HASH_CONTAINER_H +#define CPROVER_UTIL_IREP_HASH_CONTAINER_H #include // for size_t #include @@ -91,4 +91,4 @@ class irep_full_hash_containert: } }; -#endif +#endif // CPROVER_UTIL_IREP_HASH_CONTAINER_H diff --git a/src/util/irep_serialization.h b/src/util/irep_serialization.h index d75e8ef4d45..715e042300d 100644 --- a/src/util/irep_serialization.h +++ b/src/util/irep_serialization.h @@ -8,8 +8,8 @@ Date: May 2007 \*******************************************************************/ -#ifndef CPROVER_IREP_SERIALIZATION_H -#define CPROVER_IREP_SERIALIZATION_H +#ifndef CPROVER_UTIL_IREP_SERIALIZATION_H +#define CPROVER_UTIL_IREP_SERIALIZATION_H #include #include @@ -80,4 +80,4 @@ class irep_serializationt void read_irep(std::istream &, irept &irep); }; -#endif /*IREP_SERIALIZATION_H_*/ +#endif // CPROVER_UTIL_IREP_SERIALIZATION_H diff --git a/src/util/json.h b/src/util/json.h index e6e505b6c7e..acfeafacdad 100644 --- a/src/util/json.h +++ b/src/util/json.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_JSON_H -#define CPROVER_JSON_H +#ifndef CPROVER_UTIL_JSON_H +#define CPROVER_UTIL_JSON_H #include #include @@ -227,4 +227,4 @@ json_objectt &jsont::make_object() return static_cast(*this); } -#endif +#endif // CPROVER_UTIL_JSON_H diff --git a/src/util/json_expr.h b/src/util/json_expr.h index c2f8d3b8f9a..702ad74ac59 100644 --- a/src/util/json_expr.h +++ b/src/util/json_expr.h @@ -6,8 +6,8 @@ Author: Peter Schrammel \*******************************************************************/ -#ifndef CPROVER_JSON_EXPR_H -#define CPROVER_JSON_EXPR_H +#ifndef CPROVER_UTIL_JSON_EXPR_H +#define CPROVER_UTIL_JSON_EXPR_H #include "json.h" @@ -26,4 +26,4 @@ json_objectt json( json_objectt json(const source_locationt &); -#endif +#endif // CPROVER_UTIL_JSON_EXPR_H diff --git a/src/util/language.h b/src/util/language.h index d1830a9bc64..ddb2702954a 100644 --- a/src/util/language.h +++ b/src/util/language.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_LANGUAGE_H -#define CPROVER_LANGUAGE_H +#ifndef CPROVER_UTIL_LANGUAGE_H +#define CPROVER_UTIL_LANGUAGE_H #include #include @@ -102,4 +102,4 @@ class languaget:public messaget languaget() { } virtual ~languaget() { } }; -#endif +#endif // CPROVER_UTIL_LANGUAGE_H diff --git a/src/util/language_file.h b/src/util/language_file.h index 1a395857570..533e8d5240e 100644 --- a/src/util/language_file.h +++ b/src/util/language_file.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_LANGUAGE_FILE_H -#define CPROVER_LANGUAGE_FILE_H +#ifndef CPROVER_UTIL_LANGUAGE_FILE_H +#define CPROVER_UTIL_LANGUAGE_FILE_H #include #include @@ -91,4 +91,4 @@ class language_filest:public messaget const std::string &module); }; -#endif +#endif // CPROVER_UTIL_LANGUAGE_FILE_H diff --git a/src/util/lispexpr.h b/src/util/lispexpr.h index b7b8e5c75ea..703e057e680 100644 --- a/src/util/lispexpr.h +++ b/src/util/lispexpr.h @@ -8,8 +8,8 @@ Author: Daniel Kroening, kroening@kroening.com // THIS HEADER IS DEPRECATED AND WILL GO AWAY -#ifndef CPROVER_LISPEXPR_H -#define CPROVER_LISPEXPR_H +#ifndef CPROVER_UTIL_LISPEXPR_H +#define CPROVER_UTIL_LISPEXPR_H #if defined(_WIN32) && !defined(__MINGW32__) #include @@ -97,4 +97,4 @@ std::string escape(const std::string &s); int test_lispexpr(); -#endif +#endif // CPROVER_UTIL_LISPEXPR_H diff --git a/src/util/lispirep.h b/src/util/lispirep.h index eab68724f2d..8faba937e49 100644 --- a/src/util/lispirep.h +++ b/src/util/lispirep.h @@ -6,8 +6,13 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#ifndef CPROVER_UTIL_LISPIREP_H +#define CPROVER_UTIL_LISPIREP_H + class irept; class lispexprt; void lisp2irep(const lispexprt &src, irept &dest); void irep2lisp(const irept &src, lispexprt &dest); + +#endif // CPROVER_UTIL_LISPIREP_H diff --git a/src/util/memory_info.h b/src/util/memory_info.h index d5f393628db..7c35825742a 100644 --- a/src/util/memory_info.h +++ b/src/util/memory_info.h @@ -6,6 +6,11 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#ifndef CPROVER_UTIL_MEMORY_INFO_H +#define CPROVER_UTIL_MEMORY_INFO_H + #include void memory_info(std::ostream &); + +#endif // CPROVER_UTIL_MEMORY_INFO_H diff --git a/src/util/merge_irep.h b/src/util/merge_irep.h index 4881cf2d905..647654386b4 100644 --- a/src/util/merge_irep.h +++ b/src/util/merge_irep.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_MERGE_IREP_H -#define CPROVER_MERGE_IREP_H +#ifndef CPROVER_UTIL_MERGE_IREP_H +#define CPROVER_UTIL_MERGE_IREP_H #include "irep.h" #include "hash_cont.h" @@ -119,4 +119,4 @@ class merge_full_irept const irept& merged(const irept &irep); }; -#endif +#endif // CPROVER_UTIL_MERGE_IREP_H diff --git a/src/util/message.h b/src/util/message.h index ec6aa222eee..24123f9788d 100644 --- a/src/util/message.h +++ b/src/util/message.h @@ -6,9 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_MESSAGE_H - -#define CPROVER_MESSAGE_H +#ifndef CPROVER_UTIL_MESSAGE_H +#define CPROVER_UTIL_MESSAGE_H #include #include @@ -265,4 +264,4 @@ class messaget:public message_clientt mstreamt mstream; }; -#endif +#endif // CPROVER_UTIL_MESSAGE_H diff --git a/src/util/message_stream.h b/src/util/message_stream.h index c59de029086..89db8200107 100644 --- a/src/util/message_stream.h +++ b/src/util/message_stream.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_MESSAGE_STREAM_H -#define CPROVER_MESSAGE_STREAM_H +#ifndef CPROVER_UTIL_MESSAGE_STREAM_H +#define CPROVER_UTIL_MESSAGE_STREAM_H #include @@ -153,4 +153,4 @@ class legacy_message_streamt:public message_clientt const std::string &error); }; -#endif +#endif // CPROVER_UTIL_MESSAGE_STREAM_H diff --git a/src/util/mp_arith.h b/src/util/mp_arith.h index 007e477b62b..23437ecc3ff 100644 --- a/src/util/mp_arith.h +++ b/src/util/mp_arith.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_MP_ARITH_H -#define CPROVER_MP_ARITH_H +#ifndef CPROVER_UTIL_MP_ARITH_H +#define CPROVER_UTIL_MP_ARITH_H #include #include @@ -28,4 +28,4 @@ mp_integer::ullong_t integer2ulong(const mp_integer &); std::size_t integer2size_t(const mp_integer &); unsigned integer2unsigned(const mp_integer &); -#endif +#endif // CPROVER_UTIL_MP_ARITH_H diff --git a/src/util/namespace.h b/src/util/namespace.h index 53a9e601bdd..bd3f376f63e 100644 --- a/src/util/namespace.h +++ b/src/util/namespace.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_NAMESPACE_H -#define CPROVER_NAMESPACE_H +#ifndef CPROVER_UTIL_NAMESPACE_H +#define CPROVER_UTIL_NAMESPACE_H #include "irep.h" @@ -115,4 +115,4 @@ class multi_namespacet:public namespacet symbol_table_listt symbol_table_list; }; -#endif +#endif // CPROVER_UTIL_NAMESPACE_H diff --git a/src/util/namespace_utils.h b/src/util/namespace_utils.h index 3a96ece58fd..3cbf117fd1c 100644 --- a/src/util/namespace_utils.h +++ b/src/util/namespace_utils.h @@ -8,8 +8,8 @@ Author: Daniel Kroening, kroening@kroening.com // THIS FILE IS DEPRECATED -#ifndef CPROVER_NAMESPACE_UTILS_H -#define CPROVER_NAMESPACE_UTILS_H +#ifndef CPROVER_UTIL_NAMESPACE_UTILS_H +#define CPROVER_UTIL_NAMESPACE_UTILS_H #include "namespace.h" #include "base_type.h" @@ -101,4 +101,4 @@ class namespace_utilst:public virtual namespace_utils_baset } }; -#endif +#endif // CPROVER_UTIL_NAMESPACE_UTILS_H diff --git a/src/util/numbering.h b/src/util/numbering.h index 77ba7a58df5..d4fccd81e9d 100644 --- a/src/util/numbering.h +++ b/src/util/numbering.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_NUMBERING_H -#define CPROVER_NUMBERING_H +#ifndef CPROVER_UTIL_NUMBERING_H +#define CPROVER_UTIL_NUMBERING_H #include #include @@ -112,4 +112,4 @@ class hash_numbering:public std::vector numberst numbers; }; -#endif +#endif // CPROVER_UTIL_NUMBERING_H diff --git a/src/util/old/cnf_simplify.h b/src/util/old/cnf_simplify.h index 0397fdba0c1..01f4ec3473b 100644 --- a/src/util/old/cnf_simplify.h +++ b/src/util/old/cnf_simplify.h @@ -1,3 +1,8 @@ +#ifndef CPROVER_UTIL_OLD_CNF_SIMPLIFY_H +#define CPROVER_UTIL_OLD_CNF_SIMPLIFY_H + class exprt; void cnf_simplify(exprt &expr); + +#endif // CPROVER_UTIL_OLD_CNF_SIMPLIFY_H diff --git a/src/util/old/collection.h b/src/util/old/collection.h index f6e6518068a..83f7a9e41dd 100644 --- a/src/util/old/collection.h +++ b/src/util/old/collection.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_STRING_COLLECTION_H -#define CPROVER_STRING_COLLECTION_H +#ifndef CPROVER_UTIL_OLD_COLLECTION_H +#define CPROVER_UTIL_OLD_COLLECTION_H #include "string_hash.h" #include "hash_cont.h" @@ -188,4 +188,4 @@ class collection_set typedef collection_set > string_collection_set; -#endif +#endif // CPROVER_UTIL_OLD_COLLECTION_H diff --git a/src/util/old/oexpr.h b/src/util/old/oexpr.h index f9c99f68b57..b8d89b184f9 100644 --- a/src/util/old/oexpr.h +++ b/src/util/old/oexpr.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_OEXPR_H -#define CPROVER_OEXPR_H +#ifndef CPROVER_UTIL_OLD_OEXPR_H +#define CPROVER_UTIL_OLD_OEXPR_H #include "expr.h" #include "std_types.h" @@ -160,4 +160,4 @@ static inline oexprt typecast(const oexprt &a, const typet &t) return oexprt(ID_typecast, a, t); } -#endif +#endif // CPROVER_UTIL_OLD_OEXPR_H diff --git a/src/util/old/set_stack.h b/src/util/old/set_stack.h index f58f1ad0651..6dcd155c4d3 100644 --- a/src/util/old/set_stack.h +++ b/src/util/old/set_stack.h @@ -1,5 +1,5 @@ -#ifndef CPROVER_SET_STACK_H -#define CPROVER_SET_STACK_H +#ifndef CPROVER_UTIL_OLD_SET_STACK_H +#define CPROVER_UTIL_OLD_SET_STACK_H #include #include @@ -146,4 +146,4 @@ void hash_set_stack::resize(list_size_type s) } } -#endif +#endif // CPROVER_UTIL_OLD_SET_STACK_H diff --git a/src/util/options.h b/src/util/options.h index edb9e5f5b4a..d9ff068b0c5 100644 --- a/src/util/options.h +++ b/src/util/options.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_OPTIONS_H -#define CPROVER_OPTIONS_H +#ifndef CPROVER_UTIL_OPTIONS_H +#define CPROVER_UTIL_OPTIONS_H #include #include @@ -54,4 +54,4 @@ class optionst const value_listt empty_list; }; -#endif +#endif // CPROVER_UTIL_OPTIONS_H diff --git a/src/util/parse_options.h b/src/util/parse_options.h index 588722dcef0..52a201158a1 100644 --- a/src/util/parse_options.h +++ b/src/util/parse_options.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_PARSE_OPTIONS_H -#define CPROVER_PARSE_OPTIONS_H +#ifndef CPROVER_UTIL_PARSE_OPTIONS_H +#define CPROVER_UTIL_PARSE_OPTIONS_H #include @@ -33,4 +33,4 @@ class parse_options_baset bool parse_result; }; -#endif +#endif // CPROVER_UTIL_PARSE_OPTIONS_H diff --git a/src/util/parser.h b/src/util/parser.h index 3678af53940..a8631d2c260 100644 --- a/src/util/parser.h +++ b/src/util/parser.h @@ -1,5 +1,5 @@ -#ifndef CPROVER_PARSER_H -#define CPROVER_PARSER_H +#ifndef CPROVER_UTIL_PARSER_H +#define CPROVER_UTIL_PARSER_H #include #include @@ -157,4 +157,4 @@ exprt &_newstack(parsert &parser, unsigned &x); #define YY_USER_ACTION PARSER.advance_column(yyleng); -#endif +#endif // CPROVER_UTIL_PARSER_H diff --git a/src/util/pipe_stream.h b/src/util/pipe_stream.h index f5b3ac803c6..e8db83f0ffe 100644 --- a/src/util/pipe_stream.h +++ b/src/util/pipe_stream.h @@ -6,8 +6,8 @@ Module: A stdin/stdout pipe as STL stream \*******************************************************************/ -#ifndef CPROVER_UTIL_PIPE_STREAM -#define CPROVER_UTIL_PIPE_STREAM +#ifndef CPROVER_UTIL_PIPE_STREAM_H +#define CPROVER_UTIL_PIPE_STREAM_H #include #include @@ -71,4 +71,4 @@ class pipe_stream:public std::iostream filedescriptor_streambuf buffer; }; -#endif +#endif // CPROVER_UTIL_PIPE_STREAM_H diff --git a/src/util/pointer_offset_size.h b/src/util/pointer_offset_size.h index 307b8eabdf4..ed0f9cb5bab 100644 --- a/src/util/pointer_offset_size.h +++ b/src/util/pointer_offset_size.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_POINTER_OFFSET_SIZE_H -#define CPROVER_POINTER_OFFSET_SIZE_H +#ifndef CPROVER_UTIL_POINTER_OFFSET_SIZE_H +#define CPROVER_UTIL_POINTER_OFFSET_SIZE_H #include "mp_arith.h" #include "irep.h" @@ -83,4 +83,4 @@ bool get_subexpression_at_offset( const typet& target_type, const namespacet& ns); -#endif +#endif // CPROVER_UTIL_POINTER_OFFSET_SIZE_H diff --git a/src/util/pointer_predicates.h b/src/util/pointer_predicates.h index 9a307efc8ed..999c2df030e 100644 --- a/src/util/pointer_predicates.h +++ b/src/util/pointer_predicates.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_GOTO_PROGRAMS_POINTER_PREDICATES_H -#define CPROVER_GOTO_PROGRAMS_POINTER_PREDICATES_H +#ifndef CPROVER_UTIL_POINTER_PREDICATES_H +#define CPROVER_UTIL_POINTER_PREDICATES_H #include "namespace.h" @@ -31,4 +31,4 @@ exprt dynamic_object_upper_bound(const exprt &pointer, const typet &dereference_ exprt object_lower_bound(const exprt &pointer); exprt object_upper_bound(const exprt &pointer, const typet &dereference_type, const namespacet &ns); -#endif +#endif // CPROVER_UTIL_POINTER_PREDICATES_H diff --git a/src/util/prefix.h b/src/util/prefix.h index 0cf5f36523b..1efd86bae7a 100644 --- a/src/util/prefix.h +++ b/src/util/prefix.h @@ -16,4 +16,4 @@ inline bool has_prefix(const std::string &s, const std::string &prefix) return s.compare(0, prefix.size(), prefix)==0; } -#endif +#endif // CPROVER_UTIL_PREFIX_H diff --git a/src/util/preprocessor.h b/src/util/preprocessor.h index 82f340bfaf0..248a85d0402 100644 --- a/src/util/preprocessor.h +++ b/src/util/preprocessor.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_PREPROCESSOR_H -#define CPROVER_PREPROCESSOR_H +#ifndef CPROVER_UTIL_PREPROCESSOR_H +#define CPROVER_UTIL_PREPROCESSOR_H #include #include @@ -37,4 +37,4 @@ class preprocessort:public messaget virtual void preprocessor()=0; }; -#endif +#endif // CPROVER_UTIL_PREPROCESSOR_H diff --git a/src/util/pretty_names.h b/src/util/pretty_names.h index 1035370800f..f1776c16c1e 100644 --- a/src/util/pretty_names.h +++ b/src/util/pretty_names.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_CBMC_PRETTY_NAMES_H -#define CPROVER_CBMC_PRETTY_NAMES_H +#ifndef CPROVER_UTIL_PRETTY_NAMES_H +#define CPROVER_UTIL_PRETTY_NAMES_H // THIS FILE WILL GO AWAY @@ -34,4 +34,4 @@ class pretty_namest }; #endif -#endif +#endif // CPROVER_UTIL_PRETTY_NAMES_H diff --git a/src/util/rational.h b/src/util/rational.h index 00c25f64378..9fe0dd79254 100644 --- a/src/util/rational.h +++ b/src/util/rational.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_RATIONAL_H -#define CPROVER_RATIONAL_H +#ifndef CPROVER_UTIL_RATIONAL_H +#define CPROVER_UTIL_RATIONAL_H #include #include @@ -126,4 +126,4 @@ class rationalt rationalt inverse(const rationalt &n); -#endif +#endif // CPROVER_UTIL_RATIONAL_H diff --git a/src/util/rational_tools.h b/src/util/rational_tools.h index 97c80a1d293..fecadc17f1a 100644 --- a/src/util/rational_tools.h +++ b/src/util/rational_tools.h @@ -6,12 +6,12 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_RATIONAL_TOOLS_H -#define CPROVER_RATIONAL_TOOLS_H +#ifndef CPROVER_UTIL_RATIONAL_TOOLS_H +#define CPROVER_UTIL_RATIONAL_TOOLS_H #include "rational.h" bool to_rational(const exprt &expr, rationalt &rational_value); constant_exprt from_rational(const rationalt &rational_value); -#endif +#endif // CPROVER_UTIL_RATIONAL_TOOLS_H diff --git a/src/util/ref_expr_set.h b/src/util/ref_expr_set.h index fe03f7ed68d..a607d15baeb 100644 --- a/src/util/ref_expr_set.h +++ b/src/util/ref_expr_set.h @@ -81,4 +81,4 @@ class ref_expr_sett:public reference_counting } }; -#endif +#endif // CPROVER_UTIL_REF_EXPR_SET_H diff --git a/src/util/reference_counting.h b/src/util/reference_counting.h index db310771038..14328b773da 100644 --- a/src/util/reference_counting.h +++ b/src/util/reference_counting.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef __REFERENCE_COUNTING_H -#define __REFERENCE_COUNTING_H +#ifndef CPROVER_UTIL_REFERENCE_COUNTING_H +#define CPROVER_UTIL_REFERENCE_COUNTING_H #include @@ -187,4 +187,4 @@ inline bool operator!=( const reference_counting &i2) { return !(i1==i2); } -#endif +#endif // CPROVER_UTIL_REFERENCE_COUNTING_H diff --git a/src/util/rename.h b/src/util/rename.h index 33228c2667e..16be66f9599 100644 --- a/src/util/rename.h +++ b/src/util/rename.h @@ -6,6 +6,9 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#ifndef CPROVER_UTIL_RENAME_H +#define CPROVER_UTIL_RENAME_H + // // automated variable renaming // @@ -27,3 +30,5 @@ void get_new_name(irep_idt &new_name, bool rename(exprt &expr, const irep_idt &old_name, const irep_idt &new_name); + +#endif // CPROVER_UTIL_RENAME_H diff --git a/src/util/rename_symbol.h b/src/util/rename_symbol.h index 7eef81f32c7..0beb85516f8 100644 --- a/src/util/rename_symbol.h +++ b/src/util/rename_symbol.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_RENAME_SYMBOL_H -#define CPROVER_RENAME_SYMBOL_H +#ifndef CPROVER_UTIL_RENAME_SYMBOL_H +#define CPROVER_UTIL_RENAME_SYMBOL_H // // true: did nothing @@ -62,4 +62,4 @@ class rename_symbolt bool have_to_rename(const typet &type) const; }; -#endif +#endif // CPROVER_UTIL_RENAME_SYMBOL_H diff --git a/src/util/replace_expr.h b/src/util/replace_expr.h index ec9fee3e4fc..9a804b1d785 100644 --- a/src/util/replace_expr.h +++ b/src/util/replace_expr.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_REPLACE_EXPR_H -#define CPROVER_REPLACE_EXPR_H +#ifndef CPROVER_UTIL_REPLACE_EXPR_H +#define CPROVER_UTIL_REPLACE_EXPR_H // // true: did nothing @@ -22,4 +22,4 @@ typedef hash_map_cont replace_mapt; bool replace_expr(const exprt &what, const exprt &by, exprt &dest); bool replace_expr(const replace_mapt &what, exprt &dest); -#endif +#endif // CPROVER_UTIL_REPLACE_EXPR_H diff --git a/src/util/replace_symbol.h b/src/util/replace_symbol.h index 1d3243b950d..b27cd1f0378 100644 --- a/src/util/replace_symbol.h +++ b/src/util/replace_symbol.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_REPLACE_SYMBOL_H -#define CPROVER_REPLACE_SYMBOL_H +#ifndef CPROVER_UTIL_REPLACE_SYMBOL_H +#define CPROVER_UTIL_REPLACE_SYMBOL_H // // true: did nothing @@ -68,4 +68,4 @@ class replace_symbolt bool have_to_replace(const typet &type) const; }; -#endif +#endif // CPROVER_UTIL_REPLACE_SYMBOL_H diff --git a/src/util/run.h b/src/util/run.h index ae3f0247c6b..10624739a59 100644 --- a/src/util/run.h +++ b/src/util/run.h @@ -8,8 +8,8 @@ Date: August 2012 \*******************************************************************/ -#ifndef GOTO_CC_RUN_H -#define GOTO_CC_RUN_H +#ifndef CPROVER_UTIL_RUN_H +#define CPROVER_UTIL_RUN_H #include #include @@ -19,4 +19,4 @@ int run( const std::vector &argv, const std::string &std_input); -#endif /* GOTO_CC_RUN_H */ +#endif // CPROVER_UTIL_RUN_H diff --git a/src/util/signal_catcher.h b/src/util/signal_catcher.h index dbe56e9275f..fb5d84961e7 100644 --- a/src/util/signal_catcher.h +++ b/src/util/signal_catcher.h @@ -6,10 +6,10 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_SIGNAL_CATCHER_H -#define CPROVER_SIGNAL_CATCHER_H +#ifndef CPROVER_UTIL_SIGNAL_CATCHER_H +#define CPROVER_UTIL_SIGNAL_CATCHER_H void install_signal_catcher(); void signal_catcher(int sig); -#endif +#endif // CPROVER_UTIL_SIGNAL_CATCHER_H diff --git a/src/util/simplify_expr.h b/src/util/simplify_expr.h index 2e2e9f50b41..f327f26ca52 100644 --- a/src/util/simplify_expr.h +++ b/src/util/simplify_expr.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_SIMPLIFY_EXPR_H -#define CPROVER_SIMPLIFY_EXPR_H +#ifndef CPROVER_UTIL_SIMPLIFY_EXPR_H +#define CPROVER_UTIL_SIMPLIFY_EXPR_H class exprt; class namespacet; @@ -26,4 +26,4 @@ bool simplify( // this is the preferred interface exprt simplify_expr(const exprt &src, const namespacet &ns); -#endif +#endif // CPROVER_UTIL_SIMPLIFY_EXPR_H diff --git a/src/util/simplify_expr_class.h b/src/util/simplify_expr_class.h index 7b1e9fb85d0..eeaa7e2bcfe 100644 --- a/src/util/simplify_expr_class.h +++ b/src/util/simplify_expr_class.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_SIMPLIFY_EXPR_CLASS_H -#define CPROVER_SIMPLIFY_EXPR_CLASS_H +#ifndef CPROVER_UTIL_SIMPLIFY_EXPR_CLASS_H +#define CPROVER_UTIL_SIMPLIFY_EXPR_CLASS_H // #define DEBUG_ON_DEMAND #ifdef DEBUG_ON_DEMAND @@ -153,4 +153,4 @@ class simplify_exprt replace_mapt local_replace_map; }; -#endif +#endif // CPROVER_UTIL_SIMPLIFY_EXPR_CLASS_H diff --git a/src/util/simplify_utils.h b/src/util/simplify_utils.h index 8afd0b53799..7860912a58f 100644 --- a/src/util/simplify_utils.h +++ b/src/util/simplify_utils.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_SIMPLIFY_UTILS_H -#define CPROVER_SIMPLIFY_UTILS_H +#ifndef CPROVER_UTIL_SIMPLIFY_UTILS_H +#define CPROVER_UTIL_SIMPLIFY_UTILS_H #include "expr.h" @@ -15,4 +15,4 @@ bool sort_operands(exprt::operandst &operands); bool sort_and_join(exprt &expr); -#endif +#endif // CPROVER_UTIL_SIMPLIFY_UTILS_H diff --git a/src/util/sorted_vector.h b/src/util/sorted_vector.h index a77f8b88baa..fe5fae10775 100644 --- a/src/util/sorted_vector.h +++ b/src/util/sorted_vector.h @@ -20,8 +20,8 @@ */ -#ifndef SORTED_VECTOR_ -#define SORTED_VECTOR_ +#ifndef CPROVER_UTIL_SORTED_VECTOR_H +#define CPROVER_UTIL_SORTED_VECTOR_H #define VERSION_SORTED_VECTOR_ 0x00010010 #include @@ -301,4 +301,4 @@ template inline //#pragma pack(pop) #elif VERSION_SORTED_VECTOR_ != 0x00010010 #error You have included two sorted_vector.h with different version numbers -#endif +#endif // CPROVER_UTIL_SORTED_VECTOR_H diff --git a/src/util/source_location.h b/src/util/source_location.h index 0b27bb543b5..c34cfb5f9d2 100644 --- a/src/util/source_location.h +++ b/src/util/source_location.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_SOURCE_LOCATION_H -#define CPROVER_SOURCE_LOCATION_H +#ifndef CPROVER_UTIL_SOURCE_LOCATION_H +#define CPROVER_UTIL_SOURCE_LOCATION_H #include "irep.h" @@ -142,4 +142,4 @@ class source_locationt:public irept std::ostream &operator <<(std::ostream &, const source_locationt &); -#endif +#endif // CPROVER_UTIL_SOURCE_LOCATION_H diff --git a/src/util/ssa_expr.h b/src/util/ssa_expr.h index a95251ba819..36ab025b821 100644 --- a/src/util/ssa_expr.h +++ b/src/util/ssa_expr.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_GOTO_SYMEX_SSA_EXPR_H -#define CPROVER_GOTO_SYMEX_SSA_EXPR_H +#ifndef CPROVER_UTIL_SSA_EXPR_H +#define CPROVER_UTIL_SSA_EXPR_H #include @@ -175,4 +175,4 @@ extern inline bool is_ssa_expr(const exprt &expr) expr.get_bool(ID_C_SSA_symbol); } -#endif +#endif // CPROVER_UTIL_SSA_EXPR_H diff --git a/src/util/std_code.h b/src/util/std_code.h index 42e29f79bbe..b7786cb6571 100644 --- a/src/util/std_code.h +++ b/src/util/std_code.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_STD_CODE_H -#define CPROVER_STD_CODE_H +#ifndef CPROVER_UTIL_STD_CODE_H +#define CPROVER_UTIL_STD_CODE_H #include @@ -1201,4 +1201,4 @@ static inline code_try_catcht &to_code_try_catch(codet &code) return static_cast(code); } -#endif +#endif // CPROVER_UTIL_STD_CODE_H diff --git a/src/util/std_expr.h b/src/util/std_expr.h index 91bb7d077b2..3189b040785 100644 --- a/src/util/std_expr.h +++ b/src/util/std_expr.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_STD_EXPR_H -#define CPROVER_STD_EXPR_H +#ifndef CPROVER_UTIL_STD_EXPR_H +#define CPROVER_UTIL_STD_EXPR_H /*! \file util/std_expr.h * \brief API to expression classes @@ -3669,4 +3669,4 @@ class exists_exprt:public exprt } }; -#endif +#endif // CPROVER_UTIL_STD_EXPR_H diff --git a/src/util/std_types.h b/src/util/std_types.h index 2dbaf27bd0b..3fb2af54e17 100644 --- a/src/util/std_types.h +++ b/src/util/std_types.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_STD_TYPES_H -#define CPROVER_STD_TYPES_H +#ifndef CPROVER_UTIL_STD_TYPES_H +#define CPROVER_UTIL_STD_TYPES_H /*! \file util/std_types.h * \brief API to type classes @@ -1615,4 +1615,4 @@ extern inline complex_typet &to_complex_type(typet &type) return static_cast(type); } -#endif +#endif // CPROVER_UTIL_STD_TYPES_H diff --git a/src/util/string2int.h b/src/util/string2int.h index e533284fb74..f77aed0274e 100644 --- a/src/util/string2int.h +++ b/src/util/string2int.h @@ -6,8 +6,8 @@ Author: Michael Tautschnig, michael.tautschnig@cs.ox.ac.uk \*******************************************************************/ -#ifndef CPROVER_STRING2INT_H -#define CPROVER_STRING2INT_H +#ifndef CPROVER_UTIL_STRING2INT_H +#define CPROVER_UTIL_STRING2INT_H #include @@ -36,4 +36,4 @@ std::size_t unsafe_string2size_t(const std::string &str, int base=10); long long int unsafe_string2signedlonglong(const std::string &str, int base=10); long long unsigned int unsafe_string2unsignedlonglong(const std::string &str, int base=10); -#endif +#endif // CPROVER_UTIL_STRING2INT_H diff --git a/src/util/string_container.h b/src/util/string_container.h index a56f2bb885e..e4dda7d393d 100644 --- a/src/util/string_container.h +++ b/src/util/string_container.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef STRING_CONTAINER_H -#define STRING_CONTAINER_H +#ifndef CPROVER_UTIL_STRING_CONTAINER_H +#define CPROVER_UTIL_STRING_CONTAINER_H #include #include @@ -89,4 +89,4 @@ class string_containert // an ugly global object extern string_containert string_container; -#endif +#endif // CPROVER_UTIL_STRING_CONTAINER_H diff --git a/src/util/string_hash.h b/src/util/string_hash.h index 9b0303c923a..70dcbd226e8 100644 --- a/src/util/string_hash.h +++ b/src/util/string_hash.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_STRING_HASH_H -#define CPROVER_STRING_HASH_H +#ifndef CPROVER_UTIL_STRING_HASH_H +#define CPROVER_UTIL_STRING_HASH_H #include @@ -19,4 +19,4 @@ struct string_hash size_t operator()(const std::string &s) const { return hash_string(s); } }; -#endif +#endif // CPROVER_UTIL_STRING_HASH_H diff --git a/src/util/substitute.h b/src/util/substitute.h index 4db92637b41..c39774fa615 100644 --- a/src/util/substitute.h +++ b/src/util/substitute.h @@ -6,9 +6,14 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#ifndef CPROVER_UTIL_SUBSTITUTE_H +#define CPROVER_UTIL_SUBSTITUTE_H + #include void substitute( std::string &dest, const std::string &what, const std::string &by); + +#endif // CPROVER_UTIL_SUBSTITUTE_H diff --git a/src/util/suffix.h b/src/util/suffix.h index 338a0723ccf..ea94c364af4 100644 --- a/src/util/suffix.h +++ b/src/util/suffix.h @@ -17,4 +17,4 @@ inline bool has_suffix(const std::string &s, const std::string &suffix) return s.compare(s.size()-suffix.size(), std::string::npos, suffix)==0; } -#endif +#endif // CPROVER_UTIL_SUFFIX_H diff --git a/src/util/symbol.h b/src/util/symbol.h index af40bea3b61..f10084184f4 100644 --- a/src/util/symbol.h +++ b/src/util/symbol.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_SYMBOL_H -#define CPROVER_SYMBOL_H +#ifndef CPROVER_UTIL_SYMBOL_H +#define CPROVER_UTIL_SYMBOL_H /*! \file util/symbol.h * \brief Symbol table entry @@ -183,4 +183,4 @@ class parameter_symbolt:public symbolt } }; -#endif +#endif // CPROVER_UTIL_SYMBOL_H diff --git a/src/util/symbol_table.h b/src/util/symbol_table.h index 1a50940df83..b9905f215b8 100644 --- a/src/util/symbol_table.h +++ b/src/util/symbol_table.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_SYMBOL_TABLE_H -#define CPROVER_SYMBOL_TABLE_H +#ifndef CPROVER_UTIL_SYMBOL_TABLE_H +#define CPROVER_UTIL_SYMBOL_TABLE_H /*! \file util/symbol_table.h * \brief Symbol table @@ -96,4 +96,4 @@ std::ostream &operator << ( std::ostream &out, const symbol_tablet &symbol_table); -#endif +#endif // CPROVER_UTIL_SYMBOL_TABLE_H diff --git a/src/util/tempdir.h b/src/util/tempdir.h index ab1d3e031fb..b8c467e7a76 100644 --- a/src/util/tempdir.h +++ b/src/util/tempdir.h @@ -6,8 +6,8 @@ Author: CM Wintersteiger \*******************************************************************/ -#ifndef CPROVER_TEMPDIR_H -#define CPROVER_TEMPDIR_H +#ifndef CPROVER_UTIL_TEMPDIR_H +#define CPROVER_UTIL_TEMPDIR_H #include @@ -41,4 +41,4 @@ class temp_working_dirt:public temp_dirt ~temp_working_dirt(); }; -#endif +#endif // CPROVER_UTIL_TEMPDIR_H diff --git a/src/util/tempfile.h b/src/util/tempfile.h index eb7756c23e1..dc4b2d642d4 100644 --- a/src/util/tempfile.h +++ b/src/util/tempfile.h @@ -6,8 +6,8 @@ Author: Daniel Kroening \*******************************************************************/ -#ifndef CPROVER_TEMPFILE_H -#define CPROVER_TEMPFILE_H +#ifndef CPROVER_UTIL_TEMPFILE_H +#define CPROVER_UTIL_TEMPFILE_H #include @@ -42,4 +42,4 @@ class temporary_filet std::string name; }; -#endif +#endif // CPROVER_UTIL_TEMPFILE_H diff --git a/src/util/threeval.h b/src/util/threeval.h index 3c6fb63a7d3..c1202d710af 100644 --- a/src/util/threeval.h +++ b/src/util/threeval.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_THREEVAL_H -#define CPROVER_THREEVAL_H +#ifndef CPROVER_UTIL_THREEVAL_H +#define CPROVER_UTIL_THREEVAL_H #include @@ -86,4 +86,4 @@ class tvt std::ostream &operator << (std::ostream &out, const tvt &a); -#endif +#endif // CPROVER_UTIL_THREEVAL_H diff --git a/src/util/time_stopping.h b/src/util/time_stopping.h index 3f57fe667ef..6b8fff9db70 100644 --- a/src/util/time_stopping.h +++ b/src/util/time_stopping.h @@ -8,8 +8,8 @@ Date: February 2004 \*******************************************************************/ -#ifndef CPROVER_TIME_STOPPING_H -#define CPROVER_TIME_STOPPING_H +#ifndef CPROVER_UTIL_TIME_STOPPING_H +#define CPROVER_UTIL_TIME_STOPPING_H #include #include @@ -92,4 +92,4 @@ absolute_timet current_time(); std::ostream &operator << (std::ostream &, const time_periodt &); -#endif +#endif // CPROVER_UTIL_TIME_STOPPING_H diff --git a/src/util/timer.h b/src/util/timer.h index 52432b641be..ef4e510fb90 100644 --- a/src/util/timer.h +++ b/src/util/timer.h @@ -1,5 +1,5 @@ -#ifndef CPROVER_TIMER_H -#define CPROVER_TIMER_H +#ifndef CPROVER_UTIL_TIMER_H +#define CPROVER_UTIL_TIMER_H #include #include @@ -60,4 +60,4 @@ class timert std::ostream& operator<< (std::ostream &out, const timert &timer); -#endif /*CPROVER_TIMER_H*/ +#endif // CPROVER_UTIL_TIMER_H diff --git a/src/util/type.h b/src/util/type.h index 51cefbf2966..6e007d261ff 100644 --- a/src/util/type.h +++ b/src/util/type.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_TYPE_H -#define CPROVER_TYPE_H +#ifndef CPROVER_UTIL_TYPE_H +#define CPROVER_UTIL_TYPE_H #include @@ -205,4 +205,4 @@ pre-defined types: bool is_number(const typet &type); // rational, real, integer, complex, unsignedbv, signedbv, floatbv -#endif +#endif // CPROVER_UTIL_TYPE_H diff --git a/src/util/type_eq.h b/src/util/type_eq.h index 3276ae0b350..f81cb9b19b4 100644 --- a/src/util/type_eq.h +++ b/src/util/type_eq.h @@ -6,12 +6,12 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_TYPE_EQ_H -#define CPROVER_TYPE_EQ_H +#ifndef CPROVER_UTIL_TYPE_EQ_H +#define CPROVER_UTIL_TYPE_EQ_H class namespacet; class typet; bool type_eq(const typet &type1, const typet &type2, const namespacet &ns); -#endif +#endif // CPROVER_UTIL_TYPE_EQ_H diff --git a/src/util/typecheck.h b/src/util/typecheck.h index de690df0d83..2da39da5695 100644 --- a/src/util/typecheck.h +++ b/src/util/typecheck.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_TYPECHECK_H -#define CPROVER_TYPECHECK_H +#ifndef CPROVER_UTIL_TYPECHECK_H +#define CPROVER_UTIL_TYPECHECK_H #include "message_stream.h" @@ -66,4 +66,4 @@ class typecheckt:public messaget virtual bool typecheck_main(); }; -#endif +#endif // CPROVER_UTIL_TYPECHECK_H diff --git a/src/util/ui_message.h b/src/util/ui_message.h index 95449461a65..a5052cdfe48 100644 --- a/src/util/ui_message.h +++ b/src/util/ui_message.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_UI_MESSAGE_H -#define CPROVER_UI_MESSAGE_H +#ifndef CPROVER_UTIL_UI_MESSAGE_H +#define CPROVER_UTIL_UI_MESSAGE_H #include "message.h" @@ -67,4 +67,4 @@ class ui_message_handlert:public message_handlert const char *level_string(unsigned level); }; -#endif +#endif // CPROVER_UTIL_UI_MESSAGE_H diff --git a/src/util/unicode.h b/src/util/unicode.h index 44038a26c04..edad95039f0 100644 --- a/src/util/unicode.h +++ b/src/util/unicode.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_UNICODE_H -#define CPROVER_UNICODE_H +#ifndef CPROVER_UTIL_UNICODE_H +#define CPROVER_UTIL_UNICODE_H #include @@ -24,4 +24,4 @@ std::string utf16_to_utf8(const std::basic_string &s); const char **narrow_argv(int argc, const wchar_t **argv_wide); -#endif +#endif // CPROVER_UTIL_UNICODE_H diff --git a/src/util/union_find.h b/src/util/union_find.h index f874378e0fc..def1da4215d 100644 --- a/src/util/union_find.h +++ b/src/util/union_find.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_UNION_FIND_H -#define CPROVER_UNION_FIND_H +#ifndef CPROVER_UTIL_UNION_FIND_H +#define CPROVER_UTIL_UNION_FIND_H #include #include @@ -246,4 +246,4 @@ class union_find:public numbering typedef numbering subt; }; -#endif +#endif // CPROVER_UTIL_UNION_FIND_H diff --git a/src/util/xml.h b/src/util/xml.h index e36b408e720..f2f19b69670 100644 --- a/src/util/xml.h +++ b/src/util/xml.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef XML_H -#define XML_H +#ifndef CPROVER_UTIL_XML_H +#define CPROVER_UTIL_XML_H #include #include @@ -130,4 +130,4 @@ extern inline std::ostream& operator <<( return out; } -#endif +#endif // CPROVER_UTIL_XML_H diff --git a/src/util/xml_expr.h b/src/util/xml_expr.h index 835eeea2d8d..145c09310be 100644 --- a/src/util/xml_expr.h +++ b/src/util/xml_expr.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_XML_EXPR_H -#define CPROVER_XML_EXPR_H +#ifndef CPROVER_UTIL_XML_EXPR_H +#define CPROVER_UTIL_XML_EXPR_H #include "xml.h" @@ -26,4 +26,4 @@ xmlt xml( xmlt xml(const source_locationt &); -#endif +#endif // CPROVER_UTIL_XML_EXPR_H diff --git a/src/util/xml_irep.h b/src/util/xml_irep.h index 4ce04d2d63e..2537649356a 100644 --- a/src/util/xml_irep.h +++ b/src/util/xml_irep.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef XML_IREP_H -#define XML_IREP_H +#ifndef CPROVER_UTIL_XML_IREP_H +#define CPROVER_UTIL_XML_IREP_H class irept; class xmlt; @@ -20,4 +20,4 @@ void convert( const xmlt &xml, irept &irep); -#endif +#endif // CPROVER_UTIL_XML_IREP_H diff --git a/src/xmllang/graphml.h b/src/xmllang/graphml.h index b2c8e626657..f8525267ec1 100644 --- a/src/xmllang/graphml.h +++ b/src/xmllang/graphml.h @@ -47,4 +47,4 @@ bool read_graphml( bool write_graphml(const graphmlt &src, std::ostream &os); -#endif +#endif // CPROVER_XMLLANG_GRAPHML_H diff --git a/src/xmllang/xml_parse_tree.h b/src/xmllang/xml_parse_tree.h index ef03bb73101..4d0ab02b8b7 100644 --- a/src/xmllang/xml_parse_tree.h +++ b/src/xmllang/xml_parse_tree.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef CPROVER_XML_PARSE_TREE_H -#define CPROVER_XML_PARSE_TREE_H +#ifndef CPROVER_XMLLANG_XML_PARSE_TREE_H +#define CPROVER_XMLLANG_XML_PARSE_TREE_H #include @@ -21,4 +21,4 @@ class xml_parse_treet void clear(); }; -#endif +#endif // CPROVER_XMLLANG_XML_PARSE_TREE_H diff --git a/src/xmllang/xml_parser.h b/src/xmllang/xml_parser.h index c36eeab658a..b4ebd33c3e6 100644 --- a/src/xmllang/xml_parser.h +++ b/src/xmllang/xml_parser.h @@ -6,8 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#ifndef XML_PARSER_H -#define XML_PARSER_H +#ifndef CPROVER_XMLLANG_XML_PARSER_H +#define CPROVER_XMLLANG_XML_PARSER_H #include @@ -63,4 +63,4 @@ bool parse_xml( message_handlert &message_handler, xmlt &dest); -#endif +#endif // CPROVER_XMLLANG_XML_PARSER_H