Changes in / [2daea42:c2409fd]

Location:

src

Files:

• AST/Node.hpp (modified) (1 diff)
• ResolvExpr/Resolver.cc (modified) (1 diff)
• ResolvExpr/Resolver.h (modified) (1 diff)
• ResolvExpr/Unify.cc (modified) (3 diffs)

src/AST/Node.hpp

@@ -229 +229 @@
         const node_t & operator* () const { _check(); return *node; }
         explicit operator bool() const { _check(); return node; }
-        operator const node_t * () const & { _check(); return node; }
-        operator const node_t * () && = delete;
+        operator const node_t * () const { _check(); return node; }
 
         const node_t * release() {

src/ResolvExpr/Resolver.cc

@@ -1311 +1311 @@
         }
 
-        const ast::Expr * resolveStmtExpr(
+        ast::ptr< ast::Expr > resolveStmtExpr(
                 const ast::StmtExpr * stmtExpr, const ast::SymbolTable & symtab
         ) {
                 assert( stmtExpr );
                 ast::Pass< Resolver_new > resolver{ symtab };
-                auto ret = mutate(stmtExpr->accept(resolver));
-                strict_dynamic_cast< ast::StmtExpr * >( ret )->computeResult();
+                ast::ptr< ast::Expr > ret = stmtExpr;
+                ret = ret->accept( resolver );
+                strict_dynamic_cast< ast::StmtExpr * >( ret.get_and_mutate() )->computeResult();
                 return ret;
         }

src/ResolvExpr/Resolver.h

@@ -72 +72 @@
         ast::ptr< ast::Init > resolveCtorInit(
                 const ast::ConstructorInit * ctorInit, const ast::SymbolTable & symtab );
-        /// Resolves a statement expression 
-        const ast::Expr * resolveStmtExpr(
+        /// Resolves a statement expression
+        ast::ptr< ast::Expr > resolveStmtExpr(
                 const ast::StmtExpr * stmtExpr, const ast::SymbolTable & symtab );
 } // namespace ResolvExpr

src/ResolvExpr/Unify.cc

@@ -811 +811 @@
                 /// Creates a tuple type based on a list of DeclWithType
                 template< typename Iter >
-                static const ast::Type * tupleFromTypes( Iter crnt, Iter end ) {
+                static ast::ptr< ast::Type > tupleFromTypes( Iter crnt, Iter end ) {
                         std::vector< ast::ptr< ast::Type > > types;
                         while ( crnt != end ) {
@@ -821 +821 @@
                         }
 
-                        return new ast::TupleType{ std::move(types) };
+                        return { new ast::TupleType{ std::move(types) } };
                 }
 
@@ -1034 +1034 @@
         private:
                 /// Creates a tuple type based on a list of Type
-                static const ast::Type * tupleFromTypes(
+                static ast::ptr< ast::Type > tupleFromTypes(
                         const std::vector< ast::ptr< ast::Type > > & tys
                 ) {