Changeset 4c03e63 for src/SynTree

Timestamp:

Jun 23, 2017, 4:20:33 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

74e58ea3, 7bbba76

Parents:

e1c1829 (diff), 88177cf (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/SynTree

Files:

• Attribute.h (modified) (1 diff)
• BaseSyntaxNode.h (modified) (1 diff)
• Constant.cc (modified) (2 diffs)
• Constant.h (modified) (3 diffs)
• Expression.cc (modified) (4 diffs)
• Expression.h (modified) (3 diffs)
• Mutator.cc (modified) (4 diffs)
• Mutator.h (modified) (1 diff)
• ObjectDecl.cc (modified) (1 diff)
• Statement.cc (modified) (2 diffs)
• Statement.h (modified) (3 diffs)
• Visitor.cc (modified) (3 diffs)
• Visitor.h (modified) (2 diffs)

src/SynTree/Attribute.h

@@ -40 +40 @@
 };
 
+const std::list< Attribute * > noAttributes;
+
 #endif
 

src/SynTree/BaseSyntaxNode.h

@@ -24 +24 @@
         CodeLocation location;
 
-        virtual void accept( Visitor & v ) = 0; // temporary -- needs to be here so that BaseSyntaxNode is polymorphic and can be dynamic_cast
+        virtual ~BaseSyntaxNode() {}
+
+        virtual void accept( Visitor & v ) = 0;
 };
 

src/SynTree/Constant.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul 30 15:18:38 2015
-// Update Count     : 12
+// Last Modified By : Andrew Beach
+// Last Modified On : Thr Jun 22 10:11:00 2017
+// Update Count     : 28
 //
 
@@ -21 +21 @@
 #include "Type.h"
 
-Constant::Constant( Type *type_, std::string value_ ) : type( type_ ), value( value_ ) {}
+Constant::Constant( Type * type, std::string rep, unsigned long long val ) : type( type ), rep( rep ), val( val ) {}
+Constant::Constant( Type * type, std::string rep, double val ) : type( type ), rep( rep ), val( val ) {}
 
-Constant::Constant( const Constant &other ) {
+Constant::Constant( const Constant &other ) : rep( other.rep ), val( other.val ) {
         type = other.type->clone();
-        value = other.value;
 }
 
 Constant::~Constant() { delete type; }
 
+Constant Constant::from_bool( bool b ) {
+        return Constant( new BasicType( Type::Qualifiers(), BasicType::Bool ), b ? "1" : "0" , (unsigned long long int)b );
+}
+
 Constant Constant::from_int( int i ) {
-        return Constant( new BasicType( Type::Qualifiers(), BasicType::SignedInt ), std::to_string( i ) );
+        return Constant( new BasicType( Type::Qualifiers(), BasicType::SignedInt ), std::to_string( i ), (unsigned long long int)i );
 }
 
 Constant Constant::from_ulong( unsigned long i ) {
-        return Constant( new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt ), std::to_string( i ) );
+        return Constant( new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt ), std::to_string( i ), (unsigned long long int)i );
 }
 
 Constant Constant::from_double( double d ) {
-        return Constant( new BasicType( Type::Qualifiers(), BasicType::Double ), std::to_string( d ) );
+        return Constant( new BasicType( Type::Qualifiers(), BasicType::Double ), std::to_string( d ), d );
 }
 
-Constant *Constant::clone() const { assert( false ); return 0; }
-
 void Constant::print( std::ostream &os ) const {
-        os << "(" << value;
+        os << "(" << rep << " " << val.ival;
         if ( type ) {
                 os << ": ";

src/SynTree/Constant.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jun 30 13:33:17 2016
-// Update Count     : 6
+// Last Modified By : Andrew Beach
+// Last Modified On : Thr Jun 22 10:13:00 2017
+// Update Count     : 15
 //
 
@@ -23 +23 @@
 class Constant {
   public:
-        Constant( Type *type, std::string value );
-        Constant( const Constant &other );
+        Constant( Type * type, std::string rep, unsigned long long val );
+        Constant( Type * type, std::string rep, double val );
+        Constant( const Constant & other );
         virtual ~Constant();
 
-        Type *get_type() { return type; }
-        void set_type( Type *newValue ) { type = newValue; }
-        std::string &get_value() { return value; }
-        void set_value( std::string newValue ) { value = newValue; }
+        Type * get_type() { return type; }
+        void set_type( Type * newValue ) { type = newValue; }
+        std::string & get_value() { return rep; }
+        void set_value( std::string newValue ) { rep = newValue; }
 
+        /// generates a boolean constant of the given bool
+        static Constant from_bool( bool b );
         /// generates an integer constant of the given int
         static Constant from_int( int i );
@@ -39 +42 @@
         static Constant from_double( double d );
 
-        virtual Constant *clone() const;
-        virtual void accept( Visitor &v ) { v.visit( this ); }
-        virtual Constant *acceptMutator( Mutator &m ) { return m.mutate( this ); }
-        virtual void print( std::ostream &os ) const;
+        virtual void accept( Visitor & v ) { v.visit( this ); }
+        virtual Constant * acceptMutator( Mutator & m ) { return m.mutate( this ); }
+        virtual void print( std::ostream & os ) const;
   private:
-        Type *type;
-        std::string value;
+        Type * type;
+        std::string rep;
+        union Val {
+                unsigned long long ival;
+                double dval;
+                Val( unsigned long long ival ) : ival( ival ) {}
+                Val( double dval ) : dval( dval ) {}
+        } val;
 };
 

src/SynTree/Expression.cc

@@ -288 +288 @@
 }
 
-// CastExpr *CastExpr::clone() const { return 0; }
-
 void CastExpr::print( std::ostream &os, int indent ) const {
         os << "Cast of:" << std::endl << std::string( indent+2, ' ' );
@@ -355 +353 @@
 }
 
-//// is this right? It's cloning the member, but the member is a declaration so probably shouldn't be cloned...
 MemberExpr::MemberExpr( const MemberExpr &other ) :
                 Expression( other ), member( other.member ), aggregate( maybeClone( other.aggregate ) ) {
@@ -361 +358 @@
 
 MemberExpr::~MemberExpr() {
-        // delete member;
+        // don't delete the member declaration, since it points somewhere else in the tree
         delete aggregate;
 }
@@ -591 +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

@@ -226 +226 @@
 };
 
-/// MemberExpr represents a member selection operation, e.g. q.p after processing by the expression analyzer
+/// MemberExpr represents a member selection operation, e.g. q.p after processing by the expression analyzer.
+/// Does not take ownership of member.
 class MemberExpr : public Expression {
   public:
@@ -247 +248 @@
 };
 
-/// VariableExpr represents an expression that simply refers to the value of a named variable
+/// VariableExpr represents an expression that simply refers to the value of a named variable.
+/// Does not take ownership of var.
 class VariableExpr : public Expression {
   public:
@@ -598 +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

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Thu Mar  8 16:36:00 2017
-// Update Count     : 23
+// Last Modified On : Thu Jun 22 13:43:00 2017
+// Update Count     : 24
 //
 
@@ -162 +162 @@
         tryStmt->set_block( maybeMutate( tryStmt->get_block(), *this ) );
         mutateAll( tryStmt->get_catchers(), *this );
+        tryStmt->set_finally( maybeMutate( tryStmt->get_finally(), *this ) );
         return tryStmt;
 }
@@ -167 +168 @@
 Statement *Mutator::mutate( CatchStmt *catchStmt ) {
         catchStmt->set_decl( maybeMutate( catchStmt->get_decl(), *this ) );
+        catchStmt->set_cond( maybeMutate( catchStmt->get_cond(), *this ) );
         catchStmt->set_body( maybeMutate( catchStmt->get_body(), *this ) );
         return catchStmt;
@@ -380 +382 @@
 }
 
-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/ObjectDecl.cc

@@ -56 +56 @@
 
         if ( init ) {
-                os << " with initializer ";
-                init->print( os, indent );
-                os << std::endl << std::string(indent, ' ');
+                os << " with initializer " << std::endl;
+                init->print( os, indent+2 );
+                os << std::endl << std::string(indent+2, ' ');
                 os << "maybeConstructed? " << init->get_maybeConstructed();
         } // if

src/SynTree/Statement.cc

@@ -313 +313 @@
 }
 
-TryStmt::TryStmt( std::list<Label> labels, CompoundStmt *tryBlock, std::list<Statement *> &_handlers, FinallyStmt *_finallyBlock ) :
+TryStmt::TryStmt( std::list<Label> labels, CompoundStmt *tryBlock, std::list<CatchStmt *> &_handlers, FinallyStmt *_finallyBlock ) :
         Statement( labels ), block( tryBlock ),  handlers( _handlers ), finallyBlock( _finallyBlock ) {
 }
@@ -334 +334 @@
         // handlers
         os << string( indent + 2, ' ' ) << "and handlers: " << endl;
-        for ( std::list<Statement *>::const_iterator i = handlers.begin(); i != handlers.end(); i++)
+        for ( std::list<CatchStmt *>::const_iterator i = handlers.begin(); i != handlers.end(); i++)
                 (*i )->print( os, indent + 4 );
 

src/SynTree/Statement.h

@@ -315 +315 @@
 class TryStmt : public Statement {
   public:
-        TryStmt( std::list<Label> labels, CompoundStmt *tryBlock, std::list<Statement *> &handlers, FinallyStmt *finallyBlock = 0 );
+        TryStmt( std::list<Label> labels, CompoundStmt *tryBlock, std::list<CatchStmt *> &handlers, FinallyStmt *finallyBlock = 0 );
         TryStmt( const TryStmt &other );
         virtual ~TryStmt();
@@ -321 +321 @@
         CompoundStmt *get_block() const { return block; }
         void set_block( CompoundStmt *newValue ) { block = newValue; }
-        std::list<Statement *>& get_catchers() { return handlers; }
+        std::list<CatchStmt *>& get_catchers() { return handlers; }
 
         FinallyStmt *get_finally() const { return finallyBlock; }
@@ -333 +333 @@
   private:
         CompoundStmt *block;
-        std::list<Statement *> handlers;
+        std::list<CatchStmt *> handlers;
         FinallyStmt *finallyBlock;
 };

src/SynTree/Visitor.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Thu Jun  8 16:31:00 2017
-// Update Count     : 25
+// Last Modified On : Thu Jun 22 13:41:00 2017
+// Update Count     : 26
 //
 
@@ -137 +137 @@
         maybeAccept( tryStmt->get_block(), *this );
         acceptAll( tryStmt->get_catchers(), *this );
+        maybeAccept( tryStmt->get_finally(), *this );
 }
 
 void Visitor::visit( CatchStmt *catchStmt ) {
         maybeAccept( catchStmt->get_decl(), *this );
+        maybeAccept( catchStmt->get_cond(), *this );
         maybeAccept( catchStmt->get_body(), *this );
 }
@@ -299 +301 @@
         maybeAccept( compLitExpr->get_result(), *this );
         maybeAccept( compLitExpr->get_initializer(), *this );
-}
-
-void Visitor::visit( UntypedValofExpr *valofExpr ) {
-        maybeAccept( valofExpr->get_result(), *this );
-        maybeAccept( valofExpr->get_body(), *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