Changeset b1e63ac5 for src/Common

Timestamp:

Jul 4, 2017, 9:40:16 AM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, 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:

208e5be

Parents:

9c951e3 (diff), f7cb0bc (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' into references

Location:

src/Common

Files:

• Assert.cc (modified) (2 diffs)
• Indenter.h (added)
• PassVisitor.h (added)
• PassVisitor.impl.h (added)
• PassVisitor.proto.h (added)
• utility.h (modified) (3 diffs)

src/Common/Assert.cc

@@ -21 +21 @@
 extern const char * __progname;                                                 // global name of running executable (argv[0])
 
-#define CFA_ASSERT_FMT "*CFA assertion error* from program \"%s\" in \"%s\" at line %d in file \"%s\""
+#define CFA_ASSERT_FMT "*CFA assertion error* \"%s\" from program \"%s\" in \"%s\" at line %d in file \"%s\""
 
 // called by macro assert in assert.h
 void __assert_fail( const char *assertion, const char *file, unsigned int line, const char *function ) {
-        fprintf( stderr, CFA_ASSERT_FMT ".\n", __progname, function, line, file );
+        fprintf( stderr, CFA_ASSERT_FMT ".\n", assertion, __progname, function, line, file );
         abort();
 }
@@ -31 +31 @@
 // called by macro assertf
 void __assert_fail_f( const char *assertion, const char *file, unsigned int line, const char *function, const char *fmt, ... ) {
-        fprintf( stderr, CFA_ASSERT_FMT ": ", __progname, function, line, file );
+        fprintf( stderr, CFA_ASSERT_FMT ": ", assertion, __progname, function, line, file );
         va_list args;
         va_start( args, fmt );

src/Common/utility.h

@@ -246 +246 @@
 };
 
+template< typename T >
+struct ValueGuardPtr {
+        T old;
+        T* ref;
+
+        ValueGuardPtr(T * inRef) : old( inRef ? *inRef : T() ), ref(inRef) {}
+        ~ValueGuardPtr() { if( ref ) *ref = old; }
+};
+
+template< typename T >
+struct ValueGuardPtr< std::list< T > > {
+        std::list< T > old;
+        std::list< T >* ref;
+
+        ValueGuardPtr( std::list< T > * inRef) : old(), ref(inRef) {
+                if( ref ) { swap( *ref, old ); }
+        }
+        ~ValueGuardPtr() { if( ref ) { swap( *ref, old ); } }
+};
+
 // -----------------------------------------------------------------------------
 // Helper struct and function to support
@@ -285 +305 @@
 // for ( val : group_iterate( container1, container2, ... ) ) {}
 // syntax to have a for each that iterates multiple containers of the same length
-// TODO: update to use variadic arguments
+// TODO: update to use variadic arguments, perfect forwarding
 
 template< typename T1, typename T2 >
@@ -334 +354 @@
         {}
 
+        CodeLocation( const CodeLocation& rhs ) = default;
+
         bool isSet () const {
                 return -1 != linenumber;