fix #line number warnings (sorry!)

diff --git a/src/expr/expr_manager_template.cpp b/src/expr/expr_manager_template.cpp
index a0ab3794a00b5378d8f01e36c57c89d9f63cfa91..738529d92c50441ea1094fe2670626779d042f7d 100644 (file)
--- a/src/expr/expr_manager_template.cpp
+++ b/src/expr/expr_manager_template.cpp
@@ -29,7 +29,7 @@ ${includes}
 // compiler directs the user to the template file instead of the
 // generated one.  We don't want the user to modify the generated one,
 // since it'll get overwritten on a later build.
-#line 35 "${template}"
+#line 33 "${template}"
 
 #ifdef CVC4_STATISTICS_ON
   #define INC_STAT(kind) \

diff --git a/src/expr/expr_manager_template.h b/src/expr/expr_manager_template.h
index a8036d2070ca9fd5dcc0050bbeb9c0103a114f7f..f38acd1530aa91a5d13cfeece692fab225e7da5d 100644 (file)
--- a/src/expr/expr_manager_template.h
+++ b/src/expr/expr_manager_template.h
@@ -34,7 +34,7 @@ ${includes}
 // compiler directs the user to the template file instead of the
 // generated one.  We don't want the user to modify the generated one,
 // since it'll get overwritten on a later build.
-#line 40 "${template}"
+#line 38 "${template}"
 
 namespace CVC4 {
 

diff --git a/src/expr/expr_template.cpp b/src/expr/expr_template.cpp
index 9ea3fbd31269451004aca15c8ee50eaf08009984..65a671b773e402772304bebabf8ace712d4e7b86 100644 (file)
--- a/src/expr/expr_template.cpp
+++ b/src/expr/expr_template.cpp
@@ -30,7 +30,7 @@ ${includes}
 // compiler directs the user to the template file instead of the
 // generated one.  We don't want the user to modify the generated one,
 // since it'll get overwritten on a later build.
-#line 36 "${template}"
+#line 34 "${template}"
 
 using namespace CVC4::kind;
 using namespace std;

diff --git a/src/expr/expr_template.h b/src/expr/expr_template.h
index 9b62cecd22ff2369b5a655dabc8b223f61c638fc..6cbaae4cbce333888e8b363f1deeb214acb753c1 100644 (file)
--- a/src/expr/expr_template.h
+++ b/src/expr/expr_template.h
@@ -40,7 +40,7 @@ ${includes}
 // compiler directs the user to the template file instead of the
 // generated one.  We don't want the user to modify the generated one,
 // since it'll get overwritten on a later build.
-#line 46 "${template}"
+#line 44 "${template}"
 
 namespace CVC4 {
 
@@ -924,7 +924,7 @@ public:
 
 ${getConst_instantiations}
 
-#line 930 "${template}"
+#line 928 "${template}"
 
 namespace expr {
 

diff --git a/src/expr/kind_template.h b/src/expr/kind_template.h
index e45a70e2b472991675023ba139516b95fd2e29ba..47504b0e4a5ee6aac7faf517d9fdf7a177afc59c 100644 (file)
--- a/src/expr/kind_template.h
+++ b/src/expr/kind_template.h
@@ -60,7 +60,7 @@ ${kind_printers}
   return out;
 }
 
-#line 66 "${template}"
+#line 64 "${template}"
 
 /** Returns true if the given kind is associative. This is used by ExprManager to
  * decide whether it's safe to modify big expressions by changing the grouping of
@@ -98,7 +98,7 @@ struct KindHashFunction {
  */
 enum TypeConstant {
 ${type_constant_list}
-#line 104 "${template}"
+#line 102 "${template}"
   LAST_TYPE
 };/* enum TypeConstant */
 
@@ -114,7 +114,7 @@ struct TypeConstantHashFunction {
 inline std::ostream& operator<<(std::ostream& out, TypeConstant typeConstant) {
   switch(typeConstant) {
 ${type_constant_descriptions}
-#line 120 "${template}"
+#line 118 "${template}"
   default:
     out << "UNKNOWN_TYPE_CONSTANT";
     break;
@@ -126,7 +126,7 @@ namespace theory {
 
 enum TheoryId {
 ${theory_enum}
-#line 132 "${template}"
+#line 130 "${template}"
   THEORY_LAST
 };/* enum TheoryId */
 
@@ -140,7 +140,7 @@ inline TheoryId& operator ++ (TheoryId& id) {
 inline std::ostream& operator<<(std::ostream& out, TheoryId theoryId) {
   switch(theoryId) {
 ${theory_descriptions}
-#line 146 "${template}"
+#line 144 "${template}"
   default:
     out << "UNKNOWN_THEORY";
     break;
@@ -154,7 +154,7 @@ inline TheoryId kindToTheoryId(::CVC4::Kind k) {
   case kind::NULL_EXPR:
     break;
 ${kind_to_theory_id}
-#line 160 "${template}"
+#line 158 "${template}"
   case kind::LAST_KIND:
     break;
   }
@@ -164,7 +164,7 @@ ${kind_to_theory_id}
 inline TheoryId typeConstantToTheoryId(::CVC4::TypeConstant typeConstant) {
   switch(typeConstant) {
 ${type_constant_to_theory_id}
-#line 170 "${template}"
+#line 168 "${template}"
   case LAST_TYPE:
     break;
   }

diff --git a/src/expr/type_checker_template.cpp b/src/expr/type_checker_template.cpp
index 7dd93916726aae5e474c5d10d438746404f63d52..16f9ba9171fb3817418d623dc3ee569277b0bf56 100644 (file)
--- a/src/expr/type_checker_template.cpp
+++ b/src/expr/type_checker_template.cpp
@@ -14,14 +14,14 @@
  ** TypeChecker implementation.
  **/
 
-#line 20 "${template}"
+#line 18 "${template}"
 
 #include "expr/type_checker.h"
 #include "expr/node_manager.h"
 
 ${typechecker_includes}
 
-#line 27 "${template}"
+#line 25 "${template}"
 
 namespace CVC4 {
 namespace expr {
@@ -42,7 +42,7 @@ TypeNode TypeChecker::computeType(NodeManager* nodeManager, TNode n, bool check)
 
 ${typerules}
 
-#line 48 "${template}"
+#line 46 "${template}"
 
   default:
     Debug("getType") << "FAILURE" << std::endl;
@@ -65,7 +65,7 @@ bool TypeChecker::computeIsConst(NodeManager* nodeManager, TNode n)
   switch(n.getKind()) {
 ${construles}
 
-#line 71 "${template}"
+#line 69 "${template}"
 
   default:;
   }

diff --git a/src/expr/type_properties_template.h b/src/expr/type_properties_template.h
index e0f0c2b9b66d7da2b110fafeecf3bc82a872264c..70ce8f2db359393d5961f09d3c6fcb5c57abcc08 100644 (file)
--- a/src/expr/type_properties_template.h
+++ b/src/expr/type_properties_template.h
@@ -19,7 +19,7 @@
 #ifndef __CVC4__TYPE_PROPERTIES_H
 #define __CVC4__TYPE_PROPERTIES_H
 
-#line 25 "${template}"
+#line 23 "${template}"
 
 #include "expr/type_node.h"
 #include "util/cvc4_assert.h"
@@ -31,7 +31,7 @@
 
 ${type_properties_includes}
 
-#line 37 "${template}"
+#line 35 "${template}"
 
 namespace CVC4 {
 namespace kind {
@@ -45,7 +45,7 @@ namespace kind {
 inline Cardinality getCardinality(TypeConstant tc) {
   switch(tc) {
 ${type_constant_cardinalities}
-#line 51 "${template}"
+#line 49 "${template}"
   default: {
     std::stringstream ss;
     ss << "No cardinality known for type constant " << tc;
@@ -66,7 +66,7 @@ inline Cardinality getCardinality(TypeNode typeNode) {
   case TYPE_CONSTANT:
     return getCardinality(typeNode.getConst<TypeConstant>());
 ${type_cardinalities}
-#line 72 "${template}"
+#line 70 "${template}"
   default: {
     std::stringstream ss;
     ss << "A theory kinds file did not provide a cardinality "
@@ -80,7 +80,7 @@ ${type_cardinalities}
 inline bool isWellFounded(TypeConstant tc) {
   switch(tc) {
 ${type_constant_wellfoundednesses}
-#line 86 "${template}"
+#line 84 "${template}"
   default: {
     std::stringstream ss;
     ss << "No well-foundedness status known for type constant: " << tc;
@@ -95,7 +95,7 @@ inline bool isWellFounded(TypeNode typeNode) {
   case TYPE_CONSTANT:
     return isWellFounded(typeNode.getConst<TypeConstant>());
 ${type_wellfoundednesses}
-#line 101 "${template}"
+#line 99 "${template}"
   default: {
     std::stringstream ss;
     ss << "A theory kinds file did not provide a well-foundedness "
@@ -109,7 +109,7 @@ ${type_wellfoundednesses}
 inline Node mkGroundTerm(TypeConstant tc) {
   switch(tc) {
 ${type_constant_groundterms}
-#line 115 "${template}"
+#line 113 "${template}"
   default: {
     std::stringstream ss;
     ss << "No ground term known for type constant: " << tc;
@@ -124,7 +124,7 @@ inline Node mkGroundTerm(TypeNode typeNode) {
   case TYPE_CONSTANT:
     return mkGroundTerm(typeNode.getConst<TypeConstant>());
 ${type_groundterms}
-#line 130 "${template}"
+#line 128 "${template}"
   default: {
     std::stringstream ss;
     ss << "A theory kinds file did not provide a ground term "

diff --git a/src/options/base_options_template.cpp b/src/options/base_options_template.cpp
index e357af1c623d2aad68c0fdbe5db0f61b0a0777e5..398dbf98774631d1f67206df57112c5b53988582 100644 (file)
--- a/src/options/base_options_template.cpp
+++ b/src/options/base_options_template.cpp
@@ -20,13 +20,13 @@ namespace CVC4 {
 
 ${module_accessors}
 
-#line 26 "${template}"
+#line 24 "${template}"
 
 namespace options {
 
 ${module_global_definitions}
 
-#line 32 "${template}"
+#line 30 "${template}"
 
 }/* CVC4::options namespace */
 

diff --git a/src/options/base_options_template.h b/src/options/base_options_template.h
index b137e485e4a067b4d53da4fe8a8185efbeba2acb..527cbc8a2bb9b02abfebe32f4173fda3940d9b44 100644 (file)
--- a/src/options/base_options_template.h
+++ b/src/options/base_options_template.h
@@ -22,11 +22,11 @@
 #include "options/options.h"
 ${module_includes}
 
-#line 28 "${template}"
+#line 26 "${template}"
 
 ${module_optionholder_spec}
 
-#line 32 "${template}"
+#line 30 "${template}"
 
 namespace CVC4 {
 
@@ -34,19 +34,19 @@ namespace options {
 
 ${module_decls}
 
-#line 40 "${template}"
+#line 38 "${template}"
 
 }/* CVC4::options namespace */
 
 ${module_specializations}
 
-#line 46 "${template}"
+#line 44 "${template}"
 
 namespace options {
 
 ${module_inlines}
 
-#line 52 "${template}"
+#line 50 "${template}"
 
 }/* CVC4::options namespace */
 

diff --git a/src/options/options_holder_template.h b/src/options/options_holder_template.h
index ef0b4efdcc80df235e42debaf4ae27ebee6cffce..cd972e823ab09abaa4ccd7c48364487f0f3b3658 100644 (file)
--- a/src/options/options_holder_template.h
+++ b/src/options/options_holder_template.h
@@ -21,7 +21,7 @@
 
 ${include_all_option_headers}
 
-#line 27 "${template}"
+#line 25 "${template}"
 
 namespace CVC4 {
 namespace options {
@@ -30,7 +30,7 @@ struct OptionsHolder {
   OptionsHolder();
 ${all_modules_contributions}
 
-#line 36 "${template}"
+#line 34 "${template}"
 
 };/* struct OptionsHolder */
 

diff --git a/src/options/options_template.cpp b/src/options/options_template.cpp
index 51f1ed1ac65af09f890891934675a1b9e07cf1c9..a2ecafa95a23ba1fa97a74cba433385ef3923fd0 100644 (file)
--- a/src/options/options_template.cpp
+++ b/src/options/options_template.cpp
@@ -35,7 +35,7 @@
 
 ${include_all_option_headers}
 
-#line 41 "${template}"
+#line 39 "${template}"
 
 #include "util/output.h"
 #include "options/options_holder.h"
@@ -44,7 +44,7 @@ ${include_all_option_headers}
 
 ${option_handler_includes}
 
-#line 50 "${template}"
+#line 48 "${template}"
 
 using namespace CVC4;
 using namespace CVC4::options;
@@ -181,7 +181,7 @@ void runBoolPredicates(T, std::string option, bool b, SmtEngine* smt) {
 
 ${all_custom_handlers}
 
-#line 187 "${template}"
+#line 220 "${template}"
 
 #ifdef CVC4_DEBUG
 #  define USE_EARLY_TYPE_CHECKING_BY_DEFAULT true
@@ -211,18 +211,18 @@ options::OptionsHolder::OptionsHolder() : ${all_modules_defaults}
 {
 }
 
-#line 217 "${template}"
+#line 215 "${template}"
 
 static const std::string mostCommonOptionsDescription = "\
 Most commonly-used CVC4 options:${common_documentation}";
 
-#line 222 "${template}"
+#line 220 "${template}"
 
 static const std::string optionsDescription = mostCommonOptionsDescription + "\n\
 \n\
 Additional CVC4 options:${remaining_documentation}";
 
-#line 228 "${template}"
+#line 226 "${template}"
 
 static const std::string optionsFootnote = "\n\
 [*] Each of these options has a --no-OPTIONNAME variant, which reverses the\n\
@@ -293,7 +293,7 @@ static struct option cmdlineOptions[] = {${all_modules_long_options}
   { NULL, no_argument, NULL, '\0' }
 };/* cmdlineOptions */
 
-#line 299 "${template}"
+#line 297 "${template}"
 
 static void preemptGetopt(int& argc, char**& argv, const char* opt) {
   const size_t maxoptlen = 128;
@@ -457,7 +457,7 @@ std::vector<std::string> Options::parseOptions(int argc, char* main_argv[]) thro
     switch(c) {
 ${all_modules_option_handlers}
 
-#line 463 "${template}"
+#line 461 "${template}"
 
     case ':':
       // This can be a long or short option, and the way to get at the

diff --git a/src/smt/smt_options_template.cpp b/src/smt/smt_options_template.cpp
index e94418f15703a1b4d188d3ddf5fdcae1690f2056..57bdd468b0544d6c01f3cd8055b36c55b1be1e11 100644 (file)
--- a/src/smt/smt_options_template.cpp
+++ b/src/smt/smt_options_template.cpp
@@ -27,7 +27,7 @@
 ${include_all_option_headers}
 ${option_handler_includes}
 
-#line 33 "${template}"
+#line 31 "${template}"
 
 using namespace std;
 
@@ -48,7 +48,7 @@ void SmtEngine::setOption(const std::string& key, const CVC4::SExpr& value)
 
   ${smt_setoption_handlers}
 
-#line 54 "${template}"
+#line 52 "${template}"
 
   throw UnrecognizedOptionException(key);
 }
@@ -65,7 +65,7 @@ CVC4::SExpr SmtEngine::getOption(const std::string& key) const
 
   ${smt_getoption_handlers}
 
-#line 71 "${template}"
+#line 69 "${template}"
 
   throw UnrecognizedOptionException(key);
 }

diff --git a/src/theory/instantiator_tables_template.cpp b/src/theory/instantiator_tables_template.cpp
index 3460d5fcb66d5132c11ba7468a3b4e1be97ff06a..bc038df6341749ecae5a54a76279c8ea1b439ff6 100644 (file)
--- a/src/theory/instantiator_tables_template.cpp
+++ b/src/theory/instantiator_tables_template.cpp
@@ -20,7 +20,7 @@
 
 ${instantiator_includes}
 
-#line 26 "${template}"
+#line 24 "${template}"
 
 namespace CVC4 {
 namespace theory {
@@ -28,7 +28,7 @@ namespace theory {
 Instantiator* Theory::makeInstantiator(context::Context* c, theory::QuantifiersEngine* qe) {
   switch(d_id) {
 ${make_instantiator_cases}
-#line 34 "${template}"
+#line 32 "${template}"
   default:
     Unhandled(d_id);
   }

diff --git a/src/theory/type_enumerator_template.cpp b/src/theory/type_enumerator_template.cpp
index 727637c13ab4bcc084402e80a966d0eaebbc4dd8..00faeebd5a93634afa40f74555156c38545c212f 100644 (file)
--- a/src/theory/type_enumerator_template.cpp
+++ b/src/theory/type_enumerator_template.cpp
@@ -22,7 +22,7 @@
 #include "util/cvc4_assert.h"
 
 ${type_enumerator_includes}
-#line 28 "${template}"
+#line 26 "${template}"
 
 using namespace std;
 
@@ -43,7 +43,7 @@ ${mk_type_enumerator_type_constant_cases}
     }
     Unreachable();
 ${mk_type_enumerator_cases}
-#line 49 "${template}"
+#line 47 "${template}"
   default:
     {
       stringstream ss;