Changeset 0b3b2ae

Timestamp:

Jun 22, 2018, 3:43:19 PM (6 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:

ed34540

Parents:

c194661

git-author:

Rob Schluntz <rschlunt@…> (06/22/18 14:48:30)

git-committer:

Rob Schluntz <rschlunt@…> (06/22/18 15:43:19)

Message:

Minor code cleanup

Location:

src

Files:

• CodeGen/CodeGenerator.cc (modified) (3 diffs)
• SymTab/Validate.cc (modified) (13 diffs)
• SynTree/ReferenceToType.cc (modified) (3 diffs)
• SynTree/Type.cc (modified) (1 diff)
• SynTree/Type.h (modified) (4 diffs)

src/CodeGen/CodeGenerator.cc

@@ -164 +164 @@
                 previsit( (BaseSyntaxNode *)node );
                 GuardAction( [this, node](){
-                        if ( printExprTypes ) {
+                        if ( printExprTypes && node->result ) {
                                 output << " /* " << genType( node->result, "", pretty, genC ) << " */ ";
                         }
@@ -224 +224 @@
 
         void CodeGenerator::handleAggregate( AggregateDecl * aggDecl, const std::string & kind ) {
-                if( ! aggDecl->get_parameters().empty() && ! genC ) {
+                if( ! aggDecl->parameters.empty() && ! genC ) {
                         // assertf( ! genC, "Aggregate type parameters should not reach code generation." );
                         output << "forall(";
-                        genCommaList( aggDecl->get_parameters().begin(), aggDecl->get_parameters().end() );
+                        genCommaList( aggDecl->parameters.begin(), aggDecl->parameters.end() );
                         output << ")" << endl;
                         output << indent;
@@ -233 +233 @@
 
                 output << kind;
-                genAttributes( aggDecl->get_attributes() );
-                output << aggDecl->get_name();
+                genAttributes( aggDecl->attributes );
+                output << aggDecl->name;
 
                 if ( aggDecl->has_body() ) {
-                        std::list< Declaration * > & memb = aggDecl->get_members();
+                        std::list< Declaration * > & memb = aggDecl->members;
                         output << " {" << endl;
 

src/SymTab/Validate.cc

@@ -379 +379 @@
         void EnumAndPointerDecay::previsit( EnumDecl *enumDecl ) {
                 // Set the type of each member of the enumeration to be EnumConstant
-                for ( std::list< Declaration * >::iterator i = enumDecl->get_members().begin(); i != enumDecl->get_members().end(); ++i ) {
+                for ( std::list< Declaration * >::iterator i = enumDecl->members.begin(); i != enumDecl->members.end(); ++i ) {
                         ObjectDecl * obj = dynamic_cast< ObjectDecl * >( *i );
                         assert( obj );
-                        obj->set_type( new EnumInstType( Type::Qualifiers( Type::Const ), enumDecl->get_name() ) );
+                        obj->set_type( new EnumInstType( Type::Qualifiers( Type::Const ), enumDecl->name ) );
                 } // for
         }
@@ -539 +539 @@
                         SemanticError( traitInst->location, "use of undeclared trait " + traitInst->name );
                 } // if
-                if ( traitDecl->get_parameters().size() != traitInst->get_parameters().size() ) {
+                if ( traitDecl->parameters.size() != traitInst->parameters.size() ) {
                         SemanticError( traitInst, "incorrect number of trait parameters: " );
                 } // if
@@ -715 +715 @@
                 if ( eliminator.pass.typedefNames.count( "size_t" ) ) {
                         // grab and remember declaration of size_t
-                        SizeType = eliminator.pass.typedefNames["size_t"].first->get_base()->clone();
+                        SizeType = eliminator.pass.typedefNames["size_t"].first->base->clone();
                 } else {
                         // xxx - missing global typedef for size_t - default to long unsigned int, even though that may be wrong
@@ -727 +727 @@
                 // instances of typedef types will come here. If it is an instance
                 // of a typdef type, link the instance to its actual type.
-                TypedefMap::const_iterator def = typedefNames.find( typeInst->get_name() );
+                TypedefMap::const_iterator def = typedefNames.find( typeInst->name );
                 if ( def != typedefNames.end() ) {
                         Type *ret = def->second.first->base->clone();
@@ -744 +744 @@
                                         SemanticError( typeInst->location, "Cannot apply type parameters to base type of " + typeInst->name );
                                 }
-                                rtt->get_parameters().clear();
+                                rtt->parameters.clear();
                                 cloneAll( typeInst->parameters, rtt->parameters );
                                 mutateAll( rtt->parameters, *visitor );  // recursively fix typedefs on parameters
@@ -751 +751 @@
                         return ret;
                 } else {
-                        TypeDeclMap::const_iterator base = typedeclNames.find( typeInst->get_name() );
+                        TypeDeclMap::const_iterator base = typedeclNames.find( typeInst->name );
                         assertf( base != typedeclNames.end(), "Cannot find typedecl name %s", typeInst->name.c_str() );
                         typeInst->set_baseType( base->second );
@@ -773 +773 @@
 
         Declaration *EliminateTypedef::postmutate( TypedefDecl * tyDecl ) {
-                if ( typedefNames.count( tyDecl->get_name() ) == 1 && typedefNames[ tyDecl->get_name() ].second == scopeLevel ) {
+                if ( typedefNames.count( tyDecl->name ) == 1 && typedefNames[ tyDecl->name ].second == scopeLevel ) {
                         // typedef to the same name from the same scope
                         // must be from the same type
 
-                        Type * t1 = tyDecl->get_base();
-                        Type * t2 = typedefNames[ tyDecl->get_name() ].first->get_base();
+                        Type * t1 = tyDecl->base;
+                        Type * t2 = typedefNames[ tyDecl->name ].first->base;
                         if ( ! ResolvExpr::typesCompatible( t1, t2, Indexer() ) ) {
                                 SemanticError( tyDecl->location, "Cannot redefine typedef: " + tyDecl->name );
@@ -790 +790 @@
                         }
                 } else {
-                        typedefNames[ tyDecl->get_name() ] = std::make_pair( TypedefDeclPtr( tyDecl ), scopeLevel );
+                        typedefNames[ tyDecl->name ] = std::make_pair( TypedefDeclPtr( tyDecl ), scopeLevel );
                 } // if
 
@@ -802 +802 @@
                 // Note, qualifiers on the typedef are superfluous for the forward declaration.
 
-                Type *designatorType = tyDecl->get_base()->stripDeclarator();
+                Type *designatorType = tyDecl->base->stripDeclarator();
                 if ( StructInstType *aggDecl = dynamic_cast< StructInstType * >( designatorType ) ) {
-                        return new StructDecl( aggDecl->get_name(), DeclarationNode::Struct, noAttributes, tyDecl->get_linkage() );
+                        return new StructDecl( aggDecl->name, DeclarationNode::Struct, noAttributes, tyDecl->linkage );
                 } else if ( UnionInstType *aggDecl = dynamic_cast< UnionInstType * >( designatorType ) ) {
-                        return new UnionDecl( aggDecl->get_name(), noAttributes, tyDecl->get_linkage() );
+                        return new UnionDecl( aggDecl->name, noAttributes, tyDecl->linkage );
                 } else if ( EnumInstType *enumDecl = dynamic_cast< EnumInstType * >( designatorType ) ) {
-                        return new EnumDecl( enumDecl->get_name(), noAttributes, tyDecl->get_linkage() );
+                        return new EnumDecl( enumDecl->name, noAttributes, tyDecl->linkage );
                 } else {
                         return tyDecl->clone();
@@ -815 +815 @@
 
         void EliminateTypedef::premutate( TypeDecl * typeDecl ) {
-                TypedefMap::iterator i = typedefNames.find( typeDecl->get_name() );
+                TypedefMap::iterator i = typedefNames.find( typeDecl->name );
                 if ( i != typedefNames.end() ) {
                         typedefNames.erase( i ) ;
                 } // if
 
-                typedeclNames[ typeDecl->get_name() ] = typeDecl;
+                typedeclNames[ typeDecl->name ] = typeDecl;
         }
 
@@ -832 +832 @@
 
         DeclarationWithType *EliminateTypedef::postmutate( ObjectDecl * objDecl ) {
-                if ( FunctionType *funtype = dynamic_cast<FunctionType *>( objDecl->get_type() ) ) { // function type?
+                if ( FunctionType *funtype = dynamic_cast<FunctionType *>( objDecl->type ) ) { // function type?
                         // replace the current object declaration with a function declaration
-                        FunctionDecl * newDecl = new FunctionDecl( objDecl->get_name(), objDecl->get_storageClasses(), objDecl->get_linkage(), funtype, 0, objDecl->get_attributes(), objDecl->get_funcSpec() );
-                        objDecl->get_attributes().clear();
+                        FunctionDecl * newDecl = new FunctionDecl( objDecl->name, objDecl->get_storageClasses(), objDecl->linkage, funtype, 0, objDecl->attributes, objDecl->get_funcSpec() );
+                        objDecl->attributes.clear();
                         objDecl->set_type( nullptr );
                         delete objDecl;
@@ -857 +857 @@
                 filter( compoundStmt->kids, [](Statement * stmt) {
                         if ( DeclStmt *declStmt = dynamic_cast< DeclStmt * >( stmt ) ) {
-                                if ( dynamic_cast< TypedefDecl * >( declStmt->get_decl() ) ) {
+                                if ( dynamic_cast< TypedefDecl * >( declStmt->decl ) ) {
                                         return true;
                                 } // if
@@ -1051 +1051 @@
 
         void ArrayLength::previsit( ObjectDecl * objDecl ) {
-                if ( ArrayType * at = dynamic_cast< ArrayType * >( objDecl->get_type() ) ) {
+                if ( ArrayType * at = dynamic_cast< ArrayType * >( objDecl->type ) ) {
                         if ( at->get_dimension() ) return;
-                        if ( ListInit * init = dynamic_cast< ListInit * >( objDecl->get_init() ) ) {
-                                at->set_dimension( new ConstantExpr( Constant::from_ulong( init->get_initializers().size() ) ) );
+                        if ( ListInit * init = dynamic_cast< ListInit * >( objDecl->init ) ) {
+                                at->set_dimension( new ConstantExpr( Constant::from_ulong( init->initializers.size() ) ) );
                         }
                 }

src/SynTree/ReferenceToType.cc

@@ -76 +76 @@
 bool StructInstType::isComplete() const { return baseStruct ? baseStruct->has_body() : false; }
 
-AggregateDecl * StructInstType::getAggr() { return baseStruct; }
+AggregateDecl * StructInstType::getAggr() const { return baseStruct; }
 
 TypeSubstitution StructInstType::genericSubstitution() const {
@@ -119 +119 @@
 bool UnionInstType::isComplete() const { return baseUnion ? baseUnion->has_body() : false; }
 
-AggregateDecl * UnionInstType::getAggr() { return baseUnion; }
+AggregateDecl * UnionInstType::getAggr() const { return baseUnion; }
 
 TypeSubstitution UnionInstType::genericSubstitution() const {
@@ -152 +152 @@
 bool EnumInstType::isComplete() const { return baseEnum ? baseEnum->has_body() : false; }
 
+AggregateDecl * EnumInstType::getAggr() const { return baseEnum; }
+
 void EnumInstType::print( std::ostream &os, Indenter indent ) const {
         using std::endl;

src/SynTree/Type.cc

@@ -129 +129 @@
 GlobalScopeType::GlobalScopeType() : Type( Type::Qualifiers(), {} ) {}
 
-void GlobalScopeType::print( std::ostream & os, Indenter indent ) const {
+void GlobalScopeType::print( std::ostream & os, Indenter ) const {
         os << "Global Scope Type" << endl;
 }

src/SynTree/Type.h

@@ -178 +178 @@
         virtual bool isComplete() const { return true; }
 
-        virtual AggregateDecl * getAggr() { assertf( false, "Non-aggregate type: %s", toCString( this ) ); }
+        virtual AggregateDecl * getAggr() const { assertf( false, "Non-aggregate type: %s", toCString( this ) ); }
 
         virtual TypeSubstitution genericSubstitution() const;
@@ -431 +431 @@
         virtual bool isComplete() const override;
 
-        virtual AggregateDecl * getAggr() override;
+        virtual AggregateDecl * getAggr() const override;
 
         virtual TypeSubstitution genericSubstitution() const override;
@@ -468 +468 @@
         virtual bool isComplete() const override;
 
-        virtual AggregateDecl * getAggr() override;
+        virtual AggregateDecl * getAggr() const override;
 
         virtual TypeSubstitution genericSubstitution() const override;
@@ -500 +500 @@
 
         virtual bool isComplete() const override;
+
+        virtual AggregateDecl * getAggr() const;
 
         virtual EnumInstType *clone() const override { return new EnumInstType( *this ); }