Changeset b067d9b for src/Tuples/Tuples.h

Timestamp:

Oct 29, 2019, 4:01:24 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

773db65, 9421f3d8

Parents:

7951100 (diff), 8364209 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/Tuples/Tuples.h (modified) (4 diffs)

src/Tuples/Tuples.h

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jul 22 09:55:00 2017
-// Update Count     : 16
+// Last Modified By : Andrew Beach
+// Last Modified On : Tue Jun 18 09:36:00 2019
+// Update Count     : 18
 //
 
@@ -19 +19 @@
 #include <vector>
 
+#include "AST/Fwd.hpp"
+#include "AST/Node.hpp"
 #include "SynTree/Expression.h"
 #include "SynTree/Declaration.h"
@@ -24 +26 @@
 
 #include "ResolvExpr/AlternativeFinder.h"
+#include "ResolvExpr/CandidateFinder.hpp"
 
 namespace Tuples {
         // TupleAssignment.cc
-        void handleTupleAssignment( ResolvExpr::AlternativeFinder & currentFinder, UntypedExpr * assign, 
+        void handleTupleAssignment( ResolvExpr::AlternativeFinder & currentFinder, UntypedExpr * assign,
                 std::vector< ResolvExpr::AlternativeFinder >& args );
-        
+        void handleTupleAssignment( 
+                ResolvExpr::CandidateFinder & finder, const ast::UntypedExpr * assign, 
+                std::vector< ResolvExpr::CandidateFinder > & args );
+
         // TupleExpansion.cc
         /// expands z.[a, b.[x, y], c] into [z.a, z.b.x, z.b.y, z.c], inserting UniqueExprs as appropriate
@@ -42 +48 @@
         /// returns VoidType if any of the expressions have Voidtype, otherwise TupleType of the Expression result types
         Type * makeTupleType( const std::list< Expression * > & exprs );
+        const ast::Type * makeTupleType( const std::vector<ast::ptr<ast::Expr>> & exprs );
 
         /// returns a TypeInstType if `type` is a ttype, nullptr otherwise
         TypeInstType * isTtype( Type * type );
+        const TypeInstType * isTtype( const Type * type );
+        const ast::TypeInstType * isTtype( const ast::Type * type );
 
         /// returns true if the expression may contain side-effects.
-        bool maybeImpure( Expression * expr );
+        bool maybeImpure( const Expression * expr );
+        bool maybeImpure( const ast::Expr * expr );
 
-        /// returns true if the expression may contain side-effect, ignoring the presence of unique expressions.
-        bool maybeImpureIgnoreUnique( Expression * expr );
+        /// Returns true if the expression may contain side-effect,
+        /// ignoring the presence of unique expressions.
+        bool maybeImpureIgnoreUnique( const Expression * expr );
+        bool maybeImpureIgnoreUnique( const ast::Expr * expr );
 } // namespace Tuples