Changeset 21255675 for src/ResolvExpr/ResolveTypeof.cc

Timestamp:

Nov 11, 2020, 2:41:34 PM (3 years ago)

Author:

Colby Alexander Parsons <caparsons@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

23954b6

Parents:

6a8882c (diff), 4a36b344 (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 plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/ResolvExpr/ResolveTypeof.cc (modified) (2 diffs)

src/ResolvExpr/ResolveTypeof.cc

@@ -29 +29 @@
 #include "SynTree/Mutator.h"     // for Mutator
 #include "SynTree/Type.h"        // for TypeofType, Type
+#include "SymTab/Mangler.h"
+#include "InitTweak/InitTweak.h" // for isConstExpr
 
 namespace SymTab {
@@ -163 +165 @@
 }
 
+struct FixArrayDimension {
+        // should not require a mutable symbol table - prevent pass template instantiation
+        const ast::SymbolTable & _symtab; 
+        FixArrayDimension(const ast::SymbolTable & symtab): _symtab(symtab) {}
+
+        const ast::ArrayType * previsit (const ast::ArrayType * arrayType) {
+                if (!arrayType->dimension) return arrayType;
+                auto mutType = mutate(arrayType);
+                ast::ptr<ast::Type> sizetype = ast::sizeType ? ast::sizeType : new ast::BasicType(ast::BasicType::LongUnsignedInt); 
+                mutType->dimension = findSingleExpression(arrayType->dimension, sizetype, _symtab);
+
+                if (InitTweak::isConstExpr(mutType->dimension)) {
+                        mutType->isVarLen = ast::LengthFlag::FixedLen;
+                }
+                else {
+                        mutType->isVarLen = ast::LengthFlag::VariableLen;
+                }
+                return mutType;
+        }
+};
+
+const ast::Type * fixArrayType( const ast::Type * type, const ast::SymbolTable & symtab) {
+        ast::Pass<FixArrayDimension> visitor {symtab};
+        return type->accept(visitor);
+}
+
+const ast::ObjectDecl * fixObjectType( const ast::ObjectDecl * decl , const ast::SymbolTable & symtab ) {
+        if (!decl->isTypeFixed) { 
+                auto mutDecl = mutate(decl);
+                auto resolvedType = resolveTypeof(decl->type, symtab);
+                resolvedType = fixArrayType(resolvedType, symtab);
+                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->isTypeFixed = true;
+                return mutDecl;
+        }
+        return decl;
+}
+
 } // namespace ResolvExpr