Changeset 9082d7e8 for src/Common

Timestamp:

Mar 30, 2023, 4:05:59 PM (3 years ago)

Author:

caparson <caparson@…>

Branches:

ADT, ast-experimental, master

Children:

bd72c284

Parents:

d24b1985 (diff), ff443e5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src/Common

Files:

• DeclStats.cpp (modified) (1 diff)
• ResolvProtoDump.cpp (modified) (2 diffs)
• ToString.hpp (added)
• module.mk (modified) (1 diff)
• utility.h (modified) (2 diffs)

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 >