Changes in / [ef5ef56:893e106]
- Location:
- src
- Files:
-
- 2 added
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
src/AST/Expr.cpp
ref5ef56 r893e106 20 20 #include <vector> 21 21 22 #include "GenericSubstitution.hpp" 22 23 #include "Stmt.hpp" 23 24 #include "Type.hpp" 25 #include "TypeSubstitution.hpp" 24 26 #include "Common/utility.h" 25 27 #include "Common/SemanticError.h" … … 157 159 assert( aggregate->result ); 158 160 161 <<<<<<< HEAD 162 // #warning Needs GenericSubsitution.cpp building to work correctly 163 // result.set_and_mutate( mem->get_type() )->qualifiers |= aggregate->result->qualifiers | CV::Lvalue; // FIXME temporary patch 164 165 // take ownership of member type 166 result = mem->get_type(); 167 // substitute aggregate generic parameters into member type 168 genericSubsitution( aggregate->result ).apply( result ); 169 // ensure lvalue and appropriate restrictions from aggregate type 170 result.get_and_mutate()->qualifiers |= aggregate->result->qualifiers | CV::Lvalue; 171 ======= 159 172 // assert(!"unimplemented; need TypeSubstitution, genericSubstitution"); 173 >>>>>>> ef5ef56042ce2b547da955746d9986e26cf628ca 160 174 } 161 175 -
src/AST/Node.cpp
ref5ef56 r893e106 35 35 void ast::ptr_base<node_t, ref_t>::_dec( const node_t * node ) { node->decrement(ref_t); } 36 36 37 /// Sets this pointer to a mutated version of a pointer (possibly) owned elsehere. 38 /// Returns a mutable version of the pointer in this node. 39 template< typename node_t, enum ast::Node::ref_type ref_t > 40 node_t * ast::ptr_base<node_t, ref_t>::set_and_mutate( const node_t * n ) { 41 // ensure ownership of `n` by this node to avoid spurious single-owner mutates 42 assign( n ); 37 template< typename node_t, enum ast::Node::ref_type ref_t > 38 node_t * ast::ptr_base<node_t, ref_t>::get_and_mutate() { 43 39 // get mutable version of `n` 44 40 auto r = mutate( node ); … … 46 42 assign( r ); 47 43 return r; 44 } 45 46 template< typename node_t, enum ast::Node::ref_type ref_t > 47 node_t * ast::ptr_base<node_t, ref_t>::set_and_mutate( const node_t * n ) { 48 // ensure ownership of `n` by this node to avoid spurious single-owner mutates 49 assign( n ); 50 // return mutable version 51 return get_and_mutate(); 48 52 } 49 53 -
src/AST/Node.hpp
ref5ef56 r893e106 94 94 std::ostream& operator<< ( std::ostream& out, const Node * node ); 95 95 96 /// Call a visitor on a possibly-null node 97 template<typename node_t> 98 auto maybe_accept( const node_t * n, Visitor & v ) -> decltype( n->accept(v) ) { 99 return n ? n->accept( v ) : nullptr; 100 } 101 96 102 /// Base class for the smart pointer types 97 103 /// should never really be used. … … 141 147 const o_node_t * as() const { return dynamic_cast<const o_node_t *>(node); } 142 148 149 /// Returns a mutable version of the pointer in this node. 150 node_t * get_and_mutate(); 151 143 152 /// Sets this pointer to a mutated version of a pointer (possibly) owned elsehere. 144 153 /// Returns a mutable version of the pointer in this node. -
src/AST/Pass.hpp
ref5ef56 r893e106 223 223 }; 224 224 225 /// Apply a pass to an entire translation unit 225 226 template<typename pass_t> 226 227 void accept_all( std::list< ast::ptr<ast::Decl> > &, ast::Pass<pass_t> & visitor ); -
src/AST/Print.cpp
ref5ef56 r893e106 495 495 496 496 virtual const ast::TypeSubstitution * visit( const ast::TypeSubstitution * node ) { 497 os << indent << "Types:" << std::endl; 498 for ( const auto& i : *node ) { 499 os << indent+1 << i.first << " -> "; 500 indent += 2; 501 i.second->accept( *this ); 502 indent -= 2; 503 os << std::endl; 504 } 505 os << indent << "Non-types:" << std::endl; 506 for ( auto i = node->beginVar(); i != node->endVar(); ++i ) { 507 os << indent+1 << i->first << " -> "; 508 indent += 2; 509 i->second->accept( *this ); 510 indent -= 2; 511 os << std::endl; 512 } 497 513 return node; 498 514 } -
src/AST/Type.hpp
ref5ef56 r893e106 47 47 bool is_atomic() const { return qualifiers.is_atomic; } 48 48 49 void set_const( bool v ) { qualifiers.is_const = v; }50 void set_restrict( bool v ) { qualifiers.is_restrict = v; }51 void set_lvalue( bool v ) { qualifiers.is_lvalue = v; }52 void set_mutex( bool v ) { qualifiers.is_mutex = v; }53 void set_atomic( bool v ) { qualifiers.is_atomic = v; }49 Type * set_const( bool v ) { qualifiers.is_const = v; return this; } 50 Type * set_restrict( bool v ) { qualifiers.is_restrict = v; return this; } 51 Type * set_lvalue( bool v ) { qualifiers.is_lvalue = v; return this; } 52 Type * set_mutex( bool v ) { qualifiers.is_mutex = v; return this; } 53 Type * set_atomic( bool v ) { qualifiers.is_atomic = v; return this; } 54 54 55 55 /// How many elemental types are represented by this type -
src/AST/TypeSubstitution.hpp
ref5ef56 r893e106 25 25 #include "Fwd.hpp" // for UniqueId 26 26 #include "ParseNode.hpp" 27 #include "Type.hpp" // for ptr<Type>27 #include "Type.hpp" 28 28 #include "Common/SemanticError.h" // for SemanticError 29 29 #include "Visitor.hpp" 30 30 #include "Decl.hpp" 31 31 #include "Expr.hpp" 32 #include "Node.hpp" 32 33 33 34 namespace ast { … … 43 44 TypeSubstitution &operator=( const TypeSubstitution &other ); 44 45 45 template< typename SynTreeClass > int apply( SynTreeClass *&input ) const; 46 template< typename SynTreeClass > int applyFree( SynTreeClass *&input ) const; 46 template< typename SynTreeClass > int apply( const SynTreeClass *& input ) const; 47 template< typename SynTreeClass > int applyFree( const SynTreeClass *& input ) const; 48 49 template< typename node_t, enum Node::ref_type ref_t > 50 int apply( ptr_base< node_t, ref_t > & input ) const { 51 const node_t * p = input.get(); 52 int ret = apply(p); 53 input = p; 54 return ret; 55 } 56 57 template< typename node_t, enum Node::ref_type ref_t > 58 int applyFree( ptr_base< node_t, ref_t > & input ) const { 59 const node_t * p = input.get(); 60 int ret = applyFree(p); 61 input = p; 62 return ret; 63 } 47 64 48 65 void add( std::string formalType, const Type *actualType ); … … 162 179 163 180 template< typename SynTreeClass > 164 int TypeSubstitution::apply( SynTreeClass *&input ) const {181 int TypeSubstitution::apply( const SynTreeClass *& input ) const { 165 182 assert( input ); 166 183 Pass<Substituter> sub( *this, false ); 167 input = dynamic_cast< SynTreeClass * >( input->acceptMutator( sub ) ); 168 assert( input ); 184 input = strict_dynamic_cast< const SynTreeClass * >( input->accept( sub ) ); 169 185 /// std::cerr << "substitution result is: "; 170 186 /// newType->print( std::cerr ); … … 174 190 175 191 template< typename SynTreeClass > 176 int TypeSubstitution::applyFree( SynTreeClass *&input ) const {192 int TypeSubstitution::applyFree( const SynTreeClass *& input ) const { 177 193 assert( input ); 178 194 Pass<Substituter> sub( *this, true ); 179 input = dynamic_cast< SynTreeClass * >( input->acceptMutator( sub ) ); 180 assert( input ); 195 input = strict_dynamic_cast< const SynTreeClass * >( input->accept( sub ) ); 181 196 /// std::cerr << "substitution result is: "; 182 197 /// newType->print( std::cerr ); -
src/AST/module.mk
ref5ef56 r893e106 21 21 AST/DeclReplacer.cpp \ 22 22 AST/Expr.cpp \ 23 AST/GenericSubstitution.cpp \ 23 24 AST/Init.cpp \ 24 25 AST/LinkageSpec.cpp \ -
src/AST/porting.md
ref5ef56 r893e106 38 38 39 39 `N->print(std::ostream&)` is a visitor now, port these methods to `ast::Print` class 40 * **TODO** write this visitor 41 * **TODO** write `std::ostream& operator<< ( std::ostream& out, const Node* node )` in `Node.hpp` in terms of `ast::Print` 42 * `Declaration::printShort` should also be integrated 40 * **TODO** `Declaration::printShort` should also be integrated 43 41 44 42 `clone` is private to `Node` now … … 208 206 209 207 `CompoundStmt` 210 * **TODO** port copy operator211 * Needs to be an almost-shallow clone, where the declarations are cloned only if needed212 * **TODO** port `DeclReplacer`213 208 * Still a `std::list` for children, rather than `std::vector` 214 209 * allows more-efficient splicing for purposes of later code generation … … 229 224 * `getAggr()` => `aggr()` 230 225 * also now returns `const AggregateDecl *` 231 * `genericSubstitution()` moved to own visitor in `AST/GenericSubstitution.hpp` **TODO** write226 * `genericSubstitution()` moved to own visitor in `AST/GenericSubstitution.hpp` 232 227 233 228 `BasicType` -
src/Makefile.in
ref5ef56 r893e106 167 167 am__objects_1 = AST/Attribute.$(OBJEXT) AST/Convert.$(OBJEXT) \ 168 168 AST/Decl.$(OBJEXT) AST/DeclReplacer.$(OBJEXT) \ 169 AST/Expr.$(OBJEXT) AST/Init.$(OBJEXT) \ 170 AST/LinkageSpec.$(OBJEXT) AST/Node.$(OBJEXT) \ 171 AST/Pass.$(OBJEXT) AST/Print.$(OBJEXT) AST/Stmt.$(OBJEXT) \ 172 AST/Type.$(OBJEXT) AST/TypeSubstitution.$(OBJEXT) 169 AST/Expr.$(OBJEXT) AST/GenericSubstitution.$(OBJEXT) \ 170 AST/Init.$(OBJEXT) AST/LinkageSpec.$(OBJEXT) \ 171 AST/Node.$(OBJEXT) AST/Pass.$(OBJEXT) AST/Print.$(OBJEXT) \ 172 AST/Stmt.$(OBJEXT) AST/Type.$(OBJEXT) \ 173 AST/TypeSubstitution.$(OBJEXT) 173 174 am__objects_2 = CodeGen/CodeGenerator.$(OBJEXT) \ 174 175 CodeGen/FixMain.$(OBJEXT) CodeGen/GenType.$(OBJEXT) \ … … 574 575 AST/DeclReplacer.cpp \ 575 576 AST/Expr.cpp \ 577 AST/GenericSubstitution.cpp \ 576 578 AST/Init.cpp \ 577 579 AST/LinkageSpec.cpp \ … … 739 741 AST/$(DEPDIR)/$(am__dirstamp) 740 742 AST/Expr.$(OBJEXT): AST/$(am__dirstamp) AST/$(DEPDIR)/$(am__dirstamp) 743 AST/GenericSubstitution.$(OBJEXT): AST/$(am__dirstamp) \ 744 AST/$(DEPDIR)/$(am__dirstamp) 741 745 AST/Init.$(OBJEXT): AST/$(am__dirstamp) AST/$(DEPDIR)/$(am__dirstamp) 742 746 AST/LinkageSpec.$(OBJEXT): AST/$(am__dirstamp) \ … … 1173 1177 @AMDEP_TRUE@@am__include@ @am__quote@AST/$(DEPDIR)/DeclReplacer.Po@am__quote@ 1174 1178 @AMDEP_TRUE@@am__include@ @am__quote@AST/$(DEPDIR)/Expr.Po@am__quote@ 1179 @AMDEP_TRUE@@am__include@ @am__quote@AST/$(DEPDIR)/GenericSubstitution.Po@am__quote@ 1175 1180 @AMDEP_TRUE@@am__include@ @am__quote@AST/$(DEPDIR)/Init.Po@am__quote@ 1176 1181 @AMDEP_TRUE@@am__include@ @am__quote@AST/$(DEPDIR)/LinkageSpec.Po@am__quote@
Note: See TracChangeset
for help on using the changeset viewer.