Changeset 7f6a7c9 for src/Parser/TypeData.cc

Timestamp:

Sep 21, 2022, 11:02:15 AM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, master, pthread-emulation

Children:

95dab9e

Parents:

428adbc (diff), 0bd46fd (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' into pthread-emulation

File:

• src/Parser/TypeData.cc (modified) (6 diffs)

src/Parser/TypeData.cc

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 15:12:51 2015
-// Last Modified By : Henry Xue
-// Last Modified On : Tue Jul 20 04:10:50 2021
-// Update Count     : 673
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue May 10 22:36:52 2022
+// Update Count     : 677
 //
 
@@ -283 +283 @@
                 if ( signedness != DeclarationNode::NoSignedness ) os << DeclarationNode::signednessNames[ signedness ] << " ";
                 if ( length != DeclarationNode::NoLength ) os << DeclarationNode::lengthNames[ length ] << " ";
-                if ( complextype == DeclarationNode::NoComplexType ) { // basic type
-                        assert( basictype != DeclarationNode::NoBasicType );
-                        os << DeclarationNode::basicTypeNames[ basictype ] << " ";
-                } else {                                                                                // complex type
-                        // handle double _Complex
-                        if ( basictype != DeclarationNode::NoBasicType ) os << DeclarationNode::basicTypeNames[ basictype ] << " ";
-                        os << DeclarationNode::complexTypeNames[ complextype ] << " ";
-                } // if
+                if ( complextype != DeclarationNode::NoComplexType ) os << DeclarationNode::complexTypeNames[ complextype ] << " ";
+                if ( basictype != DeclarationNode::NoBasicType ) os << DeclarationNode::basicTypeNames[ basictype ] << " ";
                 break;
           case Pointer:
@@ -437 +431 @@
                         __attribute__((fallthrough));
                 #endif
+                // FALL THROUGH
           case Typeof:
                 os << "type-of expression ";
@@ -442 +437 @@
                         typeexpr->print( os, indent + 2 );
                 } // if
+                break;
+          case Vtable:
+                os << "vtable";
                 break;
           case Builtin:
@@ -548 +546 @@
                 return buildAggInst( td );
           case TypeData::EnumConstant:
-                // the name gets filled in later -- by SymTab::Validate
                 return new EnumInstType( buildQualifiers( td ), "" );
           case TypeData::SymbolicInst:
@@ -923 +920 @@
         assert( td->kind == TypeData::Enum );
         Type * baseType = td->base ? typebuild(td->base) : nullptr;
-        EnumDecl * ret = new EnumDecl( *td->enumeration.name, attributes, linkage, baseType );
+        EnumDecl * ret = new EnumDecl( *td->enumeration.name, attributes, td->enumeration.typed, linkage, baseType );
         buildList( td->enumeration.constants, ret->get_members() );
         list< Declaration * >::iterator members = ret->get_members().begin();
         for ( const DeclarationNode * cur = td->enumeration.constants; cur != nullptr; cur = dynamic_cast< DeclarationNode * >( cur->get_next() ), ++members ) {
-                if ( cur->has_enumeratorValue() ) {
+                if ( ret->isTyped && !ret->base && cur->has_enumeratorValue() ) {
+                        SemanticError( td->location, "Enumerator of enum(void) cannot have an explicit initializer value." );
+                } else if ( cur->has_enumeratorValue() ) {
                         ObjectDecl * member = dynamic_cast< ObjectDecl * >(* members);
                         member->set_init( new SingleInit( maybeMoveBuild< Expression >( cur->consume_enumeratorValue() ) ) );
                 } else if ( !cur->initializer ) {
                         if ( baseType && (!dynamic_cast<BasicType *>(baseType) || !dynamic_cast<BasicType *>(baseType)->isWholeNumber())) {
-                                SemanticError( td->location, "A non whole number enum value decl must be explicitly initialized." );
+                                SemanticError( td->location, "Enumerators of an non-integer typed enum must be explicitly initialized." );
                         }
                 }