Changeset 4c925cd for src/AST/Decl.hpp

Timestamp:

Aug 14, 2020, 11:40:04 AM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

5715d43, fa5e0112

Parents:

309d814 (diff), badd22f (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

File:

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

src/AST/Decl.hpp

@@ -33 +33 @@
 
 // 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);
+#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);
 
 namespace ast {
@@ -88 +90 @@
         virtual const Type * get_type() const = 0;
         /// Set type of this declaration. May be verified by subclass
-        virtual void set_type(Type *) = 0;
+        virtual void set_type( const Type * ) = 0;
 
         const DeclWithType * accept( Visitor & v ) const override = 0;
@@ -111 +113 @@
 
         const Type* get_type() const override { return type; }
-        void set_type( Type * ty ) override { type = ty; }
+        void set_type( const Type * ty ) override { type = ty; }
 
         const DeclWithType * accept( Visitor& v ) const override { return v.visit( this ); }
@@ -133 +135 @@
 
         const Type * get_type() const override;
-        void set_type(Type * t) override;
+        void set_type( const Type * t ) override;
 
         bool has_body() const { return stmts; }
@@ -150 +152 @@
         std::vector<ptr<DeclWithType>> assertions;
 
-        NamedTypeDecl( const CodeLocation& loc, const std::string& name, Storage::Classes storage,
-                Type* b, Linkage::Spec spec = Linkage::Cforall )
+        NamedTypeDecl(
+                const CodeLocation & loc, const std::string & name, Storage::Classes storage,
+                const Type * b, Linkage::Spec spec = Linkage::Cforall )
         : Decl( loc, name, storage, spec ), base( b ), params(), assertions() {}
 
@@ -186 +189 @@
         };
 
-        TypeDecl( const CodeLocation & loc, const std::string & name, Storage::Classes storage, Type * b,
-                          Kind k, bool s, Type * i = nullptr )
-                : NamedTypeDecl( loc, name, storage, b ), kind( k ), sized( k == Ttype || s ),
-                init( i ) {}
+        TypeDecl(
+                const CodeLocation & loc, const std::string & name, Storage::Classes storage,
+                const Type * b, TypeDecl::Kind k, bool s, const Type * i = nullptr )
+        : NamedTypeDecl( loc, name, storage, b ), kind( k ), sized( k == TypeDecl::Ttype || s ),
+          init( i ) {}
 
         const char * typeString() const override;