Changes in src/main.cc [0afffee:141b786]

File:

• src/main.cc (modified) (10 diffs)

src/main.cc

@@ -10 +10 @@
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Oct 30 10:11:38 2016
-// Update Count     : 435
+// Last Modified On : Mon Aug 29 17:34:39 2016
+// Update Count     : 426
 //
 
@@ -18 +18 @@
 #include <signal.h>                                                                             // signal
 #include <getopt.h>                                                                             // getopt
-#include <execinfo.h>                                                                   // backtrace, backtrace_symbols
+#include <execinfo.h>                                                                   // backtrace, backtrace_symbols_fd
 #include <cxxabi.h>                                                                             // __cxa_demangle
-#include <cstring>                                                                              // index
 
 using namespace std;
@@ -43 +42 @@
 #include "Common/UnimplementedError.h"
 #include "../config.h"
+#include "Tuples/Tuples.h"
 
 using namespace std;
@@ -76 +76 @@
 static void dump( list< Declaration * > & translationUnit, ostream & out = cout );
 
-static void backtrace( int start ) {                                    // skip first N stack frames
+void backtrace( int start ) {                                                   // skip first N stack frames
         enum { Frames = 50 };
         void * array[Frames];
-        int size = ::backtrace( array, Frames );
-        char ** messages = ::backtrace_symbols( array, size ); // does not demangle names
-
-        *index( messages[0], '(' ) = '\0';                                      // find executable name
-        cerr << "Stack back trace for: " << messages[0] << endl;
+        int size = backtrace( array, Frames );
+        char ** messages = backtrace_symbols( array, size );
 
         // skip last 2 stack frames after main
@@ -89 +86 @@
                 char * mangled_name = nullptr, * offset_begin = nullptr, * offset_end = nullptr;
                 for ( char *p = messages[i]; *p; ++p ) {        // find parantheses and +offset
-                        if ( *p == '(' ) {
+                        if (*p == '(') {
                                 mangled_name = p;
-                        } else if ( *p == '+' ) {
+                        } else if (*p == '+') {
                                 offset_begin = p;
-                        } else if ( *p == ')' ) {
+                        } else if (*p == ')') {
                                 offset_end = p;
                                 break;
@@ -102 +99 @@
                 int frameNo = i - start;
                 if ( mangled_name && offset_begin && offset_end && mangled_name < offset_begin ) {
-                        *mangled_name++ = '\0';                                         // delimit strings
+                        *mangled_name++ = '\0';
                         *offset_begin++ = '\0';
                         *offset_end++ = '\0';
 
-                        int status;
+                        int status, frameNo = i - start;
                         char * real_name = __cxxabiv1::__cxa_demangle( mangled_name, 0, 0, &status );
-                        // bug in __cxa_demangle for single-character lower-case non-mangled names
                         if ( status == 0 ) {                                            // demangling successful ?
                                 cerr << "(" << frameNo << ") " << messages[i] << " : "
                                          << real_name << "+" << offset_begin << offset_end << endl;
+
                         } else {                                                                        // otherwise, output mangled name
                                 cerr << "(" << frameNo << ") " << messages[i] << " : "
-                                         << mangled_name << "(/*unknown*/)+" << offset_begin << offset_end << endl;
+                                         << mangled_name << "+" << offset_begin << offset_end << endl;
                         } // if
-
                         free( real_name );
                 } else {                                                                                // otherwise, print the whole line
@@ -129 +125 @@
         cerr << "*CFA runtime error* program cfa-cpp terminated with "
                  <<     (sig_num == SIGSEGV ? "segment fault" : "bus error")
-                 << "." << endl;
+                 << " backtrace:" << endl;
         backtrace( 2 );                                                                         // skip first 2 stack frames
         exit( EXIT_FAILURE );
@@ -236 +232 @@
                 OPTPRINT( "tweakInit" )
                 InitTweak::genInit( translationUnit );
-
+                OPTPRINT( "expandMemberTuples" );
+                Tuples::expandMemberTuples( translationUnit );
                 if ( libcfap ) {
                         // generate the bodies of cfa library functions
@@ -261 +258 @@
                         return 0;
                 } // if
+
+                OPTPRINT( "expandUniqueExpr" ); // xxx - is this the right place for this? want to expand ASAP so that subsequent passes don't need to worry about double-visiting a unique expr - needs to go after InitTweak::fix so that copy constructed return declarations are reused
+                Tuples::expandUniqueExpr( translationUnit );
 
                 OPTPRINT("instantiateGenerics")
@@ -277 +277 @@
                 OPTPRINT( "box" )
                 GenPoly::box( translationUnit );
+                OPTPRINT( "expandTuples" ); // xxx - is this the right place for this?
+                Tuples::expandTuples( translationUnit );
 
                 // print tree right before code generation