Changeset 9feb34b

Timestamp:

Mar 29, 2023, 11:07:03 AM (2 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, ast-experimental, master

Children:

afdb74b

Parents:

60380a1

Message:

Moved toString and toCString to a new header. Updated includes. cassert was somehow getting instances of toString before but that stopped working so I embedded the new smaller include.

Location:

src

Files:

• CodeGen/CodeGenerator.cc (modified) (1 diff)
• Common/DeclStats.cpp (modified) (1 diff)
• Common/ResolvProtoDump.cpp (modified) (2 diffs)
• Common/ToString.hpp (added)
• Common/module.mk (modified) (1 diff)
• Common/utility.h (modified) (2 diffs)
• ControlStruct/ExceptDeclNew.cpp (modified) (1 diff)
• ControlStruct/MLEMutator.cc (modified) (1 diff)
• GenPoly/Box.cc (modified) (1 diff)
• GenPoly/Lvalue.cc (modified) (1 diff)
• GenPoly/LvalueNew.cpp (modified) (1 diff)
• InitTweak/FixInit.cc (modified) (1 diff)
• InitTweak/FixInitNew.cpp (modified) (1 diff)
• InitTweak/GenInit.cc (modified) (1 diff)
• Parser/parser.yy (modified) (1 diff)
• ResolvExpr/Candidate.cpp (modified) (2 diffs)
• ResolvExpr/Resolver.cc (modified) (1 diff)
• SymTab/FixFunction.cc (modified) (1 diff)
• SymTab/Mangler.cc (modified) (1 diff)
• SymTab/Validate.cc (modified) (1 diff)
• SymTab/ValidateType.cc (modified) (1 diff)
• SynTree/Type.cc (modified) (2 diffs)
• SynTree/Type.h (modified) (2 diffs)
• Validate/FixQualifiedTypes.cpp (modified) (1 diff)
• Validate/ForallPointerDecay.cpp (modified) (1 diff)
• Validate/HandleAttributes.cc (modified) (1 diff)
• Validate/HoistStruct.cpp (modified) (1 diff)
• include/cassert (modified) (1 diff)

src/CodeGen/CodeGenerator.cc ¶

@@ -17 +17 @@
 #include <cassert>                   // for assert, assertf
 #include <list>                      // for _List_iterator, list, list<>::it...
+#include <sstream>                   // for stringstream
 
 #include "AST/Decl.hpp"              // for DeclWithType
 #include "Common/UniqueName.h"       // for UniqueName
-#include "Common/utility.h"          // for CodeLocation, toString
 #include "GenType.h"                 // for genType
 #include "InitTweak/InitTweak.h"     // for getPointerBase

src/Common/DeclStats.cpp ¶

@@ -23 +23 @@
 #include <iostream>
 #include <map>
+#include <sstream>
 #include <unordered_map>
 #include <unordered_set>

src/Common/ResolvProtoDump.cpp ¶

@@ -19 +19 @@
 #include <iostream>
 #include <set>
+#include <sstream>
 #include <unordered_set>
 
@@ -26 +27 @@
 #include "AST/Type.hpp"
 #include "CodeGen/OperatorTable.h"
-#include "Common/utility.h"
 
 namespace {

src/Common/module.mk ¶

@@ -52 +52 @@
         Common/Stats/Time.cc \
         Common/Stats/Time.h \
+        Common/ToString.hpp \
         Common/UniqueName.cc \
         Common/UniqueName.h \

src/Common/utility.h ¶

@@ -22 +22 @@
 #include <list>
 #include <memory>
-#include <sstream>
 #include <string>
 #include <type_traits>
@@ -143 +142 @@
         dst.swap( src );
 }
-
-template < typename T >
-void toString_single( std::ostream & os, const T & value ) {
-        os << value;
-}
-
-template < typename T, typename... Params >
-void toString_single( std::ostream & os, const T & value, const Params & ... params ) {
-        os << value;
-        toString_single( os, params ... );
-}
-
-template < typename ... Params >
-std::string toString( const Params & ... params ) {
-        std::ostringstream os;
-        toString_single( os, params... );
-        return os.str();
-}
-
-#define toCString( ... ) toString( __VA_ARGS__ ).c_str()
 
 template< typename... Args >

src/ControlStruct/ExceptDeclNew.cpp ¶

@@ -15 +15 @@
 
 #include "ExceptDecl.h"
+
+#include <sstream>
 
 #include "AST/Decl.hpp"

src/ControlStruct/MLEMutator.cc ¶

@@ -25 +25 @@
 #include <memory>                          // for allocator_traits<>::value_...
 
-#include "Common/utility.h"                // for toString, operator+
+#include "Common/ToString.hpp"             // for toString
 #include "ControlStruct/LabelGenerator.h"  // for LabelGenerator
 #include "MLEMutator.h"

src/GenPoly/Box.cc ¶

@@ -31 +31 @@
 #include "Common/SemanticError.h"        // for SemanticError
 #include "Common/UniqueName.h"           // for UniqueName
-#include "Common/utility.h"              // for toString
+#include "Common/ToString.hpp"           // for toCString
 #include "FindFunction.h"                // for findFunction, findAndReplace...
 #include "GenPoly/ErasableScopedMap.h"   // for ErasableScopedMap<>::const_i...

src/GenPoly/Lvalue.cc ¶

@@ -17 +17 @@
 #include <string>                        // for string
 
+#include "Common/ToString.hpp"           // for toCString
 #include "Common/UniqueName.h"
 #include "Common/PassVisitor.h"

src/GenPoly/LvalueNew.cpp ¶

@@ -25 +25 @@
 #include "AST/Pass.hpp"
 #include "Common/SemanticError.h"      // for SemanticWarning
+#include "Common/ToString.hpp"         // for toCString
 #include "Common/UniqueName.h"         // for UniqueName
 #include "GenPoly/GenPoly.h"           // for genFunctionType

src/InitTweak/FixInit.cc ¶

@@ -32 +32 @@
 #include "Common/PassVisitor.h"        // for PassVisitor, WithStmtsToAdd
 #include "Common/SemanticError.h"      // for SemanticError
+#include "Common/ToString.hpp"         // for toCString
 #include "Common/UniqueName.h"         // for UniqueName
-#include "Common/utility.h"            // for CodeLocation, ValueGuard, toSt...
 #include "FixGlobalInit.h"             // for fixGlobalInit
 #include "GenInit.h"                   // for genCtorDtor

src/InitTweak/FixInitNew.cpp ¶

@@ -20 +20 @@
 #include "Common/PassVisitor.h"        // for PassVisitor, WithStmtsToAdd
 #include "Common/SemanticError.h"      // for SemanticError
+#include "Common/ToString.hpp"         // for toCString
 #include "Common/UniqueName.h"         // for UniqueName
-#include "Common/utility.h"            // for CodeLocation, ValueGuard, toSt...
 #include "FixGlobalInit.h"             // for fixGlobalInit
 #include "GenInit.h"                   // for genCtorDtor

src/InitTweak/GenInit.cc ¶

@@ -31 +31 @@
 #include "Common/PassVisitor.h"        // for PassVisitor, WithGuards, WithShort...
 #include "Common/SemanticError.h"      // for SemanticError
+#include "Common/ToString.hpp"         // for toCString
 #include "Common/UniqueName.h"         // for UniqueName
 #include "Common/utility.h"            // for ValueGuard, maybeClone

src/Parser/parser.yy ¶

@@ -44 +44 @@
 
 #include <cstdio>
+#include <sstream>
 #include <stack>
 using namespace std;

src/ResolvExpr/Candidate.cpp ¶

@@ -17 +17 @@
 
 #include <iostream>
+#include <sstream>
 
 #include "AST/Print.hpp"
@@ -44 +45 @@
         sorted.reserve(cands.size());
         for(const auto & c : cands) {
-                std::stringstream ss;
+                std::ostringstream ss;
                 print( ss, *c, indent );
                 sorted.push_back(ss.str());

src/ResolvExpr/Resolver.cc ¶

@@ -39 +39 @@
 #include "AST/Type.hpp"
 #include "Common/Eval.h"                 // for eval
+#include "Common/Iterate.hpp"            // for group_iterate
 #include "Common/PassVisitor.h"          // for PassVisitor
 #include "Common/SemanticError.h"        // for SemanticError
 #include "Common/Stats/ResolveTime.h"    // for ResolveTime::start(), ResolveTime::stop()
-#include "Common/utility.h"              // for ValueGuard, group_iterate
+#include "Common/ToString.hpp"           // for toCString
 #include "InitTweak/GenInit.h"
 #include "InitTweak/InitTweak.h"         // for isIntrinsicSingleArgCallStmt

src/SymTab/FixFunction.cc ¶

@@ -21 +21 @@
 #include "AST/Pass.hpp"
 #include "AST/Type.hpp"
-#include "Common/utility.h"       // for maybeClone, copy
+#include "Common/utility.h"       // for copy
 #include "SynTree/Declaration.h"  // for FunctionDecl, ObjectDecl, Declarati...
 #include "SynTree/Expression.h"   // for Expression

src/SymTab/Mangler.cc ¶

@@ -24 +24 @@
 #include "CodeGen/OperatorTable.h"       // for OperatorInfo, operatorLookup
 #include "Common/PassVisitor.h"
+#include "Common/ToString.hpp"           // for toCString
 #include "Common/SemanticError.h"        // for SemanticError
-#include "Common/utility.h"              // for toString
 #include "ResolvExpr/TypeEnvironment.h"  // for TypeEnvironment
 #include "SynTree/LinkageSpec.h"         // for Spec, isOverridable, AutoGen, Int...

src/SymTab/Validate.cc ¶

@@ -55 +55 @@
 #include "Common/ScopedMap.h"          // for ScopedMap
 #include "Common/SemanticError.h"      // for SemanticError
+#include "Common/ToString.hpp"         // for toCString
 #include "Common/UniqueName.h"         // for UniqueName
-#include "Common/utility.h"            // for operator+, cloneAll, deleteAll
+#include "Common/utility.h"            // for cloneAll, deleteAll
 #include "CompilationState.h"          // skip some passes in new-ast build
 #include "Concurrency/Keywords.h"      // for applyKeywords

src/SymTab/ValidateType.cc ¶

@@ -18 +18 @@
 #include "CodeGen/OperatorTable.h"
 #include "Common/PassVisitor.h"
+#include "Common/ToString.hpp"
 #include "SymTab/FixFunction.h"
 #include "SynTree/Declaration.h"

src/SynTree/Type.cc ¶

@@ -16 +16 @@
 
 #include "Attribute.h"                // for Attribute
+#include "Common/ToString.hpp"        // for toCString
 #include "Common/utility.h"           // for cloneAll, deleteAll, printAll
 #include "InitTweak/InitTweak.h"      // for getPointerBase
@@ -105 +106 @@
 int Type::referenceDepth() const { return 0; }
 
+AggregateDecl * Type::getAggr() const {
+        assertf( false, "Non-aggregate type: %s", toCString( this ) );
+}
+
 TypeSubstitution Type::genericSubstitution() const { assertf( false, "Non-aggregate type: %s", toCString( this ) ); }
 

src/SynTree/Type.h ¶

@@ -24 +24 @@
 #include "BaseSyntaxNode.h"  // for BaseSyntaxNode
 #include "Common/Iterate.hpp"// for operator+
-#include "Common/utility.h"  // for toCString
 #include "Mutator.h"         // for Mutator
 #include "SynTree.h"         // for AST nodes
@@ -186 +185 @@
         virtual bool isComplete() const { return true; }
 
-        virtual AggregateDecl * getAggr() const { assertf( false, "Non-aggregate type: %s", toCString( this ) ); }
+        virtual AggregateDecl * getAggr() const;
 
         virtual TypeSubstitution genericSubstitution() const;

src/Validate/FixQualifiedTypes.cpp ¶

@@ -16 +16 @@
 #include "Validate/FixQualifiedTypes.hpp"
 
+#include "AST/LinkageSpec.hpp"             // for Linkage
 #include "AST/Pass.hpp"
 #include "AST/TranslationUnit.hpp"
+#include "Common/ToString.hpp"             // for toString
+#include "SymTab/Mangler.h"                // for Mangler
 #include "Validate/NoIdSymbolTable.hpp"
-#include "SymTab/Mangler.h"            // for Mangler
-#include "AST/LinkageSpec.hpp"                     // for Linkage
 
 namespace Validate {

src/Validate/ForallPointerDecay.cpp ¶

@@ -22 +22 @@
 #include "CodeGen/OperatorTable.h"
 #include "Common/CodeLocation.h"
+#include "Common/ToString.hpp"
 #include "SymTab/FixFunction.h"
 

src/Validate/HandleAttributes.cc ¶

@@ -19 +19 @@
 #include "Common/Eval.h"
 #include "Common/PassVisitor.h"
+#include "Common/ToString.hpp"
 #include "Common/SemanticError.h"
 #include "ResolvExpr/Resolver.h"

src/Validate/HoistStruct.cpp ¶

@@ -16 +16 @@
 #include "Validate/HoistStruct.hpp"
 
+#include <sstream>
+
 #include "AST/Pass.hpp"
 #include "AST/TranslationUnit.hpp"
-#include "Common/utility.h"
 
 namespace Validate {

src/include/cassert ¶

@@ -20 +20 @@
 #include_next <cassert>
 
-#include <string>
-
-template < typename ... Params >
-std::string toString( const Params & ... params );
+#include "Common/ToString.hpp"
 
 #ifdef NDEBUG