Changeset 29207bf for src/ResolvExpr

Timestamp:

Dec 8, 2018, 4:06:32 PM (7 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:

5ebb1368, 90cfc16

Parents:

47ed726 (diff), 3d99498 (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' of plg2.cs.uwaterloo.ca:software/cfa/cfa-cc

Location:

src/ResolvExpr

Files:

• AlternativeFinder.cc (modified) (2 diffs)
• ResolveTypeof.cc (modified) (1 diff)

src/ResolvExpr/AlternativeFinder.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 23:52:08 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Feb 17 11:19:39 2018
-// Update Count     : 33
+// Last Modified On : Thu Nov  1 21:00:56 2018
+// Update Count     : 34
 //
 
@@ -1344 +1344 @@
                 /// Gets name from untyped member expression (member must be NameExpr)
                 const std::string& get_member_name( UntypedMemberExpr *memberExpr ) {
+                        if ( dynamic_cast< ConstantExpr * >( memberExpr->get_member() ) ) {
+                                SemanticError( memberExpr, "Indexed access to struct fields unsupported: " );
+                        } // if
                         NameExpr * nameExpr = dynamic_cast< NameExpr * >( memberExpr->get_member() );
                         assert( nameExpr );

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 ) {
+                        // replace basetypeof(<enum>) by int
+                        if ( dynamic_cast<EnumInstType*>(newType) ) {
+                                Type* newerType = 
+                                        new BasicType{ newType->get_qualifiers(), BasicType::SignedInt, 
+                                        newType->attributes };
+                                delete newType;
+                                newType = newerType;
+                        }
+                        newType->get_qualifiers().val 
+                                = ( newType->get_qualifiers().val & ~Type::Qualifiers::Mask ) | oldQuals;
+                } else {
+                        newType->get_qualifiers().val |= oldQuals;
+                }
+                
+                return newType;
         }
 } // namespace ResolvExpr