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

File:

• src/AST/Decl.hpp (modified) (8 diffs)

src/AST/Decl.hpp

@@ -32 +32 @@
 
 // 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);
 
 namespace ast {
@@ -89 +87 @@
         virtual const Type * get_type() const = 0;
         /// Set type of this declaration. May be verified by subclass
-        virtual void set_type( const Type * ) = 0;
+        virtual void set_type(Type *) = 0;
 
         const DeclWithType * accept( Visitor & v ) const override = 0;
@@ -104 +102 @@
         ptr<Expr> bitfieldWidth;
 
-        ObjectDecl( const CodeLocation & loc, const std::string & name, const Type * type, 
-                const Init * init = nullptr, Storage::Classes storage = {}, 
-                Linkage::Spec linkage = Linkage::C, const Expr * bitWd = nullptr, 
+        ObjectDecl( const CodeLocation & loc, const std::string & name, const Type * type,
+                const Init * init = nullptr, Storage::Classes storage = {},
+                Linkage::Spec linkage = Linkage::C, const Expr * bitWd = nullptr,
                 std::vector< ptr<Attribute> > && attrs = {}, Function::Specs fs = {} )
         : DeclWithType( loc, name, storage, linkage, std::move(attrs), fs ), type( type ),
@@ -112 +110 @@
 
         const Type* get_type() const override { return type; }
-        void set_type( const Type * ty ) override { type = ty; }
+        void set_type( Type * ty ) override { type = ty; }
 
         const DeclWithType * accept( Visitor& v ) const override { return v.visit( this ); }
@@ -134 +132 @@
 
         const Type * get_type() const override;
-        void set_type( const Type * t ) override;
+        void set_type(Type * t) override;
 
         bool has_body() const { return stmts; }
@@ -151 +149 @@
         std::vector<ptr<DeclWithType>> assertions;
 
-        NamedTypeDecl( 
-                const CodeLocation & loc, const std::string & name, Storage::Classes storage,
-                const Type * b, Linkage::Spec spec = Linkage::Cforall )
+        NamedTypeDecl( const CodeLocation& loc, const std::string& name, Storage::Classes storage,
+                Type* b, Linkage::Spec spec = Linkage::Cforall )
         : Decl( loc, name, storage, spec ), base( b ), params(), assertions() {}
 
@@ -188 +185 @@
         };
 
-        TypeDecl( 
-                const CodeLocation & loc, const std::string & name, Storage::Classes storage, 
-                const Type * b, TypeVar::Kind k, bool s, const Type * i = nullptr )
+        TypeDecl( const CodeLocation& loc, const std::string& name, Storage::Classes storage, Type* b,
+                TypeVar::Kind k, bool s, Type* i = nullptr )
         : NamedTypeDecl( loc, name, storage, b ), kind( k ), sized( k == TypeVar::Ttype || s ),
           init( i ) {}
@@ -325 +321 @@
 };
 
+/// With statement `with (...) ...`
+class WithStmt final : public Decl {
+public:
+        std::vector<ptr<Expr>> exprs;
+        ptr<Stmt> stmt;
+
+        WithStmt( const CodeLocation & loc, std::vector<ptr<Expr>> && exprs, const Stmt * stmt )
+        : Decl(loc, "", Storage::Auto, Linkage::Cforall), exprs(std::move(exprs)), stmt(stmt) {}
+
+        const Decl * accept( Visitor & v ) const override { return v.visit( this ); }
+private:
+        WithStmt * clone() const override { return new WithStmt{ *this }; }
+        MUTATE_FRIEND
+};
+
 class AsmDecl : public Decl {
 public: