Changes in src/AST/Expr.cpp [10a1225:20a5977]

File:

• src/AST/Expr.cpp (modified) (4 diffs)

src/AST/Expr.cpp

@@ -20 +20 @@
 #include <vector>
 
+#include "GenericSubstitution.hpp"
 #include "Stmt.hpp"
 #include "Type.hpp"
+#include "TypeSubstitution.hpp"
+#include "Common/utility.h"
 #include "Common/SemanticError.h"
 #include "GenPoly/Lvalue.h"        // for referencesPermissable
@@ -156 +159 @@
         assert( aggregate->result );
 
-        assert(!"unimplemented; need TypeSubstitution, genericSubstitution");
+        // take ownership of member type
+        result = mem->get_type();
+        // substitute aggregate generic parameters into member type
+        genericSubsitution( aggregate->result ).apply( result );
+        // ensure lvalue and appropriate restrictions from aggregate type
+        result.get_and_mutate()->qualifiers |= aggregate->result->qualifiers | CV::Lvalue;
 }
 
@@ -233 +241 @@
                         FixedLen, DynamicDim },
                 std::string{"\""} + s + "\"",
-                (unsigned long long)0 };
+                (unsigned long long)0,
+                ConstantExpr::String };
 }
 
@@ -332 +341 @@
         stmts.emplace_back( new ExprStmt{ loc, tupleExpr } );
         stmtExpr = new StmtExpr{ loc, new CompoundStmt{ loc, std::move(stmts) } };
+}
+
+TupleAssignExpr::TupleAssignExpr(
+        const CodeLocation & loc, const Type * result, const StmtExpr * s )
+: Expr( loc, result ), stmtExpr() {
+        stmtExpr = s;
 }