Changes in src/SymTab/Validate.cc [be9288a:b128d3e]

File:

• src/SymTab/Validate.cc (modified) (9 diffs)

src/SymTab/Validate.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 21:50:04 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Tus Aug  8 13:27:00 2017
-// Update Count     : 358
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Mon Aug 28 13:47:23 2017
+// Update Count     : 359
 //
 
@@ -47 +47 @@
 
 #include "CodeGen/CodeGenerator.h"     // for genName
+#include "CodeGen/OperatorTable.h"     // for isCtorDtor, isCtorDtorAssign
 #include "Common/PassVisitor.h"        // for PassVisitor, WithDeclsToAdd
 #include "Common/ScopedMap.h"          // for ScopedMap
@@ -239 +240 @@
         };
 
+
+        FunctionDecl * dereferenceOperator = nullptr;
+        struct FindSpecialDeclarations final {
+                void previsit( FunctionDecl * funcDecl );
+        };
+
         void validate( std::list< Declaration * > &translationUnit, bool doDebug ) {
                 PassVisitor<EnumAndPointerDecay> epc;
@@ -245 +252 @@
                 PassVisitor<CompoundLiteral> compoundliteral;
                 PassVisitor<ValidateGenericParameters> genericParams;
+                PassVisitor<FindSpecialDeclarations> finder;
 
                 EliminateTypedef::eliminateTypedef( translationUnit );
@@ -261 +269 @@
                 acceptAll( translationUnit, fpd );
                 ArrayLength::computeLength( translationUnit );
+                acceptAll( translationUnit, finder );
         }
 
@@ -458 +467 @@
                         return;
                 }
+
+                // handle other traits
                 TraitDecl *traitDecl = indexer->lookupTrait( traitInst->get_name() );
                 if ( ! traitDecl ) {
@@ -653 +664 @@
                 } else {
                         TypeDeclMap::const_iterator base = typedeclNames.find( typeInst->get_name() );
-                        assertf( base != typedeclNames.end(), "Can't find typedecl name %s", typeInst->get_name().c_str() );
+                        assertf( base != typedeclNames.end(), "Cannot find typedecl name %s", typeInst->get_name().c_str() );
                         typeInst->set_baseType( base->second );
                 } // if
@@ -821 +832 @@
                 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 );
                         }
-                        PointerType * ptrType = dynamic_cast< PointerType * >( params.front()->get_type() );
-                        if ( ! ptrType || ptrType->is_array() ) {
-                                throw SemanticError( "First parameter of a constructor, destructor, or assignment function must be a pointer ", funcDecl );
+                        ReferenceType * refType = dynamic_cast< ReferenceType * >( params.front()->get_type() );
+                        if ( ! refType ) {
+                                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 );
                         }
@@ -945 +956 @@
                 }
         }
+
+        void FindSpecialDeclarations::previsit( FunctionDecl * funcDecl ) {
+                if ( ! dereferenceOperator ) {
+                        if ( funcDecl->get_name() == "*?" && funcDecl->get_linkage() == LinkageSpec::Intrinsic ) {
+                                FunctionType * ftype = funcDecl->get_functionType();
+                                if ( ftype->get_parameters().size() == 1 && ftype->get_parameters().front()->get_type()->get_qualifiers() == Type::Qualifiers() ) {
+                                        dereferenceOperator = funcDecl;
+                                }
+                        }
+                }
+        }
 } // namespace SymTab