Changeset 6943a987 for src/Common

Timestamp:

Aug 29, 2016, 10:33:05 AM (10 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, stuck-waitfor-destruct, with_gc

Children:

5e644d3e

Parents:

79841be (diff), 413ad05 (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:

• Assert.cc (added)
• CompilerError.h (modified) (2 diffs)
• module.mk (modified) (1 diff)
• utility.h (modified) (3 diffs)

src/Common/CompilerError.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue May 19 07:20:37 2015
-// Update Count     : 2
+// Last Modified On : Thu Aug 18 23:41:30 2016
+// Update Count     : 3
 //
 
@@ -18 +18 @@
 
 #include <string>
-//#include "../config.h"
 
 class CompilerError : public std::exception {

src/Common/module.mk

@@ -11 +11 @@
 ## Created On       : Mon Jun  1 17:49:17 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Mon Jun  1 17:51:23 2015
-## Update Count     : 1
+## Last Modified On : Thu Aug 18 13:29:04 2016
+## Update Count     : 2
 ###############################################################################
 
 SRC += Common/SemanticError.cc \
-       Common/UniqueName.cc
+       Common/UniqueName.cc \
+       Common/Assert.cc

src/Common/utility.h

@@ -49 +49 @@
 }
 
+template< typename T, typename U >
+static inline T * maybeMoveBuild( const U *orig ) {
+        T* ret = maybeBuild<T>(orig);
+        delete orig;
+        return ret;
+}
+
 template< typename Input_iterator >
 void printEnums( Input_iterator begin, Input_iterator end, const char * const *name_array, std::ostream &os ) {
@@ -137 +144 @@
 
 template < typename T >
-std::string toString ( T value ) {
+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;
-        os << value; // << std::ends;
+        toString_single( os, params... );
         return os.str();
 }
@@ -211 +229 @@
 }
 
+template< typename T >
+void warn_single( const T & arg ) {
+        std::cerr << arg << std::endl;
+}
+
+template< typename T, typename... Params >
+void warn_single(const T & arg, const Params & ... params ) {
+        std::cerr << arg;
+        warn_single( params... );
+}
+
+template< typename... Params >
+void warn( const Params & ... params ) {
+        std::cerr << "Warning: ";
+        warn_single( params... );
+}
+
 #endif // _UTILITY_H