Changes in / [f4c2f1a:6380f78]

Location:

src

Files:

• AST/Expr.cpp (modified) (2 diffs)
• AST/GenericSubstitution.cpp (added)
• AST/GenericSubstitution.hpp (added)
• AST/Node.hpp (modified) (1 diff)
• AST/Pass.hpp (modified) (1 diff)
• AST/TypeSubstitution.hpp (modified) (3 diffs)
• AST/module.mk (modified) (1 diff)
• AST/porting.md (modified) (3 diffs)
• Makefile.in (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"
@@ -157 +159 @@
         assert( aggregate->result );
 
-        assert(!"unimplemented; need TypeSubstitution, genericSubstitution");
+        // take ownership of member type
+        Type * res = result.set_and_mutate( mem->get_type() );
+        // substitute aggregate generic parameters into member type
+        genericSubsitution( aggregate->result ).apply( res );
+        // ensure lvalue and appropriate restrictions from aggregate type
+        res->set_lvalue( true );
+        res->qualifiers |= aggregate->result->qualifiers;
+        // ensure changes propegated back into result
+        result = res;
 }
 

src/AST/Node.hpp

@@ -94 +94 @@
 std::ostream& operator<< ( std::ostream& out, const Node * node );
 
+/// Call a visitor on a possibly-null node
+template<typename node_t>
+auto maybe_accept( const node_t * n, Visitor & v ) -> decltype( n->accept(v) ) {
+        return n ? n->accept( v ) : nullptr;
+}
+
 /// Base class for the smart pointer types
 /// should never really be used.

src/AST/Pass.hpp

@@ -223 +223 @@
 };
 
+/// Apply a pass to an entire translation unit
 template<typename pass_t>
 void accept_all( std::list< ast::ptr<ast::Decl> > &, ast::Pass<pass_t> & visitor );

src/AST/TypeSubstitution.hpp

@@ -25 +25 @@
 #include "Fwd.hpp"        // for UniqueId
 #include "ParseNode.hpp"
-#include "Type.hpp"       // for ptr<Type>
+#include "Type.hpp"       
 #include "Common/SemanticError.h"  // for SemanticError
 #include "Visitor.hpp"
@@ -165 +165 @@
         assert( input );
         Pass<Substituter> sub( *this, false );
-        input = dynamic_cast< SynTreeClass * >( input->acceptMutator( sub ) );
-        assert( input );
+        input = strict_dynamic_cast< SynTreeClass * >( input->accept( sub ) );
 ///     std::cerr << "substitution result is: ";
 ///     newType->print( std::cerr );
@@ -177 +176 @@
         assert( input );
         Pass<Substituter> sub( *this, true );
-        input = dynamic_cast< SynTreeClass * >( input->acceptMutator( sub ) );
-        assert( input );
+        input = strict_dynamic_cast< SynTreeClass * >( input->accept( sub ) );
 ///     std::cerr << "substitution result is: ";
 ///     newType->print( std::cerr );

src/AST/module.mk

@@ -21 +21 @@
         AST/DeclReplacer.cpp \
         AST/Expr.cpp \
+        AST/GenericSubstitution.cpp \
         AST/Init.cpp \
         AST/LinkageSpec.cpp \

src/AST/porting.md

@@ -38 +38 @@
 
 `N->print(std::ostream&)` is a visitor now, port these methods to `ast::Print` class
-* **TODO** write this visitor
-* **TODO** write `std::ostream& operator<< ( std::ostream& out, const Node* node )` in `Node.hpp` in terms of `ast::Print`
-* `Declaration::printShort` should also be integrated
+* **TODO** `Declaration::printShort` should also be integrated
 
 `clone` is private to `Node` now
@@ -208 +206 @@
 
 `CompoundStmt`
-* **TODO** port copy operator
-  * Needs to be an almost-shallow clone, where the declarations are cloned only if needed
-  * **TODO** port `DeclReplacer`
 * Still a `std::list` for children, rather than `std::vector`
   * allows more-efficient splicing for purposes of later code generation
@@ -229 +224 @@
   * `getAggr()` => `aggr()`
     * also now returns `const AggregateDecl *`
-* `genericSubstitution()` moved to own visitor in `AST/GenericSubstitution.hpp` **TODO** write
+* `genericSubstitution()` moved to own visitor in `AST/GenericSubstitution.hpp`
 
 `BasicType`

src/Makefile.in

@@ -167 +167 @@
 am__objects_1 = AST/Attribute.$(OBJEXT) AST/Convert.$(OBJEXT) \
         AST/Decl.$(OBJEXT) AST/DeclReplacer.$(OBJEXT) \
-        AST/Expr.$(OBJEXT) AST/Init.$(OBJEXT) \
-        AST/LinkageSpec.$(OBJEXT) AST/Node.$(OBJEXT) \
-        AST/Pass.$(OBJEXT) AST/Print.$(OBJEXT) AST/Stmt.$(OBJEXT) \
-        AST/Type.$(OBJEXT) AST/TypeSubstitution.$(OBJEXT)
+        AST/Expr.$(OBJEXT) AST/GenericSubstitution.$(OBJEXT) \
+        AST/Init.$(OBJEXT) AST/LinkageSpec.$(OBJEXT) \
+        AST/Node.$(OBJEXT) AST/Pass.$(OBJEXT) AST/Print.$(OBJEXT) \
+        AST/Stmt.$(OBJEXT) AST/Type.$(OBJEXT) \
+        AST/TypeSubstitution.$(OBJEXT)
 am__objects_2 = CodeGen/CodeGenerator.$(OBJEXT) \
         CodeGen/FixMain.$(OBJEXT) CodeGen/GenType.$(OBJEXT) \
@@ -574 +575 @@
         AST/DeclReplacer.cpp \
         AST/Expr.cpp \
+        AST/GenericSubstitution.cpp \
         AST/Init.cpp \
         AST/LinkageSpec.cpp \
@@ -739 +741 @@
         AST/$(DEPDIR)/$(am__dirstamp)
 AST/Expr.$(OBJEXT): AST/$(am__dirstamp) AST/$(DEPDIR)/$(am__dirstamp)
+AST/GenericSubstitution.$(OBJEXT): AST/$(am__dirstamp) \
+        AST/$(DEPDIR)/$(am__dirstamp)
 AST/Init.$(OBJEXT): AST/$(am__dirstamp) AST/$(DEPDIR)/$(am__dirstamp)
 AST/LinkageSpec.$(OBJEXT): AST/$(am__dirstamp) \
@@ -1173 +1177 @@
 @AMDEP_TRUE@@am__include@ @am__quote@AST/$(DEPDIR)/DeclReplacer.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@AST/$(DEPDIR)/Expr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@AST/$(DEPDIR)/GenericSubstitution.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@AST/$(DEPDIR)/Init.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@AST/$(DEPDIR)/LinkageSpec.Po@am__quote@