Changeset 136ccd7 for src/ResolvExpr/PtrsCastable.cc

Timestamp:

Nov 3, 2017, 3:01:31 PM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

4ee36bf0

Parents:

4ee1efb (diff), 760ba67 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into cleanup-dtors

File:

• src/ResolvExpr/PtrsCastable.cc (modified) (4 diffs)

src/ResolvExpr/PtrsCastable.cc

@@ -50 +50 @@
         };
 
-        int objectCast( Type *src, const TypeEnvironment &env, const SymTab::Indexer &indexer ) {
-                if ( dynamic_cast< FunctionType* >( src ) ) {
-                        return -1;
-                } else if ( TypeInstType *typeInst = dynamic_cast< TypeInstType* >( src ) ) {
-                        EqvClass eqvClass;
-                        if ( NamedTypeDecl *ntDecl = indexer.lookupType( typeInst->get_name() ) ) {
-                                if ( TypeDecl *tyDecl = dynamic_cast< TypeDecl* >( ntDecl ) ) {
-                                        if ( tyDecl->get_kind() == TypeDecl::Ftype ) {
+        namespace {
+                int objectCast( Type *src, const TypeEnvironment &env, const SymTab::Indexer &indexer ) {
+                        if ( dynamic_cast< FunctionType* >( src ) ) {
+                                return -1;
+                        } else if ( TypeInstType *typeInst = dynamic_cast< TypeInstType* >( src ) ) {
+                                EqvClass eqvClass;
+                                if ( NamedTypeDecl *ntDecl = indexer.lookupType( typeInst->get_name() ) ) {
+                                        if ( TypeDecl *tyDecl = dynamic_cast< TypeDecl* >( ntDecl ) ) {
+                                                if ( tyDecl->get_kind() == TypeDecl::Ftype ) {
+                                                        return -1;
+                                                } // if
+                                        } //if
+                                } else if ( env.lookup( typeInst->get_name(), eqvClass ) ) {
+                                        if ( eqvClass.data.kind == TypeDecl::Ftype ) {
                                                 return -1;
                                         } // if
-                                } //if
-                        } else if ( env.lookup( typeInst->get_name(), eqvClass ) ) {
-                                if ( eqvClass.data.kind == TypeDecl::Ftype ) {
-                                        return -1;
                                 } // if
-                        } // if
-                } //if
-                return 1;
-        }
-        int functionCast( Type *src, const TypeEnvironment &env, const SymTab::Indexer &indexer ) {
-                return -1 * objectCast( src, env, indexer );  // reverse the sense of objectCast
+                        } //if
+                        return 1;
+                }
+                int functionCast( Type *src, const TypeEnvironment &env, const SymTab::Indexer &indexer ) {
+                        return -1 * objectCast( src, env, indexer );  // reverse the sense of objectCast
+                }
         }
 
@@ -93 +95 @@
         }
 
-        void PtrsCastable::visit( __attribute__((unused)) VoidType *voidType) {
+        void PtrsCastable::visit( VoidType * ) {
                 result = objectCast( dest, env, indexer );
         }
 
-        void PtrsCastable::visit( __attribute__((unused)) BasicType *basicType) {
+        void PtrsCastable::visit( BasicType * ) {
                 result = objectCast( dest, env, indexer );
         }
 
-        void PtrsCastable::visit( __attribute__((unused)) PointerType *pointerType) {
+        void PtrsCastable::visit( PointerType * ) {
                 result = objectCast( dest, env, indexer );
         }
 
-        void PtrsCastable::visit( __attribute__((unused)) ArrayType *arrayType) {
+        void PtrsCastable::visit( ArrayType * ) {
                 result = objectCast( dest, env, indexer );
         }
 
-        void PtrsCastable::visit( __attribute__((unused)) FunctionType *functionType) {
+        void PtrsCastable::visit( FunctionType * ) {
                 // result = -1;
                 result = functionCast( dest, env, indexer );
         }
 
-        void PtrsCastable::visit( __attribute__((unused)) StructInstType *inst) {
+        void PtrsCastable::visit( StructInstType * ) {
                 result = objectCast( dest, env, indexer );
         }
 
-        void PtrsCastable::visit( __attribute__((unused)) UnionInstType *inst) {
+        void PtrsCastable::visit( UnionInstType * ) {
                 result = objectCast( dest, env, indexer );
         }
 
-        void PtrsCastable::visit( __attribute__((unused)) EnumInstType *inst) {
+        void PtrsCastable::visit( EnumInstType * ) {
                 if ( dynamic_cast< EnumInstType* >( dest ) ) {
                         result = 1;
@@ -136 +138 @@
         }
 
-        void PtrsCastable::visit( __attribute__((unused)) TraitInstType *inst ) {}
+        void PtrsCastable::visit( TraitInstType * ) {}
 
         void PtrsCastable::visit(TypeInstType *inst) {
@@ -143 +145 @@
         }
 
-        void PtrsCastable::visit( __attribute__((unused)) TupleType *tupleType) {
+        void PtrsCastable::visit( TupleType * ) {
                 result = objectCast( dest, env, indexer );
         }
 
-        void PtrsCastable::visit( __attribute__((unused)) VarArgsType *varArgsType) {
+        void PtrsCastable::visit( VarArgsType * ) {
                 result = objectCast( dest, env, indexer );
         }
 
-        void PtrsCastable::visit( __attribute__((unused)) ZeroType *zeroType) {
+        void PtrsCastable::visit( ZeroType * ) {
                 result = objectCast( dest, env, indexer );
         }
 
-        void PtrsCastable::visit( __attribute__((unused)) OneType *oneType) {
+        void PtrsCastable::visit( OneType * ) {
                 result = objectCast( dest, env, indexer );
         }