Changeset 2c57025 for src/SynTree

Timestamp:

Nov 25, 2016, 6:11:03 PM (8 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:

0f35657

Parents:

186fd86

Message:

add support for built-in sized trait which decouples size/alignment information from otype parameters, add test for sized trait

Location:

src/SynTree

Files:

• ApplicationExpr.cc (modified) (1 diff)
• Declaration.h (modified) (4 diffs)
• ReferenceToType.cc (modified) (1 diff)
• Type.h (modified) (1 diff)
• TypeDecl.cc (modified) (3 diffs)

src/SynTree/ApplicationExpr.cc

@@ -30 +30 @@
         if ( &other == this ) return *this;
         decl = other.decl;
+        // xxx - this looks like a memory leak
         actualType = maybeClone( other.actualType );
         formalType = maybeClone( other.formalType );

src/SynTree/Declaration.h

@@ -176 +176 @@
   public:
         enum Kind { Any, Dtype, Ftype };
+        /// Data extracted from a type decl
+        struct Data {
+                TypeDecl::Kind kind;
+                bool isComplete;
+                Data() : kind( (TypeDecl::Kind)-1 ), isComplete( false ) {}
+                Data( TypeDecl * typeDecl ) : Data( typeDecl->get_kind(), typeDecl->isComplete() ) {}
+                Data( Kind kind, bool isComplete ) : kind( kind ), isComplete( isComplete ) {}
+                bool operator==(const Data & other) const { return kind == other.kind && isComplete == other.isComplete; }
+                bool operator!=(const Data & other) const { return !(*this == other);}
+        };
 
         TypeDecl( const std::string &name, DeclarationNode::StorageClass sc, Type *type, Kind kind );
@@ -182 +192 @@
         Kind get_kind() const { return kind; }
 
+        bool isComplete() const { return kind == Any || sized; }
+        bool get_sized() const { return sized; }
+        TypeDecl * set_sized( bool newValue ) { sized = newValue; return this; }
+
         virtual TypeDecl *clone() const { return new TypeDecl( *this ); }
         virtual void accept( Visitor &v ) { v.visit( this ); }
@@ -188 +202 @@
         virtual std::string typeString() const;
         Kind kind;
+        bool sized;
 };
 
@@ -280 +295 @@
 
 std::ostream & operator<<( std::ostream & out, const Declaration * decl );
+std::ostream & operator<<( std::ostream & os, const TypeDecl::Data & data );
 
 #endif // DECLARATION_H

src/SynTree/ReferenceToType.cc

@@ -128 +128 @@
 }
 
+TypeInstType::TypeInstType( const TypeInstType &other ) : Parent( other ), baseType( other.baseType ), isFtype( other.isFtype ) {
+}
+
+
 TypeInstType::~TypeInstType() {
         // delete baseType; //This is shared and should not be deleted

src/SynTree/Type.h

@@ -337 +337 @@
         TypeInstType( const Type::Qualifiers &tq, const std::string &name, TypeDecl *baseType );
         TypeInstType( const Type::Qualifiers &tq, const std::string &name, bool isFtype );
-        TypeInstType( const TypeInstType &other ) : Parent( other ), baseType( other.baseType ), isFtype( other.isFtype ) {}
+        TypeInstType( const TypeInstType &other );
         ~TypeInstType();
 

src/SynTree/TypeDecl.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// TypeDecl.cc -- 
+// TypeDecl.cc --
 //
 // Author           : Richard C. Bilson
@@ -18 +18 @@
 #include "Common/utility.h"
 
-TypeDecl::TypeDecl( const std::string &name, DeclarationNode::StorageClass sc, Type *type, Kind kind ) : Parent( name, sc, type ), kind( kind ) {
+TypeDecl::TypeDecl( const std::string &name, DeclarationNode::StorageClass sc, Type *type, Kind kind ) : Parent( name, sc, type ), kind( kind ), sized( kind == Any ) {
 }
 
-TypeDecl::TypeDecl( const TypeDecl &other ) : Parent( other ), kind( other.kind ) {
+TypeDecl::TypeDecl( const TypeDecl &other ) : Parent( other ), kind( other.kind ), sized( other.sized ) {
 }
 
@@ -29 +29 @@
 }
 
+std::ostream & operator<<( std::ostream & os, const TypeDecl::Data & data ) {
+  return os << data.kind << ", " << data.isComplete;
+}
+
 // Local Variables: //
 // tab-width: 4 //