Changeset d672350 for src/ResolvExpr/ResolveTypeof.cc

Timestamp:

Mar 21, 2022, 1:44:06 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

a76202d

Parents:

ef3c383 (diff), dbe2533 (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) (7 diffs)

src/ResolvExpr/ResolveTypeof.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 12:12:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Tue May 19 16:49:04 2015
-// Update Count     : 3
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed Mar 16 16:09:00 2022
+// Update Count     : 4
 //
 
@@ -22 +22 @@
 #include "AST/Node.hpp"
 #include "AST/Pass.hpp"
+#include "AST/TranslationUnit.hpp"
 #include "AST/Type.hpp"
 #include "AST/TypeEnvironment.hpp"
@@ -119 +120 @@
 namespace {
         struct ResolveTypeof_new : public ast::WithShortCircuiting {
-                const ast::SymbolTable & localSymtab;
-
-                ResolveTypeof_new( const ast::SymbolTable & syms ) : localSymtab( syms ) {}
+                const ResolveContext & context;
+
+                ResolveTypeof_new( const ResolveContext & context ) :
+                        context( context ) {}
 
                 void previsit( const ast::TypeofType * ) { visit_children = false; }
@@ -137 +139 @@
                                 ast::TypeEnvironment dummy;
                                 ast::ptr< ast::Expr > newExpr =
-                                        resolveInVoidContext( typeofType->expr, localSymtab, dummy );
+                                        resolveInVoidContext( typeofType->expr, context, dummy );
                                 assert( newExpr->result && ! newExpr->result->isVoid() );
                                 newType = newExpr->result;
@@ -161 +163 @@
 } // anonymous namespace
 
-const ast::Type * resolveTypeof( const ast::Type * type , const ast::SymbolTable & symtab ) {
-        ast::Pass< ResolveTypeof_new > mutator{ symtab };
+const ast::Type * resolveTypeof( const ast::Type * type , const ResolveContext & context ) {
+        ast::Pass< ResolveTypeof_new > mutator( context );
         return type->accept( mutator );
 }
@@ -168 +170 @@
 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 ResolveContext & context;
+        FixArrayDimension(const ResolveContext & context) : context( context ) {}
 
         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);
+                auto globalSizeType = context.global.sizeType;
+                ast::ptr<ast::Type> sizetype = globalSizeType ? globalSizeType : new ast::BasicType(ast::BasicType::LongUnsignedInt);
+                mutType->dimension = findSingleExpression(arrayType->dimension, sizetype, context );
 
                 if (InitTweak::isConstExpr(mutType->dimension)) {
@@ -187 +190 @@
 };
 
-const ast::Type * fixArrayType( const ast::Type * type, const ast::SymbolTable & symtab) {
-        ast::Pass<FixArrayDimension> visitor {symtab};
+const ast::Type * fixArrayType( const ast::Type * type, const ResolveContext & context ) {
+        ast::Pass<FixArrayDimension> visitor(context);
         return type->accept(visitor);
 }
 
-const ast::ObjectDecl * fixObjectType( const ast::ObjectDecl * decl , const ast::SymbolTable & symtab ) {
-        if (!decl->isTypeFixed) { 
+const ast::ObjectDecl * fixObjectType( const ast::ObjectDecl * decl , const ResolveContext & context ) {
+        if (!decl->isTypeFixed) {
                 auto mutDecl = mutate(decl);
-                auto resolvedType = resolveTypeof(decl->type, symtab);
-                resolvedType = fixArrayType(resolvedType, symtab);
+                auto resolvedType = resolveTypeof(decl->type, context);
+                resolvedType = fixArrayType(resolvedType, context);
                 mutDecl->type = resolvedType;