Changeset bff227f for src/SymTab

Timestamp:

Jul 21, 2017, 3:57:11 PM (7 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, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

9191a8e

Parents:

53a8e68

Message:

Refactor operator predicates into OperatorTable?.cc

Location:

src/SymTab

Files:

• Autogen.cc (modified) (5 diffs)
• Indexer.cc (modified) (3 diffs)
• Validate.cc (modified) (4 diffs)

src/SymTab/Autogen.cc

@@ -21 +21 @@
 #include "SynTree/TypeSubstitution.h"
 #include "Common/utility.h"
+#include "CodeGen/OperatorTable.h"
 #include "AddVisit.h"
 #include "MakeLibCfa.h"
@@ -223 +224 @@
                         FunctionType * ftype = data.genType( refType );
 
-                        if(concurrent_type && InitTweak::isDestructor( data.fname )) {
+                        if(concurrent_type && CodeGen::isDestructor( data.fname )) {
                                 ftype->get_parameters().front()->get_type()->set_mutex( true );
                         }
@@ -407 +408 @@
 
                 // field ctors are only generated if default constructor and copy constructor are both generated
-                unsigned numCtors = std::count_if( newFuncs.begin(), newFuncs.end(), [](FunctionDecl * dcl) { return InitTweak::isConstructor( dcl->get_name() ); } );
+                unsigned numCtors = std::count_if( newFuncs.begin(), newFuncs.end(), [](FunctionDecl * dcl) { return CodeGen::isConstructor( dcl->get_name() ); } );
 
                 if ( functionNesting == 0 ) {
@@ -422 +423 @@
                         // generate appropriate calls to member ctor, assignment
                         // destructor needs to do everything in reverse, so pass "forward" based on whether the function is a destructor
-                        if ( ! InitTweak::isDestructor( dcl->get_name() ) ) {
+                        if ( ! CodeGen::isDestructor( dcl->get_name() ) ) {
                                 makeStructFunctionBody( aggregateDecl->get_members().begin(), aggregateDecl->get_members().end(), dcl, isDynamicLayout );
                         } else {
                                 makeStructFunctionBody( aggregateDecl->get_members().rbegin(), aggregateDecl->get_members().rend(), dcl, isDynamicLayout, false );
                         }
-                        if ( InitTweak::isAssignment( dcl->get_name() ) ) {
+                        if ( CodeGen::isAssignment( dcl->get_name() ) ) {
                                 // assignment needs to return a value
                                 FunctionType * assignType = dcl->get_functionType();
@@ -486 +487 @@
 
                 makeUnionFieldsAssignment( srcParam, dstParam, back_inserter( funcDecl->get_statements()->get_kids() ) );
-                if ( InitTweak::isAssignment( funcDecl->get_name() ) ) {
+                if ( CodeGen::isAssignment( funcDecl->get_name() ) ) {
                         // also generate return statement in assignment
                         funcDecl->get_statements()->get_kids().push_back( new ReturnStmt( noLabels, new VariableExpr( srcParam ) ) );

src/SymTab/Indexer.cc

@@ -26 +26 @@
 
 #include "Common/utility.h"
+
+#include "CodeGen/OperatorTable.h"
 
 #include "ResolvExpr/typeops.h"
@@ -112 +114 @@
         void Indexer::removeSpecialOverrides( const std::string &id, std::list< DeclarationWithType * > & out ) const {
                 // only need to perform this step for constructors, destructors, and assignment functions
-                if ( ! InitTweak::isCtorDtorAssign( id ) ) return;
+                if ( ! CodeGen::isCtorDtorAssign( id ) ) return;
 
                 // helpful data structure
@@ -140 +142 @@
                                 decls.push_back( DeclBall{ function, isUserDefinedFunc, isDefaultCtor, isDtor, isCopyFunc } );
                                 existsUserDefinedFunc = existsUserDefinedFunc || isUserDefinedFunc;
-                                existsUserDefinedCtor = existsUserDefinedCtor || (isUserDefinedFunc && InitTweak::isConstructor( function->get_name() ) );
+                                existsUserDefinedCtor = existsUserDefinedCtor || (isUserDefinedFunc && CodeGen::isConstructor( function->get_name() ) );
                                 existsUserDefinedDtor = existsUserDefinedDtor || (isUserDefinedFunc && isDtor);
                                 existsUserDefinedCopyFunc = existsUserDefinedCopyFunc || (isUserDefinedFunc && isCopyFunc);

src/SymTab/Validate.cc

@@ -43 +43 @@
 
 #include "CodeGen/CodeGenerator.h"
+#include "CodeGen/OperatorTable.h"
 
 #include "Common/PassVisitor.h"
@@ -52 +53 @@
 
 #include "GenPoly/DeclMutator.h"
-
-#include "InitTweak/InitTweak.h"
 
 #include "AddVisit.h"
@@ -827 +826 @@
                 std::list< DeclarationWithType * > &params = funcType->get_parameters();
 
-                if ( InitTweak::isCtorDtorAssign( funcDecl->get_name() ) ) {
+                if ( CodeGen::isCtorDtorAssign( funcDecl->get_name() ) ) { // TODO: also check /=, etc.
                         if ( params.size() == 0 ) {
                                 throw SemanticError( "Constructors, destructors, and assignment functions require at least one parameter ", funcDecl );
@@ -835 +834 @@
                                 throw SemanticError( "First parameter of a constructor, destructor, or assignment function must be a reference ", funcDecl );
                         }
-                        if ( InitTweak::isCtorDtor( funcDecl->get_name() ) && returnVals.size() != 0 ) {
+                        if ( CodeGen::isCtorDtor( funcDecl->get_name() ) && returnVals.size() != 0 ) {
                                 throw SemanticError( "Constructors and destructors cannot have explicit return values ", funcDecl );
                         }