Changeset 7030dab for src/Tuples

Timestamp:

Apr 6, 2020, 4:46:28 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

e3bc51c

Parents:

71d6bd8 (diff), 057298e (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 new-ast

Location:

src/Tuples

Files:

• TupleAssignment.cc (modified) (3 diffs)
• TupleExpansion.cc (modified) (3 diffs)

src/Tuples/TupleAssignment.cc ¶

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Mar 17 09:43:03 2017
-// Update Count     : 8
+// Last Modified On : Fri Dec 13 23:45:33 2019
+// Update Count     : 9
 //
 
@@ -34 +34 @@
 #include "InitTweak/GenInit.h"             // for genCtorInit
 #include "InitTweak/InitTweak.h"           // for getPointerBase, isAssignment
-#include "Parser/LinkageSpec.h"            // for Cforall
 #include "ResolvExpr/Alternative.h"        // for AltList, Alternative
 #include "ResolvExpr/AlternativeFinder.h"  // for AlternativeFinder, simpleC...
@@ -41 +40 @@
 #include "ResolvExpr/TypeEnvironment.h"    // for TypeEnvironment
 #include "ResolvExpr/typeops.h"            // for combos
+#include "SynTree/LinkageSpec.h"           // for Cforall
 #include "SynTree/Declaration.h"           // for ObjectDecl
 #include "SynTree/Expression.h"            // for Expression, CastExpr, Name...

src/Tuples/TupleExpansion.cc ¶

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Fri Oct  4 15:38:00 2019
-// Update Count     : 23
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Dec 13 23:45:51 2019
+// Update Count     : 24
 //
 
@@ -27 +27 @@
 #include "Common/utility.h"       // for CodeLocation
 #include "InitTweak/InitTweak.h"  // for getFunction
-#include "Parser/LinkageSpec.h"   // for Spec, C, Intrinsic
+#include "SynTree/LinkageSpec.h"  // for Spec, C, Intrinsic
 #include "SynTree/Constant.h"     // for Constant
 #include "SynTree/Declaration.h"  // for StructDecl, DeclarationWithType
@@ -361 +361 @@
         const ast::TypeInstType * isTtype( const ast::Type * type ) {
                 if ( const ast::TypeInstType * inst = dynamic_cast< const ast::TypeInstType * >( type ) ) {
-                        if ( inst->base && inst->base->kind == ast::TypeVar::Ttype ) {
+                        if ( inst->base && inst->base->kind == ast::TypeDecl::Ttype ) {
                                 return inst;
                         }