Changeset 5fda7143 for src/Common

Timestamp:

Sep 7, 2016, 9:30:25 AM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

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, with_gc

Children:

9f70ab57

Parents:

1f75e2d (diff), f04a8b81 (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

Conflicts:

src/Common/utility.h

Location:

src/Common

Files:

• SemanticError.cc (modified) (2 diffs)
• SemanticError.h (modified) (3 diffs)
• utility.h (modified) (1 diff)

src/Common/SemanticError.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// SemanticError.cc -- 
+// SemanticError.cc --
 //
 // Author           : Richard C. Bilson
@@ -26 +26 @@
 
 SemanticError::SemanticError( std::string error ) {
-        errors.push_back( std::string( "Error: " ) + error );
+  append( error );
 }
 
 void SemanticError::append( SemanticError &other ) {
-        errors.splice( errors.end(), other.errors );
+  errors.splice( errors.end(), other.errors );
+}
+
+void SemanticError::append( const std::string & msg ) {
+  errors.push_back( std::string( "Error: ") + msg );
 }
 

src/Common/SemanticError.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// SemanticError.h -- 
+// SemanticError.h --
 //
 // Author           : Richard C. Bilson
@@ -31 +31 @@
 
         void append( SemanticError &other );
+        void append( const std::string & );
         bool isEmpty() const;
         void print( std::ostream &os );
@@ -42 +43 @@
 template< typename T >
 SemanticError::SemanticError( const std::string &error, const T *obj ) {
-        std::ostringstream os;
-        os << "Error: " << error;
-        obj->print( os );
-        errors.push_back( os.str() );
+        append( toString( error, obj ) );
 }
+
 
 #endif // SEMANTICERROR_H

src/Common/utility.h

@@ -265 +265 @@
 std::weak_ptr<ThisType> RefCountSingleton<ThisType>::global_instance;
 
+// RAII object to regulate "save and restore" behaviour, e.g.
+// void Foo::bar() {
+//   ValueGuard<int> guard(var); // var is a member of type Foo
+//   var = ...;
+// } // var's original value is restored
+template< typename T >
+struct ValueGuard {
+        T old;
+        T& ref;
+
+        ValueGuard(T& inRef) : old(inRef), ref(inRef) {}
+        ~ValueGuard() { ref = old; }
+};
+
+template< typename T >
+struct reverseIterate_t {
+        T& ref;
+
+        reverseIterate_t( T & ref ) : ref(ref) {}
+
+        typedef typename T::reverse_iterator iterator;
+        iterator begin() { return ref.rbegin(); }
+        iterator end() { return ref.rend(); }
+};
+
+template< typename T >
+reverseIterate_t< T > reverseIterate( T & ref ) {
+        return reverseIterate_t< T >( ref );
+}
+
 #endif // _UTILITY_H