Changeset 330d933 for src/BasicTypes-gen.cc

Timestamp:

Aug 25, 2019, 8:48:51 AM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

2aab69b, 5a43ab8

Parents:

f9bf142 (diff), bbb1b35 (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

File:

• src/BasicTypes-gen.cc (modified) (7 diffs)

src/BasicTypes-gen.cc

@@ -295 +295 @@
         // cout << code.str();
 
-        
+
+        // TEMPORARY DURING CHANGE OVER
+        #define TypeAST TOP_SRCDIR "src/AST/Type.hpp"
+        resetInput( file, TypeAST, buffer, code, str );
+
+        if ( (start = str.find( STARTMK )) == string::npos ) Abort( "start", TypeAST );
+        start += sizeof( STARTMK );                                                     // includes newline
+        code << str.substr( 0, start );
+
+        code << "\t" << BYMK << endl;
+        code << "\tenum Kind {" << endl;
+        for ( int r = 0; r < NUMBER_OF_BASIC_TYPES; r += 1 ) {
+                code << "\t\t" << graph[r].name << "," << endl;
+        } // for        
+        code << "\t\tNUMBER_OF_BASIC_TYPES" << endl;
+        code << "\t} kind;" << endl;
+        code << "\t";                                                                           // indentation for end marker
+
+        if ( (start = str.find( ENDMK, start + 1 )) == string::npos ) Abort( "end", TypeAST );
+        code << str.substr( start );
+
+        output( file, TypeAST, code );
+        // cout << code.str();
+
+
         #define ConversionCost TOP_SRCDIR "src/ResolvExpr/ConversionCost.cc"
         resetInput( file, ConversionCost, buffer, code, str );
@@ -310 +334 @@
                         code << right << setw(30) << graph[c].type << left;
                 } else if ( graph[c].rank != graph[c + 2].rank ) {
-                        code << string( 10, ' ' ) << setw(25) << graph[c].type << setw(25) << graph[c + 1].type;
+                        code << string( 10, ' ' ) << setw(25) << graph[c].type << graph[c + 1].type;
                         c += 1;
                 } else {
-                        code << setw(20) << graph[c].type << setw(20) << graph[c + 1].type << setw(20) << graph[c + 2].type;
+                        code << setw(20) << graph[c].type << setw(20) << graph[c + 1].type << graph[c + 2].type;
                         c += 2;
                 } // if
@@ -328 +352 @@
         code << "\t" << BYMK << endl;
         code << "\tstatic const int costMatrix[BasicType::NUMBER_OF_BASIC_TYPES][BasicType::NUMBER_OF_BASIC_TYPES] = { // path length from root to node" << endl
-                 << "\t\t/*         ";
+                 << "\t\t/*           ";
         for ( int r = 0; r < NUMBER_OF_BASIC_TYPES; r += 1 ) { // titles
                 code << setw(5) << graph[r].abbrev;
@@ -334 +358 @@
         code << " */" << endl;
         for ( int r = 0; r < NUMBER_OF_BASIC_TYPES; r += 1 ) { // costs
-                code << "\t\t/*" << setw(6) << graph[r].abbrev << "*/ {";
+                code << "\t\t/* " << setw(6) << graph[r].abbrev << " */ {";
                 for ( int c = 0; c < NUMBER_OF_BASIC_TYPES; c += 1 ) {
                         code << setw(4) << costMatrix[r][c] << ",";
@@ -353 +377 @@
         code << "\t" << BYMK << endl;
         code << "\tstatic const int signMatrix[BasicType::NUMBER_OF_BASIC_TYPES][BasicType::NUMBER_OF_BASIC_TYPES] = { // number of sign changes in safe conversion" << endl
-                 << "\t\t/*         ";
+                 << "\t\t/*           ";
         for ( int r = 0; r < NUMBER_OF_BASIC_TYPES; r += 1 ) { // titles
                 code << setw(5) << graph[r].abbrev;
@@ -359 +383 @@
         code << " */" << endl;
         for ( int r = 0; r < NUMBER_OF_BASIC_TYPES; r += 1 ) { // costs
-                code << "\t\t/*" << setw(6) << graph[r].abbrev << "*/ {";
+                code << "\t\t/* " << setw(6) << graph[r].abbrev << " */ {";
                 for ( int c = 0; c < NUMBER_OF_BASIC_TYPES; c += 1 ) {
                         code << setw(4) << signMatrix[r][c] << ",";
@@ -395 +419 @@
         code << "*/" << endl;
         for ( int r = 0; r < NUMBER_OF_BASIC_TYPES; r += 1 ) { // costs
-                code << "\t\t\t\t  {\n\t\t/*" << setw(6) << graph[r].abbrev << "*/";
+                code << "\t\t\t\t  {\n\t\t/* " << setw(6) << graph[r].abbrev << " */";
                 for ( int c = 0; c < NUMBER_OF_BASIC_TYPES; c += 1 ) {
                         string s = string{"BT "} + graph[commonTypeMatrix[r][c]].name;