Changeset d29fa5f for src/GenPoly/Box.cc

Timestamp:

Oct 2, 2017, 4:58:51 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:

effdde0

Parents:

bf4b4cf

Message:

Remove has_result

File:

• src/GenPoly/Box.cc (modified) (9 diffs)

src/GenPoly/Box.cc

@@ -600 +600 @@
 
                         // add size/align for generic types to parameter list
-                        if ( ! appExpr->get_function()->has_result() ) return;
+                        if ( ! appExpr->get_function()->result ) return;
                         FunctionType *funcType = getFunctionType( appExpr->get_function()->get_result() );
                         assert( funcType );
@@ -714 +714 @@
 
                 void Pass1::boxParam( Type *param, Expression *&arg, const TyVarMap &exprTyVars ) {
-                        assertf( arg->has_result(), "arg does not have result: %s", toString( arg ).c_str() );
+                        assertf( arg->result, "arg does not have result: %s", toString( arg ).c_str() );
                         if ( isPolyType( param, exprTyVars ) ) {
                                 Type * newType = arg->get_result()->clone();
@@ -965 +965 @@
                                 if ( varExpr->get_var()->get_linkage() == LinkageSpec::Intrinsic ) {
                                         if ( varExpr->get_var()->get_name() == "?[?]" ) {
-                                                assert( appExpr->has_result() );
+                                                assert( appExpr->result );
                                                 assert( appExpr->get_args().size() == 2 );
                                                 Type *baseType1 = isPolyPtr( appExpr->get_args().front()->get_result(), scopeTyVars, env );
@@ -999 +999 @@
                                                 } // if
                                         } else if ( varExpr->get_var()->get_name() == "*?" ) {
-                                                assert( appExpr->has_result() );
+                                                assert( appExpr->result );
                                                 assert( ! appExpr->get_args().empty() );
                                                 if ( isPolyType( appExpr->get_result(), scopeTyVars, env ) ) {
@@ -1016 +1016 @@
                                                 } // if
                                         } else if ( varExpr->get_var()->get_name() == "?++" || varExpr->get_var()->get_name() == "?--" ) {
-                                                assert( appExpr->has_result() );
+                                                assert( appExpr->result );
                                                 assert( appExpr->get_args().size() == 1 );
                                                 if ( Type *baseType = isPolyPtr( appExpr->get_result(), scopeTyVars, env ) ) {
@@ -1036 +1036 @@
                                                 } // if
                                         } else if ( varExpr->get_var()->get_name() == "++?" || varExpr->get_var()->get_name() == "--?" ) {
-                                                assert( appExpr->has_result() );
+                                                assert( appExpr->result );
                                                 assert( appExpr->get_args().size() == 1 );
                                                 if ( Type *baseType = isPolyPtr( appExpr->get_result(), scopeTyVars, env ) ) {
@@ -1042 +1042 @@
                                                 } // if
                                         } else if ( varExpr->get_var()->get_name() == "?+?" || varExpr->get_var()->get_name() == "?-?" ) {
-                                                assert( appExpr->has_result() );
+                                                assert( appExpr->result );
                                                 assert( appExpr->get_args().size() == 2 );
                                                 Type *baseType1 = isPolyPtr( appExpr->get_args().front()->get_result(), scopeTyVars, env );
@@ -1068 +1068 @@
                                                 } // if
                                         } else if ( varExpr->get_var()->get_name() == "?+=?" || varExpr->get_var()->get_name() == "?-=?" ) {
-                                                assert( appExpr->has_result() );
+                                                assert( appExpr->result );
                                                 assert( appExpr->get_args().size() == 2 );
                                                 Type *baseType = isPolyPtr( appExpr->get_result(), scopeTyVars, env );
@@ -1162 +1162 @@
                 void Pass1::premutate( AddressExpr * ) { visit_children = false; }
                 Expression * Pass1::postmutate( AddressExpr * addrExpr ) {
-                        assert( addrExpr->get_arg()->has_result() && ! addrExpr->get_arg()->get_result()->isVoid() );
+                        assert( addrExpr->get_arg()->result && ! addrExpr->get_arg()->get_result()->isVoid() );
 
                         bool needs = false;
                         if ( UntypedExpr *expr = dynamic_cast< UntypedExpr *>( addrExpr->get_arg() ) ) {
-                                if ( expr->has_result() && isPolyType( expr->get_result(), scopeTyVars, env ) ) {
+                                if ( expr->result && isPolyType( expr->get_result(), scopeTyVars, env ) ) {
                                         if ( NameExpr *name = dynamic_cast< NameExpr *>( expr->get_function() ) ) {
                                                 if ( name->get_name() == "*?" ) {
                                                         if ( ApplicationExpr * appExpr = dynamic_cast< ApplicationExpr * >( expr->get_args().front() ) ) {
-                                                                assert( appExpr->get_function()->has_result() );
+                                                                assert( appExpr->get_function()->result );
                                                                 FunctionType *function = getFunctionType( appExpr->get_function()->get_result() );
                                                                 assert( function );