Changeset f23de79d

Timestamp:

May 22, 2019, 5:34:17 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

0b8bf27

Parents:

5902625 (diff), 722c4831 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src/AST

Files:

• Expr.cpp (modified) (2 diffs)
• GenericSubstitution.cpp (added)
• GenericSubstitution.hpp (added)
• Node.cpp (modified) (2 diffs)
• Node.hpp (modified) (2 diffs)
• Pass.hpp (modified) (1 diff)
• Print.cpp (modified) (1 diff)
• Type.hpp (modified) (1 diff)
• TypeSubstitution.hpp (modified) (4 diffs)
• porting.md (modified) (3 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");
+        #warning Needs GenericSubsitution.cpp building to work correctly
+        result.set_and_mutate( mem->get_type() )->qualifiers |= aggregate->result->qualifiers | CV::Lvalue;  // FIXME temporary patch
+
+        // // 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;
 }
 

src/AST/Node.cpp

@@ -35 +35 @@
 void ast::ptr_base<node_t, ref_t>::_dec( const node_t * node ) { node->decrement(ref_t); }
 
-/// Sets this pointer to a mutated version of a pointer (possibly) owned elsehere.
-/// Returns a mutable version of the pointer in this node.
-template< typename node_t, enum ast::Node::ref_type ref_t >
-node_t * ast::ptr_base<node_t, ref_t>::set_and_mutate( const node_t * n ) {
-        // ensure ownership of `n` by this node to avoid spurious single-owner mutates
-        assign( n );
+template< typename node_t, enum ast::Node::ref_type ref_t >
+node_t * ast::ptr_base<node_t, ref_t>::get_and_mutate() {
         // get mutable version of `n`
         auto r = mutate( node );
@@ -46 +42 @@
         assign( r );
         return r;
+}
+
+template< typename node_t, enum ast::Node::ref_type ref_t >
+node_t * ast::ptr_base<node_t, ref_t>::set_and_mutate( const node_t * n ) {
+        // ensure ownership of `n` by this node to avoid spurious single-owner mutates
+        assign( n );
+        // return mutable version
+        return get_and_mutate();
 }
 

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.
@@ -141 +147 @@
         const o_node_t * as() const { return dynamic_cast<const o_node_t *>(node); }
 
+        /// Returns a mutable version of the pointer in this node.
+        node_t * get_and_mutate();
+
         /// Sets this pointer to a mutated version of a pointer (possibly) owned elsehere.
         /// Returns a mutable version of the pointer in this node.

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/Print.cpp

@@ -656 +656 @@
 
         virtual const ast::TypeSubstitution * visit( const ast::TypeSubstitution * node ) {
+                os << indent << "Types:" << std::endl;
+                for ( const auto& i : *node ) {
+                        os << indent+1 << i.first << " -> ";
+                        indent += 2;
+                        i.second->accept( *this );
+                        indent -= 2;
+                        os << std::endl;
+                }
+                os << indent << "Non-types:" << std::endl;
+                for ( auto i = node->beginVar(); i != node->endVar(); ++i ) {
+                        os << indent+1 << i->first << " -> ";
+                        indent += 2;
+                        i->second->accept( *this );
+                        indent -= 2;
+                        os << std::endl;
+                }
                 return node;
         }

src/AST/Type.hpp

@@ -47 +47 @@
         bool is_atomic() const { return qualifiers.is_atomic; }
 
-        void set_const( bool v ) { qualifiers.is_const = v; }
-        void set_restrict( bool v ) { qualifiers.is_restrict = v; }
-        void set_lvalue( bool v ) { qualifiers.is_lvalue = v; }
-        void set_mutex( bool v ) { qualifiers.is_mutex = v; }
-        void set_atomic( bool v ) { qualifiers.is_atomic = v; }
+        Type * set_const( bool v ) { qualifiers.is_const = v; return this; }
+        Type * set_restrict( bool v ) { qualifiers.is_restrict = v; return this; }
+        Type * set_lvalue( bool v ) { qualifiers.is_lvalue = v; return this; }
+        Type * set_mutex( bool v ) { qualifiers.is_mutex = v; return this; }
+        Type * set_atomic( bool v ) { qualifiers.is_atomic = v; return this; }
 
         /// How many elemental types are represented by this type

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"
 #include "Decl.hpp"
 #include "Expr.hpp"
+#include "Node.hpp"
 
 namespace ast {
@@ -43 +44 @@
         TypeSubstitution &operator=( const TypeSubstitution &other );
 
-        template< typename SynTreeClass > int apply( SynTreeClass *&input ) const;
-        template< typename SynTreeClass > int applyFree( SynTreeClass *&input ) const;
+        template< typename SynTreeClass > int apply( const SynTreeClass *& input ) const;
+        template< typename SynTreeClass > int applyFree( const SynTreeClass *& input ) const;
+
+        template< typename node_t, enum Node::ref_type ref_t >
+        int apply( ptr_base< node_t, ref_t > & input ) const {
+                const node_t * p = input.get();
+                int ret = apply(p);
+                input = p;
+                return ret;
+        }
+
+        template< typename node_t, enum Node::ref_type ref_t >
+        int applyFree( ptr_base< node_t, ref_t > & input ) const {
+                const node_t * p = input.get();
+                int ret = applyFree(p);
+                input = p;
+                return ret;
+        }
 
         void add( std::string formalType, const Type *actualType );
@@ -162 +179 @@
 
 template< typename SynTreeClass >
-int TypeSubstitution::apply( SynTreeClass *&input ) const {
+int TypeSubstitution::apply( const SynTreeClass *& input ) const {
         assert( input );
         Pass<Substituter> sub( *this, false );
-        input = dynamic_cast< SynTreeClass * >( input->acceptMutator( sub ) );
-        assert( input );
+        input = strict_dynamic_cast< const SynTreeClass * >( input->accept( sub ) );
 ///     std::cerr << "substitution result is: ";
 ///     newType->print( std::cerr );
@@ -174 +190 @@
 
 template< typename SynTreeClass >
-int TypeSubstitution::applyFree( SynTreeClass *&input ) const {
+int TypeSubstitution::applyFree( const SynTreeClass *& input ) const {
         assert( input );
         Pass<Substituter> sub( *this, true );
-        input = dynamic_cast< SynTreeClass * >( input->acceptMutator( sub ) );
-        assert( input );
+        input = strict_dynamic_cast< const SynTreeClass * >( input->accept( sub ) );
 ///     std::cerr << "substitution result is: ";
 ///     newType->print( std::cerr );

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`