Changeset 5d125e4 for src/SynTree

Timestamp:

Jul 15, 2016, 10:16:47 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

873ffb7

Parents:

5ed9061

Message:

start code allowing structures to no fields

Location:

src/SynTree

Files:

• AggregateDecl.cc (modified) (5 diffs)
• Declaration.h (modified) (4 diffs)
• ReferenceToType.cc (modified) (3 diffs)
• Type.h (modified) (4 diffs)

src/SynTree/AggregateDecl.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 23:56:39 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar  2 17:28:00 2016
-// Update Count     : 7
+// Last Modified On : Wed Jul 13 18:03:30 2016
+// Update Count     : 10
 //
 
@@ -19 +19 @@
 
 
-AggregateDecl::AggregateDecl( const std::string &name ) : Parent( name, DeclarationNode::NoStorageClass, LinkageSpec::Cforall ) {
+AggregateDecl::AggregateDecl( const std::string &name ) : Parent( name, DeclarationNode::NoStorageClass, LinkageSpec::Cforall ), body( false ) {
 }
 
@@ -25 +25 @@
         cloneAll( other.members, members );
         cloneAll( other.parameters, parameters );
+        body = other.body;
 }
 
@@ -37 +38 @@
 
         os << typeString() << " " << get_name();
+        os << string( indent+2, ' ' ) << "with body " << has_body() << endl;
+
         if ( ! parameters.empty() ) {
                 os << endl << string( indent+2, ' ' ) << "with parameters" << endl;
@@ -52 +55 @@
 
         os << typeString() << " " << get_name();
+        os << string( indent+2, ' ' ) << "with body " << has_body() << endl;
+
         if ( ! parameters.empty() ) {
                 os << endl << string( indent+2, ' ' ) << "with parameters" << endl;

src/SynTree/Declaration.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jun 30 21:17:24 2016
-// Update Count     : 38
+// Last Modified On : Tue Jul 12 21:03:17 2016
+// Update Count     : 39
 //
 
@@ -210 +210 @@
         std::list<TypeDecl*>& get_parameters() { return parameters; }
 
+        bool has_body() const { return body; }
+        AggregateDecl * set_body( bool body ) { AggregateDecl::body = body; return this; }
+
         virtual void print( std::ostream &os, int indent = 0 ) const;
         virtual void printShort( std::ostream &os, int indent = 0 ) const;
@@ -218 +221 @@
         std::list<Declaration*> members;
         std::list<TypeDecl*> parameters;
+        bool body;
 };
 
@@ -229 +233 @@
         virtual void accept( Visitor &v ) { v.visit( this ); }
         virtual Declaration *acceptMutator( Mutator &m ) { return m.mutate( this ); }
-
   private:
         virtual std::string typeString() const;

src/SynTree/ReferenceToType.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar  2 17:28:51 2016
-// Update Count     : 5
+// Last Modified On : Wed Jul 13 18:03:30 2016
+// Update Count     : 9
 //
 
@@ -69 +69 @@
 }
 
+void StructInstType::print( std::ostream &os, int indent ) const {
+        using std::endl;
+
+        if ( baseStruct == NULL ) ReferenceToType::print( os, indent );
+        else {
+                Type::print( os, indent );
+                os << "instance of " << typeString() << " " << name << " with body " << baseStruct->has_body() << " ";
+                if ( ! parameters.empty() ) {
+                        os << endl << std::string( indent, ' ' ) << "with parameters" << endl;
+                        printAll( parameters, os, indent+2 );
+                } // if
+        } // if
+}
+
 std::string UnionInstType::typeString() const { return "union"; }
 
@@ -79 +93 @@
         assert( baseUnion );
         doLookup( baseUnion->get_members(), baseUnion->get_parameters(), parameters, name, foundDecls );
+}
+
+void UnionInstType::print( std::ostream &os, int indent ) const {
+        using std::endl;
+
+        if ( baseUnion == NULL ) ReferenceToType::print( os, indent );
+        else {
+                Type::print( os, indent );
+                os << "instance of " << typeString() << " " << name << " with body " << baseUnion->has_body() << " ";
+                if ( ! parameters.empty() ) {
+                        os << endl << std::string( indent, ' ' ) << "with parameters" << endl;
+                        printAll( parameters, os, indent+2 );
+                } // if
+        } // if
 }
 

src/SynTree/Type.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar  2 17:29:08 2016
-// Update Count     : 21
+// Last Modified On : Wed Jul 13 11:46:54 2016
+// Update Count     : 23
 //
 
@@ -226 +226 @@
         virtual std::string typeString() const = 0;
         std::list< Expression* > parameters;
-  private:
         std::string name;
+  private:
 };
 
@@ -249 +249 @@
         virtual void accept( Visitor &v ) { v.visit( this ); }
         virtual Type *acceptMutator( Mutator &m ) { return m.mutate( this ); }
+
+        virtual void print( std::ostream &os, int indent = 0 ) const;
   private:
         virtual std::string typeString() const;
@@ -276 +278 @@
         virtual void accept( Visitor &v ) { v.visit( this ); }
         virtual Type *acceptMutator( Mutator &m ) { return m.mutate( this ); }
+
+        virtual void print( std::ostream &os, int indent = 0 ) const;
   private:
         virtual std::string typeString() const;