Changeset 94fa946

Timestamp:

Mar 23, 2022, 3:09:52 PM (3 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, ast-experimental, enum, master, pthread-emulation, qualifiedEnum

Children:

8631c84

Parents:

3caf5e3

Message:

Cleaned up some files I have been looking at a lot recently.

Location:

src/ResolvExpr

Files:

• RenameVars.h (modified) (1 diff)
• ResolveTypeof.cc (modified) (2 diffs)
• ResolveTypeof.h (modified) (1 diff)

src/ResolvExpr/RenameVars.h

@@ -36 +36 @@
         };
         const ast::Type * renameTyVars( const ast::Type *, RenameMode mode = GEN_USAGE, bool reset = true );
-        
 
         /// resets internal state of renamer to avoid overflow
         void resetTyVarRenaming();
-
-        
 } // namespace ResolvExpr
 

src/ResolvExpr/ResolveTypeof.cc

@@ -169 +169 @@
 
 struct FixArrayDimension {
-        // should not require a mutable symbol table - prevent pass template instantiation
         const ResolveContext & context;
         FixArrayDimension(const ResolveContext & context) : context( context ) {}
@@ -196 +195 @@
 
 const ast::ObjectDecl * fixObjectType( const ast::ObjectDecl * decl , const ResolveContext & context ) {
-        if (!decl->isTypeFixed) {
-                auto mutDecl = mutate(decl);
+        if (decl->isTypeFixed) {
+                return decl;
+        }
+
+        auto mutDecl = mutate(decl);
+        {
                 auto resolvedType = resolveTypeof(decl->type, context);
                 resolvedType = fixArrayType(resolvedType, context);
                 mutDecl->type = resolvedType;
-
-                // check variable length if object is an array.
-                // xxx - should this be part of fixObjectType?
-
-                /*
-                if (auto arrayType = dynamic_cast<const ast::ArrayType *>(resolvedType)) {
-                        auto dimExpr = findSingleExpression(arrayType->dimension, ast::sizeType, symtab);
-                        if (auto varexpr = arrayType->dimension.as<ast::VariableExpr>()) {// hoisted previously
-                                if (InitTweak::isConstExpr(varexpr->var.strict_as<ast::ObjectDecl>()->init)) {
-                                        auto mutType = mutate(arrayType);
-                                        mutType->isVarLen = ast::LengthFlag::VariableLen;
-                                        mutDecl->type = mutType;
-                                }
-                        }
-                }
-                */
-
-
-                if (!mutDecl->name.empty()) 
-                        mutDecl->mangleName = Mangle::mangle(mutDecl); // do not mangle unnamed variables
-                
-                mutDecl->type = renameTyVars(mutDecl->type, RenameMode::GEN_EXPR_ID);
-                mutDecl->isTypeFixed = true;
-                return mutDecl;
-        }
-        return decl;
+        }
+
+        // Do not mangle unnamed variables.
+        if (!mutDecl->name.empty()) {
+                mutDecl->mangleName = Mangle::mangle(mutDecl);
+        }
+
+        mutDecl->type = renameTyVars(mutDecl->type, RenameMode::GEN_EXPR_ID);
+        mutDecl->isTypeFixed = true;
+        return mutDecl;
 }
 

src/ResolvExpr/ResolveTypeof.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// ResolveTypeof.h -- 
+// ResolveTypeof.h --
 //
 // Author           : Richard C. Bilson