Changeset 7d55e4d for src/BasicTypes-gen.cc

Timestamp:

Oct 30, 2023, 4:59:34 PM (11 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

4ac402d

Parents:

36e6f10

Message:

Simple rework to BasicTypes?-gen.cc to avoid refering to the old ast. No larger rework at this time.

File:

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

src/BasicTypes-gen.cc

@@ -117 +117 @@
         // { LongDoubleImaginary, "LongDoubleImaginary", "LDI", "long double _Imaginary", "Ie", false, LongDoubleComplex, -1, -1, 17 },
 
-        { uFloat128x, "uFloat128x", "_FBX", "_Float128x", "DF128x_", Floating, uFloat128xComplex, -1, -1, 18 }, 
+        { uFloat128x, "uFloat128x", "_FBX", "_Float128x", "DF128x_", Floating, uFloat128xComplex, -1, -1, 18 },
         { uFloat128xComplex, "uFloat128xComplex", "_FLDXC", "_Float128x _Complex", "CDF128x_", Floating, -1, -1, -1, 18 }
 }; // graph
@@ -127 +127 @@
 void generateCosts( int row ) {
         bool seen[NUMBER_OF_BASIC_TYPES] = { false /*, ... */ };
-        
+
         struct el_cost {
                 int i;
                 int path;
                 int sign;
-                
+
                 el_cost( int i = 0, int p = 0, int s = 0 ) : i(i), path(p), sign(s) {}
-                
+
                 // reverse the sense for use in largest-on-top priority queue
                 bool operator< (const el_cost& o) const {
@@ -195 +195 @@
                         return;
                 } // if
-                
+
                 i = graph[col].middle;
                 if ( i == -1 ) assert("invalid ancestor assumption");
@@ -284 +284 @@
         for ( int r = 0; r < NUMBER_OF_BASIC_TYPES; r += 1 ) {
                 code << "\t\t" << graph[r].name << "," << endl;
-        } // for        
+        } // for
         code << "\t\tNUMBER_OF_BASIC_TYPES" << endl;
         code << "\t} kind;" << endl;
@@ -307 +307 @@
         for ( int r = 0; r < NUMBER_OF_BASIC_TYPES; r += 1 ) {
                 code << "\t\"" << graph[r].type << "\"," << endl;
-        } // for        
+        } // for
         code << "};" << endl;
 
@@ -329 +329 @@
         for ( int r = 0; r < NUMBER_OF_BASIC_TYPES; r += 1 ) {
                 code << "\t\t" << graph[r].name << "," << endl;
-        } // for        
+        } // for
         code << "\t\tNUMBER_OF_BASIC_TYPES" << endl;
         code << "\t} kind;" << endl;
@@ -352 +352 @@
         for ( int r = 0; r < NUMBER_OF_BASIC_TYPES; r += 1 ) {
                 code << "\t\"" << graph[r].type << "\"," << endl;
-        } // for        
+        } // for
         code << "};" << endl;
 
@@ -391 +391 @@
         end += sizeof( STARTMK );
         code << str.substr( start, end - start );
-        
+
         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
+        code << "\tstatic const int costMatrix[ast::BasicType::NUMBER_OF_BASIC_TYPES][ast::BasicType::NUMBER_OF_BASIC_TYPES] = { // path length from root to node" << endl
                  << "\t\t/*           ";
         for ( int r = 0; r < NUMBER_OF_BASIC_TYPES; r += 1 ) { // titles
@@ -411 +411 @@
         code << "\tstatic const int maxIntCost = " << *max_element(costMatrix[SignedInt], costMatrix[SignedInt] + NUMBER_OF_BASIC_TYPES) << ";" << endl;
         code << "\t";                                                                           // indentation for end marker
-        
+
         if ( (start = str.find( ENDMK, start + 1 )) == string::npos ) Abort( "end", ConversionCost );
         if ( (end = str.find( STARTMK, start + 1 )) == string::npos ) Abort( "start", ConversionCost );
@@ -418 +418 @@
 
         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
+        code << "\tstatic const int signMatrix[ast::BasicType::NUMBER_OF_BASIC_TYPES][ast::BasicType::NUMBER_OF_BASIC_TYPES] = { // number of sign changes in safe conversion" << endl
                  << "\t\t/*           ";
         for ( int r = 0; r < NUMBER_OF_BASIC_TYPES; r += 1 ) { // titles
@@ -450 +450 @@
         enum { PER_ROW = 6 };
         code << "\t" << BYMK << endl;
-        code << "\t#define BT BasicType::" << endl;
-        code << "\tstatic const BasicType::Kind commonTypes[BasicType::NUMBER_OF_BASIC_TYPES][BasicType::NUMBER_OF_BASIC_TYPES] = { // nearest common ancestor" << endl
+        code << "\t#define BT ast::BasicType::" << endl;
+        code << "\tstatic const BT Kind commonTypes[BT NUMBER_OF_BASIC_TYPES][BT NUMBER_OF_BASIC_TYPES] = { // nearest common ancestor" << endl
              << "\t\t/*\t\t ";
         for ( int r = 0; r < NUMBER_OF_BASIC_TYPES; r += 1 ) { // titles
@@ -505 +505 @@
                 "\t\t\t//   - \"Di\" char32_t\n"
                 "\t\t\t//   - \"Ds\" char16_t\n";
-                
-        code << "\t\t\tconst std::string basicTypes[BasicType::NUMBER_OF_BASIC_TYPES] = {" << endl;
+
+        code << "\t\t\tconst std::string basicTypes[ast::BasicType::NUMBER_OF_BASIC_TYPES] = {" << endl;
         for ( int r = 0; r < NUMBER_OF_BASIC_TYPES; r += 1 ) {
                 code << "\t\t\t\t\"" << graph[r].mangled << "\"," << setw(9 - strlen(graph[r].mangled)) << ' ' << "// " << graph[r].type << endl;
-        } // for        
+        } // for
         code << "\t\t\t}; // basicTypes" << endl;
         code << "\t\t\t";                                                                       // indentation for end marker