Changeset 7a780ad for src/BasicTypes-gen.cc

Timestamp:

Apr 18, 2024, 5:19:17 PM (4 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

38093ae

Parents:

60c5b6d

Message:

Moved ast::BasicType::Kind to ast::BasicKind? in its own hearder. This is more consistent with other utility enums (although we still use this as a enum class) and reduces what some files need to include. Also did a upgrade in a comment with MAX_INTEGER_TYPE, it is now part of the enum.

File:

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

src/BasicTypes-gen.cc

@@ -249 +249 @@
                 } // for
         } // for
+        int lastInteger = NUMBER_OF_BASIC_TYPES;
 
         for ( int r = 0; r < NUMBER_OF_BASIC_TYPES; r += 1 ) { // perform breath-first traversal to generate cost graph
@@ -259 +260 @@
                 } // for
         } // for
+
+        // Find the last integer type.
+        // Assumes at least 1, and all come before the floating types.
+        for ( int i = 1 ; i < NUMBER_OF_BASIC_TYPES ; i += 1 ) {
+                if ( Floating == graph[i].sign ) {
+                        lastInteger = (i - 1);
+                        break;
+                }
+        }
 
         #define STARTMK "// GENERATED START, DO NOT EDIT"
@@ -272 +282 @@
         size_t start, end;
 
-        #define TypeH_AST TOP_SRCDIR "src/AST/Type.hpp"
+        #define TypeH_AST TOP_SRCDIR "src/AST/BasicKind.hpp"
         resetInput( file, TypeH_AST, buffer, code, str );
 
@@ -279 +289 @@
         code << str.substr( 0, start );
 
-        code << "\t" << BYMK << endl;
-        code << "\tenum Kind {" << endl;
+        code << BYMK << endl;
+        code << "enum BasicKind {" << 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
+                code << "\t" << graph[r].name << "," << endl;
+        } // for
+        code << "\tNUMBER_OF_BASIC_TYPES," << endl;
+        code << "\tMAX_INTEGER_TYPE = " << graph[lastInteger].name << "," << endl;
+        code << "};" << endl;
 
         if ( (start = str.find( ENDMK, start + 1 )) == string::npos ) Abort( "end", TypeH_AST );
@@ -347 +357 @@
 
         code << "\t" << BYMK << 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
+        code << "\tstatic const int costMatrix[ast::BasicKind::NUMBER_OF_BASIC_TYPES][ast::BasicKind::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
@@ -372 +382 @@
 
         code << "\t" << BYMK << 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
+        code << "\tstatic const int signMatrix[ast::BasicKind::NUMBER_OF_BASIC_TYPES][ast::BasicKind::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
@@ -404 +414 @@
         enum { PER_ROW = 6 };
         code << "\t" << BYMK << endl;
-        code << "\t#define BT ast::BasicType::" << endl;
+        code << "\t#define BT ast::BasicKind::" << 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 ";
@@ -460 +470 @@
                 "//   - \"Ds\" char16_t\n";
 
-        code << "const std::string basicTypes[ast::BasicType::NUMBER_OF_BASIC_TYPES] = {" << endl;
+        code << "const std::string basicTypes[ast::BasicKind::NUMBER_OF_BASIC_TYPES] = {" << endl;
         for ( int r = 0; r < NUMBER_OF_BASIC_TYPES; r += 1 ) {
                 code << "\t\"" << graph[r].mangled << "\"," << setw(9 - strlen(graph[r].mangled)) << ' ' << "// " << graph[r].type << endl;