Changes in src/SynTree/Expression.h [0f79853:df626eb]

File:

• src/SynTree/Expression.h (modified) (7 diffs)

src/SynTree/Expression.h

@@ -41 +41 @@
         ParamEntry( UniqueId decl, Type * actualType, Type * formalType, Expression* expr ): decl( decl ), actualType( actualType ), formalType( formalType ), expr( expr ), inferParams( new InferredParams ) {}
         ParamEntry( const ParamEntry & other );
-        ParamEntry( ParamEntry && other );
         ~ParamEntry();
         ParamEntry & operator=( const ParamEntry & other );
-        ParamEntry & operator=( ParamEntry && other );
 
         UniqueId decl;
@@ -76 +74 @@
         InferredParams & get_inferParams() { return inferParams; }
 
-        // move other's inferParams to this
-        void spliceInferParams( Expression * other );
-
         virtual Expression * clone() const override = 0;
         virtual void accept( Visitor & v ) override = 0;
@@ -193 +188 @@
   public:
         Expression * arg;
-        bool isGenerated = true; // whether this cast appeared in the source program
-
-        CastExpr( Expression * arg, bool isGenerated = true );
-        CastExpr( Expression * arg, Type * toType, bool isGenerated = true );
-        CastExpr( Expression * arg, void * ) = delete; // prevent accidentally passing pointers for isGenerated in the first constructor
+
+        CastExpr( Expression * arg );
+        CastExpr( Expression * arg, Type * toType );
         CastExpr( const CastExpr & other );
         virtual ~CastExpr();
@@ -205 +198 @@
 
         virtual CastExpr * clone() const { return new CastExpr( * this ); }
-        virtual void accept( Visitor & v ) { v.visit( this ); }
-        virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
-        virtual void print( std::ostream & os, Indenter indent = {} ) const;
-};
-
-/// KeywordCastExpr represents a cast to 'keyword types', e.g. (thread &)t
-class KeywordCastExpr : public Expression {
-public:
-        Expression * arg;
-        enum Target {
-                Coroutine, Thread, Monitor, NUMBER_OF_TARGETS
-        } target;
-
-        KeywordCastExpr( Expression * arg, Target target );
-        KeywordCastExpr( const KeywordCastExpr & other );
-        virtual ~KeywordCastExpr();
-
-        const std::string & targetString() const;
-
-        virtual KeywordCastExpr * clone() const { return new KeywordCastExpr( * this ); }
         virtual void accept( Visitor & v ) { v.visit( this ); }
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
@@ -322 +295 @@
 
         Constant * get_constant() { return & constant; }
-        const Constant * get_constant() const { return & constant; }
         void set_constant( const Constant & newValue ) { constant = newValue; }
-
-        long long int intValue() const;
 
         virtual ConstantExpr * clone() const { return new ConstantExpr( * this ); }
@@ -755 +725 @@
         StmtExpr * set_statements( CompoundStmt * newValue ) { statements = newValue; return this; }
 
-        // call to set the result type of this StmtExpr based on its body
-        void computeResult();
-
         std::list< ObjectDecl * > & get_returnDecls() { return returnDecls; }
         std::list< Expression * > & get_dtors() { return dtors; }
@@ -849 +816 @@
 };
 
-/// expression that contains a deleted identifier - should never make it past the resolver.
-class DeletedExpr : public Expression {
-public:
-        Expression * expr;
-        BaseSyntaxNode * deleteStmt;
-
-        DeletedExpr( Expression * expr, BaseSyntaxNode * deleteStmt );
-        DeletedExpr( const DeletedExpr & other );
-        ~DeletedExpr();
-
-        virtual DeletedExpr * clone() const { return new DeletedExpr( * this ); }
-        virtual void accept( Visitor & v ) { v.visit( this ); }
-        virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
-        virtual void print( std::ostream & os, Indenter indent = {} ) const;
-};
-
-/// expression wrapping the use of a default argument - should never make it past the resolver.
-class DefaultArgExpr : public Expression {
-public:
-        Expression * expr;
-
-        DefaultArgExpr( Expression * expr );
-        DefaultArgExpr( const DefaultArgExpr & other );
-        ~DefaultArgExpr();
-
-        virtual DefaultArgExpr * clone() const { return new DefaultArgExpr( * this ); }
-        virtual void accept( Visitor & v ) { v.visit( this ); }
-        virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
-        virtual void print( std::ostream & os, Indenter indent = {} ) const;
-};
-
-/// C11 _Generic expression
-class GenericExpr : public Expression {
-public:
-        struct Association {
-                Type * type = nullptr;
-                Expression * expr = nullptr;
-                bool isDefault = false;
-
-                Association( Type * type, Expression * expr );
-                Association( Expression * expr );
-                Association( const Association & other );
-                Association & operator=( const Association & other ) = delete; // at the moment this isn't used, and I don't want to implement it
-                ~Association();
-        };
-
-        Expression * control;
-        std::list<Association> associations;
-
-        GenericExpr( Expression * control, const std::list<Association> & assoc );
-        GenericExpr( const GenericExpr & other );
-        virtual ~GenericExpr();
-
-        virtual GenericExpr * clone() const { return new GenericExpr( * this ); }
-        virtual void accept( Visitor & v ) { v.visit( this ); }
-        virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
-        virtual void print( std::ostream & os, Indenter indent = {} ) const;
-};
-
 // Local Variables: //
 // tab-width: 4 //