Changeset af5c204a

Timestamp:

Jun 21, 2017, 11:47:32 AM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

06edda0

Parents:

4551a6e

Message:

remove UntypedValOfExpr? and hook in build for StmtExpr?

Location:

src

Files:

• Common/PassVisitor.h (modified) (2 diffs)
• Common/PassVisitor.impl.h (modified) (2 diffs)
• Parser/ExpressionNode.cc (modified) (1 diff)
• SymTab/Indexer.cc (modified) (1 diff)
• SymTab/Indexer.h (modified) (1 diff)
• SynTree/Expression.cc (modified) (1 diff)
• SynTree/Expression.h (modified) (1 diff)
• SynTree/Mutator.cc (modified) (1 diff)
• SynTree/Mutator.h (modified) (1 diff)
• SynTree/Visitor.cc (modified) (1 diff)
• SynTree/Visitor.h (modified) (2 diffs)

src/Common/PassVisitor.h

@@ -95 +95 @@
         virtual void visit( ConstructorExpr * ctorExpr ) override final;
         virtual void visit( CompoundLiteralExpr *compLitExpr ) override final;
-        virtual void visit( UntypedValofExpr *valofExpr ) override final;
         virtual void visit( RangeExpr *rangeExpr ) override final;
         virtual void visit( UntypedTupleExpr *tupleExpr ) override final;
@@ -181 +180 @@
         virtual Expression* mutate( ConstructorExpr *ctorExpr ) override final;
         virtual Expression* mutate( CompoundLiteralExpr *compLitExpr ) override final;
-        virtual Expression* mutate( UntypedValofExpr *valofExpr ) override final;
         virtual Expression* mutate( RangeExpr *rangeExpr ) override final;
         virtual Expression* mutate( UntypedTupleExpr *tupleExpr ) override final;

src/Common/PassVisitor.impl.h

@@ -607 +607 @@
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( CompoundLiteralExpr * node ) {
-        VISIT_BODY( node ); 
-}
-
-template< typename pass_type >
-void PassVisitor< pass_type >::visit( UntypedValofExpr * node ) {
-        VISIT_BODY( node ); 
+        VISIT_BODY( node );
 }
 
@@ -988 +983 @@
 
 template< typename pass_type >
-Expression * PassVisitor< pass_type >::mutate( UntypedValofExpr * node ) {
-        MUTATE_BODY( Expression, node );
-}
-
-template< typename pass_type >
 Expression * PassVisitor< pass_type >::mutate( RangeExpr * node ) {
         MUTATE_BODY( Expression, node );

src/Parser/ExpressionNode.cc

@@ -346 +346 @@
 
 Expression *build_valexpr( StatementNode *s ) {
-        return new UntypedValofExpr( maybeMoveBuild< Statement >(s), nullptr );
+        return new StmtExpr( dynamic_cast< CompoundStmt * >(maybeMoveBuild< Statement >(s) ) );
 }
 Expression *build_typevalue( DeclarationNode *decl ) {

src/SymTab/Indexer.cc

@@ -493 +493 @@
                 acceptNewScope( compLitExpr->get_result(), *this );
                 maybeAccept( compLitExpr->get_initializer(), *this );
-        }
-
-        void Indexer::visit( UntypedValofExpr *valofExpr ) {
-                acceptNewScope( valofExpr->get_result(), *this );
-                maybeAccept( valofExpr->get_body(), *this );
         }
 

src/SymTab/Indexer.h

@@ -69 +69 @@
                 virtual void visit( ConstructorExpr * ctorExpr );
                 virtual void visit( CompoundLiteralExpr *compLitExpr );
-                virtual void visit( UntypedValofExpr *valofExpr );
                 virtual void visit( RangeExpr *rangeExpr );
                 virtual void visit( UntypedTupleExpr *tupleExpr );

src/SynTree/Expression.cc

@@ -588 +588 @@
 }
 
-UntypedValofExpr::UntypedValofExpr( const UntypedValofExpr & other ) : Expression( other ), body ( maybeClone( other.body ) ) {}
-
-UntypedValofExpr::~UntypedValofExpr() { delete body; }
-
-void UntypedValofExpr::print( std::ostream &os, int indent ) const {
-        os << std::string( indent, ' ' ) << "Valof Expression: " << std::endl;
-        if ( get_body() != 0 )
-                get_body()->print( os, indent + 2 );
-}
-
 RangeExpr::RangeExpr( Expression *low, Expression *high ) : low( low ), high( high ) {}
 RangeExpr::RangeExpr( const RangeExpr &other ) : Expression( other ), low( other.low->clone() ), high( other.high->clone() ) {}

src/SynTree/Expression.h

@@ -600 +600 @@
 };
 
-/// ValofExpr represents a GCC 'lambda expression'
-class UntypedValofExpr : public Expression {
-  public:
-        UntypedValofExpr( Statement *_body, Expression *_aname = nullptr ) : Expression( _aname ), body ( _body ) {}
-        UntypedValofExpr( const UntypedValofExpr & other );
-        virtual ~UntypedValofExpr();
-
-        Expression * get_value();
-        Statement * get_body() const { return body; }
-
-        virtual UntypedValofExpr * clone() const { return new UntypedValofExpr( * this ); }
-        virtual void accept( Visitor & v ) { v.visit( this ); }
-        virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
-        virtual void print( std::ostream & os, int indent = 0 ) const;
-  private:
-        Statement * body;
-};
-
 /// RangeExpr represents a range e.g. '3 ... 5' or '1~10'
 class RangeExpr : public Expression {

src/SynTree/Mutator.cc

@@ -380 +380 @@
 }
 
-Expression *Mutator::mutate( UntypedValofExpr *valofExpr ) {
-        valofExpr->set_env( maybeMutate( valofExpr->get_env(), *this ) );
-        valofExpr->set_result( maybeMutate( valofExpr->get_result(), *this ) );
-        return valofExpr;
-}
-
 Expression *Mutator::mutate( RangeExpr *rangeExpr ) {
         rangeExpr->set_env( maybeMutate( rangeExpr->get_env(), *this ) );

src/SynTree/Mutator.h

@@ -78 +78 @@
         virtual Expression* mutate( ConstructorExpr *ctorExpr );
         virtual Expression* mutate( CompoundLiteralExpr *compLitExpr );
-        virtual Expression* mutate( UntypedValofExpr *valofExpr );
         virtual Expression* mutate( RangeExpr *rangeExpr );
         virtual Expression* mutate( UntypedTupleExpr *tupleExpr );

src/SynTree/Visitor.cc

@@ -301 +301 @@
 }
 
-void Visitor::visit( UntypedValofExpr *valofExpr ) {
-        maybeAccept( valofExpr->get_result(), *this );
-        maybeAccept( valofExpr->get_body(), *this );
-}
-
 void Visitor::visit( RangeExpr *rangeExpr ) {
         maybeAccept( rangeExpr->get_low(), *this );

src/SynTree/Visitor.h

@@ -81 +81 @@
         virtual void visit( ConstructorExpr * ctorExpr );
         virtual void visit( CompoundLiteralExpr *compLitExpr );
-        virtual void visit( UntypedValofExpr *valofExpr );
         virtual void visit( RangeExpr *rangeExpr );
         virtual void visit( UntypedTupleExpr *tupleExpr );
@@ -163 +162 @@
                         } // if
                 } catch( SemanticError &e ) {
-                        e.set_location( (*i)->location );                       
+                        e.set_location( (*i)->location );
                         errors.append( e );
                 } // try