Merge branch 'unstable' of https://github.com/Z3Prover/z3 into minimum

Signed-off-by: Alex Horn <t-alexh@microsoft.com>

Conflicts:
	src/test/dl_table.cpp

doc/mk_api_doc.py

@@ -1,3 +1,5 @@
+# Copyright (c) Microsoft Corporation 2015
+
 import os
 import shutil
 import re

examples/c++/example.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #include<vector>
 #include"z3++.h"
 

examples/c/test_capi.c

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #include<stdio.h>
 #include<stdlib.h>
 #include<stdarg.h>

examples/interp/iz3.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <iostream>

examples/maxsat/maxsat.c

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 /*
   Simple MAXSAT solver on top of the Z3 API.
 */

examples/python/example.py

@@ -1,3 +1,5 @@
+# Copyright (c) Microsoft Corporation 2015
+
 from z3 import *
 
 x = Real('x')

examples/tptp/tptp5.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #include <string>
 #include <cstring>
 #include <list>

examples/tptp/tptp5.h

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #ifndef TPTP5_H_
 #define TPTP5_H_
 

examples/tptp/tptp5.lex.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #line 2 "tptp5.lex.cpp"
 
 #line 4 "tptp5.lex.cpp"

scripts/mk_copyright.py

@@ -0,0 +1,57 @@
+# Copyright (c) 2015 Microsoft Corporation
+
+import os
+import re
+
+cr = re.compile("Copyright")
+aut = re.compile("Automatically generated")
+
+cr_notice = """
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
+"""
+
+def has_cr(file):
+    ins = open(file)
+    lines = 0
+    line = ins.readline()
+    while line and lines < 20:
+	m = cr.search(line)
+	if m:
+	    ins.close()
+	    return True
+	m = aut.search(line)
+	if m:
+	    ins.close()
+	    return True
+	line = ins.readline()
+    ins.close()
+    return False
+
+def add_cr(file):
+    tmp = "%s.tmp" % file
+    ins = open(file)
+    ous = open(tmp,'w')
+    ous.write(cr_notice)
+    line = ins.readline()
+    while line:
+	ous.write(line)
+	line = ins.readline()
+    ins.close()
+    ous.close()
+    os.system("move %s %s" % (tmp, file))
+    
+def add_missing_cr(dir):
+    for root, dirs, files in os.walk(dir):
+	for f in files:
+	    if f.endswith('.cpp') or f.endswith('.h') or f.endswith('.c'):
+		path = "%s\\%s" % (root, f)
+		if not has_cr(path):
+		    print "Missing CR for %s" % path
+		    add_cr(path)
+
+add_missing_cr('src')
+add_missing_cr('examples')

scripts/trackall.sh

@@ -1,7 +1,9 @@
 #!/bin/bash
 
+# Copyright (c) 2015 Microsoft Corporation
 # Script for "cloning" (and tracking) all branches at codeplex.
 # On Windows, this script must be executed in the "git Bash" console.
+
 for branch in `git branch -a | grep remotes | grep -v HEAD | grep -v master`; do
     git branch --track ${branch##*/} $branch
 done

src/api/dll/dll.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #ifdef _WINDOWS
 
 #include<windows.h>

src/api/ml/z3_stubs.c

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 /* File generated from z3.idl */
 
 #include <stddef.h>

src/api/z3_api.h

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #ifndef _Z3_API_H_
 #define _Z3_API_H_
 

src/api/z3_macros.h

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #ifndef __in
 #define __in
 #endif

src/ast/proof_checker/proof_checker.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #include "proof_checker.h"
 #include "ast_ll_pp.h"
 #include "ast_pp.h"

src/ast/simplifier/bv_elim.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #include "bv_elim.h"
 #include "bv_decl_plugin.h"
 #include "var_subst.h"

src/muz/base/dl_boogie_proof.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 /**
 
 Example from Boogie:

src/muz/base/dl_boogie_proof.h

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 /**
 
 output     :: derivation model

src/muz/base/hnf.h

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 /*--
  Module Name:
  

src/muz/base/proof_utils.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #include "dl_util.h"
 #include "proof_utils.h"
 #include "ast_smt2_pp.h"

src/muz/fp/datalog_parser.cpp

@@ -1,4 +1,10 @@
 
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
+
 #include"datalog_parser.h"
 #include"string_buffer.h"
 #include"str_hashtable.h"

src/muz/rel/check_relation.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #include "check_relation.h"
 #include "dl_relation_manager.h"
 #include "qe_util.h"

src/muz/rel/karr_relation.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #include "karr_relation.h"
 #include "bool_rewriter.h"
 

src/parsers/smt/smtlib.cpp

@@ -1,4 +1,10 @@
 
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
+
 #include"smtlib.h"
 #include"ast_pp.h"
 #include"ast_smt2_pp.h"

src/qe/nlarith_util.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #include "ast.h"
 #include "nlarith_util.h"
 #include "arith_decl_plugin.h"

src/qe/qe_arith.h

@@ -1,4 +1,10 @@
 
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
+
 #ifndef __QE_ARITH_H_
 #define __QE_ARITH_H_
 

src/qe/qe_array_plugin.cpp

@@ -1,4 +1,10 @@
 
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
+
 #include "qe.h"
 #include "array_decl_plugin.h"
 #include "expr_safe_replace.h"

src/qe/qe_cmd.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #include "qe_cmd.h"
 #include "qe.h"
 #include "cmd_context.h"

src/qe/qe_datatype_plugin.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 // ---------------------
 // datatypes
 // Quantifier elimination routine for recursive data-types.

src/qe/qe_dl_plugin.cpp

@@ -1,4 +1,10 @@
 
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
+
 #include "qe.h"
 #include "expr_safe_replace.h"
 #include "dl_decl_plugin.h"

src/qe/qe_util.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #include "qe_util.h"
 #include "bool_rewriter.h"
 

src/shell/opt_frontend.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #include<fstream>
 #include<signal.h>
 #include<time.h>

src/shell/options.h

@@ -1,4 +1,10 @@
 
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
+
 /**
    \page cmdline Command line options
    

src/smt/database.h

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 static char const g_pattern_database[] =
 "(benchmark patterns \n"
 " :status unknown \n"

src/tactic/arith/arith_bounds_tactic.cpp

@@ -1,4 +1,10 @@
 
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
+
 
 #include"arith_bounds_tactic.h"
 #include"arith_decl_plugin.h"

src/test/api.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #ifdef _WINDOWS
 #include "z3.h"
 #include "z3_private.h"

src/test/api_bug.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #include<stdio.h>
 #include"z3.h"
 

src/test/arith_rewriter.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #include "arith_rewriter.h"
 #include "bv_decl_plugin.h"
 #include "ast_pp.h"

src/test/arith_simplifier_plugin.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #include "arith_eq_solver.h"
 #include "smt_params.h"
 

src/test/bits.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 // Test some bit hacks
 #include"util.h"
 #include"debug.h"

src/test/bv_simplifier_plugin.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #include "bv_simplifier_plugin.h"
 #include "arith_decl_plugin.h"
 #include "ast_pp.h"

src/test/check_assumptions.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #include "memory_manager.h"
 #include "smt_params.h"
 #include "ast.h"

src/test/datalog_parser.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #include "datalog_parser.h"
 #include "ast_pp.h"
 #include "arith_decl_plugin.h"

src/test/ddnf.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #include "ddnf.h"
 #include "tbv.h"
 #include <iostream>

src/test/dl_context.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #include "datalog_parser.h"
 #include "ast_pp.h"
 #include "arith_decl_plugin.h"

src/test/dl_product_relation.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #ifdef _WINDOWS
 #include "dl_context.h"
 #include "dl_register_engine.h"

src/test/dl_query.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #include "datalog_parser.h"
 #include "ast_pp.h"
 #include "dl_table_relation.h"

src/test/dl_relation.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #ifdef _WINDOWS
 #include "dl_context.h"
 #include "dl_register_engine.h"

src/test/dl_table.cpp

@@ -1,4 +1,8 @@
+/*++
+Copyright (c) 2015 Microsoft Corporation
+--*/
 #if defined(_WINDOWS) || defined(_CYGWIN)
+
 #include "dl_context.h"
 #include "dl_table.h"
 #include "dl_register_engine.h"

src/test/dl_util.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #include "dl_util.h"
 
 using namespace datalog;

src/test/doc.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #include "doc.h"
 #include "trace.h"
 #include "vector.h"

src/test/expr_rand.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #include "expr_rand.h"
 #include "ast_pp.h"
 #include "bv_decl_plugin.h"

src/test/expr_substitution.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #include "expr_substitution.h"
 #include "smt_params.h"
 #include "substitution.h"

src/test/factor_rewriter.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #include "factor_rewriter.h"
 #include "bv_decl_plugin.h"
 #include "ast_pp.h"

src/test/fuzzing/expr_delta.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #include "expr_delta.h"
 #include "ast_pp.h"
 

src/test/fuzzing/expr_rand.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #include "expr_rand.h"
 #include "bv_decl_plugin.h"
 #include "array_decl_plugin.h"

src/test/get_implied_equalities.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #include "z3.h"
 #include "trace.h"
 #include "debug.h"

src/test/heap_trie.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #include "heap_trie.h"
 
 struct unsigned_le {

src/test/hilbert_basis.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #include "hilbert_basis.h"
 #include "ast_pp.h"
 #include "reg_decl_plugins.h"

src/test/horn_subsume_model_converter.cpp

@@ -1,4 +1,10 @@
 
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
+
 #include "horn_subsume_model_converter.h"
 #include "arith_decl_plugin.h"
 #include "model_smt2_pp.h"

src/test/karr.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #include "hilbert_basis.h"
 
 /*

src/test/memory.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #ifdef _WINDOWS
 #include "z3.h"
 #include "z3_private.h"

src/test/model2expr.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #include "model2expr.h"
 #include "ast_pp.h"
 #include "arith_decl_plugin.h"

src/test/model_retrieval.cpp

@@ -1,4 +1,10 @@
 
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
+
 #include "ast.h"
 #include "smt_params.h"
 #include "smt_context.h"

src/test/nlarith_util.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #include "nlarith_util.h"
 #include "arith_decl_plugin.h"
 #include "ast_pp.h"

src/test/pdr.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #include "pdr_context.h"
 #include "reg_decl_plugins.h"
 

src/test/polynorm.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #include "th_rewriter.h"
 #include "smt2parser.h"
 #include "arith_decl_plugin.h"

src/test/proof_checker.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #include "proof_checker.h"
 #include "ast_ll_pp.h"
 

src/test/qe_arith.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #include "qe_arith.h"
 #include "qe.h"
 #include "th_rewriter.h"

src/test/quant_elim.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #include "ast.h"
 #include "smt_params.h"
 #include "simplifier.h"

src/test/quant_solve.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #include "ast.h"
 #include "smt_params.h"
 #include "qe.h"

src/test/sat_user_scope.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #include "sat_solver.h"
 #include "util.h"
 

src/test/simplex.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #include "sparse_matrix.h"
 #include "sparse_matrix_def.h"
 #include "simplex.h"

src/test/simplifier.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #ifdef _WINDOWS
 #include "z3.h"
 #include "z3_private.h"

src/test/small_object_allocator.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #include<iostream>
 #include"util.h"
 #include"trace.h"

src/test/smt2print_parse.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 // This is to test the print-parse facilities over the API
 // for SMT-LIB2.
 

src/test/smt_context.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #include "smt_context.h"
 #include "reg_decl_plugins.h"
 

src/test/sorting_network.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #include "trace.h"
 #include "vector.h"
 #include "ast.h"

src/test/substitution.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #include "expr_substitution.h"
 #include "smt_params.h"
 #include "substitution.h"

src/test/tbv.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #include "tbv.h"
 
 static void tst1(unsigned num_bits) {

src/test/test_util.h

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #pragma once
 
 #include "stopwatch.h"

src/test/theory_dl.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #include "smt_context.h"
 #include "dl_decl_plugin.h"
 #include "ast_pp.h"

src/test/theory_pb.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #include "smt_context.h"
 #include "ast_pp.h"
 #include "model_v2_pp.h"

src/test/timeout.cpp

@@ -1,4 +1,10 @@
 
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
+
 #include "timeout.h"
 #include "trace.h"
 

src/test/udoc_relation.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #include "udoc_relation.h"
 #include "trace.h"
 #include "vector.h"

src/util/memory_manager.cpp

@@ -1,3 +1,9 @@
+
+/*++
+Copyright (c) 2015 Microsoft Corporation
+
+--*/
+
 #include<iostream>
 #include<stdlib.h>
 #include<limits.h>