Changes in src/AST/Expr.hpp [99da267:e67991f]

File:

• src/AST/Expr.hpp (modified) (9 diffs)

src/AST/Expr.hpp

@@ -30 +30 @@
 
 // Must be included in *all* AST classes; should be #undef'd at the end of the file
-#define MUTATE_FRIEND \
-    template<typename node_t> friend node_t * mutate(const node_t * node); \
-        template<typename node_t> friend node_t * shallowCopy(const node_t * node);
-
+#define MUTATE_FRIEND template<typename node_t> friend node_t * mutate(const node_t * node);
 
 class ConverterOldToNew;
@@ -50 +47 @@
 
         ParamEntry() : decl( 0 ), declptr( nullptr ), actualType( nullptr ), formalType( nullptr ), expr( nullptr ) {}
-        ParamEntry( 
-                UniqueId id, const Decl * declptr, const Type * actual, const Type * formal, 
+        ParamEntry(
+                UniqueId id, const Decl * declptr, const Type * actual, const Type * formal,
                 const Expr * e )
         : decl( id ), declptr( declptr ), actualType( actual ), formalType( formal ), expr( e ) {}
@@ -115 +112 @@
                         case Empty: new(&data.resnSlots) ResnSlots{}; mode = Slots; // fallthrough
                         case Slots: return data.resnSlots;
-                        case Params: assert(!"Cannot return to resnSlots from Params");
+                        case Params: assertf(false, "Cannot return to resnSlots from Params"); abort();
                         }
-                        return *((ResnSlots*)nullptr);
+                        assertf(false, "unreachable");
                 }
 
@@ -124 +121 @@
                                 return data.resnSlots;
                         }
-                        assert(!"Mode was not already resnSlots");
-                        return *((ResnSlots*)nullptr);
+                        assertf(false, "Mode was not already resnSlots");
+                        abort();
                 }
 
@@ -134 +131 @@
                         case Params: return data.inferParams;
                         }
-                        assert(!"unreachable");
-                        return *((InferredParams*)nullptr);
+                        assertf(false, "unreachable");
                 }
 
@@ -142 +138 @@
                                 return data.inferParams;
                         }
-                        assert(!"Mode was not already Params");
-                        return *((InferredParams*)nullptr);
+                        assertf(false, "Mode was not already Params");
+                        abort();
                 }
 
                 void set_inferParams( InferredParams && ps ) {
                         switch(mode) {
-                        case Slots: 
+                        case Slots:
                                 data.resnSlots.~ResnSlots();
                                 // fallthrough
-                        case Empty: 
+                        case Empty:
                                 new(&data.inferParams) InferredParams{ std::move( ps ) };
                                 mode = Params;
@@ -175 +171 @@
                                         data.inferParams[p.first] = std::move(p.second);
                                 }
-                        } else assert(!"invalid mode");
+                        } else assertf(false, "invalid mode");
                 }
         };
@@ -387 +383 @@
 
         ConstantExpr(
-                const CodeLocation & loc, const Type * ty, const std::string & r, 
+                const CodeLocation & loc, const Type * ty, const std::string & r,
                         std::optional<unsigned long long> i )
         : Expr( loc, ty ), rep( r ), ival( i ) {}
@@ -773 +769 @@
 public:
         ptr<Expr> expr;
-        readonly<Node> deleteStmt;
-
-        DeletedExpr( const CodeLocation & loc, const Expr * e, const Node * del )
+        readonly<Decl> deleteStmt;
+
+        DeletedExpr( const CodeLocation & loc, const Expr * e, const Decl * del )
         : Expr( loc, e->result ), expr( e ), deleteStmt( del ) { assert( expr->result ); }