Changeset 86f852b

Timestamp:

Oct 19, 2017, 11:15:35 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:

84733c1

Parents:

b93a3de

git-author:

Rob Schluntz <rschlunt@…> (10/13/17 16:44:00)

git-committer:

Rob Schluntz <rschlunt@…> (10/19/17 11:15:35)

Message:

Update ctor-autogen test case with generic types

Location:

src

Files:

• CodeGen/GenType.cc (modified) (1 diff)
• tests/ctor-autogen.c (modified) (4 diffs)

src/CodeGen/GenType.cc

@@ -210 +210 @@
 
         std::string GenType::handleGeneric( ReferenceToType * refType ) {
-                if ( ! refType->get_parameters().empty() ) {
+                if ( ! refType->parameters.empty() ) {
                         std::ostringstream os;
                         PassVisitor<CodeGenerator> cg( os, pretty, genC, lineMarks );
                         os << "(";
-                        cg.pass.genCommaList( refType->get_parameters().begin(), refType->get_parameters().end() );
+                        cg.pass.genCommaList( refType->parameters.begin(), refType->parameters.end() );
                         os << ") ";
                         return os.str();

src/tests/ctor-autogen.c

@@ -32 +32 @@
 };
 
+// dtype-static generic type is otype
+forall(dtype T)
+struct DtypeStaticStruct {
+  T * data;
+  short size;
+};
+
+forall(dtype T)
+union DtypeStaticUnion {
+  T * data;
+  short size;
+};
+
+// dynamic generic type is otype
+forall(otype T)
+struct DynamicStruct {
+        T x;
+};
+
+forall(otype T)
+union DynamicUnion {
+        T x;
+};
+
+// struct/union that contains a generic type is
+struct GenericContainingStruct {
+        DynamicStruct(int) dsi;
+        DynamicStruct(double) dsd;
+        DynamicUnion(int) dui;
+        DynamicUnion(double) dud;
+        DtypeStaticStruct(int) dssi;
+        DtypeStaticStruct(float) dssf;
+        DtypeStaticUnion(int) dsui;
+        DtypeStaticUnion(float) dsuf;
+};
+
+union GenericContainingUnion {
+        DynamicStruct(int) dsi;
+        DynamicStruct(double) dsd;
+        DynamicUnion(int) dui;
+        DynamicUnion(double) dud;
+        DtypeStaticStruct(int) dssi;
+        DtypeStaticStruct(float) dssf;
+        DtypeStaticUnion(int) dsui;
+        DtypeStaticUnion(float) dsuf;
+};
+
+
+forall(otype T)
+T identity(T x) { return x; }
+
+// can identity e if only sized or only the assertion, but the combination breaks...
+// forall(dtype T | sized(T) | { void ?{}(T &); })
+// void identity(T x) {  }
+
+#if ERR1
 // managed type - defines a constructor - can't use field constructors
 struct Managed {
@@ -44 +100 @@
 };
 
-forall(otype T)
-T identity(T x) { return x; }
+Managed x = { 123 }; // error
+Managed y;           // okay
 
-// can identity e if only sized or only the assertion, but the combination breaks...
-// forall(dtype T | sized(T) | { void ?{}(T &); })
-// void identity(T x) {  }
+InheritManaged z = { y };  // error?
+#endif
 
 int main() {
@@ -56 +111 @@
         Color e;
 
-        // identity(R);  // Color should be an otype
-        // identity((Color)e);
+        // identity(R);  Color constant should be Color which is otype
+        identity(e);  // Color should be an otype
         identity(u);  // U should be an otype
         identity(s);  // S should be an otype
@@ -73 +128 @@
         identity(pu); // should recursively be an otype
 
-#if ERR1
-        Managed x = { 123 }; // error
-        Managed y;           // okay
+        DynamicStruct(int) dsi;
+        DynamicStruct(double) dsd;
+        DynamicUnion(int) dui;
+        DynamicUnion(double) dud;
+        DtypeStaticStruct(int) dssi;
+        DtypeStaticStruct(float) dssf;
+        DtypeStaticUnion(int) dsui;
+        DtypeStaticUnion(float) dsuf;
 
-        InheritManaged z = { y };  // error?
-#endif
+        identity(dsi);
+        identity(dsd);
+        // identity(dui); // xxx - codegen errors in generated thunk _temp3 (Box-pass-generated assignment return-temporary)
+        // identity(dud);
+        identity(dssi);
+        identity(dssf);
+        identity(dsui);
+        identity(dsuf);
 
+        GenericContainingStruct gcs;
+        GenericContainingUnion gcu;
+
+        identity(gcs);
+        identity(gcu);
 }