Changeset 67cf18c for src/SynTree

Timestamp:

May 26, 2017, 6:37:49 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:

01b9928

Parents:

ff03f5c

git-author:

Rob Schluntz <rschlunt@…> (05/26/17 18:34:50)

git-committer:

Rob Schluntz <rschlunt@…> (05/26/17 18:37:49)

Message:

implement default type arguments for generic types [closes #13]

Location:

src/SynTree

Files:

• Declaration.h (modified) (2 diffs)
• Mutator.cc (modified) (1 diff)
• TypeDecl.cc (modified) (2 diffs)
• Visitor.cc (modified) (1 diff)

src/SynTree/Declaration.h

@@ -194 +194 @@
         };
 
-        TypeDecl( const std::string &name, Type::StorageClasses scs, Type *type, Kind kind );
+        TypeDecl( const std::string &name, Type::StorageClasses scs, Type *type, Kind kind, Type * init = nullptr );
         TypeDecl( const TypeDecl &other );
+        virtual ~TypeDecl();
 
         Kind get_kind() const { return kind; }
+
+        Type * get_init() const { return init; }
+        TypeDecl * set_init( Type * newValue ) { init = newValue; return this; }
 
         bool isComplete() const { return kind == Any || sized; }
@@ -209 +213 @@
         virtual void accept( Visitor &v ) { v.visit( this ); }
         virtual TypeDecl *acceptMutator( Mutator &m ) { return m.mutate( this ); }
+        virtual void print( std::ostream &os, int indent = 0 ) const;
+
   private:
         Kind kind;
+        Type * init;
         bool sized;
 };

src/SynTree/Mutator.cc

@@ -77 +77 @@
 TypeDecl *Mutator::mutate( TypeDecl *typeDecl ) {
         handleNamedTypeDecl( typeDecl );
+        typeDecl->set_init( maybeMutate( typeDecl->get_init(), *this ) );
         return typeDecl;
 }

src/SynTree/TypeDecl.cc

@@ -18 +18 @@
 #include "Common/utility.h"
 
-TypeDecl::TypeDecl( const std::string &name, Type::StorageClasses scs, Type *type, Kind kind ) : Parent( name, scs, type ), kind( kind ), sized( kind == Any || kind == Ttype ) {
+TypeDecl::TypeDecl( const std::string &name, Type::StorageClasses scs, Type *type, Kind kind, Type * init ) : Parent( name, scs, type ), kind( kind ), init( init ), sized( kind == Any || kind == Ttype ) {
 }
 
-TypeDecl::TypeDecl( const TypeDecl &other ) : Parent( other ), kind( other.kind ), sized( other.sized ) {
+TypeDecl::TypeDecl( const TypeDecl &other ) : Parent( other ), kind( other.kind ), init( maybeClone( other.init ) ), sized( other.sized ) {
+}
+
+TypeDecl::~TypeDecl() {
+  delete init;
 }
 
@@ -34 +38 @@
 }
 
+void TypeDecl::print( std::ostream &os, int indent ) const {
+  NamedTypeDecl::print( os, indent );
+  if ( init ) {
+    os << std::endl << std::string( indent, ' ' ) << "with type initializer: ";
+    init->print( os, indent + 2 );
+  }
+}
+
+
 std::ostream & operator<<( std::ostream & os, const TypeDecl::Data & data ) {
   return os << data.kind << ", " << data.isComplete;

src/SynTree/Visitor.cc

@@ -67 +67 @@
 void Visitor::visit( TypeDecl *typeDecl ) {
         handleNamedTypeDecl( static_cast< NamedTypeDecl* >( typeDecl ) );
+        maybeAccept( typeDecl->get_init(), *this );
 }