Changeset 81da3da4 for src/AST/Expr.hpp

Timestamp:

Dec 11, 2023, 4:18:13 AM (22 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

21ce2c7, 2554f24

Parents:

5ddb8bf (diff), 1c85ffc (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) (5 diffs)

src/AST/Expr.hpp

@@ -35 +35 @@
         template<typename node_t> friend node_t * shallowCopy(const node_t * node);
 
-
-class ConverterOldToNew;
-class ConverterNewToOld;
-
 namespace ast {
 
@@ -439 +435 @@
         MemberExpr * clone() const override { return new MemberExpr{ *this }; }
         MUTATE_FRIEND
-
-        // Custructor overload meant only for AST conversion
-        enum NoOpConstruction { NoOpConstructionChosen };
-        MemberExpr( const CodeLocation & loc, const DeclWithType * mem, const Expr * agg,
-            NoOpConstruction overloadSelector );
-        friend class ::ConverterOldToNew;
-        friend class ::ConverterNewToOld;
 };
 
@@ -458 +447 @@
         ConstantExpr(
                 const CodeLocation & loc, const Type * ty, const std::string & r,
-                        std::optional<unsigned long long> i )
-        : Expr( loc, ty ), rep( r ), ival( i ), underlyer(ty) {}
+                        const std::optional<unsigned long long> & i )
+        : Expr( loc, ty ), rep( r ), ival( i ) {}
 
         /// Gets the integer value of this constant, if one is appropriate to its type.
@@ -483 +472 @@
 
         std::optional<unsigned long long> ival;
-
-        // Intended only for legacy support of roundtripping the old AST.
-        // Captures the very-locally inferred type, before the resolver modifies the type of this ConstantExpression.
-        // In the old AST it's constExpr->constant.type
-        ptr<Type> underlyer;
-        friend class ::ConverterOldToNew;
-        friend class ::ConverterNewToOld;
 };
 
@@ -779 +761 @@
         const Expr * accept( Visitor & v ) const override { return v.visit( this ); }
 
-        friend class ::ConverterOldToNew;
-
 private:
         TupleAssignExpr * clone() const override { return new TupleAssignExpr{ *this }; }
-    TupleAssignExpr( const CodeLocation & loc, const Type * result, const StmtExpr * s );
-
         MUTATE_FRIEND
 };