Changeset b3f252a for src/SynTree

Timestamp:

Sep 7, 2017, 10:36:35 AM (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:

e0886db

Parents:

871cdb4 (diff), 416cc86 (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:

• AddressExpr.cc (modified) (1 diff)
• Declaration.h (modified) (3 diffs)
• Expression.h (modified) (5 diffs)
• Mutator.cc (modified) (2 diffs)
• ReferenceToType.cc (modified) (1 diff)
• Statement.cc (modified) (3 diffs)
• Statement.h (modified) (3 diffs)
• Type.h (modified) (1 diff)
• TypeSubstitution.h (modified) (1 diff)
• Visitor.cc (modified) (2 diffs)

src/SynTree/AddressExpr.cc

@@ -70 +70 @@
 }
 
+LabelAddressExpr::LabelAddressExpr( const Label &arg ) : arg( arg ) {
+        // label address always has type void *
+        result = new PointerType( Type::Qualifiers(), new VoidType( Type::Qualifiers() ) );
+}
+LabelAddressExpr::LabelAddressExpr( const LabelAddressExpr & other ) : Expression( other ), arg( other.arg ) {}
+LabelAddressExpr::~LabelAddressExpr() {}
+
+void LabelAddressExpr::print( std::ostream & os, int indent ) const {
+        os << "Address of label:" << std::endl << std::string( indent+2, ' ' ) << arg;
+}
+
 // Local Variables: //
 // tab-width: 4 //

src/SynTree/Declaration.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Mon Aug 14 10:15:00 2017
-// Update Count     : 128
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sun Sep  3 19:24:06 2017
+// Update Count     : 131
 //
 
@@ -82 +82 @@
         int scopeLevel = 0;
 
-        ConstantExpr *asmName;
+        Expression *asmName;
         std::list< Attribute * > attributes;
 
@@ -97 +97 @@
         DeclarationWithType * set_scopeLevel( int newValue ) { scopeLevel = newValue; return this; }
 
-        ConstantExpr *get_asmName() const { return asmName; }
-        DeclarationWithType * set_asmName( ConstantExpr *newValue ) { asmName = newValue; return this; }
+        Expression *get_asmName() const { return asmName; }
+        DeclarationWithType * set_asmName( Expression *newValue ) { asmName = newValue; return this; }
 
         std::list< Attribute * >& get_attributes() { return attributes; }

src/SynTree/Expression.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Fri Aug  8 11:54:00 2017
-// Update Count     : 44
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sun Sep  3 19:23:46 2017
+// Update Count     : 48
 //
+
 #pragma once
 
@@ -24 +25 @@
 #include "Constant.h"             // for Constant
 #include "Initializer.h"          // for Designation (ptr only), Initializer
+#include "Label.h"                // for Label
 #include "Mutator.h"              // for Mutator
 #include "SynTree.h"              // for UniqueId
@@ -171 +173 @@
 };
 
-// xxx - this doesn't appear to actually be hooked in anywhere. We should use this instead of the "&&"" UntypedExpr hack
+// GCC &&label
+// https://gcc.gnu.org/onlinedocs/gcc-3.4.2/gcc/Labels-as-Values.html
 class LabelAddressExpr : public Expression {
   public:
-        Expression * arg;
-
-        LabelAddressExpr( Expression * arg );
+        Label arg;
+
+        LabelAddressExpr( const Label &arg );
         LabelAddressExpr( const LabelAddressExpr & other );
         virtual ~LabelAddressExpr();
-
-        Expression * get_arg() const { return arg; }
-        void set_arg(Expression * newValue ) { arg = newValue; }
 
         virtual LabelAddressExpr * clone() const { return new LabelAddressExpr( * this ); }
@@ -538 +538 @@
   public:
         Expression * inout;
-        ConstantExpr * constraint;
+        Expression * constraint;
         Expression * operand;
 
-        AsmExpr( Expression * inout, ConstantExpr * constraint, Expression * operand ) : inout( inout ), constraint( constraint ), operand( operand ) {}
+        AsmExpr( Expression * inout, Expression * constraint, Expression * operand ) : inout( inout ), constraint( constraint ), operand( operand ) {}
         AsmExpr( const AsmExpr & other );
         virtual ~AsmExpr() { delete inout; delete constraint; delete operand; };
@@ -548 +548 @@
         void set_inout( Expression * newValue ) { inout = newValue; }
 
-        ConstantExpr * get_constraint() const { return constraint; }
-        void set_constraint( ConstantExpr * newValue ) { constraint = newValue; }
+        Expression * get_constraint() const { return constraint; }
+        void set_constraint( Expression * newValue ) { constraint = newValue; }
 
         Expression * get_operand() const { return operand; }

src/SynTree/Mutator.cc

@@ -246 +246 @@
         labelAddressExpr->set_env( maybeMutate( labelAddressExpr->get_env(), *this ) );
         labelAddressExpr->set_result( maybeMutate( labelAddressExpr->get_result(), *this ) );
-        labelAddressExpr->set_arg( maybeMutate( labelAddressExpr->get_arg(), *this ) );
         return labelAddressExpr;
 }
@@ -538 +537 @@
 Type * Mutator::mutate( TraitInstType *aggregateUseType ) {
         handleReferenceToType( aggregateUseType );
-        mutateAll( aggregateUseType->get_members(), *this );
         return aggregateUseType;
 }

src/SynTree/ReferenceToType.cc

@@ -132 +132 @@
 std::string TraitInstType::typeString() const { return "trait"; }
 
-TraitInstType::TraitInstType( const TraitInstType &other ) : Parent( other ) {
-        cloneAll( other.members, members );
+TraitInstType::TraitInstType( const Type::Qualifiers & tq, TraitDecl * baseTrait, const std::list< Attribute * > & attributes ) : Parent( tq, baseTrait->name, attributes ), baseTrait( baseTrait ) {}
+
+TraitInstType::TraitInstType( const TraitInstType &other ) : Parent( other ), baseTrait( other.baseTrait ) {
 }
 
 TraitInstType::~TraitInstType() {
-        deleteAll( members );
 }
 

src/SynTree/Statement.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug 17 16:17:20 2017
-// Update Count     : 67
+// Last Modified On : Sun Sep  3 20:46:44 2017
+// Update Count     : 68
 //
 
@@ -52 +52 @@
 
 
-AsmStmt::AsmStmt( std::list<Label> labels, bool voltile, ConstantExpr *instruction, std::list<Expression *> output, std::list<Expression *> input, std::list<ConstantExpr *> clobber, std::list<Label> gotolabels ) : Statement( labels ), voltile( voltile ), instruction( instruction ), output( output ), input( input ), clobber( clobber ), gotolabels( gotolabels ) {}
+AsmStmt::AsmStmt( std::list<Label> labels, bool voltile, Expression *instruction, std::list<Expression *> output, std::list<Expression *> input, std::list<ConstantExpr *> clobber, std::list<Label> gotolabels ) : Statement( labels ), voltile( voltile ), instruction( instruction ), output( output ), input( input ), clobber( clobber ), gotolabels( gotolabels ) {}
 
 AsmStmt::AsmStmt( const AsmStmt & other ) : Statement( other ), voltile( other.voltile ), instruction( maybeClone( other.instruction ) ), gotolabels( other.gotolabels ) {
@@ -89 +89 @@
 
 BranchStmt::BranchStmt( std::list<Label> labels, Label target, Type type ) throw ( SemanticError ) :
-        Statement( labels ), originalTarget( target ), target( target ), computedTarget( NULL ), type( type ) {
+        Statement( labels ), originalTarget( target ), target( target ), computedTarget( nullptr ), type( type ) {
         //actually this is a syntactic error signaled by the parser
-        if ( type == BranchStmt::Goto && target.empty() )
+        if ( type == BranchStmt::Goto && target.empty() ) {
                 throw SemanticError("goto without target");
+        }
 }
 
 BranchStmt::BranchStmt( std::list<Label> labels, Expression *computedTarget, Type type ) throw ( SemanticError ) :
         Statement( labels ), computedTarget( computedTarget ), type( type ) {
-        if ( type != BranchStmt::Goto || computedTarget == 0 )
+        if ( type != BranchStmt::Goto || computedTarget == nullptr ) {
                 throw SemanticError("Computed target not valid in branch statement");
+        }
 }
 
 void BranchStmt::print( std::ostream &os, int indent ) const {
         os << string( indent, ' ' ) << "Branch (" << brType[type] << ")" << endl ;
+        if ( target != "" ) os << string( indent+2, ' ' ) << "with target: " << target << endl;
+        if ( originalTarget != "" ) os << string( indent+2, ' ' ) << "with original target: " << originalTarget << endl;
+        if ( computedTarget != nullptr ) os << string( indent+2, ' ' ) << "with computed target: " << computedTarget << endl;
 }
 

src/SynTree/Statement.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug 17 15:37:53 2017
-// Update Count     : 72
+// Last Modified On : Sun Sep  3 20:46:46 2017
+// Update Count     : 77
 //
 
@@ -98 +98 @@
   public:
         bool voltile;
-        ConstantExpr *instruction;
+        Expression *instruction;
         std::list<Expression *> output, input;
         std::list<ConstantExpr *> clobber;
         std::list<Label> gotolabels;
 
-        AsmStmt( std::list<Label> labels, bool voltile, ConstantExpr *instruction, std::list<Expression *> input, std::list<Expression *> output, std::list<ConstantExpr *> clobber, std::list<Label> gotolabels );
+        AsmStmt( std::list<Label> labels, bool voltile, Expression *instruction, std::list<Expression *> output, std::list<Expression *> input, std::list<ConstantExpr *> clobber, std::list<Label> gotolabels );
         AsmStmt( const AsmStmt &other );
         virtual ~AsmStmt();
@@ -109 +109 @@
         bool get_voltile() { return voltile; }
         void set_voltile( bool newValue ) { voltile = newValue; }
-        ConstantExpr *get_instruction() { return instruction; }
-        void set_instruction( ConstantExpr *newValue ) { instruction = newValue; }
-        std::list<Expression *> &get_output() { return output; }
-        void set_output( const std::list<Expression *> &newValue ) { output = newValue; }
-        std::list<Expression *> &get_input() { return input; }
+        Expression * get_instruction() { return instruction; }
+        void set_instruction( Expression * newValue ) { instruction = newValue; }
+        std::list<Expression *> & get_output() { return output; }
+        void set_output( const std::list<Expression *> & newValue ) { output = newValue; }
+        std::list<Expression *> & get_input() { return input; }
         void set_input( const std::list<Expression *> &newValue ) { input = newValue; }
-        std::list<ConstantExpr *> &get_clobber() { return clobber; }
+        std::list<ConstantExpr *> & get_clobber() { return clobber; }
         void set_clobber( const std::list<ConstantExpr *> &newValue ) { clobber = newValue; }
-        std::list<Label> &get_gotolabels() { return gotolabels; }
+        std::list<Label> & get_gotolabels() { return gotolabels; }
         void set_gotolabels( const std::list<Label> &newValue ) { gotolabels = newValue; }
 
-        virtual AsmStmt *clone() const { return new AsmStmt( *this ); }
-        virtual void accept( Visitor &v ) { v.visit( this ); }
-        virtual Statement *acceptMutator( Mutator &m ) { return m.mutate( this ); }
-        virtual void print( std::ostream &os, int indent = 0 ) const;
+        virtual AsmStmt * clone() const { return new AsmStmt( *this ); }
+        virtual void accept( Visitor & v ) { v.visit( this ); }
+        virtual Statement * acceptMutator( Mutator & m ) { return m.mutate( this ); }
+        virtual void print( std::ostream & os, int indent = 0 ) const;
 };
 

src/SynTree/Type.h

@@ -471 +471 @@
         typedef ReferenceToType Parent;
   public:
-        // this member is filled in by the validate pass, which instantiates the members of the correponding
-        // aggregate with the actual type parameters specified for this use of the context
-        std::list< Declaration* > members;
-
-        TraitInstType( const Type::Qualifiers & tq, const std::string & name, const std::list< Attribute * > & attributes = std::list< Attribute * >()  ) : Parent( tq, name, attributes ) {}
+        // this decl is not "owned" by the trait inst; it is merely a pointer to elsewhere in the tree,
+        // where the trait used in this type is actually defined
+        TraitDecl * baseTrait = nullptr;
+
+        TraitInstType( const Type::Qualifiers & tq, const std::string & name, const std::list< Attribute * > & attributes = std::list< Attribute * >() ) : Parent( tq, name, attributes ) {}
+        TraitInstType( const Type::Qualifiers & tq, TraitDecl * baseTrait, const std::list< Attribute * > & attributes = std::list< Attribute * >() );
         TraitInstType( const TraitInstType & other );
         ~TraitInstType();
-
-        std::list< Declaration* >& get_members() { return members; }
 
         virtual bool isComplete() const;

src/SynTree/TypeSubstitution.h

@@ -177 +177 @@
 void applySubstitution( FormalIterator formalBegin, FormalIterator formalEnd, ActualIterator actual, MemberIterator memberBegin, MemberIterator memberEnd, OutputIterator out ) {
         TypeSubstitution sub = TypeSubstitution( formalBegin, formalEnd, actual );
-        for ( std::list< Declaration* >::iterator i = memberBegin; i != memberEnd; ++i ) {
+        for ( auto i = memberBegin; i != memberEnd; ++i ) {
                 sub.apply( *i );
                 *out++ = *i;

src/SynTree/Visitor.cc

@@ -205 +205 @@
 void Visitor::visit( LabelAddressExpr *labAddressExpr ) {
         maybeAccept( labAddressExpr->get_result(), *this );
-        maybeAccept( labAddressExpr->get_arg(), *this );
 }
 
@@ -429 +428 @@
 void Visitor::visit( TraitInstType *aggregateUseType ) {
         handleReferenceToType( static_cast< ReferenceToType * >( aggregateUseType ) );
-        acceptAll( aggregateUseType->get_members(), *this );
 }