diff --git a/.travis.yml b/.travis.yml index f4d5af54c8f..d454d25f806 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,4 +41,4 @@ matrix: script: - make -C src minisat2-download - make -C src CXX=$COMPILER CXXFLAGS="-Wall -O2 -g -Werror -Wno-deprecated-register -pedantic -Wno-sign-compare" -j2 && make -C regression test - - make -C src CXX=$COMPILER CXXFLAGS="-Wall -O2 -g -Werror -Wno-deprecated-register -pedantic -Wno-sign-compare" -j2 cegis.dir musketeer.dir + - make -C src CXX=$COMPILER CXXFLAGS="-Wall -O2 -g -Werror -Wno-deprecated-register -pedantic -Wno-sign-compare" -j2 aa-symex.dir cegis.dir clobber.dir memory-models.dir musketeer.dir diff --git a/src/Makefile b/src/Makefile index 8d617957170..7b9e3a1d446 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,7 +1,8 @@ DIRS = ansi-c big-int cbmc cpp goto-cc goto-instrument goto-programs \ goto-symex langapi pointer-analysis solvers util linking xmllang \ assembler analyses java_bytecode aa-path-symex path-symex musketeer \ - json cegis goto-analyzer jsil symex goto-diff + json cegis goto-analyzer jsil symex goto-diff aa-symex clobber \ + memory-models all: cbmc.dir goto-cc.dir goto-instrument.dir symex.dir goto-analyzer.dir goto-diff.dir @@ -43,6 +44,8 @@ symex.dir: languages goto-programs.dir pointer-analysis.dir \ goto-symex.dir linking.dir analyses.dir solvers.dir \ path-symex.dir goto-instrument.dir +aa-symex.dir: symex.dir aa-path-symex.dir + # building for a particular directory $(patsubst %, %.dir, $(DIRS)): diff --git a/src/aa-path-symex/Makefile b/src/aa-path-symex/Makefile index 272a422aac0..9d3c4d96074 100644 --- a/src/aa-path-symex/Makefile +++ b/src/aa-path-symex/Makefile @@ -1,5 +1,4 @@ -SRC = locs.cpp var_map.cpp path_symex_history.cpp path_symex_state.cpp \ - path_symex.cpp build_goto_trace.cpp +SRC = path_symex_state.cpp path_symex.cpp build_goto_trace.cpp INCLUDES= -I .. diff --git a/src/aa-path-symex/build_goto_trace.cpp b/src/aa-path-symex/build_goto_trace.cpp deleted file mode 100644 index ac37f4ea6fb..00000000000 --- a/src/aa-path-symex/build_goto_trace.cpp +++ /dev/null @@ -1,123 +0,0 @@ -/*******************************************************************\ - -Module: Build Goto Trace from State History - -Author: Daniel Kroening, kroening@kroening.com - -\*******************************************************************/ - -#include "build_goto_trace.h" - -/*******************************************************************\ - -Function: build_goto_trace - - Inputs: - - Outputs: - - Purpose: follow state history to build a goto trace - -\*******************************************************************/ - -void build_goto_trace( - const path_symex_statet &state, - const decision_proceduret &decision_procedure, - goto_tracet &goto_trace) -{ - // follow the history in the state, - // but in a forwards-fashion - - std::vector steps; - state.history.build_history(steps); - - unsigned step_nr; - - for(step_nr=0; step_nr -#include - -#include "path_symex_state.h" - -void build_goto_trace( - const path_symex_statet &state, - const decision_proceduret &decision_procedure, - goto_tracet &goto_trace); - -#endif // CPROVER_AA_PATH_SYMEX_BUILD_GOTO_TRACE_H diff --git a/src/aa-path-symex/build_goto_trace.h b/src/aa-path-symex/build_goto_trace.h new file mode 120000 index 00000000000..3183a6b0910 --- /dev/null +++ b/src/aa-path-symex/build_goto_trace.h @@ -0,0 +1 @@ +../path-symex/build_goto_trace.h \ No newline at end of file diff --git a/src/aa-path-symex/loc_ref.h b/src/aa-path-symex/loc_ref.h deleted file mode 100644 index 37e6935c6da..00000000000 --- a/src/aa-path-symex/loc_ref.h +++ /dev/null @@ -1,86 +0,0 @@ -/*******************************************************************\ - -Module: Program Locations - -Author: Daniel Kroening, kroening@kroening.com - -\*******************************************************************/ - -#ifndef CPROVER_AA_PATH_SYMEX_LOC_REF_H -#define CPROVER_AA_PATH_SYMEX_LOC_REF_H - -#include - -class loc_reft -{ -public: - unsigned loc_number; - - inline loc_reft next_loc() const - { - loc_reft tmp=*this; - tmp.increase(); - return tmp; - } - - inline void increase() - { - loc_number++; - } - - inline void decrease() - { - loc_number--; - } - - inline bool is_nil() const - { - return loc_number==nil().loc_number; - } - - loc_reft():loc_number(-1) // ugly conversion - { - } - - static inline loc_reft nil() - { - return loc_reft(); - } - - inline loc_reft &operator++() // this is pre-increment - { - increase(); - return *this; - } - - inline loc_reft &operator--() // this is pre-decrement - { - decrease(); - return *this; - } -}; - -static inline bool operator < (const loc_reft l1, const loc_reft l2) -{ - return l1.loc_number < l2.loc_number; -} - -static inline bool operator != (const loc_reft l1, const loc_reft l2) -{ - return l1.loc_number != l2.loc_number; -} - -static inline bool operator == (const loc_reft l1, const loc_reft l2) -{ - return l1.loc_number == l2.loc_number; -} - -static inline std::ostream &operator << (std::ostream &out, loc_reft l) -{ - if(l.is_nil()) - return out << "nil"; - else - return out << l.loc_number; -} - -#endif // CPROVER_AA_PATH_SYMEX_LOC_REF_H diff --git a/src/aa-path-symex/locs.cpp b/src/aa-path-symex/locs.cpp deleted file mode 100644 index 5afbd8ac84a..00000000000 --- a/src/aa-path-symex/locs.cpp +++ /dev/null @@ -1,140 +0,0 @@ -/*******************************************************************\ - -Module: Program Locations - -Author: Daniel Kroening, kroening@kroening.com - -\*******************************************************************/ - -#include "locs.h" - -/*******************************************************************\ - -Function: locst::locst - - Inputs: - - Outputs: - - Purpose: - -\*******************************************************************/ - -locst::locst( - const namespacet &_ns): - ns(_ns) -{ -} - -/*******************************************************************\ - -Function: locst::build - - Inputs: - - Outputs: - - Purpose: - -\*******************************************************************/ - -void locst::build(const goto_functionst &goto_functions) -{ - // build locations - - typedef std::map target_mapt; - - target_mapt target_map; - - forall_goto_functions(f_it, goto_functions) - { - const goto_functionst::goto_functiont &goto_function = f_it->second; - - function_entryt &function_entry=function_map[f_it->first]; - function_entry.type=goto_function.type; - - if(goto_function.body_available) - { - const loc_reft entry_loc=end(); - function_entry.first_loc=entry_loc; - - forall_goto_program_instructions(i_it, goto_function.body) - { - target_map[i_it]=end(); - loc_vector.push_back(loct(i_it, f_it->first)); - } - } - else - function_entry.first_loc=loc_reft::nil(); - } - - if(function_map.find(ID_main)==function_map.end()) - throw "no entry point"; - - entry_loc=function_map[ID_main].first_loc; - - // build branch targets - for(unsigned l=0; lsecond; - - if(target.loc_number>=loc_vector.size()) - throw "locst::build: illegal jump target"; - - loc_vector[l].branch_target=target; - } - else - throw "locst does not support more than one branch target"; - } -} - -/*******************************************************************\ - -Function: locst::output - - Inputs: - - Outputs: - - Purpose: - -\*******************************************************************/ - -void locst::output(std::ostream &out) const -{ - irep_idt function; - - for(unsigned l=0; ltype << " " -// << loc.target->location - << " " << as_string(ns, *loc.target) << "\n"; - - if(!loc.branch_target.is_nil()) - out << " T: " << loc.branch_target << "\n"; - } - - out << "\n"; - out << "The entry location is L" << entry_loc << ".\n"; -} diff --git a/src/aa-path-symex/locs.h b/src/aa-path-symex/locs.h deleted file mode 100644 index 75e0ae29f7e..00000000000 --- a/src/aa-path-symex/locs.h +++ /dev/null @@ -1,107 +0,0 @@ -/*******************************************************************\ - -Module: CFG made of Program Locations, built from goto_functionst - -Author: Daniel Kroening, kroening@kroening.com - -\*******************************************************************/ - -#ifndef CPROVER_AA_PATH_SYMEX_LOCS_H -#define CPROVER_AA_PATH_SYMEX_LOCS_H - -#include - -#include - -#include "loc_ref.h" - -struct loct -{ -public: - loct(goto_programt::const_targett _target, - const irep_idt &_function): - target(_target), - function(_function) - { - } - - goto_programt::const_targett target; - irep_idt function; - - // we only support a single branch target - loc_reft branch_target; -}; - -class locst -{ -public: - typedef std::vector loc_vectort; - loc_vectort loc_vector; - loc_reft entry_loc; - - class function_entryt - { - public: - loc_reft first_loc; - code_typet type; - }; - - typedef std::map function_mapt; - function_mapt function_map; - - locst(const namespacet &_ns); - void build(const goto_functionst &goto_functions); - void output(std::ostream &out) const; - - inline loct &operator[] (loc_reft l) - { - assert(l.loc_number>=0 && l.loc_number < loc_vector.size()); - return loc_vector[l.loc_number]; - } - - inline const loct &operator[] (loc_reft l) const - { - assert(l.loc_number>=0 && l.loc_number < loc_vector.size()); - return loc_vector[l.loc_number]; - } - - static inline loc_reft begin() - { - loc_reft tmp; - tmp.loc_number=0; - return tmp; - } - - inline loc_reft end() const - { - loc_reft tmp; - tmp.loc_number=loc_vector.size(); - return tmp; - } - -protected: - const namespacet &ns; -}; - -class target_to_loc_mapt -{ -public: - explicit target_to_loc_mapt(const locst &locs) - { - for(loc_reft it=locs.begin(); it!=locs.end(); ++it) - map[locs[it].target]=it; - } - - inline loc_reft operator[](const goto_programt::const_targett t) const - { - mapt::const_iterator it=map.find(t); - assert(it!=map.end()); - return it->second; - } - -protected: - typedef std::map mapt; - mapt map; -}; - -#endif // CPROVER_AA_PATH_SYMEX_LOCS_H diff --git a/src/aa-path-symex/path_symex.cpp b/src/aa-path-symex/path_symex.cpp index 83e56461136..0ead6c840ba 100644 --- a/src/aa-path-symex/path_symex.cpp +++ b/src/aa-path-symex/path_symex.cpp @@ -187,7 +187,7 @@ void path_symext::assign( const exprt &lhs, const exprt &rhs) { - if(rhs.id()==ID_sideeffect) // catch side effects on rhs + if(rhs.id()==ID_side_effect) // catch side effects on rhs { const side_effect_exprt &side_effect_expr=to_side_effect_expr(rhs); const irep_idt &statement=side_effect_expr.get_statement(); @@ -208,7 +208,7 @@ void path_symext::assign( // read the address of the lhs, with propagation exprt lhs_address=state.read(address_of_exprt(lhs)); - // now SSA it, no propagation + // now SSA the lhs, no propagation exprt ssa_lhs= state.read_no_propagate(dereference_exprt(lhs_address)); @@ -285,7 +285,7 @@ void path_symext::symex_malloc( if(tmp_type.is_not_nil()) { // Did the size get multiplied? - mp_integer elem_size=pointer_offset_size(state.var_map.ns, tmp_type); + mp_integer elem_size=pointer_offset_size(tmp_type, state.var_map.ns); mp_integer alloc_size; if(elem_size<0 || to_integer(tmp_size, alloc_size)) { @@ -395,7 +395,7 @@ void path_symext::assign_rec( if(ssa_lhs.id()==ID_symbol) { - // These are expected to the SSA symbols + // These are expected to be SSA symbols assert(ssa_lhs.get_bool(ID_C_SSA_symbol)); const symbol_exprt &symbol_expr=to_symbol_expr(ssa_lhs); @@ -471,17 +471,27 @@ void path_symext::assign_rec( if(compound_type.id()==ID_struct) { - throw "unexpected struct member on lhs"; + // We flatten the top-level structs, so this one is inside an + // array or a union. + + exprt member_name(ID_member_name); + member_name.set( + ID_component_name, + ssa_lhs_member_expr.get_component_name()); + + with_exprt new_rhs(struct_op, member_name, ssa_rhs); + + assign_rec(state, guard, struct_op, new_rhs); } else if(compound_type.id()==ID_union) { - // adjust the rhs - union_exprt new_rhs; - new_rhs.type()=struct_op.type(); - new_rhs.set_component_name(ssa_lhs_member_expr.get_component_name()); - new_rhs.op()=ssa_rhs; + // rewrite into byte_extract, and do again + exprt offset=gen_zero(index_type()); - assign_rec(state, guard, struct_op, new_rhs); + byte_extract_exprt + new_lhs(byte_update_id(), struct_op, offset, ssa_rhs.type()); + + assign_rec(state, guard, new_lhs, ssa_rhs); } else throw "assign_rec: member expects struct or union type"; @@ -566,7 +576,7 @@ void path_symext::assign_rec( assert(operands.size()==components.size()); - for(unsigned i=0; i &further_states); - -// Transform a state by executing a single statement. -// Will fail if there is more than one successor state. -void path_symex(path_symex_statet &state); - -// Transforms a state by executing a goto statement; -// the 'taken' argument indicates which way. -void path_symex_goto( - path_symex_statet &state, - bool taken); - -// Transforms a state by executing an assertion statement; -// it is enforced that the assertion fails. -void path_symex_assert_fail( - path_symex_statet &state); - -#endif // CPROVER_AA_PATH_SYMEX_PATH_SYMEX_H diff --git a/src/aa-path-symex/path_symex.h b/src/aa-path-symex/path_symex.h new file mode 120000 index 00000000000..538d30846d4 --- /dev/null +++ b/src/aa-path-symex/path_symex.h @@ -0,0 +1 @@ +../path-symex/path_symex.h \ No newline at end of file diff --git a/src/aa-path-symex/path_symex_history.cpp b/src/aa-path-symex/path_symex_history.cpp deleted file mode 100644 index e35cd62d337..00000000000 --- a/src/aa-path-symex/path_symex_history.cpp +++ /dev/null @@ -1,63 +0,0 @@ -/*******************************************************************\ - -Module: History of path-based symbolic simulator - -Author: Daniel Kroening, kroening@kroening.com - -\*******************************************************************/ - -#include - -#include - -#include "path_symex_history.h" - -/*******************************************************************\ - -Function: path_symex_stept::output - - Inputs: - - Outputs: - - Purpose: - -\*******************************************************************/ - -void path_symex_stept::output(std::ostream &out) const -{ - out << "PCs:"; - -/* - for(const auto &pc : s_it->pc_vector) - out << " " << pc; - */ - out << "\n"; - - out << "Guard: " << from_expr(guard) << "\n"; - out << "Full LHS: " << from_expr(full_lhs) << "\n"; - out << "SSA LHS: " << from_expr(ssa_lhs) << "\n"; - out << "SSA RHS: " << from_expr(ssa_rhs) << "\n"; - out << "\n"; -} - -/*******************************************************************\ - -Function: path_symex_stept::convert - - Inputs: - - Outputs: - - Purpose: - -\*******************************************************************/ - -void path_symex_stept::convert(decision_proceduret &dest) const -{ - if(ssa_rhs.is_not_nil()) - dest << equal_exprt(ssa_lhs, ssa_rhs); - - if(guard.is_not_nil()) - dest << guard; -} diff --git a/src/aa-path-symex/path_symex_history.h b/src/aa-path-symex/path_symex_history.h deleted file mode 100644 index c2a261b7fdf..00000000000 --- a/src/aa-path-symex/path_symex_history.h +++ /dev/null @@ -1,164 +0,0 @@ -/*******************************************************************\ - -Module: History for path-based symbolic simulator - -Author: Daniel Kroening, kroening@kroening.com - -\*******************************************************************/ - -#ifndef CPROVER_AA_PATH_SYMEX_PATH_SYMEX_HISTORY_H -#define CPROVER_AA_PATH_SYMEX_PATH_SYMEX_HISTORY_H - -#include -#include - -#include - -#include "loc_ref.h" - -class path_symex_stept; - -// This is a reference to a path_symex_stept, -// and is really cheap to copy. These references are stable, -// even though the underlying vector is not. -class path_symex_step_reft -{ -public: - explicit inline path_symex_step_reft( - class path_symex_historyt &_history): - index(std::numeric_limits::max()), - history(&_history) - { - } - - inline path_symex_step_reft(): - index(std::numeric_limits::max()), history(0) - { - } - - inline bool is_nil() const - { - return index==std::numeric_limits::max(); - } - - inline path_symex_historyt &get_history() const - { - assert(history!=0); - return *history; - } - - // pre-decrement - inline path_symex_step_reft &operator--(); - - inline path_symex_stept &operator*() const { return get(); } - inline path_symex_stept *operator->() const { return &get(); } - - void generate_successor(); - - // build a forward-traversible version of the history - void build_history(std::vector &dest) const; - -protected: - // we use a vector to store all steps - std::size_t index; - class path_symex_historyt *history; - - inline path_symex_stept &get() const; -}; - -class decision_proceduret; - -// the actual history node -class path_symex_stept -{ -public: - path_symex_step_reft predecessor; - - // the thread that did the step - unsigned thread_nr; - - // the instruction that was executed - loc_reft pc; - - exprt guard, ssa_rhs; - exprt full_lhs; - symbol_exprt ssa_lhs; - - bool hidden; - - path_symex_stept(): - guard(nil_exprt()), - ssa_rhs(nil_exprt()), - full_lhs(nil_exprt()), - hidden(false) - { - } - - // interface to solvers; this converts a single step - void convert(decision_proceduret &dest) const; - - void output(std::ostream &) const; -}; - -// converts the full history -static inline decision_proceduret &operator << ( - decision_proceduret &dest, - path_symex_step_reft src) -{ - while(!src.is_nil()) - { - src->convert(dest); - --src; - } - - return dest; -} - -// this stores the forest of histories -class path_symex_historyt -{ -public: - typedef std::vector step_containert; - step_containert step_container; - - // TODO: consider typedefing path_symex_historyt - inline void clear() - { - step_container.clear(); - } -}; - -inline void path_symex_step_reft::generate_successor() -{ - assert(history!=0); - path_symex_step_reft old=*this; - index=history->step_container.size(); - history->step_container.push_back(path_symex_stept()); - history->step_container.back().predecessor=old; -} - -inline path_symex_step_reft &path_symex_step_reft::operator--() -{ - *this=get().predecessor; - return *this; -} - -inline path_symex_stept &path_symex_step_reft::get() const -{ - assert(history!=0); - assert(!is_nil()); - return history->step_container[index]; -} - -inline void path_symex_step_reft::build_history( - std::vector &dest) const -{ - path_symex_step_reft s=*this; - while(!s.is_nil()) - { - dest.push_back(s); - --s; - } -} - -#endif // CPROVER_AA_PATH_SYMEX_PATH_SYMEX_HISTORY_H diff --git a/src/aa-path-symex/path_symex_state.cpp b/src/aa-path-symex/path_symex_state.cpp index a078c4c2e65..124b0e7fea9 100644 --- a/src/aa-path-symex/path_symex_state.cpp +++ b/src/aa-path-symex/path_symex_state.cpp @@ -17,6 +17,7 @@ Author: Daniel Kroening, kroening@kroening.com #include #include +#include #include "path_symex_state.h" @@ -153,27 +154,31 @@ exprt path_symex_statet::read(const exprt &src, bool propagate) //std::cout << "path_symex_statet::read " << src.pretty() << std::endl; #endif - // This has four phases! + // This has five phases! // 1. Floating-point expression adjustment (rounding mode) - // 2. Dereferencing, including propagation of pointers. - // 3. Rewriting to SSA symbols - // 4. Simplifier + // 2. Rewrite unions into byte operators + // 3. Dereferencing, including propagation of pointers. + // 4. Rewriting to SSA symbols + // 5. Simplifier exprt tmp1=src; adjust_float_expressions(tmp1, var_map.ns); + exprt tmp2=tmp1; + rewrite_union(tmp2, var_map.ns); + // we force propagation for dereferencing - exprt tmp2=dereference_rec(tmp1, true); + exprt tmp3=dereference_rec(tmp2, true); - exprt tmp3=instantiate_rec(tmp2, propagate); + exprt tmp4=instantiate_rec(tmp3, propagate); - exprt tmp4=simplify_expr(tmp3, var_map.ns); + exprt tmp5=simplify_expr(tmp4, var_map.ns); #ifdef DEBUG //std::cout << " ==> " << tmp.pretty() << std::endl; #endif - return tmp4; + return tmp5; } /*******************************************************************\ @@ -239,13 +244,13 @@ exprt path_symex_statet::instantiate_rec( if(to_integer(array_type.size(), size)) throw "failed to convert array size"; - unsigned long long size_int=integer2unsigned(size); + std::size_t size_int=integer2size_t(size); array_exprt result(array_type); result.operands().resize(size_int); // split it up into elements - for(unsigned long long i=0; i -#include "locs.h" -#include "var_map.h" -#include "path_symex_history.h" +#include +#include +#include // These variables may be defined in this header file only because // it is (transitively) included by many essential path-symex files. diff --git a/src/aa-path-symex/var_map.cpp b/src/aa-path-symex/var_map.cpp deleted file mode 100644 index 941a8645a6f..00000000000 --- a/src/aa-path-symex/var_map.cpp +++ /dev/null @@ -1,118 +0,0 @@ -/*******************************************************************\ - -Module: Variable Numbering - -Author: Daniel Kroening, kroening@kroening.com - -\*******************************************************************/ - -#include -#include -#include - -#include "var_map.h" - -// #define DEBUG - -/*******************************************************************\ - -Function: var_mapt::var_infot::output - - Inputs: - - Outputs: - - Purpose: - -\*******************************************************************/ - -void var_mapt::var_infot::output(std::ostream &out) const -{ - out << "full_identifier: " << full_identifier << "\n"; - out << "symbol: " << symbol << "\n"; - out << "suffix: " << suffix << "\n"; - - out << "kind: "; - - switch(kind) - { - case PROCEDURE_LOCAL: out << "PROCEDURE_LOCAL"; break; - case THREAD_LOCAL: out << "THREAD_LOCAL"; break; - case SHARED: out << "SHARED"; break; - } - - out << "\n"; - - out << "number: " << number << "\n"; - - out << "type: " << type << "\n"; - - out << "\n"; -} - -/*******************************************************************\ - -Function: var_mapt::init - - Inputs: - - Outputs: - - Purpose: - -\*******************************************************************/ - -void var_mapt::init(var_infot &var_info) -{ - if(has_prefix(id2string(var_info.symbol), "symex_dynamic::")) - { - var_info.kind=var_infot::SHARED; - } - else - { - try - { - const symbolt &symbol=ns.lookup(var_info.symbol); - - if(symbol.is_static_lifetime) - { - if(symbol.is_thread_local) - var_info.kind=var_infot::THREAD_LOCAL; - else - var_info.kind=var_infot::SHARED; - } - else - var_info.kind=var_infot::PROCEDURE_LOCAL; - } - - catch(std::string s) - { - throw "var_mapt::init identifier \"" + - id2string(var_info.full_identifier)+ - "\" lookup in ns failed"; - } - } - - if(var_info.is_shared()) - var_info.number=shared_count++; - else - var_info.number=local_count++; -} - -/*******************************************************************\ - -Function: var_mapt::var_infot::ssa_identifier - - Inputs: - - Outputs: - - Purpose: - -\*******************************************************************/ - -irep_idt var_mapt::var_infot::ssa_identifier() const -{ - return id2string(full_identifier)+ - "#"+std::to_string(ssa_counter); -} diff --git a/src/aa-path-symex/var_map.h b/src/aa-path-symex/var_map.h deleted file mode 100644 index 00c95ec3ad5..00000000000 --- a/src/aa-path-symex/var_map.h +++ /dev/null @@ -1,121 +0,0 @@ -/*******************************************************************\ - -Module: Variable Numbering - -Author: Daniel Kroening, kroening@kroening.com - -\*******************************************************************/ - -#ifndef CPROVER_AA_PATH_SYMEX_VAR_MAP_H -#define CPROVER_AA_PATH_SYMEX_VAR_MAP_H - -#include - -#include -#include - -class var_mapt -{ -public: - explicit var_mapt(const namespacet &_ns): - ns(_ns), shared_count(0), local_count(0), nondet_count(0), dynamic_count(0) - { - } - - struct var_infot - { - enum { SHARED, THREAD_LOCAL, PROCEDURE_LOCAL } kind; - - inline bool is_shared() const - { - return kind==SHARED; - } - - // the variables are numbered - unsigned number; - - // full_identifier=symbol+suffix - irep_idt full_identifier, symbol, suffix; - - // the type of the identifier (struct member or array) - typet type; - - unsigned ssa_counter; - - var_infot():kind(SHARED), number(0), ssa_counter(0) - { - } - - irep_idt ssa_identifier() const; - - symbol_exprt ssa_symbol() const - { - symbol_exprt s=symbol_exprt(ssa_identifier(), type); - s.set(ID_C_SSA_symbol, true); - s.set(ID_C_full_identifier, full_identifier); - return s; - } - - inline void increment_ssa_counter() - { - ++ssa_counter; - } - - void output(std::ostream &out) const; - }; - - typedef std::map id_mapt; - id_mapt id_map; - - inline var_infot &operator()( - const irep_idt &symbol, - const irep_idt &suffix, - const typet &type) - { - std::string full_identifier= - id2string(symbol)+id2string(suffix); - - std::pair result; - - result=id_map.insert(std::pair( - full_identifier, var_infot())); - - if(result.second) // inserted? - { - result.first->second.full_identifier=full_identifier; - result.first->second.symbol=symbol; - result.first->second.suffix=suffix; - result.first->second.type=type; - init(result.first->second); - } - - return result.first->second; - } - - inline var_infot &operator[](const irep_idt &full_identifier) - { - return id_map[full_identifier]; - } - - inline void clear() - { - shared_count=0; - local_count=0; - nondet_count=0; - dynamic_count=0; - id_map.clear(); - } - - void init(var_infot &var_info); - - const namespacet &ns; - -protected: - unsigned shared_count, local_count; - -public: - unsigned nondet_count; // free inputs - unsigned dynamic_count; // memory allocation -}; - -#endif // CPROVER_AA_PATH_SYMEX_VAR_MAP_H diff --git a/src/aa-symex/Makefile b/src/aa-symex/Makefile index 5ff56e5ded2..a5e2b0ad5d8 100644 --- a/src/aa-symex/Makefile +++ b/src/aa-symex/Makefile @@ -1,4 +1,4 @@ -SRC = symex_main.cpp symex_parseoptions.cpp path_search.cpp +SRC = path_search.cpp OBJ += ../ansi-c/ansi-c$(LIBEXT) \ ../linking/linking$(LIBEXT) \ @@ -11,8 +11,15 @@ OBJ += ../ansi-c/ansi-c$(LIBEXT) \ ../solvers/solvers$(LIBEXT) \ ../util/util$(LIBEXT) \ ../goto-symex/adjust_float_expressions$(OBJEXT) \ + ../goto-symex/rewrite_union$(OBJEXT) \ ../pointer-analysis/dereference$(OBJEXT) \ - ../aa-path-symex/aa-path-symex$(LIBEXT) + ../goto-instrument/cover$(OBJEXT) \ + ../aa-path-symex/aa-path-symex$(LIBEXT) \ + ../symex/symex_main$(OBJEXT) \ + ../symex/symex_parse_options$(OBJEXT) \ + ../symex/symex_cover$(OBJEXT) \ + ../path-symex/locs$(OBJEXT) ../path-symex/var_map$(OBJEXT) \ + ../path-symex/path_symex_history$(OBJEXT) INCLUDES= -I .. diff --git a/src/aa-symex/path_search.cpp b/src/aa-symex/path_search.cpp index 9b8d2295a45..b6fdfdd70dd 100644 --- a/src/aa-symex/path_search.cpp +++ b/src/aa-symex/path_search.cpp @@ -44,7 +44,8 @@ path_searcht::resultt path_searcht::operator()( // run concurrently. This could be remedied by piping // to individual files or inter-process communication, // a performance bottleneck, however. - *messaget::mstream.message_handler=NULL; + null_message_handlert null_message; + set_message_handler(null_message); #endif locst locs(ns); @@ -58,9 +59,9 @@ path_searcht::resultt path_searcht::operator()( queue.push_back(initial_state(var_map, locs, history)); // set up the statistics - number_of_paths=0; number_of_instructions=0; number_of_dropped_states=0; + number_of_paths=0; number_of_VCCs=0; number_of_VCCs_after_simplification=0; number_of_failed_properties=0; @@ -136,10 +137,10 @@ path_searcht::resultt path_searcht::operator()( if(state->get_instruction()->is_assert()) { if(show_vcc) - do_show_vcc(*state, ns); + do_show_vcc(*state); else { - check_assertion(*state, ns); + check_assertion(*state); // all assertions failed? if(number_of_failed_properties==property_map.size()) @@ -271,8 +272,6 @@ Function: path_searcht::report_statistics void path_searcht::report_statistics() { // report a bit - status() << "Number of paths: " - << number_of_paths << messaget::eom; status() << "Number of instructions: " << number_of_instructions << messaget::eom; @@ -280,6 +279,9 @@ void path_searcht::report_statistics() status() << "Number of dropped states: " << number_of_dropped_states << messaget::eom; + status() << "Number of paths: " + << number_of_paths << messaget::eom; + status() << "Number of fast forward steps: " << number_of_fast_forward_steps << messaget::eom; @@ -323,9 +325,7 @@ Function: path_searcht::do_show_vcc \*******************************************************************/ -void path_searcht::do_show_vcc( - statet &state, - const namespacet &ns) +void path_searcht::do_show_vcc(statet &state) { // keep statistics number_of_VCCs++; @@ -335,11 +335,11 @@ void path_searcht::do_show_vcc( mstreamt &out=result(); - if(instruction.location.is_not_nil()) - out << instruction.location << "\n"; + if(instruction.source_location.is_not_nil()) + out << instruction.source_location << '\n'; - if(instruction.location.get_comment()!="") - out << instruction.location.get_comment() << "\n"; + if(instruction.source_location.get_comment()!="") + out << instruction.source_location.get_comment() << '\n'; unsigned count=1; @@ -351,25 +351,25 @@ void path_searcht::do_show_vcc( if(step_ref->guard.is_not_nil()) { std::string string_value=from_expr(ns, "", step_ref->guard); - out << "{-" << count << "} " << string_value << "\n"; + out << "{-" << count << "} " << string_value << '\n'; count++; } - if((*s_it)->ssa_rhs.is_not_nil()) + if(step_ref->ssa_rhs.is_not_nil()) { - equal_exprt equality((*s_it)->ssa_lhs, (*s_it)->ssa_rhs); + equal_exprt equality(step_ref->ssa_lhs, step_ref->ssa_rhs); std::string string_value=from_expr(ns, "", equality); - out << "{-" << count << "} " << string_value << "\n"; + out << "{-" << count << "} " << string_value << '\n'; count++; } } - out << "|--------------------------" << "\n"; + out << "|--------------------------" << '\n'; exprt assertion=state.read(instruction.guard); out << "{" << 1 << "} " - << from_expr(ns, "", assertion) << "\n"; + << from_expr(ns, "", assertion) << '\n'; if(!assertion.is_true()) number_of_VCCs_after_simplification++; @@ -391,14 +391,17 @@ Function: path_searcht::drop_state bool path_searcht::drop_state(const statet &state) const { - // depth - if(depth_limit!=-1 && state.get_depth()>depth_limit) return true; + // depth limit + if(depth_limit_set && state.get_depth()>depth_limit) + return true; // context bound - if(context_bound!=-1 && state.get_no_thread_interleavings()) return true; + if(context_bound_set && state.get_no_thread_interleavings()>context_bound) + return true; + // unwinding limit -- loops - if(unwind_limit!=-1 && state.get_instruction()->is_backwards_goto()) + if(unwind_limit_set && state.get_instruction()->is_backwards_goto()) { for(const auto &loop_info : state.unwinding_map) if(loop_info.second>unwind_limit) @@ -406,7 +409,7 @@ bool path_searcht::drop_state(const statet &state) const } // unwinding limit -- recursion - if(unwind_limit!=-1 && state.get_instruction()->is_function_call()) + if(unwind_limit_set && state.get_instruction()->is_function_call()) { for(const auto &rec_info : state.recursion_map) if(rec_info.second>unwind_limit) @@ -428,9 +431,7 @@ Function: path_searcht::check_assertion \*******************************************************************/ -void path_searcht::check_assertion( - statet &state, - const namespacet &ns) +void path_searcht::check_assertion(statet &state) { // keep statistics number_of_VCCs++; @@ -438,13 +439,13 @@ void path_searcht::check_assertion( const goto_programt::instructiont &instruction= *state.get_instruction(); - irep_idt property_name=instruction.location.get_property_id(); + irep_idt property_name=instruction.source_location.get_property_id(); property_entryt &property_entry=property_map[property_name]; - if(property_entry.status==FAIL) + if(property_entry.status==FAILURE) return; // already failed else if(property_entry.status==NOT_REACHED) - property_entry.status=PASS; // well, for now! + property_entry.status=SUCCESS; // well, for now! // the assertion in SSA exprt assertion= @@ -469,7 +470,7 @@ void path_searcht::check_assertion( if(!state.check_assertion(bv_pointers)) { build_goto_trace(state, bv_pointers, property_entry.error_trace); - property_entry.status=FAIL; + property_entry.status=FAILURE; number_of_failed_properties++; } @@ -501,13 +502,14 @@ void path_searcht::initialize_property_map( if(!i_it->is_assert()) continue; - const locationt &location=i_it->location; + const source_locationt &source_location=i_it->source_location; - irep_idt property_name=location.get_property_id(); + irep_idt property_name=source_location.get_property_id(); property_entryt &property_entry=property_map[property_name]; property_entry.status=NOT_REACHED; - property_entry.description=location.get_comment(); + property_entry.description=source_location.get_comment(); + property_entry.source_location=source_location; } } } diff --git a/src/aa-symex/path_search.h b/src/aa-symex/path_search.h index 3c546989fd2..7a6b270c040 100644 --- a/src/aa-symex/path_search.h +++ b/src/aa-symex/path_search.h @@ -22,25 +22,39 @@ class path_searcht:public safety_checkert explicit inline path_searcht(const namespacet &_ns): safety_checkert(_ns), show_vcc(false), - depth_limit(-1), // no limit - context_bound(-1), - unwind_limit(-1) + depth_limit_set(false), // no limit + context_bound_set(false), + unwind_limit_set(false) { } virtual resultt operator()( const goto_functionst &goto_functions); - bool show_vcc; + void set_depth_limit(unsigned limit) + { + depth_limit_set=true; + depth_limit=limit; + } - unsigned depth_limit; - unsigned context_bound; - unsigned unwind_limit; + void set_context_bound(unsigned limit) + { + context_bound_set=true; + context_bound=limit; + } + + void set_unwind_limit(unsigned limit) + { + unwind_limit_set=true; + unwind_limit=limit; + } + + bool show_vcc; // statistics - unsigned number_of_paths; unsigned number_of_instructions; unsigned number_of_dropped_states; + unsigned number_of_paths; unsigned number_of_VCCs; unsigned number_of_VCCs_after_simplification; unsigned number_of_failed_properties; @@ -48,13 +62,18 @@ class path_searcht:public safety_checkert absolute_timet start_time; time_periodt sat_time; - enum statust { NOT_REACHED, PASS, FAIL }; + enum statust { NOT_REACHED, SUCCESS, FAILURE }; struct property_entryt { statust status; irep_idt description; goto_tracet error_trace; + source_locationt source_location; + + inline bool is_success() const { return status==SUCCESS; } + inline bool is_failure() const { return status==FAILURE; } + inline bool is_not_reached() const { return status==NOT_REACHED; } }; typedef std::map property_mapt; @@ -73,15 +92,17 @@ class path_searcht:public safety_checkert typedef path_symex_statet statet; // State queue. Iterators are stable. + // The states most recently executed are at the head. typedef std::list queuet; queuet queue; + // search heuristic queuet::iterator pick_state(); bool execute(queuet::iterator state, const namespacet &); - void check_assertion(statet &state, const namespacet &); - void do_show_vcc(statet &state, const namespacet &); + void check_assertion(statet &state); + void do_show_vcc(statet &state); bool drop_state(const statet &state) const; @@ -89,6 +110,11 @@ class path_searcht:public safety_checkert void initialize_property_map( const goto_functionst &goto_functions); + + unsigned depth_limit; + unsigned context_bound; + unsigned unwind_limit; + bool depth_limit_set, context_bound_set, unwind_limit_set; }; #endif // CPROVER_AA_SYMEX_PATH_SEARCH_H diff --git a/src/aa-symex/symex_main.cpp b/src/aa-symex/symex_main.cpp deleted file mode 100644 index eed970eb5cc..00000000000 --- a/src/aa-symex/symex_main.cpp +++ /dev/null @@ -1,38 +0,0 @@ -/*******************************************************************\ - -Module: Symex Main Module - -Author: Daniel Kroening, kroening@kroening.com - -\*******************************************************************/ - -#include - -#include "symex_parseoptions.h" - -/*******************************************************************\ - -Function: main - - Inputs: - - Outputs: - - Purpose: - -\*******************************************************************/ - -#ifdef _MSC_VER -int wmain(int argc, const wchar_t **argv_wide) -{ - const char **argv=narrow_argv(argc, argv_wide); - symex_parseoptionst parseoptions(argc, argv); - return parseoptions.main(); -} -#else -int main(int argc, const char **argv) -{ - symex_parseoptionst parseoptions(argc, argv); - return parseoptions.main(); -} -#endif diff --git a/src/aa-symex/symex_parseoptions.cpp b/src/aa-symex/symex_parseoptions.cpp deleted file mode 100644 index 8eaf3de42f1..00000000000 --- a/src/aa-symex/symex_parseoptions.cpp +++ /dev/null @@ -1,784 +0,0 @@ -/*******************************************************************\ - -Module: Symex Command Line Options Processing - -Author: Daniel Kroening, kroening@kroening.com - -\*******************************************************************/ - -#include -#include -#include - -#include -#include -#include -#include -#include - -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#include - -#include - -#include "path_search.h" -#include "symex_parseoptions.h" - -/*******************************************************************\ - -Function: symex_parseoptionst::symex_parseoptionst - - Inputs: - - Outputs: - - Purpose: - -\*******************************************************************/ - -symex_parseoptionst::symex_parseoptionst(int argc, const char **argv): - parseoptions_baset(SYMEX_OPTIONS, argc, argv), - language_uit("Symex " CBMC_VERSION, cmdline) -{ -} - -/*******************************************************************\ - -Function: symex_parseoptionst::eval_verbosity - - Inputs: - - Outputs: - - Purpose: - -\*******************************************************************/ - -void symex_parseoptionst::eval_verbosity() -{ - // this is our default verbosity - int v=messaget::M_STATISTICS; - - if(cmdline.isset("verbosity")) - { - v=unsafe_string2int(cmdline.getval("verbosity")); - if(v<0) - v=0; - else if(v>10) - v=10; - } - - set_verbosity(v); -} - -/*******************************************************************\ - -Function: symex_parseoptionst::get_command_line_options - - Inputs: - - Outputs: - - Purpose: - -\*******************************************************************/ - -void symex_parseoptionst::get_command_line_options(optionst &options) -{ - if(config.set(cmdline)) - { - usage_error(); - std::exit(1); - } - - if(cmdline.isset("debug-level")) - options.set_option("debug-level", cmdline.getval("debug-level")); - - if(cmdline.isset("unwindset")) - options.set_option("unwindset", cmdline.getval("unwindset")); - - // all checks supported by goto_check - GOTO_CHECK_PARSE_OPTIONS(cmdline, options); - - // check assertions - if(cmdline.isset("no-assertions")) - options.set_option("assertions", false); - else - options.set_option("assertions", true); - - // use assumptions - if(cmdline.isset("no-assumptions")) - options.set_option("assumptions", false); - else - options.set_option("assumptions", true); - - // magic error label - if(cmdline.isset("error-label")) - options.set_option("error-label", cmdline.getval("error-label")); -} - -/*******************************************************************\ - -Function: symex_parseoptionst::doit - - Inputs: - - Outputs: - - Purpose: invoke main modules - -\*******************************************************************/ - -int symex_parseoptionst::doit() -{ - if(cmdline.isset("version")) - { - std::cout << CBMC_VERSION << std::endl; - return 0; - } - - register_language(new_ansi_c_language); - register_language(new_cpp_language); - - // - // command line options - // - - optionst options; - get_command_line_options(options); - - eval_verbosity(); - - goto_functionst goto_functions; - - if(get_goto_program(options, goto_functions)) - return 6; - - label_properties(goto_functions); - - if(cmdline.isset("show-properties")) - { - const namespacet ns(symbol_table); - show_properties(ns, get_ui(), goto_functions); - return 0; - } - - if(set_properties(goto_functions)) - return 7; - - if(cmdline.isset("show-locs")) - { - const namespacet ns(symbol_table); - locst locs(ns); - locs.build(goto_functions); - locs.output(std::cout); - return 0; - } - - // do actual Symex - - try - { - const namespacet ns(symbol_table); - path_searcht path_search(ns); - - path_search.set_message_handler(get_message_handler()); - path_search.set_verbosity(get_verbosity()); - - if(cmdline.isset("depth")) - path_search.depth_limit=unsafe_string2unsigned(cmdline.getval("depth")); - - if(cmdline.isset("context-bound")) - path_search.context_bound=unsafe_string2unsigned(cmdline.getval("context-bound")); - - if(cmdline.isset("unwind")) - path_search.unwind_limit=unsafe_string2unsigned(cmdline.getval("unwind")); - - if(cmdline.isset("show-vcc")) - { - path_search.show_vcc=true; - path_search(goto_functions); - return 0; - } - - // do actual symex - switch(path_search(goto_functions)) - { - case safety_checkert::SAFE: - report_properties(path_search.property_map); - report_success(); - return 0; - - case safety_checkert::UNSAFE: - report_properties(path_search.property_map); - report_failure(); - return 10; - - default: - return 8; - } - } - - catch(const std::string error_msg) - { - error() << error_msg << messaget::eom; - return 8; - } - - catch(const char *error_msg) - { - error() << error_msg << messaget::eom; - return 8; - } - - #if 0 - // let's log some more statistics - debug() << "Memory consumption:" << messaget::endl; - memory_info(debug()); - debug() << eom; - #endif -} - -/*******************************************************************\ - -Function: symex_parseoptionst::set_properties - - Inputs: - - Outputs: - - Purpose: - -\*******************************************************************/ - -bool symex_parseoptionst::set_properties(goto_functionst &goto_functions) -{ - try - { - if(cmdline.isset("property")) - ::set_properties(goto_functions, cmdline.get_values("property")); - } - - catch(const char *e) - { - error(e); - return true; - } - - catch(const std::string e) - { - error(e); - return true; - } - - catch(int) - { - return true; - } - - return false; -} - -/*******************************************************************\ - -Function: symex_parseoptionst::get_goto_program - - Inputs: - - Outputs: - - Purpose: - -\*******************************************************************/ - -bool symex_parseoptionst::get_goto_program( - const optionst &options, - goto_functionst &goto_functions) -{ - if(cmdline.args.empty()) - { - error() << "Please provide a program to verify" << eom; - return true; - } - - try - { - if(cmdline.args.size()==1 && - is_goto_binary(cmdline.args[0])) - { - status() << "Reading GOTO program from file" << eom; - - if(read_goto_binary(cmdline.args[0], - symbol_table, goto_functions, get_message_handler())) - return true; - - config.ansi_c.set_from_symbol_table(symbol_table); - - if(cmdline.isset("show-symbol-table")) - { - show_symbol_table(); - return true; - } - - irep_idt entry_point=goto_functions.entry_point(); - - if(symbol_table.symbols.find(entry_point)==symbol_table.symbols.end()) - { - error() << "The goto binary has no entry point; please complete linking" << eom; - return true; - } - } - else if(cmdline.isset("show-parse-tree")) - { - if(cmdline.args.size()!=1) - { - error() << "Please give one source file only" << eom; - return true; - } - - std::string filename=cmdline.args[0]; - - #ifdef _MSC_VER - std::ifstream infile(widen(filename).c_str()); - #else - std::ifstream infile(filename.c_str()); - #endif - - if(!infile) - { - error() << "failed to open input file `" << filename << "'" << eom; - return true; - } - - languaget *language=get_language_from_filename(filename); - - if(language==NULL) - { - error() << "failed to figure out type of file `" << filename << "'" << eom; - return true; - } - - status("Parsing", filename); - - if(language->parse(infile, filename, get_message_handler())) - { - error() << "PARSING ERROR" << eom; - return true; - } - - language->show_parse(std::cout); - return true; - } - else - { - - if(parse()) return true; - if(typecheck()) return true; - if(final()) return true; - - // we no longer need any parse trees or language files - clear_parse(); - - if(cmdline.isset("show-symbol-table")) - { - show_symbol_table(); - return true; - } - - irep_idt entry_point=goto_functions.entry_point(); - - if(symbol_table.symbols.find(entry_point)==symbol_table.symbols.end()) - { - error() << "No entry point; please provide a main function" << eom; - return true; - } - - status() << "Generating GOTO Program" << eom; - - goto_convert(symbol_table, goto_functions, ui_message_handler); - } - - // finally add the library - status() << "Adding CPROVER library" << eom; - link_to_library(symbol_table, goto_functions, ui_message_handler); - - if(process_goto_program(options, goto_functions)) - return true; - } - - catch(const char *e) - { - error(e); - return true; - } - - catch(const std::string e) - { - error(e); - return true; - } - - catch(int) - { - return true; - } - - catch(std::bad_alloc) - { - error() << "Out of memory" << eom; - return true; - } - - return false; -} - -/*******************************************************************\ - -Function: symex_parseoptionst::process_goto_program - - Inputs: - - Outputs: - - Purpose: - -\*******************************************************************/ - -bool symex_parseoptionst::process_goto_program( - const optionst &options, - goto_functionst &goto_functions) -{ - try - { - namespacet ns(symbol_table); - - // do partial inlining - status() << "Partial Inlining" << eom; - goto_partial_inline(goto_functions, ns, ui_message_handler); - - // add generic checks - status() << "Generic Property Instrumentation" << eom; - goto_check(ns, options, goto_functions); - - // recalculate numbers, etc. - goto_functions.update(); - - // add loop ids - goto_functions.compute_loop_numbers(); - - // if we aim to cover, replace - // all assertions by false to prevent simplification - - if(cmdline.isset("cover-assertions")) - make_assertions_false(goto_functions); - - // show it? - if(cmdline.isset("show-loops")) - { - show_loop_ids(get_ui(), goto_functions); - return true; - } - - // show it? - if(cmdline.isset("show-goto-functions")) - { - goto_functions.output(ns, std::cout); - return true; - } - } - - catch(const char *e) - { - error(e); - return true; - } - - catch(const std::string e) - { - error(e); - return true; - } - - catch(int) - { - return true; - } - - catch(std::bad_alloc) - { - error() << "Out of memory" << eom; - return true; - } - - return false; -} - -/*******************************************************************\ - -Function: symex_parseoptionst::report_properties - - Inputs: - - Outputs: - - Purpose: - -\*******************************************************************/ - -void symex_parseoptionst::report_properties( - const path_searcht::property_mapt &property_map) -{ - for(const auto &prop_pair : property_map) - { - if(get_ui()==ui_message_handlert::XML_UI) - { - xmlt xml_result("result"); - xml_result.set_attribute("claim", id2string(prop_pair.first)); - - std::string status_string; - - switch(it->second.status) - { - case path_searcht::PASS: status_string="OK"; break; - case path_searcht::FAIL: status_string="FAILURE"; break; - case path_searcht::NOT_REACHED: status_string="OK"; break; - } - - xml_result.set_attribute("status", status_string); - - std::cout << xml_result << "\n"; - } - else - { - status() << "[" << prop_pair.first << "] " - << prop_pair.second.description << ": "; - switch(prop_pair.second.status) - { - case path_searcht::PASS: status() << "OK"; break; - case path_searcht::FAIL: status() << "FAILED"; break; - case path_searcht::NOT_REACHED: status() << "OK"; break; - } - status() << eom; - } - - if(cmdline.isset("show-trace") && - prop_pair.second.status==path_searcht::FAIL) - show_counterexample(prop_pair.second.error_trace); - } - - if(!cmdline.isset("property")) - { - status() << eom; - - unsigned failed=0; - - for(const auto &prop_pair : property_map) - if(prop_pair.second.status==path_searcht::FAIL) - failed++; - - status() << "** " << failed - << " of " << property_map.size() << " failed" - << eom; - } -} - -/*******************************************************************\ - -Function: symex_parseoptionst::report_success - - Inputs: - - Outputs: - - Purpose: - -\*******************************************************************/ - -void symex_parseoptionst::report_success() -{ - result() << "VERIFICATION SUCCESSFUL" << eom; - - switch(get_ui()) - { - case ui_message_handlert::PLAIN: - break; - - case ui_message_handlert::XML_UI: - { - xmlt xml("cprover-status"); - xml.data="SUCCESS"; - std::cout << xml; - std::cout << std::endl; - } - break; - - default: - assert(false); - } -} - -/*******************************************************************\ - -Function: symex_parseoptionst::show_counterexample - - Inputs: - - Outputs: - - Purpose: - -\*******************************************************************/ - -void symex_parseoptionst::show_counterexample( - const goto_tracet &error_trace) -{ - const namespacet ns(symbol_table); - - switch(get_ui()) - { - case ui_message_handlert::PLAIN: - std::cout << std::endl << "Counterexample:" << std::endl; - show_goto_trace(std::cout, ns, error_trace); - break; - - case ui_message_handlert::XML_UI: - { - xmlt xml; - convert(ns, error_trace, xml); - std::cout << xml << std::endl; - } - break; - - default: - assert(false); - } -} - -/*******************************************************************\ - -Function: symex_parseoptionst::report_failure - - Inputs: - - Outputs: - - Purpose: - -\*******************************************************************/ - -void symex_parseoptionst::report_failure() -{ - result() << "VERIFICATION FAILED" << eom; - - switch(get_ui()) - { - case ui_message_handlert::PLAIN: - break; - - case ui_message_handlert::XML_UI: - { - xmlt xml("cprover-status"); - xml.data="FAILURE"; - std::cout << xml; - std::cout << std::endl; - } - break; - - default: - assert(false); - } -} - -/*******************************************************************\ - -Function: symex_parseoptionst::help - - Inputs: - - Outputs: - - Purpose: display command line help - -\*******************************************************************/ - -void symex_parseoptionst::help() -{ - std::cout << - "\n" - "* * Symex " CBMC_VERSION " - Copyright (C) 2013 "; - - std::cout << "(" << (sizeof(void *)*8) << "-bit version)"; - - std::cout << " * *\n"; - - std::cout << - "* * Daniel Kroening * *\n" - "* * University of Oxford * *\n" - "* * kroening@kroening.com * *\n" - "\n" - "Usage: Purpose:\n" - "\n" - " symex [-?] [-h] [--help] show help\n" - " symex file.c ... source file names\n" - "\n" - "Frontend options:\n" - " -I path set include path (C/C++)\n" - " -D macro define preprocessor macro (C/C++)\n" - " --preprocess stop after preprocessing\n" - " --16, --32, --64 set width of int\n" - " --LP64, --ILP64, --LLP64,\n" - " --ILP32, --LP32 set width of int, long and pointers\n" - " --little-endian allow little-endian word-byte conversions\n" - " --big-endian allow big-endian word-byte conversions\n" - " --unsigned-char make \"char\" unsigned by default\n" - " --show-parse-tree show parse tree\n" - " --show-symbol-table show symbol table\n" - " --show-goto-functions show goto program\n" - " --ppc-macos set MACOS/PPC architecture\n" - " --mm model set memory model (default: sc)\n" - " --arch set architecture (default: " - << configt::this_architecture() << ")\n" - " --os set operating system (default: " - << configt::this_operating_system() << ")\n" - #ifdef _WIN32 - " --gcc use GCC as preprocessor\n" - #endif - " --no-arch don't set up an architecture\n" - " --no-library disable built-in abstract C library\n" - " --round-to-nearest IEEE floating point rounding mode (default)\n" - " --round-to-plus-inf IEEE floating point rounding mode\n" - " --round-to-minus-inf IEEE floating point rounding mode\n" - " --round-to-zero IEEE floating point rounding mode\n" - "\n" - "Program instrumentation options:\n" - GOTO_CHECK_HELP - " --show-properties show the properties\n" - " --no-assertions ignore user assertions\n" - " --no-assumptions ignore user assumptions\n" - " --error-label label check that label is unreachable\n" - "\n" - "Symex options:\n" - " --function name set main function name\n" - " --property nr only check one specific property\n" - " --depth nr limit search depth\n" - " --context-bound nr limit number of context switches\n" - " --unwind nr unwind nr times\n" - "\n" - "Other options:\n" - " --version show version and exit\n" - " --xml-ui use XML-formatted output\n" - "\n"; -} diff --git a/src/aa-symex/symex_parseoptions.h b/src/aa-symex/symex_parseoptions.h deleted file mode 100644 index 2b07b5880fd..00000000000 --- a/src/aa-symex/symex_parseoptions.h +++ /dev/null @@ -1,78 +0,0 @@ -/*******************************************************************\ - -Module: Command Line Parsing - -Author: Daniel Kroening, kroening@kroening.com - -\*******************************************************************/ - -#ifndef CPROVER_AA_SYMEX_SYMEX_PARSEOPTIONS_H -#define CPROVER_AA_SYMEX_SYMEX_PARSEOPTIONS_H - -#include -#include - -#include - -#include - -#include "path_search.h" - -class goto_functionst; -class optionst; - -#define SYMEX_OPTIONS \ - "(function):" \ - "D:I:" \ - "(depth):(context-bound):(unwind):" \ - GOTO_CHECK_OPTIONS \ - "(no-assertions)(no-assumptions)" \ - "(16)(32)(64)(LP64)(ILP64)(LLP64)(ILP32)(LP32)" \ - "(little-endian)(big-endian)" \ - "(error-label):(verbosity):(no-library)" \ - "(version)" \ - "(i386-linux)(i386-macos)(i386-win32)(win32)(winx64)(gcc)" \ - "(ppc-macos)(unsigned-char)" \ - "(string-abstraction)(no-arch)(arch):(floatbv)(fixedbv)" \ - "(round-to-nearest)(round-to-plus-inf)(round-to-minus-inf)(round-to-zero)" \ - "(show-locs)(show-vcc)(show-properties)(show-trace)" \ - "(property):" \ - "(no-simplify)(no-unwinding-assertions)(no-propagation)" - // the last line is for CBMC-regression testing only - -class symex_parseoptionst: - public parseoptions_baset, - public language_uit -{ -public: - virtual int doit(); - virtual void help(); - - symex_parseoptionst(int argc, const char **argv); - symex_parseoptionst( - int argc, - const char **argv, - const std::string &extra_options); - -protected: - void get_command_line_options(optionst &options); - - bool get_goto_program( - const optionst &options, - goto_functionst &goto_functions); - - bool process_goto_program( - const optionst &options, - goto_functionst &goto_functions); - - bool set_properties(goto_functionst &goto_functions); - - void report_success(); - void report_failure(); - void report_properties(const path_searcht::property_mapt &); - void show_counterexample(const class goto_tracet &); - - void eval_verbosity(); -}; - -#endif // CPROVER_AA_SYMEX_SYMEX_PARSEOPTIONS_H diff --git a/src/cegis/Makefile b/src/cegis/Makefile index 6547bec6890..95c5abbb2a9 100644 --- a/src/cegis/Makefile +++ b/src/cegis/Makefile @@ -129,6 +129,8 @@ LIBS = $(DLFCN_LINKFLAGS) CLEANFILES = cegis$(EXEEXT) +CP_CXXFLAGS += -Wno-unused-label + all: cegis$(EXEEXT) ifneq ($(wildcard ../java_bytecode/Makefile),) diff --git a/src/cegis/cegis-util/cbmc_runner.cpp b/src/cegis/cegis-util/cbmc_runner.cpp index b2b3c564366..58739658ab1 100644 --- a/src/cegis/cegis-util/cbmc_runner.cpp +++ b/src/cegis/cegis-util/cbmc_runner.cpp @@ -1,5 +1,11 @@ -#include -#include +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ #include #include @@ -43,43 +49,20 @@ bool is_gcc() return configt::ansi_ct::flavourt::GCC == config.ansi_c.mode; } -std::vector get_args() -{ - std::vector result= { "cbmc", "--stop-on-fail" }; - if (is_gcc()) result.push_back("--gcc"); - return result; -} - -std::vector get_argv(const std::vector &args) +int argc() { - std::vector result; - std::transform(args.begin(), args.end(), std::back_inserter(result), - std::mem_fun_ref(&std::string::c_str)); - return result; + return is_gcc()?3:2; } -class args_providert +const char **argv() { - const std::vector args; - std::vector arg_ref; -public: - args_providert() : - args(get_args()), arg_ref(get_argv(args)) - { - } - - int argc() - { - return arg_ref.size(); - } + static const char* n_gcc[]={"cbmc", "--stop-on-fail", 0}; + static const char* w_gcc[]={"cbmc", "--stop-on-fail", "--gcc", 0}; - const char * *argv() - { - return arg_ref.data(); - } -}; + return is_gcc()?w_gcc:n_gcc; +} -class cbmc_runnert: public args_providert, public cbmc_parse_optionst +class cbmc_runnert:public cbmc_parse_optionst { const symbol_tablet &st; const goto_functionst &gf; diff --git a/src/cegis/cegis-util/cbmc_runner.h b/src/cegis/cegis-util/cbmc_runner.h index 6317ca444c2..364be5ca2a5 100644 --- a/src/cegis/cegis-util/cbmc_runner.h +++ b/src/cegis/cegis-util/cbmc_runner.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/cegis-util/constant_width.cpp b/src/cegis/cegis-util/constant_width.cpp index 3ee1a74faf6..4f951e35694 100644 --- a/src/cegis/cegis-util/constant_width.cpp +++ b/src/cegis/cegis-util/constant_width.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include "constant_width.h" diff --git a/src/cegis/cegis-util/constant_width.h b/src/cegis/cegis-util/constant_width.h index 0e53b29a20e..94effe58964 100644 --- a/src/cegis/cegis-util/constant_width.h +++ b/src/cegis/cegis-util/constant_width.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/cegis-util/counterexample_vars.cpp b/src/cegis/cegis-util/counterexample_vars.cpp index b130324cdf0..f0593f7f486 100644 --- a/src/cegis/cegis-util/counterexample_vars.cpp +++ b/src/cegis/cegis-util/counterexample_vars.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/cegis-util/counterexample_vars.h b/src/cegis/cegis-util/counterexample_vars.h index b0e68f4f91c..9604c63b346 100644 --- a/src/cegis/cegis-util/counterexample_vars.h +++ b/src/cegis/cegis-util/counterexample_vars.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/cegis-util/goto_range.h b/src/cegis/cegis-util/goto_range.h index a34685336cf..e34dd50579f 100644 --- a/src/cegis/cegis-util/goto_range.h +++ b/src/cegis/cegis-util/goto_range.h @@ -1,12 +1,15 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ +#ifndef CPROVER_CEGIS_CEGIS_UTIL_GOTO_RANGE_H +#define CPROVER_CEGIS_CEGIS_UTIL_GOTO_RANGE_H + #include /** @@ -15,3 +18,5 @@ * @details */ typedef std::pair goto_ranget; + +#endif // CPROVER_CEGIS_CEGIS_UTIL_GOTO_RANGE_H diff --git a/src/cegis/cegis-util/inline_user_program.cpp b/src/cegis/cegis-util/inline_user_program.cpp index 11fb3d92bb7..8a34803d62f 100644 --- a/src/cegis/cegis-util/inline_user_program.cpp +++ b/src/cegis/cegis-util/inline_user_program.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/cegis-util/inline_user_program.h b/src/cegis/cegis-util/inline_user_program.h index 41a4b332e0a..4bcc9a0c2c2 100644 --- a/src/cegis/cegis-util/inline_user_program.h +++ b/src/cegis/cegis-util/inline_user_program.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/cegis-util/instruction_iterator.cpp b/src/cegis/cegis-util/instruction_iterator.cpp index 6b8d5df5fd3..f6dbaca1eda 100644 --- a/src/cegis/cegis-util/instruction_iterator.cpp +++ b/src/cegis/cegis-util/instruction_iterator.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include namespace diff --git a/src/cegis/cegis-util/instruction_iterator.h b/src/cegis/cegis-util/instruction_iterator.h index 94044e3cfc3..40b289f88e9 100644 --- a/src/cegis/cegis-util/instruction_iterator.h +++ b/src/cegis/cegis-util/instruction_iterator.h @@ -1,11 +1,11 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk - \*******************************************************************/ +\*******************************************************************/ #ifndef CPROVER_CEGIS_CEGIS_UTIL_INSTRUCTION_ITERATOR_H #define CPROVER_CEGIS_CEGIS_UTIL_INSTRUCTION_ITERATOR_H diff --git a/src/cegis/cegis-util/irep_pipe.cpp b/src/cegis/cegis-util/irep_pipe.cpp index 3a309e9e048..40300014409 100644 --- a/src/cegis/cegis-util/irep_pipe.cpp +++ b/src/cegis/cegis-util/irep_pipe.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/cegis-util/irep_pipe.h b/src/cegis/cegis-util/irep_pipe.h index f35980d2cc3..aa74b31c760 100644 --- a/src/cegis/cegis-util/irep_pipe.h +++ b/src/cegis/cegis-util/irep_pipe.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/cegis-util/iterator_helper.h b/src/cegis/cegis-util/iterator_helper.h index cc92868ba13..bbd7369cd33 100644 --- a/src/cegis/cegis-util/iterator_helper.h +++ b/src/cegis/cegis-util/iterator_helper.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/cegis-util/labelled_assignments.h b/src/cegis/cegis-util/labelled_assignments.h index fbe98008b01..1784731b4f0 100644 --- a/src/cegis/cegis-util/labelled_assignments.h +++ b/src/cegis/cegis-util/labelled_assignments.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/cegis-util/module_helper.cpp b/src/cegis/cegis-util/module_helper.cpp index 14e2f4fe2be..b4fd6e0157a 100644 --- a/src/cegis/cegis-util/module_helper.cpp +++ b/src/cegis/cegis-util/module_helper.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #ifdef _WIN32 #include #else diff --git a/src/cegis/cegis-util/module_helper.h b/src/cegis/cegis-util/module_helper.h index ad5283f099b..6c7413c78b0 100644 --- a/src/cegis/cegis-util/module_helper.h +++ b/src/cegis/cegis-util/module_helper.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/cegis-util/program_helper.cpp b/src/cegis/cegis-util/program_helper.cpp index c50eb0e8c90..673510d8b04 100644 --- a/src/cegis/cegis-util/program_helper.cpp +++ b/src/cegis/cegis-util/program_helper.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/cegis-util/program_helper.h b/src/cegis/cegis-util/program_helper.h index f6e1249cf7d..b2476d228a6 100644 --- a/src/cegis/cegis-util/program_helper.h +++ b/src/cegis/cegis-util/program_helper.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/cegis-util/string_helper.cpp b/src/cegis/cegis-util/string_helper.cpp index 5486acfa81a..883550d0c90 100644 --- a/src/cegis/cegis-util/string_helper.cpp +++ b/src/cegis/cegis-util/string_helper.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/cegis-util/string_helper.h b/src/cegis/cegis-util/string_helper.h index 26c987d08c8..3aedc93f68b 100644 --- a/src/cegis/cegis-util/string_helper.h +++ b/src/cegis/cegis-util/string_helper.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/cegis-util/task_pool.cpp b/src/cegis/cegis-util/task_pool.cpp index c5b9cef59f2..769dc49be79 100644 --- a/src/cegis/cegis-util/task_pool.cpp +++ b/src/cegis/cegis-util/task_pool.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #ifndef _WIN32 #include #include diff --git a/src/cegis/cegis-util/task_pool.h b/src/cegis/cegis-util/task_pool.h index 62b8266023f..d7c0dafc168 100644 --- a/src/cegis/cegis-util/task_pool.h +++ b/src/cegis/cegis-util/task_pool.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Util +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/cegis-util/temporary_output_block.cpp b/src/cegis/cegis-util/temporary_output_block.cpp index 07b3b122e88..d15641c6ca1 100644 --- a/src/cegis/cegis-util/temporary_output_block.cpp +++ b/src/cegis/cegis-util/temporary_output_block.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/cegis-util/temporary_output_block.h b/src/cegis/cegis-util/temporary_output_block.h index 20c7aa0a807..719cb0d1af1 100644 --- a/src/cegis/cegis-util/temporary_output_block.h +++ b/src/cegis/cegis-util/temporary_output_block.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/cegis-util/type_helper.cpp b/src/cegis/cegis-util/type_helper.cpp index c4b3266396d..b20ea9d08e6 100644 --- a/src/cegis/cegis-util/type_helper.cpp +++ b/src/cegis/cegis-util/type_helper.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/cegis-util/type_helper.h b/src/cegis/cegis-util/type_helper.h index db86f15d57a..f8898d6344a 100644 --- a/src/cegis/cegis-util/type_helper.h +++ b/src/cegis/cegis-util/type_helper.h @@ -1,11 +1,11 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk - \*******************************************************************/ +\*******************************************************************/ #ifndef CPROVER_CEGIS_CEGIS_UTIL_TYPE_HELPER_H #define CPROVER_CEGIS_CEGIS_UTIL_TYPE_HELPER_H diff --git a/src/cegis/constant/add_constant.cpp b/src/cegis/constant/add_constant.cpp index 4a2a762341f..29472aff5bc 100644 --- a/src/cegis/constant/add_constant.cpp +++ b/src/cegis/constant/add_constant.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/constant/add_constant.h b/src/cegis/constant/add_constant.h index 437a722ca53..5d61c80dde9 100644 --- a/src/cegis/constant/add_constant.h +++ b/src/cegis/constant/add_constant.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/constant/default_cegis_constant_strategy.cpp b/src/cegis/constant/default_cegis_constant_strategy.cpp index f7281a3cc7b..74fd4fac76a 100644 --- a/src/cegis/constant/default_cegis_constant_strategy.cpp +++ b/src/cegis/constant/default_cegis_constant_strategy.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/constant/default_cegis_constant_strategy.h b/src/cegis/constant/default_cegis_constant_strategy.h index ad952aaca76..2e687a1611e 100644 --- a/src/cegis/constant/default_cegis_constant_strategy.h +++ b/src/cegis/constant/default_cegis_constant_strategy.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/constant/literals_collector.cpp b/src/cegis/constant/literals_collector.cpp index 8ae3f85ba7f..7400815ef89 100644 --- a/src/cegis/constant/literals_collector.cpp +++ b/src/cegis/constant/literals_collector.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/constant/literals_collector.h b/src/cegis/constant/literals_collector.h index d25212f905e..85f12c19e99 100644 --- a/src/cegis/constant/literals_collector.h +++ b/src/cegis/constant/literals_collector.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/control/facade/control_runner.cpp b/src/cegis/control/facade/control_runner.cpp index 67621c5403d..8e6a2070dc6 100644 --- a/src/cegis/control/facade/control_runner.cpp +++ b/src/cegis/control/facade/control_runner.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/control/facade/control_runner.h b/src/cegis/control/facade/control_runner.h index eb013720d56..f37974ec3ba 100644 --- a/src/cegis/control/facade/control_runner.h +++ b/src/cegis/control/facade/control_runner.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/control/learn/control_symex_learn.h b/src/cegis/control/learn/control_symex_learn.h index bedfb8e0203..0ec02f3c2b4 100644 --- a/src/cegis/control/learn/control_symex_learn.h +++ b/src/cegis/control/learn/control_symex_learn.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/control/learn/nondet_solution.cpp b/src/cegis/control/learn/nondet_solution.cpp index 0e4a8ce1718..7a7a4c710e5 100644 --- a/src/cegis/control/learn/nondet_solution.cpp +++ b/src/cegis/control/learn/nondet_solution.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include #include diff --git a/src/cegis/control/learn/nondet_solution.h b/src/cegis/control/learn/nondet_solution.h index e569373192e..9bdbcbb383e 100644 --- a/src/cegis/control/learn/nondet_solution.h +++ b/src/cegis/control/learn/nondet_solution.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/control/learn/print_control_solution.cpp b/src/cegis/control/learn/print_control_solution.cpp index b5a75264511..6b66990c7a5 100644 --- a/src/cegis/control/learn/print_control_solution.cpp +++ b/src/cegis/control/learn/print_control_solution.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/control/learn/print_control_solution.h b/src/cegis/control/learn/print_control_solution.h index 992321b8b15..a6f0bcab9ef 100644 --- a/src/cegis/control/learn/print_control_solution.h +++ b/src/cegis/control/learn/print_control_solution.h @@ -1,14 +1,14 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ -#ifndef CEGIS_CONTROL_LEARN_PRINT_CONTROL_SOLUTION_H_ -#define CEGIS_CONTROL_LEARN_PRINT_CONTROL_SOLUTION_H_ +#ifndef CPROVER_CEGIS_CONTROL_LEARN_PRINT_CONTROL_SOLUTION_H +#define CPROVER_CEGIS_CONTROL_LEARN_PRINT_CONTROL_SOLUTION_H #include #include @@ -30,4 +30,4 @@ void print_control_array( const char * name, const symbol_tablet &st); -#endif /* CEGIS_CONTROL_LEARN_PRINT_CONTROL_SOLUTION_H_ */ +#endif // CPROVER_CEGIS_CONTROL_LEARN_PRINT_CONTROL_SOLUTION_H diff --git a/src/cegis/control/learn/rational_solution_configuration.cpp b/src/cegis/control/learn/rational_solution_configuration.cpp index a1dc06b81d6..41fb7aa0cdc 100644 --- a/src/cegis/control/learn/rational_solution_configuration.cpp +++ b/src/cegis/control/learn/rational_solution_configuration.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/control/learn/rational_solution_configuration.h b/src/cegis/control/learn/rational_solution_configuration.h index 06dc3a78a51..f135c58578f 100644 --- a/src/cegis/control/learn/rational_solution_configuration.h +++ b/src/cegis/control/learn/rational_solution_configuration.h @@ -1,14 +1,14 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ -#ifndef CEGIS_CONTROL_LEARN_RATIONAL_SOLUTION_CONFIGURATION_H_ -#define CEGIS_CONTROL_LEARN_RATIONAL_SOLUTION_CONFIGURATION_H_ +#ifndef CPROVER_CEGIS_CONTROL_LEARN_RATIONAL_SOLUTION_CONFIGURATION_H +#define CPROVER_CEGIS_CONTROL_LEARN_RATIONAL_SOLUTION_CONFIGURATION_H #include @@ -71,4 +71,4 @@ class rational_solution_configurationt const symbol_tablet &st); }; -#endif /* CEGIS_CONTROL_LEARN_RATIONAL_SOLUTION_CONFIGURATION_H_ */ +#endif // CPROVER_CEGIS_CONTROL_LEARN_RATIONAL_SOLUTION_CONFIGURATION_H diff --git a/src/cegis/control/learn/vector_solution_configuration.cpp b/src/cegis/control/learn/vector_solution_configuration.cpp index fd7ee3c400d..5da8cdc3192 100644 --- a/src/cegis/control/learn/vector_solution_configuration.cpp +++ b/src/cegis/control/learn/vector_solution_configuration.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/control/learn/vector_solution_configuration.h b/src/cegis/control/learn/vector_solution_configuration.h index d720741f9f8..d79aae04eed 100644 --- a/src/cegis/control/learn/vector_solution_configuration.h +++ b/src/cegis/control/learn/vector_solution_configuration.h @@ -1,14 +1,14 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ -#ifndef CEGIS_CONTROL_LEARN_VECTOR_SOLUTION_CONFIGURATION_H_ -#define CEGIS_CONTROL_LEARN_VECTOR_SOLUTION_CONFIGURATION_H_ +#ifndef CPROVER_CEGIS_CONTROL_LEARN_VECTOR_SOLUTION_CONFIGURATION_H +#define CPROVER_CEGIS_CONTROL_LEARN_VECTOR_SOLUTION_CONFIGURATION_H #include @@ -72,4 +72,4 @@ class vector_solution_configurationt const symbol_tablet &st); }; -#endif /* CEGIS_CONTROL_LEARN_VECTOR_SOLUTION_CONFIGURATION_H_ */ +#endif // CPROVER_CEGIS_CONTROL_LEARN_VECTOR_SOLUTION_CONFIGURATION_H diff --git a/src/cegis/control/options/control_program.cpp b/src/cegis/control/options/control_program.cpp index 7f180d38d82..e8fd02460c2 100644 --- a/src/cegis/control/options/control_program.cpp +++ b/src/cegis/control/options/control_program.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include #include diff --git a/src/cegis/control/options/control_program.h b/src/cegis/control/options/control_program.h index ad8f99196b5..f8bab843305 100644 --- a/src/cegis/control/options/control_program.h +++ b/src/cegis/control/options/control_program.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/control/preprocessing/control_preprocessing.cpp b/src/cegis/control/preprocessing/control_preprocessing.cpp index b1067139a2c..d9b86289226 100644 --- a/src/cegis/control/preprocessing/control_preprocessing.cpp +++ b/src/cegis/control/preprocessing/control_preprocessing.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/control/preprocessing/control_preprocessing.h b/src/cegis/control/preprocessing/control_preprocessing.h index ff8601f19bb..3631a195003 100644 --- a/src/cegis/control/preprocessing/control_preprocessing.h +++ b/src/cegis/control/preprocessing/control_preprocessing.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/control/preprocessing/propagate_controller_sizes.cpp b/src/cegis/control/preprocessing/propagate_controller_sizes.cpp index c8373a9151c..48a1aece609 100644 --- a/src/cegis/control/preprocessing/propagate_controller_sizes.cpp +++ b/src/cegis/control/preprocessing/propagate_controller_sizes.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/control/preprocessing/propagate_controller_sizes.h b/src/cegis/control/preprocessing/propagate_controller_sizes.h index cb73f8f323d..0358270c62a 100644 --- a/src/cegis/control/preprocessing/propagate_controller_sizes.h +++ b/src/cegis/control/preprocessing/propagate_controller_sizes.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/control/simplify/remove_unused_elements.cpp b/src/cegis/control/simplify/remove_unused_elements.cpp index 7b5ed77ff2b..3bc35dd88cf 100644 --- a/src/cegis/control/simplify/remove_unused_elements.cpp +++ b/src/cegis/control/simplify/remove_unused_elements.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/control/simplify/remove_unused_elements.h b/src/cegis/control/simplify/remove_unused_elements.h index a02782b56da..ab0fdc0e151 100644 --- a/src/cegis/control/simplify/remove_unused_elements.h +++ b/src/cegis/control/simplify/remove_unused_elements.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/control/value/control_counterexample.h b/src/cegis/control/value/control_counterexample.h index 9b06c0ada6e..b09ce580997 100644 --- a/src/cegis/control/value/control_counterexample.h +++ b/src/cegis/control/value/control_counterexample.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/control/value/control_solution.h b/src/cegis/control/value/control_solution.h index c9791d066b1..3d135ebfd27 100644 --- a/src/cegis/control/value/control_solution.h +++ b/src/cegis/control/value/control_solution.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/control/value/control_types.cpp b/src/cegis/control/value/control_types.cpp index c38fcfa65cf..598ce3c8f75 100644 --- a/src/cegis/control/value/control_types.cpp +++ b/src/cegis/control/value/control_types.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/control/value/control_types.h b/src/cegis/control/value/control_types.h index eed77a48440..395c6f9218d 100644 --- a/src/cegis/control/value/control_types.h +++ b/src/cegis/control/value/control_types.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/control/value/control_vars.h b/src/cegis/control/value/control_vars.h index 3b8c8b94ec1..9a93729c788 100644 --- a/src/cegis/control/value/control_vars.h +++ b/src/cegis/control/value/control_vars.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/control/value/control_vector_solution.cpp b/src/cegis/control/value/control_vector_solution.cpp index 637104d8ab0..9ec0d622f88 100644 --- a/src/cegis/control/value/control_vector_solution.cpp +++ b/src/cegis/control/value/control_vector_solution.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include control_vector_solutiont::control_vector_solutiont() diff --git a/src/cegis/control/value/control_vector_solution.h b/src/cegis/control/value/control_vector_solution.h index a677bca8f8d..6b118960711 100644 --- a/src/cegis/control/value/control_vector_solution.h +++ b/src/cegis/control/value/control_vector_solution.h @@ -1,14 +1,14 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ -#ifndef CEGIS_CONTROL_VALUE_CONTROL_VECTOR_SOLUTION_H_ -#define CEGIS_CONTROL_VALUE_CONTROL_VECTOR_SOLUTION_H_ +#ifndef CPROVER_CEGIS_CONTROL_VALUE_CONTROL_VECTOR_SOLUTION_H +#define CPROVER_CEGIS_CONTROL_VALUE_CONTROL_VECTOR_SOLUTION_H #include @@ -28,4 +28,4 @@ class control_vector_solutiont array_exprt K; }; -#endif /* CEGIS_CONTROL_VALUE_CONTROL_VECTOR_SOLUTION_H_ */ +#endif // CPROVER_CEGIS_CONTROL_VALUE_CONTROL_VECTOR_SOLUTION_H diff --git a/src/cegis/control/value/float_helper.cpp b/src/cegis/control/value/float_helper.cpp index 2ba17bbcc5c..39ac8fdbeb4 100644 --- a/src/cegis/control/value/float_helper.cpp +++ b/src/cegis/control/value/float_helper.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/control/value/float_helper.h b/src/cegis/control/value/float_helper.h index 6a538317a5a..ee1a8652a31 100644 --- a/src/cegis/control/value/float_helper.h +++ b/src/cegis/control/value/float_helper.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/control/verify/control_symex_verify.h b/src/cegis/control/verify/control_symex_verify.h index b8039271d3b..e40f8dabce3 100644 --- a/src/cegis/control/verify/control_symex_verify.h +++ b/src/cegis/control/verify/control_symex_verify.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/control/verify/insert_solution.cpp b/src/cegis/control/verify/insert_solution.cpp index c447b182157..9c1fbe27642 100644 --- a/src/cegis/control/verify/insert_solution.cpp +++ b/src/cegis/control/verify/insert_solution.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/control/verify/insert_solution.h b/src/cegis/control/verify/insert_solution.h index 6215f0839ac..61e92c29d68 100644 --- a/src/cegis/control/verify/insert_solution.h +++ b/src/cegis/control/verify/insert_solution.h @@ -1,13 +1,12 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ - #ifndef CPROVER_CEGIS_CONTROL_VERIFY_INSERT_SOLUTION_H #define CPROVER_CEGIS_CONTROL_VERIFY_INSERT_SOLUTION_H diff --git a/src/cegis/control/verify/zero_solutions.cpp b/src/cegis/control/verify/zero_solutions.cpp index e5300638574..59468253271 100644 --- a/src/cegis/control/verify/zero_solutions.cpp +++ b/src/cegis/control/verify/zero_solutions.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/control/verify/zero_solutions.h b/src/cegis/control/verify/zero_solutions.h index 5dc3b617796..b1e47dfa3ff 100644 --- a/src/cegis/control/verify/zero_solutions.h +++ b/src/cegis/control/verify/zero_solutions.h @@ -1,14 +1,14 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ -#ifndef CEGIS_CONTROL_VERIFY_ZERO_SOLUTIONS_H_ -#define CEGIS_CONTROL_VERIFY_ZERO_SOLUTIONS_H_ +#ifndef CPROVER_CEGIS_CONTROL_VERIFY_ZERO_SOLUTIONS_H +#define CPROVER_CEGIS_CONTROL_VERIFY_ZERO_SOLUTIONS_H /** * @brief @@ -77,4 +77,4 @@ class zero_vector_solutiont void operator()(class control_vector_solutiont &solution) const; }; -#endif /* CEGIS_CONTROL_VERIFY_ZERO_SOLUTIONS_H_ */ +#endif // CPROVER_CEGIS_CONTROL_VERIFY_ZERO_SOLUTIONS_H diff --git a/src/cegis/danger/constraint/danger_constraint_factory.cpp b/src/cegis/danger/constraint/danger_constraint_factory.cpp index f158b1de807..5cea1a36dd2 100644 --- a/src/cegis/danger/constraint/danger_constraint_factory.cpp +++ b/src/cegis/danger/constraint/danger_constraint_factory.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include #include diff --git a/src/cegis/danger/constraint/danger_constraint_factory.h b/src/cegis/danger/constraint/danger_constraint_factory.h index 860ed10f77c..140e397efb1 100644 --- a/src/cegis/danger/constraint/danger_constraint_factory.h +++ b/src/cegis/danger/constraint/danger_constraint_factory.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/danger/facade/danger_runner.cpp b/src/cegis/danger/facade/danger_runner.cpp index 04722a22cbd..57ebc1f43e0 100644 --- a/src/cegis/danger/facade/danger_runner.cpp +++ b/src/cegis/danger/facade/danger_runner.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/danger/facade/danger_runner.h b/src/cegis/danger/facade/danger_runner.h index 1b6512eb264..b25579edfc0 100644 --- a/src/cegis/danger/facade/danger_runner.h +++ b/src/cegis/danger/facade/danger_runner.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/danger/genetic/dynamic_danger_test_runner.cpp b/src/cegis/danger/genetic/dynamic_danger_test_runner.cpp index 68b108281f8..ba874730b63 100644 --- a/src/cegis/danger/genetic/dynamic_danger_test_runner.cpp +++ b/src/cegis/danger/genetic/dynamic_danger_test_runner.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/danger/genetic/dynamic_danger_test_runner.h b/src/cegis/danger/genetic/dynamic_danger_test_runner.h index 5279099d0fb..ba0be5780a9 100644 --- a/src/cegis/danger/genetic/dynamic_danger_test_runner.h +++ b/src/cegis/danger/genetic/dynamic_danger_test_runner.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/danger/meta/literals.h b/src/cegis/danger/meta/literals.h index b73a37ca971..f936d14b41b 100644 --- a/src/cegis/danger/meta/literals.h +++ b/src/cegis/danger/meta/literals.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/danger/meta/meta_variable_names.cpp b/src/cegis/danger/meta/meta_variable_names.cpp index 83bad70b812..fff265aa752 100644 --- a/src/cegis/danger/meta/meta_variable_names.cpp +++ b/src/cegis/danger/meta/meta_variable_names.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/danger/meta/meta_variable_names.h b/src/cegis/danger/meta/meta_variable_names.h index eb13216f5f6..6a36666713b 100644 --- a/src/cegis/danger/meta/meta_variable_names.h +++ b/src/cegis/danger/meta/meta_variable_names.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/danger/options/danger_program.cpp b/src/cegis/danger/options/danger_program.cpp index 81110967d72..7b9e1d77dae 100644 --- a/src/cegis/danger/options/danger_program.cpp +++ b/src/cegis/danger/options/danger_program.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/danger/options/danger_program.h b/src/cegis/danger/options/danger_program.h index a7024d89a34..96b350d3c7c 100644 --- a/src/cegis/danger/options/danger_program.h +++ b/src/cegis/danger/options/danger_program.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/danger/options/danger_program_genetic_settings.h b/src/cegis/danger/options/danger_program_genetic_settings.h index 8fddcd52974..5f0b1e5c034 100644 --- a/src/cegis/danger/options/danger_program_genetic_settings.h +++ b/src/cegis/danger/options/danger_program_genetic_settings.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/danger/options/danger_program_printer.cpp b/src/cegis/danger/options/danger_program_printer.cpp index ea1451da1d1..a889ad266df 100644 --- a/src/cegis/danger/options/danger_program_printer.cpp +++ b/src/cegis/danger/options/danger_program_printer.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/danger/options/danger_program_printer.h b/src/cegis/danger/options/danger_program_printer.h index ae16b92fe08..3891f760374 100644 --- a/src/cegis/danger/options/danger_program_printer.h +++ b/src/cegis/danger/options/danger_program_printer.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/danger/preprocess/add_ranking_and_skolem_variables.cpp b/src/cegis/danger/preprocess/add_ranking_and_skolem_variables.cpp index 597e6628e60..899a86bcc34 100644 --- a/src/cegis/danger/preprocess/add_ranking_and_skolem_variables.cpp +++ b/src/cegis/danger/preprocess/add_ranking_and_skolem_variables.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include 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 6097b181d90..e1cdfb47d1c 100644 --- a/src/cegis/danger/preprocess/add_ranking_and_skolem_variables.h +++ b/src/cegis/danger/preprocess/add_ranking_and_skolem_variables.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/danger/preprocess/danger_preprocessing.cpp b/src/cegis/danger/preprocess/danger_preprocessing.cpp index 4a3d89f13d7..642ccffc713 100644 --- a/src/cegis/danger/preprocess/danger_preprocessing.cpp +++ b/src/cegis/danger/preprocess/danger_preprocessing.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/danger/preprocess/danger_preprocessing.h b/src/cegis/danger/preprocess/danger_preprocessing.h index 816a3546160..b69ab0813b7 100644 --- a/src/cegis/danger/preprocess/danger_preprocessing.h +++ b/src/cegis/danger/preprocess/danger_preprocessing.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/danger/preprocess/store_nondet_choices.cpp b/src/cegis/danger/preprocess/store_nondet_choices.cpp index d45f19b86ca..88246dd1bfa 100644 --- a/src/cegis/danger/preprocess/store_nondet_choices.cpp +++ b/src/cegis/danger/preprocess/store_nondet_choices.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/danger/preprocess/store_nondet_choices.h b/src/cegis/danger/preprocess/store_nondet_choices.h index 1171096fbd3..b19a165c624 100644 --- a/src/cegis/danger/preprocess/store_nondet_choices.h +++ b/src/cegis/danger/preprocess/store_nondet_choices.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/danger/symex/fitness/danger_fitness_config.cpp b/src/cegis/danger/symex/fitness/danger_fitness_config.cpp index 86e59b9a3a7..2df293372be 100644 --- a/src/cegis/danger/symex/fitness/danger_fitness_config.cpp +++ b/src/cegis/danger/symex/fitness/danger_fitness_config.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/danger/symex/fitness/danger_fitness_config.h b/src/cegis/danger/symex/fitness/danger_fitness_config.h index ee474ba887f..d2fb750aa6c 100644 --- a/src/cegis/danger/symex/fitness/danger_fitness_config.h +++ b/src/cegis/danger/symex/fitness/danger_fitness_config.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/danger/symex/learn/add_programs_to_learn.cpp b/src/cegis/danger/symex/learn/add_programs_to_learn.cpp index dd1ca9db1d8..665ac91771e 100644 --- a/src/cegis/danger/symex/learn/add_programs_to_learn.cpp +++ b/src/cegis/danger/symex/learn/add_programs_to_learn.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include 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 d61fb6954ee..c8f1278c240 100644 --- a/src/cegis/danger/symex/learn/add_programs_to_learn.h +++ b/src/cegis/danger/symex/learn/add_programs_to_learn.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/danger/symex/learn/add_variable_refs.cpp b/src/cegis/danger/symex/learn/add_variable_refs.cpp index d6cfccbe6f6..412c92f1ac0 100644 --- a/src/cegis/danger/symex/learn/add_variable_refs.cpp +++ b/src/cegis/danger/symex/learn/add_variable_refs.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/danger/symex/learn/add_variable_refs.h b/src/cegis/danger/symex/learn/add_variable_refs.h index f980563a741..aa275c149dd 100644 --- a/src/cegis/danger/symex/learn/add_variable_refs.h +++ b/src/cegis/danger/symex/learn/add_variable_refs.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/danger/symex/learn/add_x0_placeholders.cpp b/src/cegis/danger/symex/learn/add_x0_placeholders.cpp index 1c62a0a5278..ebe7353d53c 100644 --- a/src/cegis/danger/symex/learn/add_x0_placeholders.cpp +++ b/src/cegis/danger/symex/learn/add_x0_placeholders.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/danger/symex/learn/add_x0_placeholders.h b/src/cegis/danger/symex/learn/add_x0_placeholders.h index 830746adbb2..f5ae6f3fbcf 100644 --- a/src/cegis/danger/symex/learn/add_x0_placeholders.h +++ b/src/cegis/danger/symex/learn/add_x0_placeholders.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/danger/symex/learn/danger_learn_config.cpp b/src/cegis/danger/symex/learn/danger_learn_config.cpp index 3e3999bef8e..159af723b91 100644 --- a/src/cegis/danger/symex/learn/danger_learn_config.cpp +++ b/src/cegis/danger/symex/learn/danger_learn_config.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/danger/symex/learn/danger_learn_config.h b/src/cegis/danger/symex/learn/danger_learn_config.h index 910402065aa..15be7ace25f 100644 --- a/src/cegis/danger/symex/learn/danger_learn_config.h +++ b/src/cegis/danger/symex/learn/danger_learn_config.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/danger/symex/learn/encoded_danger_learn_config.cpp b/src/cegis/danger/symex/learn/encoded_danger_learn_config.cpp index 2f5e9bff278..d9a995f3821 100644 --- a/src/cegis/danger/symex/learn/encoded_danger_learn_config.cpp +++ b/src/cegis/danger/symex/learn/encoded_danger_learn_config.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include 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 8e9a2a1826d..f618b1c2f69 100644 --- a/src/cegis/danger/symex/learn/encoded_danger_learn_config.h +++ b/src/cegis/danger/symex/learn/encoded_danger_learn_config.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/danger/symex/learn/read_x0.cpp b/src/cegis/danger/symex/learn/read_x0.cpp index 825638fc51c..ba504cfa5b1 100644 --- a/src/cegis/danger/symex/learn/read_x0.cpp +++ b/src/cegis/danger/symex/learn/read_x0.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/danger/symex/learn/read_x0.h b/src/cegis/danger/symex/learn/read_x0.h index 433b1175c4b..b47620bac74 100644 --- a/src/cegis/danger/symex/learn/read_x0.h +++ b/src/cegis/danger/symex/learn/read_x0.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/danger/symex/learn/solution_factory.cpp b/src/cegis/danger/symex/learn/solution_factory.cpp index 02b02636d6b..ead676a3456 100644 --- a/src/cegis/danger/symex/learn/solution_factory.cpp +++ b/src/cegis/danger/symex/learn/solution_factory.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/danger/symex/learn/solution_factory.h b/src/cegis/danger/symex/learn/solution_factory.h index f1cd177d2e6..c67b02c2826 100644 --- a/src/cegis/danger/symex/learn/solution_factory.h +++ b/src/cegis/danger/symex/learn/solution_factory.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/danger/symex/verify/danger_verify_config.cpp b/src/cegis/danger/symex/verify/danger_verify_config.cpp index 1f8b40ed9d5..c5bcf426212 100644 --- a/src/cegis/danger/symex/verify/danger_verify_config.cpp +++ b/src/cegis/danger/symex/verify/danger_verify_config.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/danger/symex/verify/danger_verify_config.h b/src/cegis/danger/symex/verify/danger_verify_config.h index 763804d5f69..70d8c79da83 100644 --- a/src/cegis/danger/symex/verify/danger_verify_config.h +++ b/src/cegis/danger/symex/verify/danger_verify_config.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/danger/symex/verify/insert_candidate.cpp b/src/cegis/danger/symex/verify/insert_candidate.cpp index 1acfe6b52d8..83bf1bbbc35 100644 --- a/src/cegis/danger/symex/verify/insert_candidate.cpp +++ b/src/cegis/danger/symex/verify/insert_candidate.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/danger/symex/verify/insert_candidate.h b/src/cegis/danger/symex/verify/insert_candidate.h index cd945f5a5d3..00014b5ddbc 100644 --- a/src/cegis/danger/symex/verify/insert_candidate.h +++ b/src/cegis/danger/symex/verify/insert_candidate.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/danger/symex/verify/parallel_danger_verifier.cpp b/src/cegis/danger/symex/verify/parallel_danger_verifier.cpp index 0cf3d5e6da5..ee57b71e9e9 100644 --- a/src/cegis/danger/symex/verify/parallel_danger_verifier.cpp +++ b/src/cegis/danger/symex/verify/parallel_danger_verifier.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #ifndef _WIN32 #include diff --git a/src/cegis/danger/symex/verify/parallel_danger_verifier.h b/src/cegis/danger/symex/verify/parallel_danger_verifier.h index 9a7c3c5841a..64f80ca17da 100644 --- a/src/cegis/danger/symex/verify/parallel_danger_verifier.h +++ b/src/cegis/danger/symex/verify/parallel_danger_verifier.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/danger/symex/verify/parallel_danger_verify_task.cpp b/src/cegis/danger/symex/verify/parallel_danger_verify_task.cpp index c077a3e4e30..187b72551cd 100644 --- a/src/cegis/danger/symex/verify/parallel_danger_verify_task.cpp +++ b/src/cegis/danger/symex/verify/parallel_danger_verify_task.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include 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 524acc9b97e..4947826096b 100644 --- a/src/cegis/danger/symex/verify/parallel_danger_verify_task.h +++ b/src/cegis/danger/symex/verify/parallel_danger_verify_task.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/danger/symex/verify/restrict_counterexamples.cpp b/src/cegis/danger/symex/verify/restrict_counterexamples.cpp index cb6ce99015c..886d8186895 100644 --- a/src/cegis/danger/symex/verify/restrict_counterexamples.cpp +++ b/src/cegis/danger/symex/verify/restrict_counterexamples.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/danger/symex/verify/restrict_counterexamples.h b/src/cegis/danger/symex/verify/restrict_counterexamples.h index d3667275017..1dcc09891ac 100644 --- a/src/cegis/danger/symex/verify/restrict_counterexamples.h +++ b/src/cegis/danger/symex/verify/restrict_counterexamples.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/danger/value/danger_goto_solution.h b/src/cegis/danger/value/danger_goto_solution.h index 24401681ed4..2f351979333 100644 --- a/src/cegis/danger/value/danger_goto_solution.h +++ b/src/cegis/danger/value/danger_goto_solution.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/facade/cegis.h b/src/cegis/facade/cegis.h index 6f783f942f0..027ffe1c386 100644 --- a/src/cegis/facade/cegis.h +++ b/src/cegis/facade/cegis.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/facade/runner_helper.h b/src/cegis/facade/runner_helper.h index 4a634e4b2eb..6b53c015b47 100644 --- a/src/cegis/facade/runner_helper.h +++ b/src/cegis/facade/runner_helper.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/genetic/concrete_test_runner.cpp b/src/cegis/genetic/concrete_test_runner.cpp index 290ebbcccf4..e529b798f70 100644 --- a/src/cegis/genetic/concrete_test_runner.cpp +++ b/src/cegis/genetic/concrete_test_runner.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include #include diff --git a/src/cegis/genetic/concrete_test_runner.h b/src/cegis/genetic/concrete_test_runner.h index abf6da7076e..cb633130d77 100644 --- a/src/cegis/genetic/concrete_test_runner.h +++ b/src/cegis/genetic/concrete_test_runner.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/genetic/dynamic_test_runner_helper.cpp b/src/cegis/genetic/dynamic_test_runner_helper.cpp index d1461e9ca2f..f357b80b72d 100644 --- a/src/cegis/genetic/dynamic_test_runner_helper.cpp +++ b/src/cegis/genetic/dynamic_test_runner_helper.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #if !defined(_WIN32) || defined(_HAVE_DLFCN) #include #endif diff --git a/src/cegis/genetic/dynamic_test_runner_helper.h b/src/cegis/genetic/dynamic_test_runner_helper.h index 50a3c3a09b4..74453d08768 100644 --- a/src/cegis/genetic/dynamic_test_runner_helper.h +++ b/src/cegis/genetic/dynamic_test_runner_helper.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/genetic/family_selection.h b/src/cegis/genetic/family_selection.h index 1afea9c0bd2..715fe2dfe2b 100644 --- a/src/cegis/genetic/family_selection.h +++ b/src/cegis/genetic/family_selection.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/genetic/ga_learn.h b/src/cegis/genetic/ga_learn.h index 379802f7eea..8ecb2376b88 100644 --- a/src/cegis/genetic/ga_learn.h +++ b/src/cegis/genetic/ga_learn.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/genetic/genetic_constant_strategy.cpp b/src/cegis/genetic/genetic_constant_strategy.cpp index cf3d3db8111..1e27f8faf00 100644 --- a/src/cegis/genetic/genetic_constant_strategy.cpp +++ b/src/cegis/genetic/genetic_constant_strategy.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/genetic/genetic_constant_strategy.h b/src/cegis/genetic/genetic_constant_strategy.h index e07175b55d4..12bfafaf31e 100644 --- a/src/cegis/genetic/genetic_constant_strategy.h +++ b/src/cegis/genetic/genetic_constant_strategy.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/genetic/genetic_preprocessing.h b/src/cegis/genetic/genetic_preprocessing.h index 1f893c1a78d..b0875c413af 100644 --- a/src/cegis/genetic/genetic_preprocessing.h +++ b/src/cegis/genetic/genetic_preprocessing.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/genetic/genetic_settings.cpp b/src/cegis/genetic/genetic_settings.cpp index cfcd0d6bf1f..0997c1ff693 100644 --- a/src/cegis/genetic/genetic_settings.cpp +++ b/src/cegis/genetic/genetic_settings.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include genetic_settingst::~genetic_settingst() diff --git a/src/cegis/genetic/genetic_settings.h b/src/cegis/genetic/genetic_settings.h index a1905ae8bb8..3eddd3ee225 100644 --- a/src/cegis/genetic/genetic_settings.h +++ b/src/cegis/genetic/genetic_settings.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/genetic/instruction_set_info_factory.cpp b/src/cegis/genetic/instruction_set_info_factory.cpp index 16d7cef5a4f..d9b1f06d7de 100644 --- a/src/cegis/genetic/instruction_set_info_factory.cpp +++ b/src/cegis/genetic/instruction_set_info_factory.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include #include diff --git a/src/cegis/genetic/instruction_set_info_factory.h b/src/cegis/genetic/instruction_set_info_factory.h index ee62f785194..c9c109cb1dc 100644 --- a/src/cegis/genetic/instruction_set_info_factory.h +++ b/src/cegis/genetic/instruction_set_info_factory.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/genetic/lazy_fitness.h b/src/cegis/genetic/lazy_fitness.h index 350fe9796e4..6563d5d1a77 100644 --- a/src/cegis/genetic/lazy_fitness.h +++ b/src/cegis/genetic/lazy_fitness.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/genetic/lazy_genetic_settings.h b/src/cegis/genetic/lazy_genetic_settings.h index ec0c9279e73..1229ce85667 100644 --- a/src/cegis/genetic/lazy_genetic_settings.h +++ b/src/cegis/genetic/lazy_genetic_settings.h @@ -1,9 +1,11 @@ -/* - * lazy_genetic_settings.h - * - * Created on: 10 Jan 2016 - * Author: Pascal - */ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ #ifndef CPROVER_CEGIS_GENETIC_LAZY_GENETIC_SETTINGS_H #define 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 910103ed239..9bfac990f85 100644 --- a/src/cegis/genetic/learn_preprocess_seed.h +++ b/src/cegis/genetic/learn_preprocess_seed.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/genetic/match_select.cpp b/src/cegis/genetic/match_select.cpp index ff2a2809777..35e0cde1382 100644 --- a/src/cegis/genetic/match_select.cpp +++ b/src/cegis/genetic/match_select.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/genetic/match_select.h b/src/cegis/genetic/match_select.h index d6e60fdee5c..07e67df55aa 100644 --- a/src/cegis/genetic/match_select.h +++ b/src/cegis/genetic/match_select.h @@ -1,11 +1,11 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk - \*******************************************************************/ +\*******************************************************************/ #ifndef CPROVER_CEGIS_GENETIC_MATCH_SELECT_H #define CPROVER_CEGIS_GENETIC_MATCH_SELECT_H diff --git a/src/cegis/genetic/program_individual_test_runner_helper.cpp b/src/cegis/genetic/program_individual_test_runner_helper.cpp index 0ea9532ec3e..ef8c42ad260 100644 --- a/src/cegis/genetic/program_individual_test_runner_helper.cpp +++ b/src/cegis/genetic/program_individual_test_runner_helper.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/genetic/program_individual_test_runner_helper.h b/src/cegis/genetic/program_individual_test_runner_helper.h index bbd6cf6ed6b..a7f1c79b345 100644 --- a/src/cegis/genetic/program_individual_test_runner_helper.h +++ b/src/cegis/genetic/program_individual_test_runner_helper.h @@ -1,11 +1,11 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk - \*******************************************************************/ +\*******************************************************************/ #ifndef CPROVER_CEGIS_GENETIC_PROGRAM_INDIVIDUAL_TEST_RUNNER_HELPER_H #define CPROVER_CEGIS_GENETIC_PROGRAM_INDIVIDUAL_TEST_RUNNER_HELPER_H diff --git a/src/cegis/genetic/random_cross.cpp b/src/cegis/genetic/random_cross.cpp index e4b18b1735e..6af2f9b9472 100644 --- a/src/cegis/genetic/random_cross.cpp +++ b/src/cegis/genetic/random_cross.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include #include diff --git a/src/cegis/genetic/random_cross.h b/src/cegis/genetic/random_cross.h index 32ad57bf8ac..840a674b72f 100644 --- a/src/cegis/genetic/random_cross.h +++ b/src/cegis/genetic/random_cross.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/genetic/random_individual.cpp b/src/cegis/genetic/random_individual.cpp index 555d88d7da5..d4fe319acab 100644 --- a/src/cegis/genetic/random_individual.cpp +++ b/src/cegis/genetic/random_individual.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/genetic/random_individual.h b/src/cegis/genetic/random_individual.h index 49b64db8881..cbaf28df4b2 100644 --- a/src/cegis/genetic/random_individual.h +++ b/src/cegis/genetic/random_individual.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/genetic/random_mutate.cpp b/src/cegis/genetic/random_mutate.cpp index 08af17a4633..71ef128d14f 100644 --- a/src/cegis/genetic/random_mutate.cpp +++ b/src/cegis/genetic/random_mutate.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/genetic/random_mutate.h b/src/cegis/genetic/random_mutate.h index 86c74c351db..f573bbe7bbe 100644 --- a/src/cegis/genetic/random_mutate.h +++ b/src/cegis/genetic/random_mutate.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/genetic/serialise_individual.cpp b/src/cegis/genetic/serialise_individual.cpp index 7387a54373a..f8655df986d 100644 --- a/src/cegis/genetic/serialise_individual.cpp +++ b/src/cegis/genetic/serialise_individual.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/genetic/serialise_individual.h b/src/cegis/genetic/serialise_individual.h index 58ca35ea0b5..fe921dd1b08 100644 --- a/src/cegis/genetic/serialise_individual.h +++ b/src/cegis/genetic/serialise_individual.h @@ -1,11 +1,11 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk - \*******************************************************************/ +\*******************************************************************/ #ifndef CPROVER_CEGIS_GENETIC_SERIALISE_INDIVIDUAL_H #define 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 54074632384..c96dd039684 100644 --- a/src/cegis/genetic/symex_test_runner.h +++ b/src/cegis/genetic/symex_test_runner.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/genetic/tournament_select.cpp b/src/cegis/genetic/tournament_select.cpp index 5dd4d2fb479..392c3f81f80 100644 --- a/src/cegis/genetic/tournament_select.cpp +++ b/src/cegis/genetic/tournament_select.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/genetic/tournament_select.h b/src/cegis/genetic/tournament_select.h index 283cc3b99da..e4ba07452b5 100644 --- a/src/cegis/genetic/tournament_select.h +++ b/src/cegis/genetic/tournament_select.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/instructions/instruction_set_factory.cpp b/src/cegis/instructions/instruction_set_factory.cpp index 45f60a5a995..fb9438f7e92 100644 --- a/src/cegis/instructions/instruction_set_factory.cpp +++ b/src/cegis/instructions/instruction_set_factory.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/instructions/instruction_set_factory.h b/src/cegis/instructions/instruction_set_factory.h index 26c8d43c9d0..fd01c29229f 100644 --- a/src/cegis/instructions/instruction_set_factory.h +++ b/src/cegis/instructions/instruction_set_factory.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/instrument/cegis_library.cpp b/src/cegis/instrument/cegis_library.cpp index 48594376748..251849164a3 100644 --- a/src/cegis/instrument/cegis_library.cpp +++ b/src/cegis/instrument/cegis_library.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/instrument/cegis_library.h b/src/cegis/instrument/cegis_library.h index 06cfc6e08dc..d824159ace9 100644 --- a/src/cegis/instrument/cegis_library.h +++ b/src/cegis/instrument/cegis_library.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/instrument/find_cprover_initialize.cpp b/src/cegis/instrument/find_cprover_initialize.cpp index 8da4c4d0e80..658fd614002 100644 --- a/src/cegis/instrument/find_cprover_initialize.cpp +++ b/src/cegis/instrument/find_cprover_initialize.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/instrument/find_cprover_initialize.h b/src/cegis/instrument/find_cprover_initialize.h index de1ab0597e5..49c74e750ed 100644 --- a/src/cegis/instrument/find_cprover_initialize.h +++ b/src/cegis/instrument/find_cprover_initialize.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/instrument/instrument_var_ops.cpp b/src/cegis/instrument/instrument_var_ops.cpp index f5a6bc65f61..485476c944d 100644 --- a/src/cegis/instrument/instrument_var_ops.cpp +++ b/src/cegis/instrument/instrument_var_ops.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/instrument/instrument_var_ops.h b/src/cegis/instrument/instrument_var_ops.h index 688b65b2b56..256be2e1706 100644 --- a/src/cegis/instrument/instrument_var_ops.h +++ b/src/cegis/instrument/instrument_var_ops.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/instrument/literals.h b/src/cegis/instrument/literals.h index 1377946bc2c..ddc7eab7e30 100644 --- a/src/cegis/instrument/literals.h +++ b/src/cegis/instrument/literals.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/instrument/meta_variables.cpp b/src/cegis/instrument/meta_variables.cpp index 41e163d425f..83d48e70ecb 100644 --- a/src/cegis/instrument/meta_variables.cpp +++ b/src/cegis/instrument/meta_variables.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/instrument/meta_variables.h b/src/cegis/instrument/meta_variables.h index 00df2b5c15b..378f44bb055 100644 --- a/src/cegis/instrument/meta_variables.h +++ b/src/cegis/instrument/meta_variables.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/invariant/constant/add_constant.cpp b/src/cegis/invariant/constant/add_constant.cpp index fab9f2ebb4b..e64ff8f871f 100644 --- a/src/cegis/invariant/constant/add_constant.cpp +++ b/src/cegis/invariant/constant/add_constant.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/invariant/constant/add_constant.h b/src/cegis/invariant/constant/add_constant.h index 3c8d5af7c3d..272e8f152c9 100644 --- a/src/cegis/invariant/constant/add_constant.h +++ b/src/cegis/invariant/constant/add_constant.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/invariant/constant/constant_strategy.h b/src/cegis/invariant/constant/constant_strategy.h index e91b082bb66..0ba229066be 100644 --- a/src/cegis/invariant/constant/constant_strategy.h +++ b/src/cegis/invariant/constant/constant_strategy.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/invariant/constant/default_constant_strategy.cpp b/src/cegis/invariant/constant/default_constant_strategy.cpp index c6d58ab956f..36e12634a09 100644 --- a/src/cegis/invariant/constant/default_constant_strategy.cpp +++ b/src/cegis/invariant/constant/default_constant_strategy.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/invariant/constant/default_constant_strategy.h b/src/cegis/invariant/constant/default_constant_strategy.h index 342ef5f95d1..124d4eb81c7 100644 --- a/src/cegis/invariant/constant/default_constant_strategy.h +++ b/src/cegis/invariant/constant/default_constant_strategy.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/invariant/constant/literals_constant_strategy.cpp b/src/cegis/invariant/constant/literals_constant_strategy.cpp index ec12572494b..44d80d4d6f2 100644 --- a/src/cegis/invariant/constant/literals_constant_strategy.cpp +++ b/src/cegis/invariant/constant/literals_constant_strategy.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/invariant/constant/literals_constant_strategy.h b/src/cegis/invariant/constant/literals_constant_strategy.h index 90158f1466f..6b7f73564d3 100644 --- a/src/cegis/invariant/constant/literals_constant_strategy.h +++ b/src/cegis/invariant/constant/literals_constant_strategy.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/invariant/fitness/concrete_fitness_source_provider.cpp b/src/cegis/invariant/fitness/concrete_fitness_source_provider.cpp index c84b55aa9d2..28e41138cb3 100644 --- a/src/cegis/invariant/fitness/concrete_fitness_source_provider.cpp +++ b/src/cegis/invariant/fitness/concrete_fitness_source_provider.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/invariant/fitness/concrete_fitness_source_provider.h b/src/cegis/invariant/fitness/concrete_fitness_source_provider.h index 9fcbd69ec77..4176e2b685e 100644 --- a/src/cegis/invariant/fitness/concrete_fitness_source_provider.h +++ b/src/cegis/invariant/fitness/concrete_fitness_source_provider.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/invariant/meta/meta_variable_names.cpp b/src/cegis/invariant/meta/meta_variable_names.cpp index 3bfd885018c..be19ceb945b 100644 --- a/src/cegis/invariant/meta/meta_variable_names.cpp +++ b/src/cegis/invariant/meta/meta_variable_names.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/invariant/meta/meta_variable_names.h b/src/cegis/invariant/meta/meta_variable_names.h index 68169d27a47..683a5115ed1 100644 --- a/src/cegis/invariant/meta/meta_variable_names.h +++ b/src/cegis/invariant/meta/meta_variable_names.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/invariant/options/invariant_program.cpp b/src/cegis/invariant/options/invariant_program.cpp index f6fb89e50c9..c139a756baf 100644 --- a/src/cegis/invariant/options/invariant_program.cpp +++ b/src/cegis/invariant/options/invariant_program.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/invariant/options/invariant_program.h b/src/cegis/invariant/options/invariant_program.h index 1d79880269f..a87161a6292 100644 --- a/src/cegis/invariant/options/invariant_program.h +++ b/src/cegis/invariant/options/invariant_program.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/invariant/options/target_copy_helper.cpp b/src/cegis/invariant/options/target_copy_helper.cpp index 8cc28175b84..af0c209bb7c 100644 --- a/src/cegis/invariant/options/target_copy_helper.cpp +++ b/src/cegis/invariant/options/target_copy_helper.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include #include diff --git a/src/cegis/invariant/options/target_copy_helper.h b/src/cegis/invariant/options/target_copy_helper.h index a09a5a431a8..c69aa677a6d 100644 --- a/src/cegis/invariant/options/target_copy_helper.h +++ b/src/cegis/invariant/options/target_copy_helper.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/invariant/preprocess/add_invariants_and_temp_variables.cpp b/src/cegis/invariant/preprocess/add_invariants_and_temp_variables.cpp index e8111388a2a..417a581ae3c 100644 --- a/src/cegis/invariant/preprocess/add_invariants_and_temp_variables.cpp +++ b/src/cegis/invariant/preprocess/add_invariants_and_temp_variables.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include 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 f34f6ec7ce8..4272953976f 100644 --- a/src/cegis/invariant/preprocess/add_invariants_and_temp_variables.h +++ b/src/cegis/invariant/preprocess/add_invariants_and_temp_variables.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/invariant/preprocess/remove_loops_and_assertion.cpp b/src/cegis/invariant/preprocess/remove_loops_and_assertion.cpp index 31e7f0687bd..60a34406bf8 100644 --- a/src/cegis/invariant/preprocess/remove_loops_and_assertion.cpp +++ b/src/cegis/invariant/preprocess/remove_loops_and_assertion.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/invariant/preprocess/remove_loops_and_assertion.h b/src/cegis/invariant/preprocess/remove_loops_and_assertion.h index 19367a29bb9..ac3bd191dcf 100644 --- a/src/cegis/invariant/preprocess/remove_loops_and_assertion.h +++ b/src/cegis/invariant/preprocess/remove_loops_and_assertion.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/invariant/symex/learn/add_counterexamples.cpp b/src/cegis/invariant/symex/learn/add_counterexamples.cpp index b975b3226f7..5359762a0c7 100644 --- a/src/cegis/invariant/symex/learn/add_counterexamples.cpp +++ b/src/cegis/invariant/symex/learn/add_counterexamples.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/invariant/symex/learn/add_counterexamples.h b/src/cegis/invariant/symex/learn/add_counterexamples.h index 008dc14f794..97a95560536 100644 --- a/src/cegis/invariant/symex/learn/add_counterexamples.h +++ b/src/cegis/invariant/symex/learn/add_counterexamples.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/invariant/symex/learn/add_invariant_programs_to_learn.cpp b/src/cegis/invariant/symex/learn/add_invariant_programs_to_learn.cpp index 35e78ab47f0..5ad3c8740d6 100644 --- a/src/cegis/invariant/symex/learn/add_invariant_programs_to_learn.cpp +++ b/src/cegis/invariant/symex/learn/add_invariant_programs_to_learn.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include 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 a4a69fd8277..cfbccfbca8c 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 @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/invariant/symex/learn/instrument_vars.cpp b/src/cegis/invariant/symex/learn/instrument_vars.cpp index ee099cb7a25..b6e43c68b25 100644 --- a/src/cegis/invariant/symex/learn/instrument_vars.cpp +++ b/src/cegis/invariant/symex/learn/instrument_vars.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/invariant/symex/learn/instrument_vars.h b/src/cegis/invariant/symex/learn/instrument_vars.h index b5a37acf96b..f2b963cb173 100644 --- a/src/cegis/invariant/symex/learn/instrument_vars.h +++ b/src/cegis/invariant/symex/learn/instrument_vars.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/invariant/symex/learn/invariant_body_provider.h b/src/cegis/invariant/symex/learn/invariant_body_provider.h index 04720832790..d58fea886fb 100644 --- a/src/cegis/invariant/symex/learn/invariant_body_provider.h +++ b/src/cegis/invariant/symex/learn/invariant_body_provider.h @@ -1,11 +1,11 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk - \*******************************************************************/ +\*******************************************************************/ #ifndef CPROVER_CEGIS_INVARIANT_SYMEX_LEARN_INVARIANT_BODY_PROVIDER_H #define CPROVER_CEGIS_INVARIANT_SYMEX_LEARN_INVARIANT_BODY_PROVIDER_H diff --git a/src/cegis/invariant/symex/learn/replace_operators.cpp b/src/cegis/invariant/symex/learn/replace_operators.cpp index e46db87a394..b0031f0c327 100644 --- a/src/cegis/invariant/symex/learn/replace_operators.cpp +++ b/src/cegis/invariant/symex/learn/replace_operators.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/invariant/symex/learn/replace_operators.h b/src/cegis/invariant/symex/learn/replace_operators.h index 82c50952fa6..1668871c951 100644 --- a/src/cegis/invariant/symex/learn/replace_operators.h +++ b/src/cegis/invariant/symex/learn/replace_operators.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/invariant/symex/verify/extract_counterexample.cpp b/src/cegis/invariant/symex/verify/extract_counterexample.cpp index 1e6ca8b4afb..4a2d9cf211f 100644 --- a/src/cegis/invariant/symex/verify/extract_counterexample.cpp +++ b/src/cegis/invariant/symex/verify/extract_counterexample.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/invariant/symex/verify/extract_counterexample.h b/src/cegis/invariant/symex/verify/extract_counterexample.h index 7281314db26..70f480762a7 100644 --- a/src/cegis/invariant/symex/verify/extract_counterexample.h +++ b/src/cegis/invariant/symex/verify/extract_counterexample.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/invariant/symex/verify/insert_constraint.cpp b/src/cegis/invariant/symex/verify/insert_constraint.cpp index 454d82c03c5..0eb89c01e09 100644 --- a/src/cegis/invariant/symex/verify/insert_constraint.cpp +++ b/src/cegis/invariant/symex/verify/insert_constraint.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/invariant/symex/verify/insert_constraint.h b/src/cegis/invariant/symex/verify/insert_constraint.h index 139e629f44b..6c730f9cff0 100644 --- a/src/cegis/invariant/symex/verify/insert_constraint.h +++ b/src/cegis/invariant/symex/verify/insert_constraint.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/invariant/symex/verify/insert_program.cpp b/src/cegis/invariant/symex/verify/insert_program.cpp index 804b76cfdb8..9509141932b 100644 --- a/src/cegis/invariant/symex/verify/insert_program.cpp +++ b/src/cegis/invariant/symex/verify/insert_program.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/invariant/symex/verify/insert_program.h b/src/cegis/invariant/symex/verify/insert_program.h index eae08aea2a0..5a6ae8c3d65 100644 --- a/src/cegis/invariant/symex/verify/insert_program.h +++ b/src/cegis/invariant/symex/verify/insert_program.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/invariant/util/copy_instructions.cpp b/src/cegis/invariant/util/copy_instructions.cpp index 65a35cf98b9..b108a6dc389 100644 --- a/src/cegis/invariant/util/copy_instructions.cpp +++ b/src/cegis/invariant/util/copy_instructions.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/invariant/util/copy_instructions.h b/src/cegis/invariant/util/copy_instructions.h index 82687e6818c..3fcf7d5abaa 100644 --- a/src/cegis/invariant/util/copy_instructions.h +++ b/src/cegis/invariant/util/copy_instructions.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/invariant/util/invariant_constraint_variables.cpp b/src/cegis/invariant/util/invariant_constraint_variables.cpp index 8999048a99c..5c9a6fd69b7 100644 --- a/src/cegis/invariant/util/invariant_constraint_variables.cpp +++ b/src/cegis/invariant/util/invariant_constraint_variables.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/invariant/util/invariant_constraint_variables.h b/src/cegis/invariant/util/invariant_constraint_variables.h index 3c2c1a090ce..93efd59da0b 100644 --- a/src/cegis/invariant/util/invariant_constraint_variables.h +++ b/src/cegis/invariant/util/invariant_constraint_variables.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/invariant/util/invariant_program_helper.cpp b/src/cegis/invariant/util/invariant_program_helper.cpp index 2899a96ebea..616b612b41a 100644 --- a/src/cegis/invariant/util/invariant_program_helper.cpp +++ b/src/cegis/invariant/util/invariant_program_helper.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/invariant/util/invariant_program_helper.h b/src/cegis/invariant/util/invariant_program_helper.h index c408a688d70..1af13d90fed 100644 --- a/src/cegis/invariant/util/invariant_program_helper.h +++ b/src/cegis/invariant/util/invariant_program_helper.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/jsa/constraint/jsa_constraint_factory.cpp b/src/cegis/jsa/constraint/jsa_constraint_factory.cpp index f24f799e95e..00b611f9d36 100644 --- a/src/cegis/jsa/constraint/jsa_constraint_factory.cpp +++ b/src/cegis/jsa/constraint/jsa_constraint_factory.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/jsa/constraint/jsa_constraint_factory.h b/src/cegis/jsa/constraint/jsa_constraint_factory.h index 107a64e8505..f5c5fe48f9c 100644 --- a/src/cegis/jsa/constraint/jsa_constraint_factory.h +++ b/src/cegis/jsa/constraint/jsa_constraint_factory.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/jsa/converters/counterexample.cpp b/src/cegis/jsa/converters/counterexample.cpp index ef0f3b642a4..71e23f01754 100644 --- a/src/cegis/jsa/converters/counterexample.cpp +++ b/src/cegis/jsa/converters/counterexample.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/jsa/converters/counterexample.h b/src/cegis/jsa/converters/counterexample.h index db1669f834b..42a4e6fb13d 100644 --- a/src/cegis/jsa/converters/counterexample.h +++ b/src/cegis/jsa/converters/counterexample.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/jsa/converters/replace_operators.cpp b/src/cegis/jsa/converters/replace_operators.cpp index 370980a8845..9d6d8e99d3d 100644 --- a/src/cegis/jsa/converters/replace_operators.cpp +++ b/src/cegis/jsa/converters/replace_operators.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/jsa/converters/replace_operators.h b/src/cegis/jsa/converters/replace_operators.h index b3326aa0931..00ba51b4f29 100644 --- a/src/cegis/jsa/converters/replace_operators.h +++ b/src/cegis/jsa/converters/replace_operators.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/jsa/converters/solution.cpp b/src/cegis/jsa/converters/solution.cpp index 0b5465fb748..87b789057af 100644 --- a/src/cegis/jsa/converters/solution.cpp +++ b/src/cegis/jsa/converters/solution.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include #include diff --git a/src/cegis/jsa/converters/solution.h b/src/cegis/jsa/converters/solution.h index b21b4e3803a..d262f415477 100644 --- a/src/cegis/jsa/converters/solution.h +++ b/src/cegis/jsa/converters/solution.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/jsa/converters/translate_to_goto_program.cpp b/src/cegis/jsa/converters/translate_to_goto_program.cpp index 226b8be3f84..053933ccad8 100644 --- a/src/cegis/jsa/converters/translate_to_goto_program.cpp +++ b/src/cegis/jsa/converters/translate_to_goto_program.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/jsa/converters/translate_to_goto_program.h b/src/cegis/jsa/converters/translate_to_goto_program.h index 8846fd43079..bac64b05b73 100644 --- a/src/cegis/jsa/converters/translate_to_goto_program.h +++ b/src/cegis/jsa/converters/translate_to_goto_program.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/jsa/facade/jsa_runner.cpp b/src/cegis/jsa/facade/jsa_runner.cpp index 389679838eb..6b565758941 100644 --- a/src/cegis/jsa/facade/jsa_runner.cpp +++ b/src/cegis/jsa/facade/jsa_runner.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/jsa/facade/jsa_runner.h b/src/cegis/jsa/facade/jsa_runner.h index efe6975c576..66e1e62456f 100644 --- a/src/cegis/jsa/facade/jsa_runner.h +++ b/src/cegis/jsa/facade/jsa_runner.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/jsa/genetic/dynamic_jsa_test_runner.cpp b/src/cegis/jsa/genetic/dynamic_jsa_test_runner.cpp index 4440a707b63..c0a03bb3684 100644 --- a/src/cegis/jsa/genetic/dynamic_jsa_test_runner.cpp +++ b/src/cegis/jsa/genetic/dynamic_jsa_test_runner.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/jsa/genetic/dynamic_jsa_test_runner.h b/src/cegis/jsa/genetic/dynamic_jsa_test_runner.h index 77b8bd85f58..8990800a90b 100644 --- a/src/cegis/jsa/genetic/dynamic_jsa_test_runner.h +++ b/src/cegis/jsa/genetic/dynamic_jsa_test_runner.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/jsa/genetic/jsa_genetic_convert.cpp b/src/cegis/jsa/genetic/jsa_genetic_convert.cpp index cae118da3fd..4729430f2b3 100644 --- a/src/cegis/jsa/genetic/jsa_genetic_convert.cpp +++ b/src/cegis/jsa/genetic/jsa_genetic_convert.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include #include diff --git a/src/cegis/jsa/genetic/jsa_genetic_convert.h b/src/cegis/jsa/genetic/jsa_genetic_convert.h index f50107fcee5..45271ffeb87 100644 --- a/src/cegis/jsa/genetic/jsa_genetic_convert.h +++ b/src/cegis/jsa/genetic/jsa_genetic_convert.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/jsa/genetic/jsa_paragon_wrapper.cpp b/src/cegis/jsa/genetic/jsa_paragon_wrapper.cpp index 64508bb83d5..f682bb1e455 100644 --- a/src/cegis/jsa/genetic/jsa_paragon_wrapper.cpp +++ b/src/cegis/jsa/genetic/jsa_paragon_wrapper.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include #include diff --git a/src/cegis/jsa/genetic/jsa_paragon_wrapper.h b/src/cegis/jsa/genetic/jsa_paragon_wrapper.h index 88c302f386f..f5094398b20 100644 --- a/src/cegis/jsa/genetic/jsa_paragon_wrapper.h +++ b/src/cegis/jsa/genetic/jsa_paragon_wrapper.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/jsa/genetic/jsa_random.cpp b/src/cegis/jsa/genetic/jsa_random.cpp index 09fea2ae2cf..087fc1efdec 100644 --- a/src/cegis/jsa/genetic/jsa_random.cpp +++ b/src/cegis/jsa/genetic/jsa_random.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/jsa/genetic/jsa_random.h b/src/cegis/jsa/genetic/jsa_random.h index 6ee282b6849..3bd1921bb9d 100644 --- a/src/cegis/jsa/genetic/jsa_random.h +++ b/src/cegis/jsa/genetic/jsa_random.h @@ -1,11 +1,11 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk - \*******************************************************************/ +\*******************************************************************/ #ifndef CPROVER_CEGIS_JSA_GENETIC_JSA_RANDOM_H #define CPROVER_CEGIS_JSA_GENETIC_JSA_RANDOM_H diff --git a/src/cegis/jsa/genetic/jsa_serialiser.cpp b/src/cegis/jsa/genetic/jsa_serialiser.cpp index b75373822e9..4f948e6adf5 100644 --- a/src/cegis/jsa/genetic/jsa_serialiser.cpp +++ b/src/cegis/jsa/genetic/jsa_serialiser.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include #include diff --git a/src/cegis/jsa/genetic/jsa_serialiser.h b/src/cegis/jsa/genetic/jsa_serialiser.h index 46d7e9ae00e..48adbfa5e42 100644 --- a/src/cegis/jsa/genetic/jsa_serialiser.h +++ b/src/cegis/jsa/genetic/jsa_serialiser.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/jsa/genetic/jsa_source_provider.cpp b/src/cegis/jsa/genetic/jsa_source_provider.cpp index b66b10a765a..4984bfe1c9b 100644 --- a/src/cegis/jsa/genetic/jsa_source_provider.cpp +++ b/src/cegis/jsa/genetic/jsa_source_provider.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include #include diff --git a/src/cegis/jsa/genetic/jsa_source_provider.h b/src/cegis/jsa/genetic/jsa_source_provider.h index 1a8d6f096dc..cf7be6f543a 100644 --- a/src/cegis/jsa/genetic/jsa_source_provider.h +++ b/src/cegis/jsa/genetic/jsa_source_provider.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/jsa/genetic/random_jsa_cross.cpp b/src/cegis/jsa/genetic/random_jsa_cross.cpp index 35434dd3f84..88e1e5bc224 100644 --- a/src/cegis/jsa/genetic/random_jsa_cross.cpp +++ b/src/cegis/jsa/genetic/random_jsa_cross.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/jsa/genetic/random_jsa_cross.h b/src/cegis/jsa/genetic/random_jsa_cross.h index 7d27eebc443..dad01f21373 100644 --- a/src/cegis/jsa/genetic/random_jsa_cross.h +++ b/src/cegis/jsa/genetic/random_jsa_cross.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/jsa/genetic/random_jsa_mutate.cpp b/src/cegis/jsa/genetic/random_jsa_mutate.cpp index 838d5272ee9..0f9d9ddfd06 100644 --- a/src/cegis/jsa/genetic/random_jsa_mutate.cpp +++ b/src/cegis/jsa/genetic/random_jsa_mutate.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include #include diff --git a/src/cegis/jsa/genetic/random_jsa_mutate.h b/src/cegis/jsa/genetic/random_jsa_mutate.h index 9265b50d559..e931ae48319 100644 --- a/src/cegis/jsa/genetic/random_jsa_mutate.h +++ b/src/cegis/jsa/genetic/random_jsa_mutate.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/jsa/genetic/solution_helper.cpp b/src/cegis/jsa/genetic/solution_helper.cpp index c4c7d35ffb0..a4b206a9d73 100644 --- a/src/cegis/jsa/genetic/solution_helper.cpp +++ b/src/cegis/jsa/genetic/solution_helper.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/jsa/genetic/solution_helper.h b/src/cegis/jsa/genetic/solution_helper.h index 6497bd000a8..e31538404e7 100644 --- a/src/cegis/jsa/genetic/solution_helper.h +++ b/src/cegis/jsa/genetic/solution_helper.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/jsa/instrument/jsa_meta_data.cpp b/src/cegis/jsa/instrument/jsa_meta_data.cpp index 0315b595287..a03412faec0 100644 --- a/src/cegis/jsa/instrument/jsa_meta_data.cpp +++ b/src/cegis/jsa/instrument/jsa_meta_data.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/jsa/instrument/jsa_meta_data.h b/src/cegis/jsa/instrument/jsa_meta_data.h index faacef24090..d5fbc8f69dc 100644 --- a/src/cegis/jsa/instrument/jsa_meta_data.h +++ b/src/cegis/jsa/instrument/jsa_meta_data.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/jsa/instrument/temps_helper.cpp b/src/cegis/jsa/instrument/temps_helper.cpp index a60e6b3c389..d70f9c5ef50 100644 --- a/src/cegis/jsa/instrument/temps_helper.cpp +++ b/src/cegis/jsa/instrument/temps_helper.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/jsa/instrument/temps_helper.h b/src/cegis/jsa/instrument/temps_helper.h index 68f743bca7c..0bdb7401197 100644 --- a/src/cegis/jsa/instrument/temps_helper.h +++ b/src/cegis/jsa/instrument/temps_helper.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/jsa/learn/execute_jsa_programs.cpp b/src/cegis/jsa/learn/execute_jsa_programs.cpp index b417f8c8f2f..27fed92b3fc 100644 --- a/src/cegis/jsa/learn/execute_jsa_programs.cpp +++ b/src/cegis/jsa/learn/execute_jsa_programs.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/jsa/learn/execute_jsa_programs.h b/src/cegis/jsa/learn/execute_jsa_programs.h index fc3604e7419..9942f873be5 100644 --- a/src/cegis/jsa/learn/execute_jsa_programs.h +++ b/src/cegis/jsa/learn/execute_jsa_programs.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/jsa/learn/extract_candidate.cpp b/src/cegis/jsa/learn/extract_candidate.cpp index 89890f6e907..1a1cf0768b1 100644 --- a/src/cegis/jsa/learn/extract_candidate.cpp +++ b/src/cegis/jsa/learn/extract_candidate.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include #include @@ -19,8 +28,9 @@ inline bool is_integer(const std::string & s) { if (s.empty() || (!isdigit(s[0]) && s[0] != '-' && s[0] != '+')) return false; char *p; - strtol(s.c_str(), &p, 10); - return *p == 0; + long result=strtol(s.c_str(), &p, 10); + (void)result; // unused as just used for testing string format + return *p==0; } bool is_prog_name(const std::string &var_name, const std::string &prefix) diff --git a/src/cegis/jsa/learn/extract_candidate.h b/src/cegis/jsa/learn/extract_candidate.h index 6a856b401cd..acfaa4461de 100644 --- a/src/cegis/jsa/learn/extract_candidate.h +++ b/src/cegis/jsa/learn/extract_candidate.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/jsa/learn/insert_counterexample.cpp b/src/cegis/jsa/learn/insert_counterexample.cpp index 162280a2a60..6d277d54e2a 100644 --- a/src/cegis/jsa/learn/insert_counterexample.cpp +++ b/src/cegis/jsa/learn/insert_counterexample.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include #include diff --git a/src/cegis/jsa/learn/insert_counterexample.h b/src/cegis/jsa/learn/insert_counterexample.h index 5d69439d850..19fab3cb363 100644 --- a/src/cegis/jsa/learn/insert_counterexample.h +++ b/src/cegis/jsa/learn/insert_counterexample.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/jsa/learn/insert_predicates_and_queries.cpp b/src/cegis/jsa/learn/insert_predicates_and_queries.cpp index fbc94dab88e..4aaf9e38cb5 100644 --- a/src/cegis/jsa/learn/insert_predicates_and_queries.cpp +++ b/src/cegis/jsa/learn/insert_predicates_and_queries.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/jsa/learn/insert_predicates_and_queries.h b/src/cegis/jsa/learn/insert_predicates_and_queries.h index 15dfd7483f5..fb6cb745400 100644 --- a/src/cegis/jsa/learn/insert_predicates_and_queries.h +++ b/src/cegis/jsa/learn/insert_predicates_and_queries.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/jsa/learn/instrument_pred_ops.cpp b/src/cegis/jsa/learn/instrument_pred_ops.cpp index 83f70aeecc2..9e001bdb34d 100644 --- a/src/cegis/jsa/learn/instrument_pred_ops.cpp +++ b/src/cegis/jsa/learn/instrument_pred_ops.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/jsa/learn/instrument_pred_ops.h b/src/cegis/jsa/learn/instrument_pred_ops.h index 9aae3ee0706..8188961bfa4 100644 --- a/src/cegis/jsa/learn/instrument_pred_ops.h +++ b/src/cegis/jsa/learn/instrument_pred_ops.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/jsa/learn/jsa_symex_learn.cpp b/src/cegis/jsa/learn/jsa_symex_learn.cpp index 05a9cc904b9..d44640e5006 100644 --- a/src/cegis/jsa/learn/jsa_symex_learn.cpp +++ b/src/cegis/jsa/learn/jsa_symex_learn.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/jsa/learn/jsa_symex_learn.h b/src/cegis/jsa/learn/jsa_symex_learn.h index 1c85adc4796..18de6d242e5 100644 --- a/src/cegis/jsa/learn/jsa_symex_learn.h +++ b/src/cegis/jsa/learn/jsa_symex_learn.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/jsa/options/jsa_program.cpp b/src/cegis/jsa/options/jsa_program.cpp index 5e42c14148b..d7d6cc8870e 100644 --- a/src/cegis/jsa/options/jsa_program.cpp +++ b/src/cegis/jsa/options/jsa_program.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include #include diff --git a/src/cegis/jsa/options/jsa_program.h b/src/cegis/jsa/options/jsa_program.h index 26c5a72fa76..c9f0001686d 100644 --- a/src/cegis/jsa/options/jsa_program.h +++ b/src/cegis/jsa/options/jsa_program.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/jsa/options/jsa_program_info.cpp b/src/cegis/jsa/options/jsa_program_info.cpp index 10b2f0be346..d2464b6fead 100644 --- a/src/cegis/jsa/options/jsa_program_info.cpp +++ b/src/cegis/jsa/options/jsa_program_info.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include #include diff --git a/src/cegis/jsa/options/jsa_program_info.h b/src/cegis/jsa/options/jsa_program_info.h index 626d37115ec..95df2352f25 100644 --- a/src/cegis/jsa/options/jsa_program_info.h +++ b/src/cegis/jsa/options/jsa_program_info.h @@ -1,11 +1,11 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk - \*******************************************************************/ +\*******************************************************************/ #ifndef CPROVER_CEGIS_JSA_OPTIONS_JSA_PROGRAM_INFO_H #define CPROVER_CEGIS_JSA_OPTIONS_JSA_PROGRAM_INFO_H diff --git a/src/cegis/jsa/preprocessing/add_constraint_meta_variables.cpp b/src/cegis/jsa/preprocessing/add_constraint_meta_variables.cpp index 82a99dc0827..da4d98bf48e 100644 --- a/src/cegis/jsa/preprocessing/add_constraint_meta_variables.cpp +++ b/src/cegis/jsa/preprocessing/add_constraint_meta_variables.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/jsa/preprocessing/add_constraint_meta_variables.h b/src/cegis/jsa/preprocessing/add_constraint_meta_variables.h index c49e2991d2e..f9268c01bae 100644 --- a/src/cegis/jsa/preprocessing/add_constraint_meta_variables.h +++ b/src/cegis/jsa/preprocessing/add_constraint_meta_variables.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/jsa/preprocessing/add_synthesis_library.cpp b/src/cegis/jsa/preprocessing/add_synthesis_library.cpp index d12fa6b862e..f2e394c51ed 100644 --- a/src/cegis/jsa/preprocessing/add_synthesis_library.cpp +++ b/src/cegis/jsa/preprocessing/add_synthesis_library.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/jsa/preprocessing/add_synthesis_library.h b/src/cegis/jsa/preprocessing/add_synthesis_library.h index af8ee791346..95d50d000d5 100644 --- a/src/cegis/jsa/preprocessing/add_synthesis_library.h +++ b/src/cegis/jsa/preprocessing/add_synthesis_library.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/jsa/preprocessing/clone_heap.cpp b/src/cegis/jsa/preprocessing/clone_heap.cpp index 9c89848ecde..ce7247ad04e 100644 --- a/src/cegis/jsa/preprocessing/clone_heap.cpp +++ b/src/cegis/jsa/preprocessing/clone_heap.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/jsa/preprocessing/clone_heap.h b/src/cegis/jsa/preprocessing/clone_heap.h index 3f247c823d5..cad2c8360c7 100644 --- a/src/cegis/jsa/preprocessing/clone_heap.h +++ b/src/cegis/jsa/preprocessing/clone_heap.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/jsa/preprocessing/collect_variables.cpp b/src/cegis/jsa/preprocessing/collect_variables.cpp index 41c0883e809..56594713b7f 100644 --- a/src/cegis/jsa/preprocessing/collect_variables.cpp +++ b/src/cegis/jsa/preprocessing/collect_variables.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/jsa/preprocessing/collect_variables.h b/src/cegis/jsa/preprocessing/collect_variables.h index 0f306b8be64..434600639a4 100644 --- a/src/cegis/jsa/preprocessing/collect_variables.h +++ b/src/cegis/jsa/preprocessing/collect_variables.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/jsa/preprocessing/create_temp_variables.cpp b/src/cegis/jsa/preprocessing/create_temp_variables.cpp index 431687b03f1..4f142e7210e 100644 --- a/src/cegis/jsa/preprocessing/create_temp_variables.cpp +++ b/src/cegis/jsa/preprocessing/create_temp_variables.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/jsa/preprocessing/create_temp_variables.h b/src/cegis/jsa/preprocessing/create_temp_variables.h index c7ec14da0e9..a2024748a95 100644 --- a/src/cegis/jsa/preprocessing/create_temp_variables.h +++ b/src/cegis/jsa/preprocessing/create_temp_variables.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/jsa/preprocessing/default_jsa_constant_strategy.cpp b/src/cegis/jsa/preprocessing/default_jsa_constant_strategy.cpp index 7a25d41952b..01474a262a8 100644 --- a/src/cegis/jsa/preprocessing/default_jsa_constant_strategy.cpp +++ b/src/cegis/jsa/preprocessing/default_jsa_constant_strategy.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/jsa/preprocessing/default_jsa_constant_strategy.h b/src/cegis/jsa/preprocessing/default_jsa_constant_strategy.h index 3c42ce0289a..f6170ca01ba 100644 --- a/src/cegis/jsa/preprocessing/default_jsa_constant_strategy.h +++ b/src/cegis/jsa/preprocessing/default_jsa_constant_strategy.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/jsa/preprocessing/inline_user_program.cpp b/src/cegis/jsa/preprocessing/inline_user_program.cpp index 77e69359e27..e02f350a6d9 100644 --- a/src/cegis/jsa/preprocessing/inline_user_program.cpp +++ b/src/cegis/jsa/preprocessing/inline_user_program.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/jsa/preprocessing/inline_user_program.h b/src/cegis/jsa/preprocessing/inline_user_program.h index e9c60c75d07..6e732f321d8 100644 --- a/src/cegis/jsa/preprocessing/inline_user_program.h +++ b/src/cegis/jsa/preprocessing/inline_user_program.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/jsa/preprocessing/jsa_preprocessing.cpp b/src/cegis/jsa/preprocessing/jsa_preprocessing.cpp index 6176b0eb5a1..433f8a3ef38 100644 --- a/src/cegis/jsa/preprocessing/jsa_preprocessing.cpp +++ b/src/cegis/jsa/preprocessing/jsa_preprocessing.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/jsa/preprocessing/jsa_preprocessing.h b/src/cegis/jsa/preprocessing/jsa_preprocessing.h index 56706df86f5..0d9bf4d7ad9 100644 --- a/src/cegis/jsa/preprocessing/jsa_preprocessing.h +++ b/src/cegis/jsa/preprocessing/jsa_preprocessing.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/jsa/preprocessing/remove_loop.cpp b/src/cegis/jsa/preprocessing/remove_loop.cpp index 16289f4545f..9469133750c 100644 --- a/src/cegis/jsa/preprocessing/remove_loop.cpp +++ b/src/cegis/jsa/preprocessing/remove_loop.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/jsa/preprocessing/remove_loop.h b/src/cegis/jsa/preprocessing/remove_loop.h index 1d7a50ed94f..53c3138952f 100644 --- a/src/cegis/jsa/preprocessing/remove_loop.h +++ b/src/cegis/jsa/preprocessing/remove_loop.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/jsa/value/default_solution.cpp b/src/cegis/jsa/value/default_solution.cpp index 3497a719ba8..d11641546ac 100644 --- a/src/cegis/jsa/value/default_solution.cpp +++ b/src/cegis/jsa/value/default_solution.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include #include diff --git a/src/cegis/jsa/value/default_solution.h b/src/cegis/jsa/value/default_solution.h index cd144d09a0e..d8678ad23bc 100644 --- a/src/cegis/jsa/value/default_solution.h +++ b/src/cegis/jsa/value/default_solution.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/jsa/value/jsa_counterexample.h b/src/cegis/jsa/value/jsa_counterexample.h index c95c4355f5f..f16a6267039 100644 --- a/src/cegis/jsa/value/jsa_counterexample.h +++ b/src/cegis/jsa/value/jsa_counterexample.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/jsa/value/jsa_counterexample_printer.cpp b/src/cegis/jsa/value/jsa_counterexample_printer.cpp index 1545849f266..83c443a9d51 100644 --- a/src/cegis/jsa/value/jsa_counterexample_printer.cpp +++ b/src/cegis/jsa/value/jsa_counterexample_printer.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include void print_jsa_counterexample(messaget::mstreamt &os, diff --git a/src/cegis/jsa/value/jsa_counterexample_printer.h b/src/cegis/jsa/value/jsa_counterexample_printer.h index 12514946132..2ae1080a540 100644 --- a/src/cegis/jsa/value/jsa_counterexample_printer.h +++ b/src/cegis/jsa/value/jsa_counterexample_printer.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/jsa/value/jsa_genetic_counterexample.h b/src/cegis/jsa/value/jsa_genetic_counterexample.h index ecdf0de2faa..f984768566e 100644 --- a/src/cegis/jsa/value/jsa_genetic_counterexample.h +++ b/src/cegis/jsa/value/jsa_genetic_counterexample.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/jsa/value/jsa_genetic_solution.h b/src/cegis/jsa/value/jsa_genetic_solution.h index 1a76a6bdc7a..1f2a7d6e5ed 100644 --- a/src/cegis/jsa/value/jsa_genetic_solution.h +++ b/src/cegis/jsa/value/jsa_genetic_solution.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/jsa/value/jsa_genetic_synthesis.h b/src/cegis/jsa/value/jsa_genetic_synthesis.h index 6678b3b71f6..823f6dc9bf4 100644 --- a/src/cegis/jsa/value/jsa_genetic_synthesis.h +++ b/src/cegis/jsa/value/jsa_genetic_synthesis.h @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #ifndef CPROVER_CEGIS_JSA_VALUE_JSA_GENETIC_SYNTHESIS_H #define CPROVER_CEGIS_JSA_VALUE_JSA_GENETIC_SYNTHESIS_H diff --git a/src/cegis/jsa/value/jsa_solution.cpp b/src/cegis/jsa/value/jsa_solution.cpp index d58be7bc328..c1434ce66f7 100644 --- a/src/cegis/jsa/value/jsa_solution.cpp +++ b/src/cegis/jsa/value/jsa_solution.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/jsa/value/jsa_solution.h b/src/cegis/jsa/value/jsa_solution.h index 4ae3ba35bda..6a93f254f10 100644 --- a/src/cegis/jsa/value/jsa_solution.h +++ b/src/cegis/jsa/value/jsa_solution.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/jsa/value/jsa_solution_printer.cpp b/src/cegis/jsa/value/jsa_solution_printer.cpp index f3115f2cd91..f9c57297b8f 100644 --- a/src/cegis/jsa/value/jsa_solution_printer.cpp +++ b/src/cegis/jsa/value/jsa_solution_printer.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/jsa/value/jsa_solution_printer.h b/src/cegis/jsa/value/jsa_solution_printer.h index 32eae1d30d6..1dcf9632db7 100644 --- a/src/cegis/jsa/value/jsa_solution_printer.h +++ b/src/cegis/jsa/value/jsa_solution_printer.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/jsa/value/jsa_types.cpp b/src/cegis/jsa/value/jsa_types.cpp index ac2e7b48eb6..003d9361b04 100644 --- a/src/cegis/jsa/value/jsa_types.cpp +++ b/src/cegis/jsa/value/jsa_types.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/jsa/value/jsa_types.h b/src/cegis/jsa/value/jsa_types.h index 47ef22fe77f..a6f1aee52a5 100644 --- a/src/cegis/jsa/value/jsa_types.h +++ b/src/cegis/jsa/value/jsa_types.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/jsa/value/pred_ops.h b/src/cegis/jsa/value/pred_ops.h index 500c1ec5f7e..fa84df5fb59 100644 --- a/src/cegis/jsa/value/pred_ops.h +++ b/src/cegis/jsa/value/pred_ops.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/jsa/verify/extract_counterexample.cpp b/src/cegis/jsa/verify/extract_counterexample.cpp index fe3caa65eca..662dacdb6c9 100644 --- a/src/cegis/jsa/verify/extract_counterexample.cpp +++ b/src/cegis/jsa/verify/extract_counterexample.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/jsa/verify/extract_counterexample.h b/src/cegis/jsa/verify/extract_counterexample.h index 315d66d9e51..006ec48adb0 100644 --- a/src/cegis/jsa/verify/extract_counterexample.h +++ b/src/cegis/jsa/verify/extract_counterexample.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/jsa/verify/insert_solution.cpp b/src/cegis/jsa/verify/insert_solution.cpp index 373791042f7..0f577968837 100644 --- a/src/cegis/jsa/verify/insert_solution.cpp +++ b/src/cegis/jsa/verify/insert_solution.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/jsa/verify/insert_solution.h b/src/cegis/jsa/verify/insert_solution.h index 0c9c9e150ae..0d8822ea065 100644 --- a/src/cegis/jsa/verify/insert_solution.h +++ b/src/cegis/jsa/verify/insert_solution.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/jsa/verify/jsa_symex_verify.cpp b/src/cegis/jsa/verify/jsa_symex_verify.cpp index c00f50eacf3..f698a34810d 100644 --- a/src/cegis/jsa/verify/jsa_symex_verify.cpp +++ b/src/cegis/jsa/verify/jsa_symex_verify.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/jsa/verify/jsa_symex_verify.h b/src/cegis/jsa/verify/jsa_symex_verify.h index 952a694ae71..f07077b6743 100644 --- a/src/cegis/jsa/verify/jsa_symex_verify.h +++ b/src/cegis/jsa/verify/jsa_symex_verify.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/jsa/verify/renondet_inputs.cpp b/src/cegis/jsa/verify/renondet_inputs.cpp index 257fecf2cdb..d02de4a3039 100644 --- a/src/cegis/jsa/verify/renondet_inputs.cpp +++ b/src/cegis/jsa/verify/renondet_inputs.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/jsa/verify/renondet_inputs.h b/src/cegis/jsa/verify/renondet_inputs.h index 2484407d311..ffe987129df 100644 --- a/src/cegis/jsa/verify/renondet_inputs.h +++ b/src/cegis/jsa/verify/renondet_inputs.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/learn/concurrent_learn.h b/src/cegis/learn/concurrent_learn.h index 25b00838941..7e8c2f62b12 100644 --- a/src/cegis/learn/concurrent_learn.h +++ b/src/cegis/learn/concurrent_learn.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/learn/constraint_helper.cpp b/src/cegis/learn/constraint_helper.cpp index 33289624049..974cdafcb5c 100644 --- a/src/cegis/learn/constraint_helper.cpp +++ b/src/cegis/learn/constraint_helper.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/learn/constraint_helper.h b/src/cegis/learn/constraint_helper.h index 7be5dc210e2..ae084a2e545 100644 --- a/src/cegis/learn/constraint_helper.h +++ b/src/cegis/learn/constraint_helper.h @@ -1,11 +1,11 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk - \*******************************************************************/ +\*******************************************************************/ #ifndef CPROVER_CEGIS_LEARN_CONSTRAINT_HELPER_H #define CPROVER_CEGIS_LEARN_CONSTRAINT_HELPER_H diff --git a/src/cegis/learn/insert_counterexample.cpp b/src/cegis/learn/insert_counterexample.cpp index 1acab8b20c5..7c321db9128 100644 --- a/src/cegis/learn/insert_counterexample.cpp +++ b/src/cegis/learn/insert_counterexample.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include @@ -139,7 +148,6 @@ void add_array_declarations(symbol_tablet &st, goto_functionst &gf, const constant_exprt sz_expr(from_integer(ces.size(), sz_type)); const array_valuest array_values(get_array_values(ces)); const labelled_counterexamplest::value_type &prototype=ces.front(); - goto_programt &body=get_entry_body(gf); goto_programt::targett pos=std::prev(begin); for (const labelled_counterexamplest::value_type::value_type &value : prototype) { diff --git a/src/cegis/learn/insert_counterexample.h b/src/cegis/learn/insert_counterexample.h index d20d9f6809b..39382ceae5c 100644 --- a/src/cegis/learn/insert_counterexample.h +++ b/src/cegis/learn/insert_counterexample.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/options/parameters.h b/src/cegis/options/parameters.h index d97633f8272..bf9d6ee931d 100644 --- a/src/cegis/options/parameters.h +++ b/src/cegis/options/parameters.h @@ -1,11 +1,11 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk - \*******************************************************************/ +\*******************************************************************/ #ifndef CPROVER_CEGIS_OPTIONS_PARAMETERS_H #define CPROVER_CEGIS_OPTIONS_PARAMETERS_H diff --git a/src/cegis/refactor/constraint/constraint_factory.cpp b/src/cegis/refactor/constraint/constraint_factory.cpp index 0013948ce60..abe6d33e4fa 100644 --- a/src/cegis/refactor/constraint/constraint_factory.cpp +++ b/src/cegis/refactor/constraint/constraint_factory.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include @@ -110,7 +119,6 @@ const goto_ranget &get_second_range(const refactor_programt::sketcht &sketch) void make_skip(const goto_programt::targett first, const goto_programt::targett last) { - const auto op(std::mem_fun_ref(&goto_programt::instructiont::make_skip)); std::for_each(first, last, [](goto_programt::instructiont &instr) { if(!instr.is_decl()) instr.make_skip();}); } diff --git a/src/cegis/refactor/constraint/constraint_factory.h b/src/cegis/refactor/constraint/constraint_factory.h index ee25bdf1bed..a6c42be5661 100644 --- a/src/cegis/refactor/constraint/constraint_factory.h +++ b/src/cegis/refactor/constraint/constraint_factory.h @@ -1,11 +1,11 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk - \*******************************************************************/ +\*******************************************************************/ #ifndef CPROVER_CEGIS_REFACTOR_CONSTRAINT_CONSTRAINT_FACTORY_H #define CPROVER_CEGIS_REFACTOR_CONSTRAINT_CONSTRAINT_FACTORY_H diff --git a/src/cegis/refactor/environment/instrument_state_vars.cpp b/src/cegis/refactor/environment/instrument_state_vars.cpp index 7c6b6e3b5e0..6dc9d60869a 100644 --- a/src/cegis/refactor/environment/instrument_state_vars.cpp +++ b/src/cegis/refactor/environment/instrument_state_vars.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include namespace diff --git a/src/cegis/refactor/environment/instrument_state_vars.h b/src/cegis/refactor/environment/instrument_state_vars.h index 64cdea270f1..ee5cdd5679e 100644 --- a/src/cegis/refactor/environment/instrument_state_vars.h +++ b/src/cegis/refactor/environment/instrument_state_vars.h @@ -1,11 +1,11 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk - \*******************************************************************/ +\*******************************************************************/ #ifndef CPROVER_CEGIS_REFACTOR_ENVIRONMENT_INSTRUMENT_STATE_VARS_H #define CPROVER_CEGIS_REFACTOR_ENVIRONMENT_INSTRUMENT_STATE_VARS_H diff --git a/src/cegis/refactor/facade/refactor_runner.cpp b/src/cegis/refactor/facade/refactor_runner.cpp index ce9c5012cf9..3d4ed42ddc2 100644 --- a/src/cegis/refactor/facade/refactor_runner.cpp +++ b/src/cegis/refactor/facade/refactor_runner.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include #include diff --git a/src/cegis/refactor/facade/refactor_runner.h b/src/cegis/refactor/facade/refactor_runner.h index f3ea91151db..b27073e3f0e 100644 --- a/src/cegis/refactor/facade/refactor_runner.h +++ b/src/cegis/refactor/facade/refactor_runner.h @@ -1,11 +1,11 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk - \*******************************************************************/ +\*******************************************************************/ #ifndef CPROVER_CEGIS_REFACTOR_FACADE_REFACTOR_RUNNER_H #define CPROVER_CEGIS_REFACTOR_FACADE_REFACTOR_RUNNER_H diff --git a/src/cegis/refactor/instructionset/cegis_instruction_factory.cpp b/src/cegis/refactor/instructionset/cegis_instruction_factory.cpp index 3d43531318d..c9d233dad1e 100644 --- a/src/cegis/refactor/instructionset/cegis_instruction_factory.cpp +++ b/src/cegis/refactor/instructionset/cegis_instruction_factory.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/refactor/instructionset/cegis_instruction_factory.h b/src/cegis/refactor/instructionset/cegis_instruction_factory.h index 30bd64adb30..f5426c54cfb 100644 --- a/src/cegis/refactor/instructionset/cegis_instruction_factory.h +++ b/src/cegis/refactor/instructionset/cegis_instruction_factory.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/refactor/instructionset/cegis_processor_body_factory.cpp b/src/cegis/refactor/instructionset/cegis_processor_body_factory.cpp index 6035112abbb..567276dc536 100644 --- a/src/cegis/refactor/instructionset/cegis_processor_body_factory.cpp +++ b/src/cegis/refactor/instructionset/cegis_processor_body_factory.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include @@ -214,49 +223,6 @@ class body_factoryt finalise_conditional_instr_gotos(); } }; - -bool is_forward_goto(const goto_programt::instructiont &instr) -{ - return instr.is_goto() && !instr.is_backwards_goto(); -} - -void remove_singleton_switch_cases(goto_programt &body) -{ - body.compute_location_numbers(); - goto_programt::instructionst &instrs=body.instructions; - const goto_programt::targett end(instrs.end()); - for (goto_programt::targett pos=instrs.begin(); pos != end; ++pos) - { - if (!is_forward_goto(*pos)) continue; - const auto pred(std::mem_fun_ref(&goto_programt::instructiont::is_skip)); - const goto_programt::targett tail=std::find_if(pos, end, pred); - assert(end != tail); - if (pos->get_target() == tail) instrs.erase(pos); - pos=tail; - } -} - -void remove_goto_next(goto_programt &body) -{ - body.compute_location_numbers(); - goto_programt::instructionst &instrs=body.instructions; - for (goto_programt::targett pos=instrs.begin(); pos != instrs.end(); ++pos) - if (is_forward_goto(*pos) && pos->get_target() == std::next(pos)) - pos=instrs.erase(pos); -} - -void remove_skips(goto_programt::instructionst &instrs) -{ - const goto_programt::targett first(instrs.begin()); - const goto_programt::targett last(instrs.end()); - for (goto_programt::targett pos=first; pos != last; ++pos) - { - if (!pos->is_skip()) continue; - const goto_programt::targett successor(std::next(pos)); - move_labels(instrs, pos, successor); - pos=instrs.erase(pos); - } -} } void generate_processor_body(symbol_tablet &st, goto_programt &body, @@ -272,9 +238,6 @@ void generate_processor_body(symbol_tablet &st, goto_programt &body, factory.finish_instruction_loop(); } body.add_instruction(goto_program_instruction_typet::END_FUNCTION); - //remove_singleton_switch_cases(body); - //remove_goto_next(body); - //remove_skips(body.instructions); body.compute_loop_numbers(); body.update(); } diff --git a/src/cegis/refactor/instructionset/cegis_processor_body_factory.h b/src/cegis/refactor/instructionset/cegis_processor_body_factory.h index a208b794fcf..bd2b3e5470d 100644 --- a/src/cegis/refactor/instructionset/cegis_processor_body_factory.h +++ b/src/cegis/refactor/instructionset/cegis_processor_body_factory.h @@ -1,11 +1,11 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk - \*******************************************************************/ +\*******************************************************************/ #ifndef CPROVER_CEGIS_REFACTOR_INSTRUCTIONSET_CEGIS_PROCESSOR_BODY_FACTORY_H #define CPROVER_CEGIS_REFACTOR_INSTRUCTIONSET_CEGIS_PROCESSOR_BODY_FACTORY_H diff --git a/src/cegis/refactor/instructionset/create_cegis_processor.cpp b/src/cegis/refactor/instructionset/create_cegis_processor.cpp index 6f8b4103ecc..0a5871aef54 100644 --- a/src/cegis/refactor/instructionset/create_cegis_processor.cpp +++ b/src/cegis/refactor/instructionset/create_cegis_processor.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include #include @@ -31,7 +40,6 @@ class type_collectort: public const_expr_visitort virtual void operator()(const exprt &expr) { const typet &type=expr.type(); - const irep_idt &type_id=type.id(); if (ID_code != type.id() && !is_empty(type)) types.insert(expr.type()); } }; @@ -131,21 +139,11 @@ symbol_typet create_instruction_type(symbol_tablet &st, return symbol_typet(instr_type_name); } -const mp_integer get_width(const typet &type) -{ - const irep_idt &id_width=type.get(ID_width); - assert(!id_width.empty()); - return string2integer(id2string(id_width)); -} - code_typet create_func_type(const symbol_tablet &st, const symbol_typet &instruction_type, const std::string &func_name) { code_typet code_type; code_type.return_type()=empty_typet(); - const typet &followed_type=namespacet(st).follow(instruction_type); - const struct_union_typet &struct_type=to_struct_union_type(followed_type); - const struct_union_typet::componentst &comps=struct_type.components(); const pointer_typet instr_ref_type(instruction_type); code_typet::parametert prog(instr_ref_type); const char * const prog_base_name=CEGIS_PROC_PROGRAM_PARAM_ID; diff --git a/src/cegis/refactor/instructionset/create_cegis_processor.h b/src/cegis/refactor/instructionset/create_cegis_processor.h index 50e5c5bbda8..7b4a1273f66 100644 --- a/src/cegis/refactor/instructionset/create_cegis_processor.h +++ b/src/cegis/refactor/instructionset/create_cegis_processor.h @@ -1,11 +1,11 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk - \*******************************************************************/ +\*******************************************************************/ #ifndef CPROVER_CEGIS_REFACTOR_INSTRUCTIONSET_CREATE_CEGIS_PROCESSOR_H #define CPROVER_CEGIS_REFACTOR_INSTRUCTIONSET_CREATE_CEGIS_PROCESSOR_H diff --git a/src/cegis/refactor/instructionset/execute_cegis_program.cpp b/src/cegis/refactor/instructionset/execute_cegis_program.cpp index 1244df9c4ef..347f550bde5 100644 --- a/src/cegis/refactor/instructionset/execute_cegis_program.cpp +++ b/src/cegis/refactor/instructionset/execute_cegis_program.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include #include diff --git a/src/cegis/refactor/instructionset/execute_cegis_program.h b/src/cegis/refactor/instructionset/execute_cegis_program.h index 999db14cc9c..bf3c9d1dc8c 100644 --- a/src/cegis/refactor/instructionset/execute_cegis_program.h +++ b/src/cegis/refactor/instructionset/execute_cegis_program.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/refactor/instructionset/instruction_description.cpp b/src/cegis/refactor/instructionset/instruction_description.cpp index 200c24e6496..ee063db4e6a 100644 --- a/src/cegis/refactor/instructionset/instruction_description.cpp +++ b/src/cegis/refactor/instructionset/instruction_description.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include instruction_descriptiont::instruction_descriptiont(const typest &signature, diff --git a/src/cegis/refactor/instructionset/instruction_description.h b/src/cegis/refactor/instructionset/instruction_description.h index 281e94ec4e2..00b08fcb0bb 100644 --- a/src/cegis/refactor/instructionset/instruction_description.h +++ b/src/cegis/refactor/instructionset/instruction_description.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/refactor/instructionset/operand_data.h b/src/cegis/refactor/instructionset/operand_data.h index 2e0f7870513..34339985649 100644 --- a/src/cegis/refactor/instructionset/operand_data.h +++ b/src/cegis/refactor/instructionset/operand_data.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/refactor/instructionset/processor_symbols.cpp b/src/cegis/refactor/instructionset/processor_symbols.cpp index 9fa981724e2..2a5fd442a66 100644 --- a/src/cegis/refactor/instructionset/processor_symbols.cpp +++ b/src/cegis/refactor/instructionset/processor_symbols.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include #include diff --git a/src/cegis/refactor/instructionset/processor_symbols.h b/src/cegis/refactor/instructionset/processor_symbols.h index ca34874c76a..cf6a0734ee7 100644 --- a/src/cegis/refactor/instructionset/processor_symbols.h +++ b/src/cegis/refactor/instructionset/processor_symbols.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/refactor/instructionset/processor_types.cpp b/src/cegis/refactor/instructionset/processor_types.cpp index 9dd1ec5c38a..af1c9d44c04 100644 --- a/src/cegis/refactor/instructionset/processor_types.cpp +++ b/src/cegis/refactor/instructionset/processor_types.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/refactor/instructionset/processor_types.h b/src/cegis/refactor/instructionset/processor_types.h index adfb10d63e8..b01e3cd860f 100644 --- a/src/cegis/refactor/instructionset/processor_types.h +++ b/src/cegis/refactor/instructionset/processor_types.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/refactor/learn/instrument_counterexamples.cpp b/src/cegis/refactor/learn/instrument_counterexamples.cpp index 713b0ef0f94..58af6e51c03 100644 --- a/src/cegis/refactor/learn/instrument_counterexamples.cpp +++ b/src/cegis/refactor/learn/instrument_counterexamples.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include @@ -49,7 +58,6 @@ void create_ce_arrays(symbol_tablet &st, goto_functionst &gf, const constant_exprt sz_expr(from_integer(ces.size(), sz_type)); const array_valuest array_values(get_array_values(ces)); const labelled_counterexamplest::value_type &prototype=ces.front(); - goto_programt &body=get_body(gf, CPROVER_INIT); for (const labelled_counterexamplest::value_type::value_type &value : prototype) { const labelled_assignmentst::value_type::first_type loc_id=value.first; @@ -121,7 +129,6 @@ void assign_ce_values(symbol_tablet &st, goto_functionst &gf, { for (const refactor_programt::counterexample_locationst::value_type ce_loc : ce_locs) { - const std::string &func=id2string(ce_loc.first); for (goto_programt::targett pos : ce_loc.second) { const irep_idt &label=get_counterexample_marker(pos); diff --git a/src/cegis/refactor/learn/instrument_counterexamples.h b/src/cegis/refactor/learn/instrument_counterexamples.h index 0f5734cb79a..45493db0a30 100644 --- a/src/cegis/refactor/learn/instrument_counterexamples.h +++ b/src/cegis/refactor/learn/instrument_counterexamples.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/refactor/learn/refactor_candidate_printer.cpp b/src/cegis/refactor/learn/refactor_candidate_printer.cpp index ea5bc63dd8f..44a88be1cd9 100644 --- a/src/cegis/refactor/learn/refactor_candidate_printer.cpp +++ b/src/cegis/refactor/learn/refactor_candidate_printer.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include @@ -38,7 +47,6 @@ void print_instr(messaget::mstreamt &os, const namespacet &ns, for (; first != last; ++first) body.output_instruction(ns, func_name, oss, first); std::string result(oss.str()); - struct_exprt::operandst::const_iterator it=std::next(ops.begin()); for (size_t i=1; i < ops.size(); ++i) { std::string nd("*__CPROVER_cegis_variable_array_double[(program + i)->op_"); diff --git a/src/cegis/refactor/learn/refactor_candidate_printer.h b/src/cegis/refactor/learn/refactor_candidate_printer.h index bbc36833498..53041c573fe 100644 --- a/src/cegis/refactor/learn/refactor_candidate_printer.h +++ b/src/cegis/refactor/learn/refactor_candidate_printer.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/refactor/learn/refactor_symex_learn.cpp b/src/cegis/refactor/learn/refactor_symex_learn.cpp index b8e42a4b02a..98d6cce1807 100644 --- a/src/cegis/refactor/learn/refactor_symex_learn.cpp +++ b/src/cegis/refactor/learn/refactor_symex_learn.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/refactor/learn/refactor_symex_learn.h b/src/cegis/refactor/learn/refactor_symex_learn.h index d335b2716be..dee68ce2afb 100644 --- a/src/cegis/refactor/learn/refactor_symex_learn.h +++ b/src/cegis/refactor/learn/refactor_symex_learn.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/refactor/nullobject/nullable_analysis.cpp b/src/cegis/refactor/nullobject/nullable_analysis.cpp index 0a439cc5dd0..c961a007980 100644 --- a/src/cegis/refactor/nullobject/nullable_analysis.cpp +++ b/src/cegis/refactor/nullobject/nullable_analysis.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include @@ -86,7 +95,6 @@ cegis_operand_datat get_operand_signature(const symbol_tablet &st, // TODO: Add global vars cegis_operand_datat result; const code_typet &code_type=to_code_type(st.lookup(method).type); - const typet &return_type=code_type.return_type(); const std::string ret_val_name(get_return_value_name(method)); if (st.has_symbol(ret_val_name)) result[st.lookup(ret_val_name).type]=1; for (const code_typet::parameterst::value_type ¶m : code_type.parameters()) diff --git a/src/cegis/refactor/nullobject/nullable_analysis.h b/src/cegis/refactor/nullobject/nullable_analysis.h index 65c2c3da754..7d2d6578e95 100644 --- a/src/cegis/refactor/nullobject/nullable_analysis.h +++ b/src/cegis/refactor/nullobject/nullable_analysis.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/refactor/nullobject/range_collector.cpp b/src/cegis/refactor/nullobject/range_collector.cpp index a9c43e1accd..01f76a5fdc0 100644 --- a/src/cegis/refactor/nullobject/range_collector.cpp +++ b/src/cegis/refactor/nullobject/range_collector.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include #include diff --git a/src/cegis/refactor/nullobject/range_collector.h b/src/cegis/refactor/nullobject/range_collector.h index f2c9780b1fb..fba93debae3 100644 --- a/src/cegis/refactor/nullobject/range_collector.h +++ b/src/cegis/refactor/nullobject/range_collector.h @@ -1,11 +1,11 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk - \*******************************************************************/ +\*******************************************************************/ #ifndef CPROVER_CEGIS_REFACTOR_NULLOBJECT_RANGE_COLLECTOR_H #define CPROVER_CEGIS_REFACTOR_NULLOBJECT_RANGE_COLLECTOR_H diff --git a/src/cegis/refactor/options/refactor_program.cpp b/src/cegis/refactor/options/refactor_program.cpp index 67ad7b053e7..c58f17d84a0 100644 --- a/src/cegis/refactor/options/refactor_program.cpp +++ b/src/cegis/refactor/options/refactor_program.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include #include diff --git a/src/cegis/refactor/options/refactor_program.h b/src/cegis/refactor/options/refactor_program.h index 35282d347b3..aa66f843bd3 100644 --- a/src/cegis/refactor/options/refactor_program.h +++ b/src/cegis/refactor/options/refactor_program.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/refactor/options/refactoring_type.cpp b/src/cegis/refactor/options/refactoring_type.cpp index 17f377871d1..101c8d6980d 100644 --- a/src/cegis/refactor/options/refactoring_type.cpp +++ b/src/cegis/refactor/options/refactoring_type.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/refactor/options/refactoring_type.h b/src/cegis/refactor/options/refactoring_type.h index 022affe60a4..189e97af520 100644 --- a/src/cegis/refactor/options/refactoring_type.h +++ b/src/cegis/refactor/options/refactoring_type.h @@ -1,11 +1,11 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk - \*******************************************************************/ +\*******************************************************************/ #ifndef CPROVER_CEGIS_REFACTOR_OPTIONS_REFACTORING_TYPE_H #define CPROVER_CEGIS_REFACTOR_OPTIONS_REFACTORING_TYPE_H diff --git a/src/cegis/refactor/preprocessing/collect_counterexamples.cpp b/src/cegis/refactor/preprocessing/collect_counterexamples.cpp index acdb42518cc..d9d7a5cd41f 100644 --- a/src/cegis/refactor/preprocessing/collect_counterexamples.cpp +++ b/src/cegis/refactor/preprocessing/collect_counterexamples.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include #include diff --git a/src/cegis/refactor/preprocessing/collect_counterexamples.h b/src/cegis/refactor/preprocessing/collect_counterexamples.h index cc0038bcf2c..5238f84c069 100644 --- a/src/cegis/refactor/preprocessing/collect_counterexamples.h +++ b/src/cegis/refactor/preprocessing/collect_counterexamples.h @@ -1,11 +1,11 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk - \*******************************************************************/ +\*******************************************************************/ #ifndef CPROVER_CEGIS_REFACTOR_PREPROCESSING_COLLECT_COUNTEREXAMPLES_H #define CPROVER_CEGIS_REFACTOR_PREPROCESSING_COLLECT_COUNTEREXAMPLES_H diff --git a/src/cegis/refactor/preprocessing/refactor_preprocessing.cpp b/src/cegis/refactor/preprocessing/refactor_preprocessing.cpp index 0b74082d54a..b5b6f3d0d5b 100644 --- a/src/cegis/refactor/preprocessing/refactor_preprocessing.cpp +++ b/src/cegis/refactor/preprocessing/refactor_preprocessing.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/refactor/preprocessing/refactor_preprocessing.h b/src/cegis/refactor/preprocessing/refactor_preprocessing.h index 155187dfea7..b3b3e86c6e3 100644 --- a/src/cegis/refactor/preprocessing/refactor_preprocessing.h +++ b/src/cegis/refactor/preprocessing/refactor_preprocessing.h @@ -1,11 +1,11 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk - \*******************************************************************/ +\*******************************************************************/ #ifndef CPROVER_CEGIS_REFACTOR_PREPROCESSING_REFACTOR_PREPROCESSING_H #define 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 fe4a8344e65..fd1bf021e9c 100644 --- a/src/cegis/refactor/value/refactor_counterexample.h +++ b/src/cegis/refactor/value/refactor_counterexample.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/refactor/value/refactor_solution.h b/src/cegis/refactor/value/refactor_solution.h index 5cb538f5bfc..15e5c1e8963 100644 --- a/src/cegis/refactor/value/refactor_solution.h +++ b/src/cegis/refactor/value/refactor_solution.h @@ -1,11 +1,11 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk - \*******************************************************************/ +\*******************************************************************/ #ifndef CPROVER_CEGIS_REFACTOR_VALUE_REFACTOR_SOLUTION_H #define CPROVER_CEGIS_REFACTOR_VALUE_REFACTOR_SOLUTION_H diff --git a/src/cegis/refactor/verify/refactor_symex_verify.cpp b/src/cegis/refactor/verify/refactor_symex_verify.cpp index 77dc78ca7b7..a65fba9f684 100644 --- a/src/cegis/refactor/verify/refactor_symex_verify.cpp +++ b/src/cegis/refactor/verify/refactor_symex_verify.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/refactor/verify/refactor_symex_verify.h b/src/cegis/refactor/verify/refactor_symex_verify.h index 65be9d7fdf8..c78efc5af07 100644 --- a/src/cegis/refactor/verify/refactor_symex_verify.h +++ b/src/cegis/refactor/verify/refactor_symex_verify.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/safety/constraint/safety_constraint_factory.cpp b/src/cegis/safety/constraint/safety_constraint_factory.cpp index dd2c243a379..b05fc243d06 100644 --- a/src/cegis/safety/constraint/safety_constraint_factory.cpp +++ b/src/cegis/safety/constraint/safety_constraint_factory.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/safety/constraint/safety_constraint_factory.h b/src/cegis/safety/constraint/safety_constraint_factory.h index 07946afe437..b34922a97b1 100644 --- a/src/cegis/safety/constraint/safety_constraint_factory.h +++ b/src/cegis/safety/constraint/safety_constraint_factory.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/safety/facade/safety_runner.cpp b/src/cegis/safety/facade/safety_runner.cpp index 2251d150b02..cf4656341c3 100644 --- a/src/cegis/safety/facade/safety_runner.cpp +++ b/src/cegis/safety/facade/safety_runner.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/safety/facade/safety_runner.h b/src/cegis/safety/facade/safety_runner.h index cb2801b1f85..cea2774c334 100644 --- a/src/cegis/safety/facade/safety_runner.h +++ b/src/cegis/safety/facade/safety_runner.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/safety/genetic/dynamic_safety_test_runner.cpp b/src/cegis/safety/genetic/dynamic_safety_test_runner.cpp index c7aa7ba0070..24a5f8df24a 100644 --- a/src/cegis/safety/genetic/dynamic_safety_test_runner.cpp +++ b/src/cegis/safety/genetic/dynamic_safety_test_runner.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/safety/genetic/dynamic_safety_test_runner.h b/src/cegis/safety/genetic/dynamic_safety_test_runner.h index 499d8e659f4..bb696fb7a7e 100644 --- a/src/cegis/safety/genetic/dynamic_safety_test_runner.h +++ b/src/cegis/safety/genetic/dynamic_safety_test_runner.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/safety/meta/meta_variable_names.cpp b/src/cegis/safety/meta/meta_variable_names.cpp index e8730af2c99..64be5eea8de 100644 --- a/src/cegis/safety/meta/meta_variable_names.cpp +++ b/src/cegis/safety/meta/meta_variable_names.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/safety/meta/meta_variable_names.h b/src/cegis/safety/meta/meta_variable_names.h index 23f07df3b58..81b68f16242 100644 --- a/src/cegis/safety/meta/meta_variable_names.h +++ b/src/cegis/safety/meta/meta_variable_names.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/safety/options/safety_program.cpp b/src/cegis/safety/options/safety_program.cpp index 9dcb2951bba..c7019b95aaf 100644 --- a/src/cegis/safety/options/safety_program.cpp +++ b/src/cegis/safety/options/safety_program.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/safety/options/safety_program.h b/src/cegis/safety/options/safety_program.h index 70f85b5e10b..08b76f2ea09 100644 --- a/src/cegis/safety/options/safety_program.h +++ b/src/cegis/safety/options/safety_program.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/safety/options/safety_program_genetic_settings.h b/src/cegis/safety/options/safety_program_genetic_settings.h index c1beb687c1d..81157207e4d 100644 --- a/src/cegis/safety/options/safety_program_genetic_settings.h +++ b/src/cegis/safety/options/safety_program_genetic_settings.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/safety/options/safety_program_printer.cpp b/src/cegis/safety/options/safety_program_printer.cpp index 16ec26c6c46..efd3aa82699 100644 --- a/src/cegis/safety/options/safety_program_printer.cpp +++ b/src/cegis/safety/options/safety_program_printer.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/safety/options/safety_program_printer.h b/src/cegis/safety/options/safety_program_printer.h index 6efcaf65225..39fff5e8251 100644 --- a/src/cegis/safety/options/safety_program_printer.h +++ b/src/cegis/safety/options/safety_program_printer.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/safety/preprocessing/safety_preprocessing.cpp b/src/cegis/safety/preprocessing/safety_preprocessing.cpp index 269b217c707..de96e76096a 100644 --- a/src/cegis/safety/preprocessing/safety_preprocessing.cpp +++ b/src/cegis/safety/preprocessing/safety_preprocessing.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/safety/preprocessing/safety_preprocessing.h b/src/cegis/safety/preprocessing/safety_preprocessing.h index 43a924a09c0..9f3251b8481 100644 --- a/src/cegis/safety/preprocessing/safety_preprocessing.h +++ b/src/cegis/safety/preprocessing/safety_preprocessing.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/safety/symex/fitness/safety_fitness_config.cpp b/src/cegis/safety/symex/fitness/safety_fitness_config.cpp index 74d7530c85d..1622eb7010d 100644 --- a/src/cegis/safety/symex/fitness/safety_fitness_config.cpp +++ b/src/cegis/safety/symex/fitness/safety_fitness_config.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include #include diff --git a/src/cegis/safety/symex/fitness/safety_fitness_config.h b/src/cegis/safety/symex/fitness/safety_fitness_config.h index 2e30a984ae9..64fb8bb30f8 100644 --- a/src/cegis/safety/symex/fitness/safety_fitness_config.h +++ b/src/cegis/safety/symex/fitness/safety_fitness_config.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/safety/symex/learn/add_counterexamples.cpp b/src/cegis/safety/symex/learn/add_counterexamples.cpp index 489c84ee832..8762c907aca 100644 --- a/src/cegis/safety/symex/learn/add_counterexamples.cpp +++ b/src/cegis/safety/symex/learn/add_counterexamples.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/safety/symex/learn/add_counterexamples.h b/src/cegis/safety/symex/learn/add_counterexamples.h index eed757b2679..08dae224adb 100644 --- a/src/cegis/safety/symex/learn/add_counterexamples.h +++ b/src/cegis/safety/symex/learn/add_counterexamples.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/safety/symex/learn/add_variable_refs.cpp b/src/cegis/safety/symex/learn/add_variable_refs.cpp index dd292a9527f..1cefa0d63ff 100644 --- a/src/cegis/safety/symex/learn/add_variable_refs.cpp +++ b/src/cegis/safety/symex/learn/add_variable_refs.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include #include diff --git a/src/cegis/safety/symex/learn/add_variable_refs.h b/src/cegis/safety/symex/learn/add_variable_refs.h index 147477b3606..51fc08a03f2 100644 --- a/src/cegis/safety/symex/learn/add_variable_refs.h +++ b/src/cegis/safety/symex/learn/add_variable_refs.h @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #ifndef CPROVER_CEGIS_SAFETY_SYMEX_LEARN_ADD_VARIABLE_REFS_H #define CPROVER_CEGIS_SAFETY_SYMEX_LEARN_ADD_VARIABLE_REFS_H diff --git a/src/cegis/safety/symex/learn/encoded_safety_learn_config.cpp b/src/cegis/safety/symex/learn/encoded_safety_learn_config.cpp index f140a11df0a..31c7b53f2a8 100644 --- a/src/cegis/safety/symex/learn/encoded_safety_learn_config.cpp +++ b/src/cegis/safety/symex/learn/encoded_safety_learn_config.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include #include 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 68c6e697872..7aa502ad1f8 100644 --- a/src/cegis/safety/symex/learn/encoded_safety_learn_config.h +++ b/src/cegis/safety/symex/learn/encoded_safety_learn_config.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/safety/symex/learn/safety_learn_config.cpp b/src/cegis/safety/symex/learn/safety_learn_config.cpp index 57b6ec6dec6..da2331cbda3 100644 --- a/src/cegis/safety/symex/learn/safety_learn_config.cpp +++ b/src/cegis/safety/symex/learn/safety_learn_config.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/safety/symex/learn/safety_learn_config.h b/src/cegis/safety/symex/learn/safety_learn_config.h index c42ee3718ab..0d93d2a4e3b 100644 --- a/src/cegis/safety/symex/learn/safety_learn_config.h +++ b/src/cegis/safety/symex/learn/safety_learn_config.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/safety/symex/learn/solution_factory.cpp b/src/cegis/safety/symex/learn/solution_factory.cpp index 5f4ef933455..f5c6e688aca 100644 --- a/src/cegis/safety/symex/learn/solution_factory.cpp +++ b/src/cegis/safety/symex/learn/solution_factory.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/safety/symex/learn/solution_factory.h b/src/cegis/safety/symex/learn/solution_factory.h index fd8b63d13c9..a3b52e5cf76 100644 --- a/src/cegis/safety/symex/learn/solution_factory.h +++ b/src/cegis/safety/symex/learn/solution_factory.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/safety/symex/verify/insert_candidate.cpp b/src/cegis/safety/symex/verify/insert_candidate.cpp index 3bd088de4fc..8315a2a4903 100644 --- a/src/cegis/safety/symex/verify/insert_candidate.cpp +++ b/src/cegis/safety/symex/verify/insert_candidate.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include #include diff --git a/src/cegis/safety/symex/verify/insert_candidate.h b/src/cegis/safety/symex/verify/insert_candidate.h index 163b4960c7e..b1723872c65 100644 --- a/src/cegis/safety/symex/verify/insert_candidate.h +++ b/src/cegis/safety/symex/verify/insert_candidate.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/safety/symex/verify/safety_verify_config.cpp b/src/cegis/safety/symex/verify/safety_verify_config.cpp index 80972e41290..dc46bcc7123 100644 --- a/src/cegis/safety/symex/verify/safety_verify_config.cpp +++ b/src/cegis/safety/symex/verify/safety_verify_config.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include #include diff --git a/src/cegis/safety/symex/verify/safety_verify_config.h b/src/cegis/safety/symex/verify/safety_verify_config.h index 27259d6b6e5..bf64a69be37 100644 --- a/src/cegis/safety/symex/verify/safety_verify_config.h +++ b/src/cegis/safety/symex/verify/safety_verify_config.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/safety/value/individual_to_safety_solution_deserialiser.cpp b/src/cegis/safety/value/individual_to_safety_solution_deserialiser.cpp index a9624b72669..2cddeea2621 100644 --- a/src/cegis/safety/value/individual_to_safety_solution_deserialiser.cpp +++ b/src/cegis/safety/value/individual_to_safety_solution_deserialiser.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include #include 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 1139b3bd5ec..5e4dce7ecee 100644 --- a/src/cegis/safety/value/individual_to_safety_solution_deserialiser.h +++ b/src/cegis/safety/value/individual_to_safety_solution_deserialiser.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/safety/value/safety_goto_ce.cpp b/src/cegis/safety/value/safety_goto_ce.cpp index 5ce1cb45e2a..d97153cfeec 100644 --- a/src/cegis/safety/value/safety_goto_ce.cpp +++ b/src/cegis/safety/value/safety_goto_ce.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include bool safety_goto_cet::operator ==(const safety_goto_cet &other) const diff --git a/src/cegis/safety/value/safety_goto_ce.h b/src/cegis/safety/value/safety_goto_ce.h index dcf5b8cf779..6fc139b2346 100644 --- a/src/cegis/safety/value/safety_goto_ce.h +++ b/src/cegis/safety/value/safety_goto_ce.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/safety/value/safety_goto_solution.h b/src/cegis/safety/value/safety_goto_solution.h index c2e740c66ae..b6ef8734e96 100644 --- a/src/cegis/safety/value/safety_goto_solution.h +++ b/src/cegis/safety/value/safety_goto_solution.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/seed/literals_seed.cpp b/src/cegis/seed/literals_seed.cpp index daf942acc47..7e7c7b63639 100644 --- a/src/cegis/seed/literals_seed.cpp +++ b/src/cegis/seed/literals_seed.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/seed/literals_seed.h b/src/cegis/seed/literals_seed.h index 6690773860e..df57f12d1f8 100644 --- a/src/cegis/seed/literals_seed.h +++ b/src/cegis/seed/literals_seed.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/seed/null_seed.h b/src/cegis/seed/null_seed.h index 4fa095a25f3..a9d07acfdf5 100644 --- a/src/cegis/seed/null_seed.h +++ b/src/cegis/seed/null_seed.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/statistics/cegis_statistics_wrapper.h b/src/cegis/statistics/cegis_statistics_wrapper.h index 166074cbef4..6100c243a80 100644 --- a/src/cegis/statistics/cegis_statistics_wrapper.h +++ b/src/cegis/statistics/cegis_statistics_wrapper.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/symex/cegis_symex_learn.h b/src/cegis/symex/cegis_symex_learn.h index cd6a7ac69c7..a8f5b0c1bb8 100644 --- a/src/cegis/symex/cegis_symex_learn.h +++ b/src/cegis/symex/cegis_symex_learn.h @@ -1,11 +1,11 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk - \*******************************************************************/ +\*******************************************************************/ #ifndef CPROVER_CEGIS_SYMEX_CEGIS_SYMEX_LEARN_H #define 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 97c485a4e0d..7c862d7089f 100644 --- a/src/cegis/symex/cegis_symex_verify.h +++ b/src/cegis/symex/cegis_symex_verify.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/value/assignments_printer.cpp b/src/cegis/value/assignments_printer.cpp index a2a08a068b4..fa57d737a74 100644 --- a/src/cegis/value/assignments_printer.cpp +++ b/src/cegis/value/assignments_printer.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/value/assignments_printer.h b/src/cegis/value/assignments_printer.h index d4437c92e87..eda5f2d849a 100644 --- a/src/cegis/value/assignments_printer.h +++ b/src/cegis/value/assignments_printer.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/value/program_individual.h b/src/cegis/value/program_individual.h index e7dd1745afc..1139cdafd0b 100644 --- a/src/cegis/value/program_individual.h +++ b/src/cegis/value/program_individual.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/cegis/value/program_individual_serialisation.cpp b/src/cegis/value/program_individual_serialisation.cpp index e5a1223db21..4f72b6cc18c 100644 --- a/src/cegis/value/program_individual_serialisation.cpp +++ b/src/cegis/value/program_individual_serialisation.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/value/program_individual_serialisation.h b/src/cegis/value/program_individual_serialisation.h index 198578bb875..83429992a2b 100644 --- a/src/cegis/value/program_individual_serialisation.h +++ b/src/cegis/value/program_individual_serialisation.h @@ -1,9 +1,9 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk \*******************************************************************/ diff --git a/src/cegis/wordsize/limited_wordsize_verify.h b/src/cegis/wordsize/limited_wordsize_verify.h index 6bd6d1b4d51..bc9c3e78b70 100644 --- a/src/cegis/wordsize/limited_wordsize_verify.h +++ b/src/cegis/wordsize/limited_wordsize_verify.h @@ -1,11 +1,11 @@ -/******************************************************************* +/*******************************************************************\ - Module: Counterexample-Guided Inductive Synthesis +Module: Counterexample-Guided Inductive Synthesis - Author: Daniel Kroening, kroening@kroening.com - Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk - \*******************************************************************/ +\*******************************************************************/ #ifndef CPROVER_CEGIS_WORDSIZE_LIMITED_WORDSIZE_VERIFY_H #define CPROVER_CEGIS_WORDSIZE_LIMITED_WORDSIZE_VERIFY_H diff --git a/src/cegis/wordsize/restrict_bv_size.cpp b/src/cegis/wordsize/restrict_bv_size.cpp index d4b8f13dd39..8ca3a0791be 100644 --- a/src/cegis/wordsize/restrict_bv_size.cpp +++ b/src/cegis/wordsize/restrict_bv_size.cpp @@ -1,3 +1,12 @@ +/*******************************************************************\ + +Module: Counterexample-Guided Inductive Synthesis + +Author: Daniel Kroening, kroening@kroening.com + Pascal Kesseli, pascal.kesseli@cs.ox.ac.uk + +\*******************************************************************/ + #include #include diff --git a/src/cegis/wordsize/restrict_bv_size.h b/src/cegis/wordsize/restrict_bv_size.h index b3c2937c2ae..cdda0d7254b 100644 --- a/src/cegis/wordsize/restrict_bv_size.h +++ b/src/cegis/wordsize/restrict_bv_size.h @@ -1,4 +1,4 @@ -/******************************************************************* +/*******************************************************************\ Module: Counterexample-Guided Inductive Synthesis diff --git a/src/clobber/clobber_parse_options.cpp b/src/clobber/clobber_parse_options.cpp index 4ed417014cd..bff5e163c4f 100644 --- a/src/clobber/clobber_parse_options.cpp +++ b/src/clobber/clobber_parse_options.cpp @@ -35,7 +35,7 @@ Author: Daniel Kroening, kroening@kroening.com #include #include "clobber_parse_options.h" -#include "clobber_instrumenter.h" +// #include "clobber_instrumenter.h" /*******************************************************************\ @@ -51,7 +51,8 @@ Function: clobber_parse_optionst::clobber_parse_optionst clobber_parse_optionst::clobber_parse_optionst(int argc, const char **argv): parse_options_baset(CLOBBER_OPTIONS, argc, argv), - language_uit("CLOBBER " CBMC_VERSION, cmdline) + language_uit(cmdline, ui_message_handler), + ui_message_handler(cmdline, "CLOBBER " CBMC_VERSION) { } @@ -74,7 +75,7 @@ void clobber_parse_optionst::eval_verbosity() if(cmdline.isset("verbosity")) { - v=unsafe_string2int(cmdline.getval("verbosity")); + v=unsafe_string2int(cmdline.get_value("verbosity")); if(v<0) v=0; else if(v>10) @@ -105,10 +106,10 @@ void clobber_parse_optionst::get_command_line_options(optionst &options) } if(cmdline.isset("debug-level")) - options.set_option("debug-level", cmdline.getval("debug-level")); + options.set_option("debug-level", cmdline.get_value("debug-level")); if(cmdline.isset("unwindset")) - options.set_option("unwindset", cmdline.getval("unwindset")); + options.set_option("unwindset", cmdline.get_value("unwindset")); // all checks supported by goto_check GOTO_CHECK_PARSE_OPTIONS(cmdline, options); @@ -127,7 +128,7 @@ void clobber_parse_optionst::get_command_line_options(optionst &options) // magic error label if(cmdline.isset("error-label")) - options.set_option("error-label", cmdline.getval("error-label")); + options.set_option("error-label", cmdline.get_value("error-label")); } /*******************************************************************\ @@ -164,25 +165,24 @@ int clobber_parse_optionst::doit() goto_functionst goto_functions; - if(get_goto_program(options, goto_functions)) - return 6; + try + { + if(get_goto_program(options, goto_functions)) + return 6; - label_properties(goto_functions); + label_properties(goto_functions); - if(cmdline.isset("show-properties")) - { - const namespacet ns(symbol_table); - show_properties(ns, get_ui(), goto_functions); - return 0; - } + if(cmdline.isset("show-properties")) + { + const namespacet ns(symbol_table); + show_properties(ns, get_ui(), goto_functions); + return 0; + } - if(set_properties(goto_functions)) - return 7; + set_properties(goto_functions); - // do instrumentation + // do instrumentation - try - { const namespacet ns(symbol_table); std::ofstream out("simulator.c"); @@ -209,6 +209,12 @@ int clobber_parse_optionst::doit() return 8; } + catch(std::bad_alloc) + { + error() << "Out of memory" << messaget::eom; + return 8; + } + #if 0 // let's log some more statistics debug() << "Memory consumption:" << messaget::endl; @@ -231,28 +237,8 @@ Function: clobber_parse_optionst::set_properties bool clobber_parse_optionst::set_properties(goto_functionst &goto_functions) { - try - { - if(cmdline.isset("property")) - ::set_properties(goto_functions, cmdline.get_values("property")); - } - - catch(const char *e) - { - error(e); - return true; - } - - catch(const std::string e) - { - error(e); - return true; - } - - catch(int) - { - return true; - } + if(cmdline.isset("property")) + ::set_properties(goto_functions, cmdline.get_values("property")); return false; } @@ -279,7 +265,6 @@ bool clobber_parse_optionst::get_goto_program( return true; } - try { if(cmdline.args.size()==1 && is_goto_binary(cmdline.args[0])) @@ -290,7 +275,7 @@ bool clobber_parse_optionst::get_goto_program( symbol_table, goto_functions, get_message_handler())) return true; - config.ansi_c.set_from_symbol_table(symbol_table); + config.set_from_symbol_table(symbol_table); if(cmdline.isset("show-symbol-table")) { @@ -388,29 +373,6 @@ bool clobber_parse_optionst::get_goto_program( return true; } - catch(const char *e) - { - error(e); - return true; - } - - catch(const std::string e) - { - error(e); - return true; - } - - catch(int) - { - return true; - } - - catch(std::bad_alloc) - { - error() << "Out of memory" << eom; - return true; - } - return false; } @@ -430,7 +392,6 @@ bool clobber_parse_optionst::process_goto_program( const optionst &options, goto_functionst &goto_functions) { - try { namespacet ns(symbol_table); @@ -469,29 +430,6 @@ bool clobber_parse_optionst::process_goto_program( } } - catch(const char *e) - { - error(e); - return true; - } - - catch(const std::string e) - { - error(e); - return true; - } - - catch(int) - { - return true; - } - - catch(std::bad_alloc) - { - error() << "Out of memory" << eom; - return true; - } - return false; } diff --git a/src/clobber/clobber_parse_options.h b/src/clobber/clobber_parse_options.h index 06e1f79843d..8d1705cf0e0 100644 --- a/src/clobber/clobber_parse_options.h +++ b/src/clobber/clobber_parse_options.h @@ -44,6 +44,8 @@ class clobber_parse_optionst: const std::string &extra_options); protected: + ui_message_handlert ui_message_handler; + void get_command_line_options(optionst &options); bool get_goto_program( diff --git a/src/memory-models/parser.y b/src/memory-models/parser.y index 920c4b8b97f..69ce183a7a3 100644 --- a/src/memory-models/parser.y +++ b/src/memory-models/parser.y @@ -501,7 +501,7 @@ instruction: { $$=$1; stack($$).id(ID_code); - stack($$).set(ID_statement, ID_enum); + stack($$).set(ID_statement, ID_c_enum); mto($$, $2); mto($$, $4); } diff --git a/src/musketeer/fence_inserter.cpp b/src/musketeer/fence_inserter.cpp index 815ae57f44a..5b00949d11b 100644 --- a/src/musketeer/fence_inserter.cpp +++ b/src/musketeer/fence_inserter.cpp @@ -147,7 +147,7 @@ void fence_insertert::preprocess() e_c_it!=e_i->end(); ++e_c_it) { - std::set pt_set; + std::set pt_set; assert(map_to_e.find(*e_c_it) != map_to_e.end()); const_graph_visitor.PT(map_to_e.find(*e_c_it)->second, pt_set); } @@ -165,7 +165,7 @@ void fence_insertert::preprocess() e_nc_it!=e_i->end(); ++e_nc_it) { - std::set pt_set; + std::set pt_set; assert(map_to_e.find(*e_nc_it) != map_to_e.end()); const_graph_visitor.PT(map_to_e.find(*e_nc_it)->second, pt_set); } @@ -183,7 +183,7 @@ void fence_insertert::preprocess() e_nc_it!=e_i->end(); ++e_nc_it) { - std::set pt_set; + std::set pt_set; assert(map_to_e.find(*e_nc_it) != map_to_e.end()); const_graph_visitor.PT(map_to_e.find(*e_nc_it)->second, pt_set); } @@ -201,7 +201,7 @@ void fence_insertert::preprocess() e_nc_it!=e_i->end(); ++e_nc_it) { - std::set pt_set; + std::set pt_set; assert(map_to_e.find(*e_nc_it) != map_to_e.end()); const_graph_visitor.PT(map_to_e.find(*e_nc_it)->second, pt_set); } @@ -221,13 +221,13 @@ void fence_insertert::preprocess() e_c_it!=e_i->end(); ++e_c_it) { - std::set ct_set; + std::set ct_set; assert( invisible_var.map_to_e.find(*e_c_it) != invisible_var.map_to_e.end()); const_graph_visitor.CT(invisible_var.map_to_e.find(*e_c_it)->second, ct_set); - std::set ct_not_powr_set; + std::set ct_not_powr_set; const_graph_visitor.CT_not_powr( invisible_var.map_to_e.find(*e_c_it)->second, ct_not_powr_set); } diff --git a/src/musketeer/graph_visitor.cpp b/src/musketeer/graph_visitor.cpp index 010d063e9f6..e503a65170d 100644 --- a/src/musketeer/graph_visitor.cpp +++ b/src/musketeer/graph_visitor.cpp @@ -29,7 +29,7 @@ void const_graph_visitort::graph_explore( event_idt next, event_idt end, std::list &old_path, - std::set &edges) + std::set &edges) { if(next == end) { /* inserts all the pos collected from old_path in edges */ @@ -75,8 +75,11 @@ void const_graph_visitort::graph_explore( \*******************************************************************/ -void const_graph_visitort::const_graph_explore(event_grapht& egraph, event_idt next, - event_idt end, std::list& old_path) +void const_graph_visitort::const_graph_explore( + event_grapht& egraph, + event_idt next, + event_idt end, + std::list& old_path) { if(next == end) { /* inserts all the pos collected from old_path in edges */ @@ -122,8 +125,12 @@ void const_graph_visitort::const_graph_explore(event_grapht& egraph, event_idt n \*******************************************************************/ -void const_graph_visitort::graph_explore_BC(event_grapht& egraph, event_idt next, - std::list& old_path, std::set& edges, bool porw) +void const_graph_visitort::graph_explore_BC( + event_grapht& egraph, + event_idt next, + std::list& old_path, + std::set& edges, + bool porw) { /* TODO: restricts to C_1 U ... U C_n for perf improvement */ assert(old_path.size() > 0); @@ -187,8 +194,10 @@ void const_graph_visitort::graph_explore_BC(event_grapht& egraph, event_idt next \*******************************************************************/ -void const_graph_visitort::const_graph_explore_BC(event_grapht& egraph, - event_idt next, std::list& old_path) +void const_graph_visitort::const_graph_explore_BC( + event_grapht& egraph, + event_idt next, + std::list& old_path) { /* TODO: restricts to C_1 U ... U C_n */ assert(old_path.size() > 0); @@ -250,8 +259,12 @@ void const_graph_visitort::const_graph_explore_BC(event_grapht& egraph, \*******************************************************************/ -void const_graph_visitort::graph_explore_AC(event_grapht& egraph, event_idt next, - std::list& old_path, std::set& edges, bool porw) +void const_graph_visitort::graph_explore_AC( + event_grapht& egraph, + event_idt next, + std::list& old_path, + std::set& edges, + bool porw) { /* TODO: restricts to C_1 U ... U C_n */ assert(old_path.size() > 0); @@ -315,8 +328,10 @@ void const_graph_visitort::graph_explore_AC(event_grapht& egraph, event_idt next \*******************************************************************/ -void const_graph_visitort::const_graph_explore_AC(event_grapht& egraph, - event_idt next, std::list& old_path) +void const_graph_visitort::const_graph_explore_AC( + event_grapht& egraph, + event_idt next, + std::list& old_path) { /* TODO: restricts to C_1 U ... U C_n */ assert(old_path.size() > 0); @@ -379,7 +394,10 @@ void const_graph_visitort::const_graph_explore_AC(event_grapht& egraph, \*******************************************************************/ -void const_graph_visitort::PT(const edget& e, std::set& edges) { +void const_graph_visitort::PT( + const edget& e, + std::set& edges) +{ visited_nodes.clear(); // if(!e.is_po) /* e is in po^+\po */ is_po is a flag set manually, do not @@ -430,7 +448,10 @@ void const_graph_visitort::PT(const edget& e, std::set& edges) { \*******************************************************************/ -void const_graph_visitort::CT(const edget& edge, std::set& edges) { +void const_graph_visitort::CT( + const edget& edge, + std::set& edges) +{ event_grapht& egraph=fence_inserter.instrumenter.egraph; /* the edge can be in the reversed order (back-edge) */ @@ -484,8 +505,9 @@ void const_graph_visitort::CT(const edget& edge, std::set& edges) { \*******************************************************************/ -void const_graph_visitort::CT_not_powr(const edget& edge, - std::set& edges) +void const_graph_visitort::CT_not_powr( + const edget& edge, + std::set& edges) { event_grapht& egraph=fence_inserter.instrumenter.egraph; diff --git a/src/musketeer/graph_visitor.h b/src/musketeer/graph_visitor.h index 210bb68d913..c75004d01d3 100644 --- a/src/musketeer/graph_visitor.h +++ b/src/musketeer/graph_visitor.h @@ -26,26 +26,36 @@ class const_graph_visitort public: /* computes the PT (btwn), CT (cml) and IT (cntrl) */ - void PT(const edget &e, std::set &edges); - void CT(const edget &e, std::set &edges); - void CT_not_powr(const edget &e, std::set &edges); - void IT(const edget &e, std::set &edges); + void PT(const edget& e, std::set& edges); + void CT(const edget& e, std::set& edges); + void CT_not_powr(const edget& e, std::set &edges); + void IT(const edget& e, std::set& edges); void const_graph_explore( - event_grapht &graph, event_idt next, event_idt end, - std::list &old_path); + event_grapht& graph, + event_idt next, + event_idt end, + std::list& old_path); void graph_explore(event_grapht& graph, event_idt next, event_idt end, - std::list &old_path, std::set &edges); + std::list& old_path, std::set& edges); void graph_explore_BC(event_grapht& egraph, event_idt next, - std::list& old_path, std::set& edges, bool porw); + std::list& old_path, std::set& edges, bool porw); void graph_explore_AC(event_grapht& egraph, event_idt next, - std::list& old_path, std::set& edges, bool porw); - void graph_explore_BC(event_grapht& egraph, event_idt next, - std::list& old_path, std::set& edges) { + std::list& old_path, std::set& edges, bool porw); + void graph_explore_BC( + event_grapht& egraph, event_idt next, + std::list& old_path, + std::set& edges) + { graph_explore_BC(egraph, next, old_path, edges, false); } - void graph_explore_AC(event_grapht& egraph, event_idt next, - std::list& old_path, std::set& edges) { + + void graph_explore_AC( + event_grapht& egraph, + event_idt next, + std::list& old_path, + std::set& edges) + { graph_explore_AC(egraph, next, old_path, edges, false); } diff --git a/src/path-symex/loc_ref.h b/src/path-symex/loc_ref.h index 72e407c2a56..d11877683c2 100644 --- a/src/path-symex/loc_ref.h +++ b/src/path-symex/loc_ref.h @@ -16,7 +16,7 @@ class loc_reft public: unsigned loc_number; - inline loc_reft next_loc() + inline loc_reft next_loc() const { loc_reft tmp=*this; tmp.increase(); diff --git a/src/path-symex/path_symex.cpp b/src/path-symex/path_symex.cpp index 31cc677eb16..a646e45409c 100644 --- a/src/path-symex/path_symex.cpp +++ b/src/path-symex/path_symex.cpp @@ -499,7 +499,9 @@ void path_symext::assign_rec( // array or a union. exprt member_name(ID_member_name); - member_name.set(ID_component_name, ssa_lhs_member_expr.get_component_name()); + member_name.set( + ID_component_name, + ssa_lhs_member_expr.get_component_name()); with_exprt new_rhs(struct_op, member_name, ssa_rhs); @@ -510,7 +512,8 @@ void path_symext::assign_rec( // rewrite into byte_extract, and do again exprt offset=gen_zero(index_type()); - byte_extract_exprt new_lhs(byte_update_id(), struct_op, offset, ssa_rhs.type()); + byte_extract_exprt + new_lhs(byte_update_id(), struct_op, offset, ssa_rhs.type()); assign_rec(state, guard, new_lhs, ssa_rhs); } diff --git a/src/path-symex/path_symex.h b/src/path-symex/path_symex.h index d78e8f042bb..a37777d5f22 100644 --- a/src/path-symex/path_symex.h +++ b/src/path-symex/path_symex.h @@ -9,14 +9,15 @@ Author: Daniel Kroening, kroening@kroening.com #ifndef CPROVER_PATH_SYMEX_PATH_SYMEX_H #define CPROVER_PATH_SYMEX_PATH_SYMEX_H -#include "locs.h" #include "path_symex_state.h" // Transform a state by executing a single statement. // May occasionally yield more than one successor state -// (branches, function calls with trinary operator), -// which are put at the end of "further_states". +// (branches, function calls with ternary operator), +// which are put into "further_states". +// \pre: "!further_states.empty()" because "state" must +// be stored inside "further_states" void path_symex( path_symex_statet &state, std::list &further_states); diff --git a/src/path-symex/path_symex_history.h b/src/path-symex/path_symex_history.h index d7018f1a0e6..95d10771091 100644 --- a/src/path-symex/path_symex_history.h +++ b/src/path-symex/path_symex_history.h @@ -140,6 +140,12 @@ class path_symex_historyt public: typedef std::vector step_containert; step_containert step_container; + + // TODO: consider typedefing path_symex_historyt + inline void clear() + { + step_container.clear(); + } }; inline void path_symex_step_reft::generate_successor() diff --git a/src/path-symex/var_map.h b/src/path-symex/var_map.h index 08bd6e7208e..38a7b1ee1a9 100644 --- a/src/path-symex/var_map.h +++ b/src/path-symex/var_map.h @@ -78,6 +78,15 @@ class var_mapt return id_map[full_identifier]; } + void clear() + { + shared_count=0; + local_count=0; + nondet_count=0; + dynamic_count=0; + id_map.clear(); + } + void init(var_infot &var_info); const namespacet &ns; diff --git a/src/symex/path_search.cpp b/src/symex/path_search.cpp index 106fd9cba23..1a34951f9b1 100644 --- a/src/symex/path_search.cpp +++ b/src/symex/path_search.cpp @@ -271,21 +271,18 @@ void path_searcht::do_show_vcc(statet &state) std::vector steps; state.history.build_history(steps); - for(std::vector::const_iterator - s_it=steps.begin(); - s_it!=steps.end(); - s_it++) + for(const auto &step_ref : steps) { - if((*s_it)->guard.is_not_nil()) + if(step_ref->guard.is_not_nil()) { - std::string string_value=from_expr(ns, "", (*s_it)->guard); + std::string string_value=from_expr(ns, "", step_ref->guard); out << "{-" << count << "} " << string_value << '\n'; count++; } - if((*s_it)->ssa_rhs.is_not_nil()) + if(step_ref->ssa_rhs.is_not_nil()) { - equal_exprt equality((*s_it)->ssa_lhs, (*s_it)->ssa_rhs); + equal_exprt equality(step_ref->ssa_lhs, step_ref->ssa_rhs); std::string string_value=from_expr(ns, "", equality); out << "{-" << count << "} " << string_value << '\n'; count++; @@ -334,22 +331,16 @@ bool path_searcht::drop_state(const statet &state) const // unwinding limit -- loops if(unwind_limit_set && state.get_instruction()->is_backwards_goto()) { - for(path_symex_statet::unwinding_mapt::const_iterator - it=state.unwinding_map.begin(); - it!=state.unwinding_map.end(); - it++) - if(it->second>unwind_limit) + for(const auto &loop_info : state.unwinding_map) + if(loop_info.second>unwind_limit) return true; } // unwinding limit -- recursion if(unwind_limit_set && state.get_instruction()->is_function_call()) { - for(path_symex_statet::recursion_mapt::const_iterator - it=state.recursion_map.begin(); - it!=state.recursion_map.end(); - it++) - if(it->second>unwind_limit) + for(const auto &rec_info : state.recursion_map) + if(rec_info.second>unwind_limit) return true; } @@ -461,23 +452,17 @@ Function: path_searcht::initialize_property_map void path_searcht::initialize_property_map( const goto_functionst &goto_functions) { - for(goto_functionst::function_mapt::const_iterator - it=goto_functions.function_map.begin(); - it!=goto_functions.function_map.end(); - it++) + forall_goto_functions(it, goto_functions) if(!it->second.is_inlined()) { const goto_programt &goto_program=it->second.body; - for(goto_programt::instructionst::const_iterator - it=goto_program.instructions.begin(); - it!=goto_program.instructions.end(); - it++) + forall_goto_program_instructions(i_it, goto_program) { - if(!it->is_assert()) + if(!i_it->is_assert()) continue; - const source_locationt &source_location=it->source_location; + const source_locationt &source_location=i_it->source_location; irep_idt property_name=source_location.get_property_id();