Changeset 3d618a0 for src/AST/Expr.hpp

Timestamp:

Sep 9, 2024, 6:16:09 PM (2 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

aa14aafe

Parents:

d93b813 (diff), f5dbc8d (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/Expr.hpp (modified) (2 diffs)

src/AST/Expr.hpp

@@ -480 +480 @@
 class SizeofExpr final : public Expr {
 public:
+        ptr<Type> type;
+
+        SizeofExpr( const CodeLocation & loc, const Type * t );
+
+        const Expr * accept( Visitor & v ) const override { return v.visit( this ); }
+private:
+        SizeofExpr * clone() const override { return new SizeofExpr{ *this }; }
+        MUTATE_FRIEND
+};
+
+class CountExpr final : public Expr {
+public:
         ptr<Expr> expr;
         ptr<Type> type;
 
-        SizeofExpr( const CodeLocation & loc, const Expr * e );
-        SizeofExpr( const CodeLocation & loc, const Type * t );
-        // deliberately no disambiguating overload for nullptr_t
-
-        const Expr * accept( Visitor & v ) const override { return v.visit( this ); }
-private:
-        SizeofExpr * clone() const override { return new SizeofExpr{ *this }; }
-        MUTATE_FRIEND
-};
-
-class CountExpr final : public Expr {
-public:
-        ptr<Expr> expr;
-        ptr<Type> type;
-
         CountExpr( const CodeLocation & loc, const Expr * t );
         CountExpr( const CodeLocation & loc, const Type * t );
@@ -510 +507 @@
 class AlignofExpr final : public Expr {
 public:
-        ptr<Expr> expr;
         ptr<Type> type;
 
-        AlignofExpr( const CodeLocation & loc, const Expr * e );
         AlignofExpr( const CodeLocation & loc, const Type * t );
-        // deliberately no disambiguating overload for nullptr_t
 
         const Expr * accept( Visitor & v ) const override { return v.visit( this ); }