Changeset 7a780ad for src/Parser/TypeData.cc

Timestamp:

Apr 18, 2024, 5:19:17 PM (6 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/Parser/TypeData.cc (modified) (11 diffs)

src/Parser/TypeData.cc

@@ -19 +19 @@
 #include <ostream>                 // for operator<<, ostream, basic_ostream
 
+#include "AST/Attribute.hpp"       // for Attribute
 #include "AST/Decl.hpp"            // for AggregateDecl, ObjectDecl, TypeDe...
-#include "AST/Attribute.hpp"       // for Attribute
 #include "AST/Init.hpp"            // for SingleInit, ListInit
 #include "AST/Print.hpp"           // for print
+#include "AST/Type.hpp"            // for Type
 #include "Common/SemanticError.h"  // for SemanticError
 #include "Common/utility.h"        // for splice, spliceBegin
@@ -1010 +1011 @@
                 // fill in implicit int
                 return new ast::BasicType(
-                        ast::BasicType::SignedInt,
+                        ast::BasicKind::SignedInt,
                         buildQualifiers( td )
                 );
@@ -1095 +1096 @@
 
 ast::Type * buildBasicType( const TypeData * td ) {
-        ast::BasicType::Kind ret;
+        ast::BasicKind ret;
 
         switch ( td->basictype ) {
@@ -1116 +1117 @@
                 } // if
 
-                ret = ast::BasicType::Bool;
+                ret = ast::BasicKind::Bool;
                 break;
 
@@ -1123 +1124 @@
                 // character types. The implementation shall define char to have the same range, representation, and behavior as
                 // either signed char or unsigned char.
-                static ast::BasicType::Kind chartype[] = { ast::BasicType::SignedChar, ast::BasicType::UnsignedChar, ast::BasicType::Char };
+                static ast::BasicKind chartype[] = { ast::BasicKind::SignedChar, ast::BasicKind::UnsignedChar, ast::BasicKind::Char };
 
                 if ( td->length != TypeData::NoLength ) {
@@ -1133 +1134 @@
 
         case TypeData::Int:
-                static ast::BasicType::Kind inttype[2][4] = {
-                        { ast::BasicType::ShortSignedInt, ast::BasicType::LongSignedInt, ast::BasicType::LongLongSignedInt, ast::BasicType::SignedInt },
-                        { ast::BasicType::ShortUnsignedInt, ast::BasicType::LongUnsignedInt, ast::BasicType::LongLongUnsignedInt, ast::BasicType::UnsignedInt },
+                static ast::BasicKind inttype[2][4] = {
+                        { ast::BasicKind::ShortSignedInt, ast::BasicKind::LongSignedInt, ast::BasicKind::LongLongSignedInt, ast::BasicKind::SignedInt },
+                        { ast::BasicKind::ShortUnsignedInt, ast::BasicKind::LongUnsignedInt, ast::BasicKind::LongLongUnsignedInt, ast::BasicKind::UnsignedInt },
                 };
 
@@ -1146 +1147 @@
 
         case TypeData::Int128:
-                ret = td->signedness == TypeData::Unsigned ? ast::BasicType::UnsignedInt128 : ast::BasicType::SignedInt128;
+                ret = td->signedness == TypeData::Unsigned ? ast::BasicKind::UnsignedInt128 : ast::BasicKind::SignedInt128;
                 if ( td->length != TypeData::NoLength ) {
                         genTSError( TypeData::lengthNames[ td->length ], td->basictype );
@@ -1164 +1165 @@
         case TypeData::uFloat128:
         case TypeData::uFloat128x:
-                static ast::BasicType::Kind floattype[2][12] = {
-                        { ast::BasicType::FloatComplex, ast::BasicType::DoubleComplex, ast::BasicType::LongDoubleComplex, (ast::BasicType::Kind)-1, (ast::BasicType::Kind)-1, ast::BasicType::uFloat16Complex, ast::BasicType::uFloat32Complex, ast::BasicType::uFloat32xComplex, ast::BasicType::uFloat64Complex, ast::BasicType::uFloat64xComplex, ast::BasicType::uFloat128Complex, ast::BasicType::uFloat128xComplex, },
-                        { ast::BasicType::Float, ast::BasicType::Double, ast::BasicType::LongDouble, ast::BasicType::uuFloat80, ast::BasicType::uuFloat128, ast::BasicType::uFloat16, ast::BasicType::uFloat32, ast::BasicType::uFloat32x, ast::BasicType::uFloat64, ast::BasicType::uFloat64x, ast::BasicType::uFloat128, ast::BasicType::uFloat128x, },
+                static ast::BasicKind floattype[2][12] = {
+                        { ast::BasicKind::FloatComplex, ast::BasicKind::DoubleComplex, ast::BasicKind::LongDoubleComplex, (ast::BasicKind)-1, (ast::BasicKind)-1, ast::BasicKind::uFloat16Complex, ast::BasicKind::uFloat32Complex, ast::BasicKind::uFloat32xComplex, ast::BasicKind::uFloat64Complex, ast::BasicKind::uFloat64xComplex, ast::BasicKind::uFloat128Complex, ast::BasicKind::uFloat128xComplex, },
+                        { ast::BasicKind::Float, ast::BasicKind::Double, ast::BasicKind::LongDouble, ast::BasicKind::uuFloat80, ast::BasicKind::uuFloat128, ast::BasicKind::uFloat16, ast::BasicKind::uFloat32, ast::BasicKind::uFloat32x, ast::BasicKind::uFloat64, ast::BasicKind::uFloat64x, ast::BasicKind::uFloat128, ast::BasicKind::uFloat128x, },
                 };
 
@@ -1213 +1214 @@
 
 static ast::Type * buildDefaultType( const TypeData * td ) {
-        return ( td ) ? typebuild( td ) : new ast::BasicType( ast::BasicType::SignedInt );
+        return ( td ) ? typebuild( td ) : new ast::BasicType( ast::BasicKind::SignedInt );
 } // buildDefaultType
 
@@ -1579 +1580 @@
                         td->location,
                         "",
-                        new ast::BasicType( ast::BasicType::SignedInt ),
+                        new ast::BasicType( ast::BasicKind::SignedInt ),
                         (ast::Init *)nullptr,
                         ast::Storage::Classes(),
@@ -1667 +1668 @@
         } else {
                 ft->returns.push_back(
-                        new ast::BasicType( ast::BasicType::SignedInt ) );
+                        new ast::BasicType( ast::BasicKind::SignedInt ) );
         } // if
         return ft;