Changeset dd7c2ce0 for src/AST/Decl.hpp

Timestamp:

Oct 24, 2023, 4:54:33 PM (14 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

e832485

Parents:

1da2affb (diff), a1da039 (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

@@ -125 +125 @@
 
 /// Object declaration `int foo()`
-class FunctionDecl : public DeclWithType {
+class FunctionDecl final : public DeclWithType {
 public:
         std::vector<ptr<TypeDecl>> type_params;
@@ -314 +314 @@
 class EnumDecl final : public AggregateDecl {
 public:
-        bool isTyped; // isTyped indicated if the enum has a declaration like:
+        // isTyped indicated if the enum has a declaration like:
         // enum (type_optional) Name {...}
-        ptr<Type> base; // if isTyped == true && base.get() == nullptr, it is a "void" type enum
+        bool isTyped;
+        // if isTyped == true && base.get() == nullptr, it is a "void" type enum
+        ptr<Type> base;
         enum class EnumHiding { Visible, Hide } hide;
 
@@ -374 +376 @@
 
 /// Assembly declaration: `asm ... ( "..." : ... )`
-class AsmDecl : public Decl {
+class AsmDecl final : public Decl {
 public:
         ptr<AsmStmt> stmt;
 
         AsmDecl( const CodeLocation & loc, AsmStmt * stmt )
-        : Decl( loc, "", {}, {} ), stmt(stmt) {}
+        : Decl( loc, "", {}, Linkage::C ), stmt(stmt) {}
 
         const AsmDecl * accept( Visitor & v ) const override { return v.visit( this ); }
@@ -388 +390 @@
 
 /// C-preprocessor directive `#...`
-class DirectiveDecl : public Decl {
+class DirectiveDecl final : public Decl {
 public:
         ptr<DirectiveStmt> stmt;
 
         DirectiveDecl( const CodeLocation & loc, DirectiveStmt * stmt )
-        : Decl( loc, "", {}, {} ), stmt(stmt) {}
+        : Decl( loc, "", {}, Linkage::C ), stmt(stmt) {}
 
         const DirectiveDecl * accept( Visitor & v ) const override { return v.visit( this ); }
@@ -402 +404 @@
 
 /// Static Assertion `_Static_assert( ... , ... );`
-class StaticAssertDecl : public Decl {
+class StaticAssertDecl final : public Decl {
 public:
         ptr<Expr> cond;
@@ -408 +410 @@
 
         StaticAssertDecl( const CodeLocation & loc, const Expr * condition, const ConstantExpr * msg )
-        : Decl( loc, "", {}, {} ), cond( condition ), msg( msg ) {}
+        : Decl( loc, "", {}, Linkage::C ), cond( condition ), msg( msg ) {}
 
         const StaticAssertDecl * accept( Visitor & v ) const override { return v.visit( this ); }