Changeset f072892

Timestamp:

Jul 30, 2018, 4:43:47 PM (5 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

4934ea3

Parents:

1be845b

git-author:

Rob Schluntz <rschlunt@…> (07/26/18 15:01:42)

git-committer:

Rob Schluntz <rschlunt@…> (07/30/18 16:43:47)

Message:

Minor cleanup

Location:

src

Files:

• InitTweak/FixGlobalInit.cc (modified) (1 diff)
• InitTweak/InitTweak.cc (modified) (1 diff)
• ResolvExpr/CurrentObject.cc (modified) (1 diff)
• SymTab/Validate.cc (modified) (1 diff)

src/InitTweak/FixGlobalInit.cc

@@ -102 +102 @@
                 if ( ConstructorInit * ctorInit = dynamic_cast< ConstructorInit * >( objDecl->get_init() ) ) {
                         // a decision should have been made by the resolver, so ctor and init are not both non-NULL
-                        assert( ! ctorInit->get_ctor() || ! ctorInit->get_init() );
+                        assert( ! ctorInit->ctor || ! ctorInit->init );
 
-                        Statement * dtor = ctorInit->get_dtor();
+                        Statement * dtor = ctorInit->dtor;
                         if ( dtor && ! isIntrinsicSingleArgCallStmt( dtor ) ) {
                                 // don't need to call intrinsic dtor, because it does nothing, but
                                 // non-intrinsic dtors must be called
                                 destroyStatements.push_front( dtor );
-                                ctorInit->set_dtor( NULL );
+                                ctorInit->dtor = nullptr;
                         } // if
-                        if ( Statement * ctor = ctorInit->get_ctor() ) {
+                        if ( Statement * ctor = ctorInit->ctor ) {
                                 initStatements.push_back( ctor );
-                                objDecl->set_init( NULL );
-                                ctorInit->set_ctor( NULL );
-                        } else if ( Initializer * init = ctorInit->get_init() ) {
-                                objDecl->set_init( init );
-                                ctorInit->set_init( NULL );
+                                objDecl->init = nullptr;
+                                ctorInit->ctor = nullptr;
+                        } else if ( Initializer * init = ctorInit->init ) {
+                                objDecl->init = init;
+                                ctorInit->init = nullptr;
                         } else {
                                 // no constructor and no initializer, which is okay
-                                objDecl->set_init( NULL );
+                                objDecl->init = nullptr;
                         } // if
                         delete ctorInit;

src/InitTweak/InitTweak.cc

@@ -408 +408 @@
                 return allofCtorDtor( stmt, []( Expression * callExpr ){
                         if ( ApplicationExpr * appExpr = isIntrinsicCallExpr( callExpr ) ) {
-                                FunctionType *funcType = GenPoly::getFunctionType( appExpr->get_function()->get_result() );
+                                FunctionType *funcType = GenPoly::getFunctionType( appExpr->function->result );
                                 assert( funcType );
                                 return funcType->get_parameters().size() == 1;

src/ResolvExpr/CurrentObject.cc

@@ -139 +139 @@
                 ArrayIterator( ArrayType * at ) : array( at ) {
                         PRINT( std::cerr << "Creating array iterator: " << at << std::endl; )
-                        base = at->get_base();
+                        base = at->base;
                         memberIter = createMemberIterator( base );
-                        if ( at->isVarLen ) SemanticError( at, "VLA initialization does not support @=" );
-                        setSize( at->get_dimension() );
+                        if ( at->isVarLen ) SemanticError( at, "VLA initialization does not support @=: " );
+                        setSize( at->dimension );
                 }
 

src/SymTab/Validate.cc

@@ -1232 +1232 @@
         void ArrayLength::previsit( ObjectDecl * objDecl ) {
                 if ( ArrayType * at = dynamic_cast< ArrayType * >( objDecl->type ) ) {
-                        if ( at->get_dimension() ) return;
+                        if ( at->dimension ) return;
                         if ( ListInit * init = dynamic_cast< ListInit * >( objDecl->init ) ) {
-                                at->set_dimension( new ConstantExpr( Constant::from_ulong( init->initializers.size() ) ) );
+                                at->dimension = new ConstantExpr( Constant::from_ulong( init->initializers.size() ) );
                         }
                 }