Changeset c4570af3 for src

Timestamp:

Nov 30, 2023, 5:00:22 PM (8 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

4dc3b8c, dd900b5

Parents:

37b3151

Message:

Removed some code that supported ast conversion, it supported ast translation, and that is done.

Location:

src/AST

Files:

• Expr.cpp (modified) (2 diffs)
• Expr.hpp (modified) (5 diffs)

src/AST/Expr.cpp

@@ -222 +222 @@
 }
 
-MemberExpr::MemberExpr( const CodeLocation & loc, const DeclWithType * mem, const Expr * agg,
-    MemberExpr::NoOpConstruction overloadSelector )
-: Expr( loc ), member( mem ), aggregate( agg ) {
-        assert( member );
-        assert( aggregate );
-        assert( aggregate->result );
-        (void) overloadSelector;
-}
-
 bool MemberExpr::get_lvalue() const {
         // This is actually wrong by C, but it works with our current set-up.
@@ -388 +379 @@
         stmts.emplace_back( new ExprStmt{ loc, tupleExpr } );
         stmtExpr = new StmtExpr{ loc, new CompoundStmt{ loc, std::move(stmts) } };
-}
-
-TupleAssignExpr::TupleAssignExpr(
-        const CodeLocation & loc, const Type * result, const StmtExpr * s )
-: Expr( loc, result ), stmtExpr() {
-        stmtExpr = s;
 }
 

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
 };