Changeset 4819cac for src/SynTree

Timestamp:

Aug 4, 2016, 4:11:11 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

4e2a1137

Parents:

f9cebb5 (diff), cf37a8e (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' into ctor

Conflicts:

src/CodeGen/CodeGenerator.cc

Location:

src/SynTree

Files:

• AddStmtVisitor.cc (modified) (2 diffs)
• Expression.cc (modified) (2 diffs)
• Expression.h (modified) (3 diffs)
• Mutator.cc (modified) (3 diffs)
• Mutator.h (modified) (2 diffs)
• Statement.cc (modified) (4 diffs)
• Statement.h (modified) (4 diffs)
• SynTree.h (modified) (2 diffs)
• Visitor.cc (modified) (3 diffs)
• Visitor.h (modified) (2 diffs)

src/SynTree/AddStmtVisitor.cc

@@ -10 +10 @@
 // Created On       : Wed Jun 22 12:11:17 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul 12 17:49:59 2016
-// Update Count     : 12
+// Last Modified On : Thu Aug  4 11:23:47 2016
+// Update Count     : 16
 //
 
@@ -71 +71 @@
 
 void AddStmtVisitor::visit(SwitchStmt *switchStmt) {
-        visitStatementList( switchStmt->get_branches() );
+        visitStatementList( switchStmt->get_statements() );
         maybeAccept( switchStmt->get_condition(), *this );
 }

src/SynTree/Expression.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jun 13 16:03:39 2016
-// Update Count     : 42
+// Last Modified On : Wed Aug  3 17:06:51 2016
+// Update Count     : 45
 //
 
@@ -529 +529 @@
 }
 
+RangeExpr::RangeExpr( ConstantExpr *low, ConstantExpr *high ) : low( low ), high( high ) {}
+RangeExpr::RangeExpr( const RangeExpr &other ) : low( other.low->clone() ), high( other.high->clone() ) {}
+void RangeExpr::print( std::ostream &os, int indent ) const {
+        os << std::string( indent, ' ' ) << "Range Expression: ";
+        low->print( os, indent );
+        os << " ... ";
+        high->print( os, indent );
+}
 
 std::ostream & operator<<( std::ostream & out, Expression * expr ) {

src/SynTree/Expression.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jul  4 14:45:32 2016
-// Update Count     : 23
+// Last Modified On : Wed Aug  3 17:08:44 2016
+// Update Count     : 27
 //
 
@@ -18 +18 @@
 
 #include <map>
+#include <memory>
 #include "SynTree.h"
 #include "Visitor.h"
@@ -634 +635 @@
 };
 
+class RangeExpr : public Expression {
+  public:
+        RangeExpr( ConstantExpr *low, ConstantExpr *high );
+        RangeExpr( const RangeExpr &other );
+
+        ConstantExpr * get_low() const { return low.get(); }
+        ConstantExpr * get_high() const { return high.get(); }
+        RangeExpr * set_low( ConstantExpr *low ) { RangeExpr::low.reset( low ); return this; }
+        RangeExpr * set_high( ConstantExpr *high ) { RangeExpr::high.reset( high ); return this; }
+
+        virtual RangeExpr *clone() const { return new RangeExpr( *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:
+        std::unique_ptr<ConstantExpr> low, high;
+};
+
 std::ostream & operator<<( std::ostream & out, Expression * expr );
 

src/SynTree/Mutator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul 12 17:51:19 2016
-// Update Count     : 17
+// Last Modified On : Thu Aug  4 11:23:21 2016
+// Update Count     : 19
 //
 
@@ -126 +126 @@
 Statement *Mutator::mutate( SwitchStmt *switchStmt ) {
         switchStmt->set_condition( maybeMutate( switchStmt->get_condition(), *this ) );
-        mutateAll( switchStmt->get_branches(), *this );
+        mutateAll( switchStmt->get_statements(), *this );
         return switchStmt;
 }
@@ -349 +349 @@
         compLitExpr->set_initializer( maybeMutate( compLitExpr->get_initializer(), *this ) );
         return compLitExpr;
+}
+
+Expression *Mutator::mutate( RangeExpr *rangeExpr ) {
+        rangeExpr->set_low( maybeMutate( rangeExpr->get_low(), *this ) );
+        rangeExpr->set_high( maybeMutate( rangeExpr->get_high(), *this ) );
+        return rangeExpr;
 }
 

src/SynTree/Mutator.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul 12 17:51:43 2016
-// Update Count     : 11
+// Last Modified On : Wed Aug  3 16:59:45 2016
+// Update Count     : 12
 //
 #include <cassert>
@@ -78 +78 @@
         virtual Expression* mutate( UntypedValofExpr *valofExpr );
         virtual Expression* mutate( CompoundLiteralExpr *compLitExpr );
+        virtual Expression* mutate( RangeExpr *rangeExpr );
 
         virtual Type* mutate( VoidType *basicType );

src/SynTree/Statement.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul 12 17:52:32 2016
-// Update Count     : 55
+// Last Modified On : Thu Aug  4 11:25:20 2016
+// Update Count     : 61
 //
 
@@ -143 +143 @@
 }
 
-SwitchStmt::SwitchStmt( std::list<Label> _labels, Expression * _condition, std::list<Statement *> &_branches ):
-        Statement( _labels ), condition( _condition ), branches( _branches ) {
+SwitchStmt::SwitchStmt( std::list<Label> _labels, Expression * _condition, std::list<Statement *> &_statements ):
+        Statement( _labels ), condition( _condition ), statements( _statements ) {
 }
 
 SwitchStmt::SwitchStmt( const SwitchStmt & other ):
         Statement( other ), condition( maybeClone( other.condition ) ) {
-        cloneAll( other.branches, branches );
+        cloneAll( other.statements, statements );
 }
 
 SwitchStmt::~SwitchStmt() {
         delete condition;
-        // destroy branches
-}
-
-void SwitchStmt::add_case( CaseStmt *c ) {}
+        // destroy statements
+}
 
 void SwitchStmt::print( std::ostream &os, int indent ) const {
@@ -164 +162 @@
         os << endl;
 
-        // branches
+        // statements
         std::list<Statement *>::const_iterator i;
-        for ( i = branches.begin(); i != branches.end(); i++)
+        for ( i = statements.begin(); i != statements.end(); i++)
                 (*i)->print( os, indent + 4 );
 
-        //for_each( branches.begin(), branches.end(), mem_fun( bind1st(&Statement::print ), os ));
+        //for_each( statements.begin(), statements.end(), mem_fun( bind1st(&Statement::print ), os ));
 }
 
@@ -187 +185 @@
 }
 
-CaseStmt * CaseStmt::makeDefault( std::list<Label> labels, std::list<Statement *> branches ) {
-        return new CaseStmt( labels, 0, branches, true );
+CaseStmt * CaseStmt::makeDefault( std::list<Label> labels, std::list<Statement *> stmts ) {
+        return new CaseStmt( labels, 0, stmts, true );
 }
 

src/SynTree/Statement.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul 12 17:53:29 2016
-// Update Count     : 47
+// Last Modified On : Thu Aug  4 11:26:02 2016
+// Update Count     : 64
 //
 
@@ -129 +129 @@
 class SwitchStmt : public Statement {
   public:
-        SwitchStmt( std::list<Label> labels, Expression *condition, std::list<Statement *> &branches );
+        SwitchStmt( std::list<Label> labels, Expression *condition, std::list<Statement *> &statements );
         SwitchStmt( const SwitchStmt &other );
         virtual ~SwitchStmt();
@@ -136 +136 @@
         void set_condition( Expression *newValue ) { condition = newValue; }
 
-        std::list<Statement *> & get_branches() { return branches; }
-        void add_case( CaseStmt * );
+        std::list<Statement *> & get_statements() { return statements; }
 
         virtual void accept( Visitor &v ) { v.visit( this ); }
@@ -146 +145 @@
   private:
         Expression * condition;
-        std::list<Statement *> branches; // should be list of CaseStmt
+        std::list<Statement *> statements;
 };
 
 class CaseStmt : public Statement {
   public:
-        CaseStmt( std::list<Label> labels, Expression *conditions,
-              std::list<Statement *> &stmts, bool isdef = false ) throw(SemanticError);
+        CaseStmt( std::list<Label> labels, Expression *conditions, std::list<Statement *> &stmts, bool isdef = false ) throw(SemanticError);
         CaseStmt( const CaseStmt &other );
         virtual ~CaseStmt();
 
-        static CaseStmt * makeDefault( std::list<Label> labels = std::list<Label>(),
-                std::list<Statement *> stmts = std::list<Statement *>() );
+        static CaseStmt * makeDefault( std::list<Label> labels = std::list<Label>(), std::list<Statement *> stmts = std::list<Statement *>() );
 
         bool isDefault() const { return _isDefault; }

src/SynTree/SynTree.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul 12 17:54:02 2016
-// Update Count     : 6
+// Last Modified On : Wed Aug  3 17:02:34 2016
+// Update Count     : 7
 //
 
@@ -83 +83 @@
 class UntypedValofExpr;
 class CompoundLiteralExpr;
+class RangeExpr;
 
 class Type;

src/SynTree/Visitor.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul 12 17:54:39 2016
-// Update Count     : 19
+// Last Modified On : Thu Aug  4 11:24:25 2016
+// Update Count     : 21
 //
 
@@ -109 +109 @@
 void Visitor::visit( SwitchStmt *switchStmt ) {
         maybeAccept( switchStmt->get_condition(), *this );
-        acceptAll( switchStmt->get_branches(), *this );
+        acceptAll( switchStmt->get_statements(), *this );
 }
 
@@ -296 +296 @@
         maybeAccept( compLitExpr->get_type(), *this );
         maybeAccept( compLitExpr->get_initializer(), *this );
+}
+
+void Visitor::visit( RangeExpr *rangeExpr ) {
+        maybeAccept( rangeExpr->get_low(), *this );
+        maybeAccept( rangeExpr->get_high(), *this );
 }
 

src/SynTree/Visitor.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul 12 17:55:09 2016
-// Update Count     : 8
+// Last Modified On : Wed Aug  3 17:01:50 2016
+// Update Count     : 9
 //
 
@@ -78 +78 @@
         virtual void visit( UntypedValofExpr *valofExpr );
         virtual void visit( CompoundLiteralExpr *compLitExpr );
+        virtual void visit( RangeExpr *rangeExpr );
 
         virtual void visit( VoidType *basicType );