Changeset e3e16bc for src/SymTab

Timestamp:

Sep 13, 2017, 2:34:55 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

982832e

Parents:

9f5ecf5

Message:

Renamed safe_dynamic_cast to strict_dynamic_cast

Location:

src/SymTab

Files:

• Autogen.cc (modified) (7 diffs)
• Indexer.cc (modified) (1 diff)
• Validate.cc (modified) (4 diffs)

src/SymTab/Autogen.cc

@@ -18 +18 @@
 #include <cstddef>                 // for NULL
 #include <algorithm>               // for count_if
-#include <cassert>                 // for safe_dynamic_cast, assert, assertf
+#include <cassert>                 // for strict_dynamic_cast, assert, assertf
 #include <iterator>                // for back_insert_iterator, back_inserter
 #include <list>                    // for list, _List_iterator, list<>::iter...
@@ -250 +250 @@
                 // parameters) are using in the variable exprs
                 assert( ftype->get_parameters().size() == 2 );
-                ObjectDecl * dstParam = safe_dynamic_cast< ObjectDecl * >( ftype->get_parameters().front() );
-                ObjectDecl * srcParam = safe_dynamic_cast< ObjectDecl * >( ftype->get_parameters().back() );
+                ObjectDecl * dstParam = strict_dynamic_cast< ObjectDecl * >( ftype->get_parameters().front() );
+                ObjectDecl * srcParam = strict_dynamic_cast< ObjectDecl * >( ftype->get_parameters().back() );
 
                 VariableExpr * assignVarExpr = new VariableExpr( assignDecl );
@@ -307 +307 @@
 
                 // assign to destination
-                Expression *dstselect = new MemberExpr( field, new CastExpr( new VariableExpr( dstParam ), safe_dynamic_cast< ReferenceType* >( dstParam->get_type() )->get_base()->clone() ) );
+                Expression *dstselect = new MemberExpr( field, new CastExpr( new VariableExpr( dstParam ), strict_dynamic_cast< ReferenceType* >( dstParam->get_type() )->get_base()->clone() ) );
                 genImplicitCall( srcParam, dstselect, func->get_name(), back_inserter( func->get_statements()->get_kids() ), field, forward );
         }
@@ -436 +436 @@
                                 FunctionType * assignType = dcl->get_functionType();
                                 assert( assignType->get_parameters().size() == 2 );
-                                ObjectDecl * srcParam = safe_dynamic_cast< ObjectDecl * >( assignType->get_parameters().back() );
+                                ObjectDecl * srcParam = strict_dynamic_cast< ObjectDecl * >( assignType->get_parameters().back() );
                                 dcl->get_statements()->get_kids().push_back( new ReturnStmt( noLabels, new VariableExpr( srcParam ) ) );
                         }
@@ -487 +487 @@
                 FunctionType * ftype = funcDecl->get_functionType();
                 assert( ftype->get_parameters().size() == 2 );
-                ObjectDecl * dstParam = safe_dynamic_cast< ObjectDecl * >( ftype->get_parameters().front() );
-                ObjectDecl * srcParam = safe_dynamic_cast< ObjectDecl * >( ftype->get_parameters().back() );
+                ObjectDecl * dstParam = strict_dynamic_cast< ObjectDecl * >( ftype->get_parameters().front() );
+                ObjectDecl * srcParam = strict_dynamic_cast< ObjectDecl * >( ftype->get_parameters().back() );
 
                 makeUnionFieldsAssignment( srcParam, dstParam, back_inserter( funcDecl->get_statements()->get_kids() ) );
@@ -700 +700 @@
 
         Type * AutogenTupleRoutines::mutate( TupleType * tupleType ) {
-                tupleType = safe_dynamic_cast< TupleType * >( Parent::mutate( tupleType ) );
+                tupleType = strict_dynamic_cast< TupleType * >( Parent::mutate( tupleType ) );
                 std::string mangleName = SymTab::Mangler::mangleType( tupleType );
                 if ( seenTuples.find( mangleName ) != seenTuples.end() ) return tupleType;
@@ -768 +768 @@
         CompoundStmt * AutogenTupleRoutines::mutate( CompoundStmt *compoundStmt ) {
                 seenTuples.beginScope();
-                compoundStmt = safe_dynamic_cast< CompoundStmt * >( Parent::mutate( compoundStmt ) );
+                compoundStmt = strict_dynamic_cast< CompoundStmt * >( Parent::mutate( compoundStmt ) );
                 seenTuples.endScope();
                 return compoundStmt;

src/SymTab/Indexer.cc

@@ -16 +16 @@
 #include "Indexer.h"
 
-#include <cassert>                 // for assert, safe_dynamic_cast
+#include <cassert>                 // for assert, strict_dynamic_cast
 #include <iostream>                // for operator<<, basic_ostream, ostream
 #include <string>                  // for string, operator<<, operator!=

src/SymTab/Validate.cc

@@ -486 +486 @@
                 std::list< DeclarationWithType * > asserts;
                 for ( Declaration * decl : inst->baseTrait->members ) {
-                        asserts.push_back( safe_dynamic_cast<DeclarationWithType *>( decl->clone() ) );
+                        asserts.push_back( strict_dynamic_cast<DeclarationWithType *>( decl->clone() ) );
                 }
                 // substitute trait decl parameters for instance parameters
@@ -530 +530 @@
                 // need to carry over the 'sized' status of each decl in the instance
                 for ( auto p : group_iterate( traitDecl->get_parameters(), traitInst->get_parameters() ) ) {
-                        TypeExpr * expr = safe_dynamic_cast< TypeExpr * >( std::get<1>(p) );
+                        TypeExpr * expr = strict_dynamic_cast< TypeExpr * >( std::get<1>(p) );
                         if ( TypeInstType * inst = dynamic_cast< TypeInstType * >( expr->get_type() ) ) {
                                 TypeDecl * formalDecl = std::get<0>(p);
@@ -892 +892 @@
                         for ( size_t i = 0; paramIter != params->end(); ++paramIter, ++i ) {
                                 if ( i < args.size() ) {
-                                        TypeExpr * expr = safe_dynamic_cast< TypeExpr * >( *std::next( args.begin(), i ) );
+                                        TypeExpr * expr = strict_dynamic_cast< TypeExpr * >( *std::next( args.begin(), i ) );
                                         sub.add( (*paramIter)->get_name(), expr->get_type()->clone() );
                                 } else if ( i == args.size() ) {
@@ -962 +962 @@
                 if ( retVals.size() > 1 ) {
                         // generate a single return parameter which is the tuple of all of the return values
-                        TupleType * tupleType = safe_dynamic_cast< TupleType * >( ResolvExpr::extractResultType( ftype ) );
+                        TupleType * tupleType = strict_dynamic_cast< TupleType * >( ResolvExpr::extractResultType( ftype ) );
                         // ensure return value is not destructed by explicitly creating an empty ListInit node wherein maybeConstruct is false.
                         ObjectDecl * newRet = new ObjectDecl( "", Type::StorageClasses(), LinkageSpec::Cforall, 0, tupleType, new ListInit( std::list<Initializer*>(), noDesignators, false ) );