Changeset f441c88 for src/ResolvExpr

Timestamp:

Nov 2, 2018, 4:14:33 PM (5 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

5753b33, 8e04794

Parents:

c45b304

Message:

Implement basetypeof

File:

• src/ResolvExpr/ResolveTypeof.cc (modified) (1 diff)

src/ResolvExpr/ResolveTypeof.cc

@@ -67 +67 @@
                 std::cerr << std::endl;
 #endif
-                if ( typeofType->expr ) {
+                // pass on null expression
+                if ( ! typeofType->expr ) return typeofType;
+
+                bool isBasetypeof = typeofType->is_basetypeof;
+                auto oldQuals = typeofType->get_qualifiers().val;
+
+                Type* newType;
+                if ( TypeExpr* tyExpr = dynamic_cast<TypeExpr*>(typeofType->expr) ) {
+                        // typeof wrapping type
+                        newType = tyExpr->type;
+                        tyExpr->type = nullptr;
+                        delete tyExpr;
+                } else {
+                        // typeof wrapping expression
                         Expression * newExpr = resolveInVoidContext( typeofType->expr, indexer );
                         assert( newExpr->result && ! newExpr->result->isVoid() );
-                        Type * newType = newExpr->result;
+                        newType = newExpr->result;
                         newExpr->result = nullptr;
                         delete typeofType;
                         delete newExpr;
-                        return newType;
-                } // if
-                return typeofType;
+                }
+
+                // clear qualifiers for base, combine with typeoftype quals in any case
+                if ( isBasetypeof ) {
+                        newType->get_qualifiers().val 
+                                = ( newType->get_qualifiers().val & ~Type::Qualifiers::Mask ) | oldQuals;
+                } else {
+                        newType->get_qualifiers().val |= oldQuals;
+                }
+                
+                return newType;
         }
 } // namespace ResolvExpr