Changeset 10a9479d for src/AST

Timestamp:

Nov 23, 2024, 8:28:37 PM (16 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master, stuck-waitfor-destruct

Children:

956b389

Parents:

b006c51e (diff), de7b7a5 (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

Location:

src/AST

Files:

• Expr.hpp (modified) (2 diffs)
• Pass.hpp (modified) (1 diff)

src/AST/Expr.hpp

@@ -330 +330 @@
 enum GeneratedFlag { ExplicitCast, GeneratedCast };
 
+/// Even within the basic cast expression there are variants:
+/// CCast - C-Style Cast: A backwards compatable cast from C.
+/// CoerceCast - Coercion Cast: Change the type without changing the value.
+/// ReturnCast - Ascription Cast: Requires the given expression result type.
+enum CastKind { CCast, CoerceCast, ReturnCast };
+
 /// A type cast, e.g. `(int)e`
 class CastExpr final : public Expr {
@@ -336 +342 @@
         GeneratedFlag isGenerated;
 
-        enum CastKind {
-                Default, // C
-                Coerce, // reinterpret cast
-                Return  // overload selection
-        };
-
-        CastKind kind = Default;
+        CastKind kind = CCast;
 
         CastExpr( const CodeLocation & loc, const Expr * a, const Type * to,
-                GeneratedFlag g = GeneratedCast, CastKind kind = Default ) : Expr( loc, to ), arg( a ), isGenerated( g ), kind( kind ) {}
+                GeneratedFlag g = GeneratedCast, CastKind kind = CCast ) : Expr( loc, to ), arg( a ), isGenerated( g ), kind( kind ) {}
         /// Cast-to-void
-        CastExpr( const CodeLocation & loc, const Expr * a, GeneratedFlag g = GeneratedCast, CastKind kind = Default );
+        CastExpr( const CodeLocation & loc, const Expr * a, GeneratedFlag g = GeneratedCast, CastKind kind = CCast );
 
         /// Wrap a cast expression around an existing expression (always generated)

src/AST/Pass.hpp

@@ -327 +327 @@
 /// The Pass template handles what *before* and *after* means automatically
 template< template<class...> class container_t = std::list >
-struct WithStmtsToAdd {
+struct WithStmtsToAddX {
         container_t< ptr<Stmt> > stmtsToAddBefore;
         container_t< ptr<Stmt> > stmtsToAddAfter;
 };
+
+struct WithStmtsToAdd : public WithStmtsToAddX<> {};
 
 /// Used if visitor requires added declarations before or after the current node.
 /// The Pass template handles what *before* and *after* means automatically
 template< template<class...> class container_t = std::list >
-struct WithDeclsToAdd {
+struct WithDeclsToAddX {
         container_t< ptr<Decl> > declsToAddBefore;
         container_t< ptr<Decl> > declsToAddAfter;
 };
+
+struct WithDeclsToAdd : public WithDeclsToAddX<> {};
 
 /// Use if visitation should stop at certain levels