Changeset 4a9ccc3 for src/SynTree

Timestamp:

Jan 24, 2017, 3:56:33 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:

ad6343e

Parents:

0bfaf80

Message:

propagate sized status through trait instances

Location:

src/SynTree

Files:

• AggregateDecl.cc (modified) (1 diff)
• ReferenceToType.cc (modified) (5 diffs)
• Type.h (modified) (12 diffs)

src/SynTree/AggregateDecl.cc ¶

@@ -69 +69 @@
 std::string EnumDecl::typeString() const { return "enum"; }
 
-std::string TraitDecl::typeString() const { return "context"; }
+std::string TraitDecl::typeString() const { return "trait"; }
 
 // Local Variables: //

src/SynTree/ReferenceToType.cc ¶

@@ -64 +64 @@
 }
 
+bool StructInstType::isComplete() const { return baseStruct->has_body(); }
+
 void StructInstType::lookup( const std::string &name, std::list< Declaration* > &foundDecls ) const {
         assert( baseStruct );
@@ -90 +92 @@
 }
 
+bool UnionInstType::isComplete() const { return baseUnion->has_body(); }
+
 void UnionInstType::lookup( const std::string &name, std::list< Declaration* > &foundDecls ) const {
         assert( baseUnion );
@@ -111 +115 @@
 std::string EnumInstType::typeString() const { return "enum"; }
 
-std::string TraitInstType::typeString() const { return "context"; }
+std::string TraitInstType::typeString() const { return "trait"; }
 
 TraitInstType::TraitInstType( const TraitInstType &other ) : Parent( other ) {
@@ -120 +124 @@
         deleteAll( members );
 }
+
+bool TraitInstType::isComplete() const { assert( false ); }
 
 TypeInstType::TypeInstType( const Type::Qualifiers &tq, const std::string &name, TypeDecl *baseType ) : Parent( tq, name ) {
@@ -143 +149 @@
 std::string TypeInstType::typeString() const { return "type"; }
 
+bool TypeInstType::isComplete() const { return baseType->isComplete(); }
+
 void TypeInstType::print( std::ostream &os, int indent ) const {
         using std::endl;

src/SynTree/Type.h ¶

@@ -74 +74 @@
         virtual Type * getComponent( unsigned i ) { assertf( size() == 1 && i == 0, "Type::getComponent was called with size %d and index %d\n", size(), i ); return this; }
 
+        virtual bool isComplete() const { return true; }
+
         virtual Type *clone() const = 0;
         virtual void accept( Visitor &v ) = 0;
@@ -90 +92 @@
 
         virtual unsigned size() const { return 0; };
+        virtual bool isComplete() const { return false; }
 
         virtual VoidType *clone() const { return new VoidType( *this ); }
@@ -185 +188 @@
         void set_isStatic( bool newValue ) { isStatic = newValue; }
 
+        virtual bool isComplete() const { return ! isVarLen; }
+
         virtual ArrayType *clone() const { return new ArrayType( *this ); }
         virtual void accept( Visitor &v ) { v.visit( this ); }
@@ -258 +263 @@
         std::list<TypeDecl*> * get_baseParameters();
 
+        virtual bool isComplete() const;
+
         /// Looks up the members of this struct named "name" and places them into "foundDecls".
         /// Clones declarations into "foundDecls", caller responsible for freeing
@@ -287 +294 @@
         std::list<TypeDecl*> * get_baseParameters();
 
+        virtual bool isComplete() const;
+
         /// looks up the members of this union named "name" and places them into "foundDecls"
         /// Clones declarations into "foundDecls", caller responsible for freeing
@@ -310 +319 @@
         EnumInstType( const EnumInstType &other ) : Parent( other ) {}
 
+        // xxx - enum inst does not currently contain a pointer to base, this should be fixed.
+        // virtual bool isComplete() const { return baseEnum()->hasBody(); }
+
         virtual EnumInstType *clone() const { return new EnumInstType( *this ); }
         virtual void accept( Visitor &v ) { v.visit( this ); }
@@ -325 +337 @@
 
         std::list< Declaration* >& get_members() { return members; }
+
+        virtual bool isComplete() const;
 
         virtual TraitInstType *clone() const { return new TraitInstType( *this ); }
@@ -349 +363 @@
         bool get_isFtype() const { return isFtype; }
         void set_isFtype( bool newValue ) { isFtype = newValue; }
+
+        virtual bool isComplete() const;
 
         virtual TypeInstType *clone() const { return new TypeInstType( *this ); }
@@ -382 +398 @@
         }
 
+        // virtual bool isComplete() const { return true; } // xxx - not sure if this is right, might need to recursively check complete-ness
+
         virtual TupleType *clone() const { return new TupleType( *this ); }
         virtual void accept( Visitor &v ) { v.visit( this ); }
@@ -398 +416 @@
         Expression *get_expr() const { return expr; }
         void set_expr( Expression *newValue ) { expr = newValue; }
+
+        virtual bool isComplete() const { assert( false ); return false; }
 
         virtual TypeofType *clone() const { return new TypeofType( *this ); }
@@ -423 +443 @@
         void set_isType( bool newValue ) { isType = newValue; }
 
+        virtual bool isComplete() const { assert( false ); } // xxx - not sure what to do here
+
         virtual AttrType *clone() const { return new AttrType( *this ); }
         virtual void accept( Visitor &v ) { v.visit( this ); }
@@ -439 +461 @@
         VarArgsType();
         VarArgsType( Type::Qualifiers tq );
+
+        virtual bool isComplete() const{ return true; } // xxx - is this right?
 
         virtual VarArgsType *clone() const { return new VarArgsType( *this ); }