From 5b8b6acd9091e2afec654ebed1332d6755bbb7d9 Mon Sep 17 00:00:00 2001 From: Morgan Deters Date: Sun, 14 Oct 2012 00:08:52 +0000 Subject: fix #line number warnings (sorry!) --- src/expr/expr_manager_template.cpp | 2 +- src/expr/expr_manager_template.h | 2 +- src/expr/expr_template.cpp | 2 +- src/expr/expr_template.h | 4 ++-- src/expr/kind_template.h | 14 +++++++------- src/expr/type_checker_template.cpp | 8 ++++---- src/expr/type_properties_template.h | 16 ++++++++-------- 7 files changed, 24 insertions(+), 24 deletions(-) (limited to 'src/expr') diff --git a/src/expr/expr_manager_template.cpp b/src/expr/expr_manager_template.cpp index a0ab3794a..738529d92 100644 --- 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 a8036d207..f38acd153 100644 --- 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 9ea3fbd31..65a671b77 100644 --- 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 9b62cecd2..6cbaae4cb 100644 --- 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 e45a70e2b..47504b0e4 100644 --- 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 7dd939167..16f9ba917 100644 --- 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 e0f0c2b9b..70ce8f2db 100644 --- 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()); ${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()); ${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()); ${type_groundterms} -#line 130 "${template}" +#line 128 "${template}" default: { std::stringstream ss; ss << "A theory kinds file did not provide a ground term " -- cgit v1.2.3