Changeset e6cee92 for src/SynTree

Timestamp:

Jul 17, 2017, 3:25:58 PM (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:

795d450

Parents:

7ebaa56

Message:

Fix TupleAssignment? code for references

Location:

src/SynTree

Files:

• Expression.cc (modified) (1 diff)
• ReferenceType.cc (modified) (1 diff)
• Type.cc (modified) (1 diff)
• Type.h (modified) (2 diffs)
• TypeExpr.cc (modified) (2 diffs)

src/SynTree/Expression.cc

@@ -502 +502 @@
 }
 
-AsmExpr::AsmExpr( const AsmExpr & other ) : inout( maybeClone( other.inout ) ), constraint( maybeClone( other.constraint ) ), operand( maybeClone( other.operand ) ) {}
+AsmExpr::AsmExpr( const AsmExpr & other ) : Expression( other ), inout( maybeClone( other.inout ) ), constraint( maybeClone( other.constraint ) ), operand( maybeClone( other.operand ) ) {}
 
 

src/SynTree/ReferenceType.cc

@@ -19 +19 @@
 
 ReferenceType::ReferenceType( const Type::Qualifiers &tq, Type *base, const std::list< Attribute * > & attributes )
-  : Type( tq, attributes ), base( base ) {
+        : Type( tq, attributes ), base( base ) {
+        assertf( base, "Reference Type with a null base created." );
 }
 
 ReferenceType::ReferenceType( const ReferenceType &other )
-  : Type( other ), base( maybeClone( other.base ) ) {
+        : Type( other ), base( maybeClone( other.base ) ) {
 }
 
 ReferenceType::~ReferenceType() {
-  delete base;
+        delete base;
+}
+
+int ReferenceType::referenceDepth() const {
+        return base->referenceDepth()+1;
 }
 
 void ReferenceType::print( std::ostream &os, int indent ) const {
-  Type::print( os, indent );
-  os << "reference to ";
-  if ( base ) {
-    base->print( os, indent );
-  } // if
+        Type::print( os, indent );
+        os << "reference to ";
+        if ( base ) {
+                base->print( os, indent );
+        } // if
 }
 

src/SynTree/Type.cc

@@ -81 +81 @@
 }
 
+int Type::referenceDepth() const { return 0; }
+
 void Type::print( std::ostream &os, int indent ) const {
         if ( ! forall.empty() ) {

src/SynTree/Type.h

@@ -163 +163 @@
         Type * stripReferences();
 
+        /// return the number of references occuring consecutively on the outermost layer of this type (i.e. do not count references nested within other types)
+        virtual int referenceDepth() const;
+
         virtual bool isComplete() const { return true; }
 
@@ -304 +307 @@
         void set_base( Type *newValue ) { base = newValue; }
 
+        virtual int referenceDepth() const;
+
         virtual ReferenceType *clone() const { return new ReferenceType( *this ); }
         virtual void accept( Visitor & v ) { v.visit( this ); }

src/SynTree/TypeExpr.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// TypeExpr.cc -- 
+// TypeExpr.cc --
 //
 // Author           : Richard C. Bilson
@@ -21 +21 @@
 }
 
-TypeExpr::TypeExpr( const TypeExpr &other ) : type( maybeClone( other.type ) ) {
+TypeExpr::TypeExpr( const TypeExpr &other ) : Expression( other ), type( maybeClone( other.type ) ) {
 }