Changes in src/SymTab/Validate.cc [8686f31:1869adf]

File:

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

src/SymTab/Validate.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 21:50:04 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Tue Jul 07 10:41:23 2015
-// Update Count     : 136
+// Last Modified On : Wed Jun 24 16:20:50 2015
+// Update Count     : 30
 //
 
@@ -52 +52 @@
 #include "UniqueName.h"
 #include "AddVisit.h"
-#include "MakeLibCfa.h"
 
 
@@ -127 +126 @@
                 std::list< Declaration * > &get_declsToAdd() { return declsToAdd; }
   
-                virtual void visit( EnumDecl *enumDecl );
                 virtual void visit( StructDecl *structDecl );
                 virtual void visit( UnionDecl *structDecl );
@@ -293 +291 @@
   
                 for ( std::list< Declaration * >::iterator i = enumDecl->get_members().begin(); i != enumDecl->get_members().end(); ++i ) {
-                        ObjectDecl * obj = dynamic_cast< ObjectDecl * >( *i );
+                        ObjectDecl *obj = dynamic_cast< ObjectDecl * >( *i );
                         assert( obj );
-                        // obj->set_type( new EnumInstType( Type::Qualifiers( true, false, false, false, false, false ), enumDecl->get_name() ) );
-                        BasicType * enumType = new BasicType( Type::Qualifiers(), BasicType::SignedInt );
-                        obj->set_type( enumType ) ;
+                        obj->set_type( new EnumInstType( Type::Qualifiers( true, false, false, false, false, false ), enumDecl->get_name() ) );
                 } // for
                 Parent::visit( enumDecl );
@@ -547 +543 @@
         }
 
-        //E ?=?(E volatile*, int), 
-        //  ?=?(E _Atomic volatile*, int);
-        void makeEnumAssignment( EnumDecl *enumDecl, EnumInstType *refType, unsigned int functionNesting, std::list< Declaration * > &declsToAdd ) {
-                FunctionType *assignType = new FunctionType( Type::Qualifiers(), false );
-  
-                ObjectDecl *returnVal = new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, refType->clone(), 0 );
-                assignType->get_returnVals().push_back( returnVal );
-
-                // need two assignment operators with different types
-                FunctionType * assignType2 = assignType->clone();
-
-                // E ?=?(E volatile *, E)
-                Type *etype = refType->clone();
-                // etype->get_qualifiers() += Type::Qualifiers(false, true, false, false, false, false);
-
-                ObjectDecl *dstParam = new ObjectDecl( "_dst", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new PointerType( Type::Qualifiers(), etype ), 0 );
-                assignType->get_parameters().push_back( dstParam );
-
-                ObjectDecl *srcParam = new ObjectDecl( "_src", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, etype->clone(), 0 );
-                assignType->get_parameters().push_back( srcParam );
-
-                // E ?=?(E volatile *, int)
-                assignType2->get_parameters().push_back( dstParam->clone() );
-                BasicType * paramType = new BasicType(Type::Qualifiers(), BasicType::SignedInt); 
-                ObjectDecl *srcParam2 = new ObjectDecl( "_src", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, paramType, 0 );
-                assignType2->get_parameters().push_back( srcParam2 );
-
-                // Routines at global scope marked "static" to prevent multiple definitions is separate translation units
-                // because each unit generates copies of the default routines for each aggregate.
-
-                // since there is no definition, these should not be inline
-                // make these intrinsic so that the code generator does not make use of them
-                FunctionDecl *assignDecl = new FunctionDecl( "?=?", functionNesting > 0 ? DeclarationNode::NoStorageClass : DeclarationNode::Static, LinkageSpec::Intrinsic, assignType, 0, false, false );
-                assignDecl->fixUniqueId();
-                FunctionDecl *assignDecl2 = new FunctionDecl( "?=?", functionNesting > 0 ? DeclarationNode::NoStorageClass : DeclarationNode::Static, LinkageSpec::Intrinsic, assignType2, 0, false, false );
-                assignDecl2->fixUniqueId();
-
-                std::list< Declaration * > assigns;
-                assigns.push_back( assignDecl );
-                assigns.push_back( assignDecl2 );
-
-                LibCfa::makeLibCfa( assigns );
-
-                // need to remove the prototypes, since these can appear nested in a routine
-                for (int start = 0, end = assigns.size()/2; start < end; start++) {
-                        delete assigns.front();
-                        assigns.pop_front();
-                }
-
-                declsToAdd.insert( declsToAdd.begin(), assigns.begin(), assigns.end() );
-
-                // return assignDecl;
-        }
-
-
         Declaration *makeStructAssignment( StructDecl *aggregateDecl, StructInstType *refType, unsigned int functionNesting ) {
                 FunctionType *assignType = new FunctionType( Type::Qualifiers(), false );
@@ -671 +612 @@
   
                 return assignDecl;
-        }
-
-        void AddStructAssignment::visit( EnumDecl *enumDecl ) {
-                if ( ! enumDecl->get_members().empty() ) {
-                        EnumInstType *enumInst = new EnumInstType( Type::Qualifiers(), enumDecl->get_name() );
-                        // enumInst->set_baseEnum( enumDecl );
-                        // declsToAdd.push_back( 
-                        makeEnumAssignment( enumDecl, enumInst, functionNesting, declsToAdd );
-                }
         }