Changeset 6d267ca

Timestamp:

Jul 25, 2017, 10:41:24 AM (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:

d335627

Parents:

9191a8e

Message:

Add unsafe_group_iterate

Location:

src

Files:

• Common/utility.h (modified) (2 diffs)
• Tuples/Explode.h (modified) (2 diffs)

src/Common/utility.h

@@ -310 +310 @@
 template< typename T1, typename T2 >
 struct group_iterate_t {
-        group_iterate_t( const T1 & v1, const T2 & v2 ) : args(v1, v2) {
-                assertf(v1.size() == v2.size(), "group iteration requires containers of the same size.");
+        group_iterate_t( bool skipBoundsCheck, const T1 & v1, const T2 & v2 ) : args(v1, v2) {
+                assertf(skipBoundsCheck || v1.size() == v2.size(), "group iteration requires containers of the same size: <%u, %u>.", v1.size(), v2.size());
         };
 
@@ -336 +336 @@
 };
 
+/// performs bounds check to ensure that all arguments are of the same length.
 template< typename... Args >
 group_iterate_t<Args...> group_iterate( Args &&... args ) {
-        return group_iterate_t<Args...>(std::forward<Args>( args )...);
+        return group_iterate_t<Args...>(false, std::forward<Args>( args )...);
+}
+
+/// does not perform a bounds check - requires user to ensure that iteration terminates when appropriate.
+template< typename... Args >
+group_iterate_t<Args...> unsafe_group_iterate( Args &&... args ) {
+        return group_iterate_t<Args...>(true, std::forward<Args>( args )...);
 }
 

src/Tuples/Explode.h

@@ -30 +30 @@
         template< typename OutputIterator >
         void explodeUnique( Expression * expr, const ResolvExpr::Alternative & alt, const SymTab::Indexer & indexer, OutputIterator out, bool isTupleAssign ) {
-                Type * res = expr->get_result();
+                Type * res = expr->get_result()->stripReferences();
                 if ( TupleType * tupleType = dynamic_cast< TupleType * > ( res ) ) {
                         if ( TupleExpr * tupleExpr = dynamic_cast< TupleExpr * >( expr ) ) {
@@ -38 +38 @@
                                 }
                         } else {
-                                // tuple type, but not tuple expr - recursively index into its components
+                                // tuple type, but not tuple expr - recursively index into its components.
+                                // if expr type is reference, convert to value type
                                 Expression * arg = expr->clone();
+
+                                if ( dynamic_cast<ReferenceType *>( arg->get_result() ) ) {
+                                        // TODO: does this go here (inside uniqueexpr) or outside uniqueexpr? I'm guessing probably should go after...
+                                        arg = new CastExpr( arg, tupleType->clone() );
+                                }
                                 if ( Tuples::maybeImpure( arg ) && ! dynamic_cast< UniqueExpr * >( arg ) ) {
                                         // expressions which may contain side effects require a single unique instance of the expression.