Changeset c93bc28 for src/ResolvExpr

Timestamp:

Aug 15, 2017, 7:00:40 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:

f6582243

Parents:

db67b11

Message:

Minor cleanup, debug statements

Location:

src/ResolvExpr

Files:

• AlternativeFinder.cc (modified) (2 diffs)
• CommonType.cc (modified) (10 diffs)
• ResolveTypeof.cc (modified) (1 diff)

src/ResolvExpr/AlternativeFinder.cc

@@ -241 +241 @@
         void AlternativeFinder::addAggMembers( StructOrUnionType *aggInst, Expression *expr, const Cost &newCost, const TypeEnvironment & env, Expression * member ) {
                 // by this point, member must be a name expr
-                NameExpr * nameExpr = safe_dynamic_cast< NameExpr * >( member );
+                NameExpr * nameExpr = dynamic_cast< NameExpr * >( member );
+                if ( ! nameExpr ) return;
                 const std::string & name = nameExpr->get_name();
                 std::list< Declaration* > members;
@@ -263 +264 @@
                         // during parsing and reusing that information here.
                         std::stringstream ss( constantExpr->get_constant()->get_value() );
-                        int val;
+                        int val = 0;
                         std::string tmp;
                         if ( ss >> val && ! (ss >> tmp) ) {

src/ResolvExpr/CommonType.cc

@@ -61 +61 @@
                         // std::cerr << "unify success" << std::endl;
                         if ( widenSecond ) {
+                                // std::cerr << "widen second" << std::endl;
                                 if ( widenFirst || other->get_qualifiers() <= refType->get_qualifiers() ) {
                                         result = new ReferenceType( refType->get_qualifiers(), common ); // refType->clone();
@@ -66 +67 @@
                                 }
                         } else if ( widenFirst ) {
+                                // std::cerr << "widen first" << std::endl;
                                 if ( widenSecond || refType->get_qualifiers() <= other->get_qualifiers() ) {
                                         result = common;
@@ -123 +125 @@
                 } // if
 #ifdef DEBUG
-                std::cout << "============= commonType" << std::endl << "type1 is ";
-                type1->print( std::cout );
-                std::cout << " type2 is ";
-                type2->print( std::cout );
+                std::cerr << "============= commonType" << std::endl << "type1 is ";
+                type1->print( std::cerr );
+                std::cerr << " type2 is ";
+                type2->print( std::cerr );
                 if ( result ) {
-                        std::cout << " common type is ";
-                        result->print( std::cout );
+                        std::cerr << " common type is ";
+                        result->print( std::cerr );
                 } else {
-                        std::cout << " no common type";
-                } // if
-                std::cout << std::endl;
+                        std::cerr << " no common type";
+                } // if
+                std::cerr << std::endl;
 #endif
                 return result;
@@ -201 +203 @@
         void CommonType::visit( PointerType *pointerType ) {
                 if ( PointerType *otherPointer = dynamic_cast< PointerType* >( type2 ) ) {
+                        // std::cerr << "commonType: two pointers: " << pointerType << " / " << otherPointer << std::endl;
                         if ( widenFirst && dynamic_cast< VoidType* >( otherPointer->get_base() ) && ! isFtype(pointerType->get_base()) ) {
                                 getCommonWithVoidPointer( otherPointer, pointerType );
@@ -207 +210 @@
                         } else if ( ( pointerType->get_base()->get_qualifiers() >= otherPointer->get_base()->get_qualifiers() || widenFirst )
                                            && ( pointerType->get_base()->get_qualifiers() <= otherPointer->get_base()->get_qualifiers() || widenSecond ) ) {
+                                // std::cerr << "middle case" << std::endl;
                                 Type::Qualifiers tq1 = pointerType->get_base()->get_qualifiers(), tq2 = otherPointer->get_base()->get_qualifiers();
                                 pointerType->get_base()->get_qualifiers() = Type::Qualifiers();
@@ -213 +217 @@
                                 OpenVarSet newOpen( openVars );
                                 if ( unifyExact( pointerType->get_base(), otherPointer->get_base(), env, have, need, newOpen, indexer ) ) {
+                                        // std::cerr << "unifyExact success" << std::endl;
                                         if ( tq1 < tq2 ) {
                                                 result = pointerType->clone();
@@ -220 +225 @@
                                         result->get_qualifiers() = tq1 | tq2;
                                 } else {
-                                        /// std::cout << "place for ptr-to-type" << std::endl;
+                                        /// std::cerr << "place for ptr-to-type" << std::endl;
                                 } // if
                                 pointerType->get_base()->get_qualifiers() = tq1;
@@ -235 +240 @@
         void CommonType::visit( ReferenceType *refType ) {
                 if ( ReferenceType *otherRef = dynamic_cast< ReferenceType* >( type2 ) ) {
+                        // std::cerr << "commonType: both references: " << refType << " / " << otherRef << std::endl;
+                        // std::cerr << ( refType->get_base()->get_qualifiers() >= otherRef->get_base()->get_qualifiers() || widenFirst ) << (refType->get_base()->get_qualifiers() <= otherRef->get_base()->get_qualifiers() || widenSecond) << std::endl;
                         if ( widenFirst && dynamic_cast< VoidType* >( otherRef->get_base() ) && ! isFtype(refType->get_base()) ) {
                                 getCommonWithVoidPointer( otherRef, refType );
@@ -241 +248 @@
                         } else if ( ( refType->get_base()->get_qualifiers() >= otherRef->get_base()->get_qualifiers() || widenFirst )
                                            && ( refType->get_base()->get_qualifiers() <= otherRef->get_base()->get_qualifiers() || widenSecond ) ) {
+                                // std::cerr << "middle case" << std::endl;
                                 Type::Qualifiers tq1 = refType->get_base()->get_qualifiers(), tq2 = otherRef->get_base()->get_qualifiers();
                                 refType->get_base()->get_qualifiers() = Type::Qualifiers();
@@ -254 +262 @@
                                         result->get_qualifiers() = tq1 | tq2;
                                 } else {
-                                        /// std::cout << "place for ptr-to-type" << std::endl;
+                                        /// std::cerr << "place for ptr-to-type" << std::endl;
                                 } // if
                                 refType->get_base()->get_qualifiers() = tq1;

src/ResolvExpr/ResolveTypeof.cc

@@ -60 +60 @@
                         assert( newExpr->has_result() && ! newExpr->get_result()->isVoid() );
                         Type *newType = newExpr->get_result();
+                        newExpr->set_result( nullptr );
                         delete typeofType;
+                        delete newExpr;
                         return newType;
                 } // if