Changeset 839ccbb

Timestamp:

Nov 20, 2015, 4:19:13 PM (9 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, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, string, with_gc

Children:

5189888

Parents:

05587c2 (diff), ed94eac (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Peter A. Buhr <pabuhr@…> (11/20/15 12:51:58)

git-committer:

Peter A. Buhr <pabuhr@…> (11/20/15 16:19:13)

Message:

Merge branch 'master' of plg2:software/cfa/cfa-cc

Location:

src

Files:

• GenPoly/InstantiateGeneric.cc (modified) (2 diffs)
• SymTab/Validate.cc (modified) (2 diffs)
• SynTree/Mutator.h (modified) (2 diffs)
• SynTree/ReferenceToType.cc (modified) (2 diffs)
• SynTree/Type.h (modified) (4 diffs)
• SynTree/TypeSubstitution.cc (modified) (1 diff)
• examples/Makefile.am (modified) (2 diffs)
• examples/fstream.c (modified) (5 diffs)
• examples/hello.c (modified) (2 diffs)
• examples/iostream.c (modified) (10 diffs)
• main.cc (modified) (2 diffs)

src/GenPoly/InstantiateGeneric.cc

@@ -219 +219 @@
                 StructDecl *concDecl = instantiations.lookup( inst );
                 if ( ! concDecl ) {
+                        assert( inst->get_baseParameters() && "Base struct has parameters" );
                         // set concDecl to new type, insert type declaration into statements to add
                         concDecl = new StructDecl( typeNamer.newName( inst->get_name() ) );
                         substituteMembers( inst->get_baseStruct()->get_members(),
-                                                                inst->get_baseParameters(), inst->get_parameters(),
+                                                                *inst->get_baseParameters(), inst->get_parameters(),
                                                                 concDecl->get_members() );
                         addDeclaration( concDecl );
@@ -246 +247 @@
                 if ( ! concDecl ) {
                         // set concDecl to new type, insert type declaration into statements to add
+                        assert( inst->get_baseParameters() && "Base union has parameters" );
                         concDecl = new UnionDecl( typeNamer.newName( inst->get_name() ) );
                         substituteMembers( inst->get_baseUnion()->get_members(),
-                                                                inst->get_baseParameters(), inst->get_parameters(),
+                                                                *inst->get_baseParameters(), inst->get_parameters(),
                                                                 concDecl->get_members() );
                         addDeclaration( concDecl );

src/SymTab/Validate.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 21:50:04 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Aug 11 16:59:35 2015
-// Update Count     : 196
+// Last Modified On : Thu Nov 19 22:31:41 2015
+// Update Count     : 197
 //
 
@@ -195 +195 @@
                 acceptAll( translationUnit, pass1 );
                 acceptAll( translationUnit, pass2 );
-                // need to collect all of the assignment operators prior to
-                // this point and only generate assignment operators if one doesn't exist
+                // need to collect all of the assignment operators prior to this point and only generate assignment operators if
+                // one doesn't exist
                 AddStructAssignment::addStructAssignment( translationUnit );
                 acceptAll( translationUnit, pass3 );

src/SynTree/Mutator.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul 23 23:24:18 2015
-// Update Count     : 7
+// Last Modified On : Thu Nov 19 22:26:16 2015
+// Update Count     : 8
 //
 #include <cassert>
@@ -103 +103 @@
 inline TreeType *maybeMutate( TreeType *tree, MutatorType &mutator ) {
         if ( tree ) {
-                TreeType *newnode = dynamic_cast< TreeType* >( tree->acceptMutator( mutator ) );
+                TreeType *newnode = dynamic_cast< TreeType * >( tree->acceptMutator( mutator ) );
                 assert( newnode );
                 return newnode;

src/SynTree/ReferenceToType.cc

@@ -59 +59 @@
 std::string StructInstType::typeString() const { return "struct"; }
 
-std::list<TypeDecl*>& StructInstType::get_baseParameters() { return baseStruct->get_parameters(); }
+std::list<TypeDecl*>* StructInstType::get_baseParameters() {
+        if ( ! baseStruct ) return NULL;
+        return &baseStruct->get_parameters();
+}
 
 void StructInstType::lookup( const std::string &name, std::list< Declaration* > &foundDecls ) const {
@@ -68 +71 @@
 std::string UnionInstType::typeString() const { return "union"; }
 
-std::list<TypeDecl*>& UnionInstType::get_baseParameters() { return baseUnion->get_parameters(); }
+std::list<TypeDecl*>* UnionInstType::get_baseParameters() {
+        if ( ! baseUnion ) return NULL;
+        return &baseUnion->get_parameters();
+}
 
 void UnionInstType::lookup( const std::string &name, std::list< Declaration* > &foundDecls ) const {

src/SynTree/Type.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul  9 16:46:15 2015
-// Update Count     : 14
+// Last Modified On : Fri Nov 20 12:54:09 2015
+// Update Count     : 15
 //
 
@@ -201 +201 @@
         std::list<DeclarationWithType*> parameters;
 
-        // does the function accept a variable number of arguments following the arguments
-        // specified in the parameters list.    This could be because of
+        // Does the function accept a variable number of arguments following the arguments specified in the parameters list.
+        // This could be because of
         // - an ellipsis in a prototype declaration
         // - an unprototyped declaration
@@ -238 +238 @@
         void set_baseStruct( StructDecl *newValue ) { baseStruct = newValue; }
 
-        /// Accesses generic parameters of base struct
-        std::list<TypeDecl*>& get_baseParameters();
+        /// Accesses generic parameters of base struct (NULL if none such)
+        std::list<TypeDecl*> * get_baseParameters();
         
         /// Looks up the members of this struct named "name" and places them into "foundDecls".
@@ -265 +265 @@
         void set_baseUnion( UnionDecl *newValue ) { baseUnion = newValue; }
 
-        /// Accesses generic parameters of base union
-        std::list<TypeDecl*>& get_baseParameters();
+        /// Accesses generic parameters of base union (NULL if none such)
+        std::list<TypeDecl*> * get_baseParameters();
         
         /// looks up the members of this union named "name" and places them into "foundDecls"

src/SynTree/TypeSubstitution.cc

@@ -147 +147 @@
         } // if
         // bind type variables from generic type instantiations
-        for ( std::list< TypeDecl* >::const_iterator tyvar = type->get_baseParameters().begin(); tyvar != type->get_baseParameters().end(); ++tyvar ) {
-                boundVars.insert( (*tyvar)->get_name() );
-        } // for
+        std::list< TypeDecl* > *baseParameters = type->get_baseParameters();
+        if ( baseParameters && ! type->get_parameters().empty() ) {
+                for ( std::list< TypeDecl* >::const_iterator tyvar = baseParameters->begin(); tyvar != baseParameters->end(); ++tyvar ) {
+                        boundVars.insert( (*tyvar)->get_name() );
+                } // for
+        } // if
         Type *ret = Mutator::mutate( type );
         boundVars = oldBoundVars;

src/examples/Makefile.am

@@ -11 +11 @@
 ## Created On       : Sun May 31 09:08:15 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Thu Nov 19 18:01:56 2015
-## Update Count     : 23
+## Last Modified On : Fri Nov 20 16:03:46 2015
+## Update Count     : 24
 ###############################################################################
 
@@ -19 +19 @@
 CC = @CFA_BINDIR@/cfa
 
-noinst_PROGRAMS = fstream_test vector_test
+noinst_PROGRAMS = fstream_test vector_test # build but do not install
 fstream_test_SOURCES = iostream.c fstream.c fstream_test.c iterator.c
 vector_test_SOURCES = vector_int.c fstream.c iostream.c array.c iterator.c vector_test.c

src/examples/fstream.c

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed May 27 18:12:33 2015
-// Update Count     : 2
+// Last Modified On : Thu Nov 19 22:43:31 2015
+// Update Count     : 4
 //
 
@@ -30 +30 @@
                 fwrite( data, size, 1, os->file );
                 os->fail = ferror( os->file );
-        }
+        } // if
         return os;
-}
+} // write
 
 int fail( ofstream *os ) {
         return os->fail;
-}
+} // fail
 
 static ofstream *make_ofstream() {
@@ -42 +42 @@
         new_stream->fail = 0;
         return new_stream;
-}
+} // make_ofstream
 
 ofstream *ofstream_stdout() {
@@ -48 +48 @@
         stdout_stream->file = stdout;
         return stdout_stream;
-}
+} // ofstream_stdout
 
 ofstream *ofstream_stderr() {
@@ -54 +54 @@
         stderr_stream->file = stderr;
         return stderr_stream;
-}
+} // ofstream_stderr
 
 ofstream *ofstream_fromfile( const char *name ) {

src/examples/hello.c

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed May 27 18:14:58 2015
-// Update Count     : 1
+// Last Modified On : Fri Nov 20 16:02:50 2015
+// Update Count     : 3
 //
 
@@ -28 +28 @@
 // Local Variables: //
 // tab-width: 4 //
-// compile-command: "cfa hello.c fstream.o iostream.o" //
+// compile-command: "cfa hello.c fstream.o iostream.o iterator.o" //
 // End: //

src/examples/iostream.c

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Nov 19 17:54:38 2015
-// Update Count     : 4
+// Last Modified On : Fri Nov 20 13:19:19 2015
+// Update Count     : 9
 //
 
@@ -17 +17 @@
 extern "C" {
 #include <stdio.h>
-//#include <string.h>
-//#include <ctype.h>
-        typedef long unsigned int size_t;
-        size_t strlen(const char *s);
+#include <string.h>                                                                             // strlen
 }
 
@@ -26 +23 @@
 ostype * ?<<?( ostype *os, char c ) {
         return write( os, &c, 1 );
-}
+} // ?<<?
 
 forall( dtype ostype | ostream( ostype ) )
@@ -33 +30 @@
         sprintf( buffer, "%d", i );
         return write( os, buffer, strlen( buffer ) );
-}
+} // ?<<?
 
 forall( dtype ostype | ostream( ostype ) )
@@ -40 +37 @@
         sprintf( buffer, "%g", d );
         return write( os, buffer, strlen( buffer ) );
-}
+} // ?<<?
 
 forall( dtype ostype | ostream( ostype ) )
 ostype * ?<<?( ostype *os, const char *cp ) {
         return write( os, cp, strlen( cp ) );
-}
+} // ?<<?
 
 forall( dtype ostype | ostream( ostype ) )
@@ -52 +49 @@
         sprintf( buffer, "%p", p );
         return write( os, buffer, strlen( buffer ) );
-}
+} // ?<<?
 
 forall( type elt_type | writeable( elt_type ),
@@ -62 +59 @@
         }
         for_each( begin, end, print );
-}
+} // ?<<?
 
 forall( type elt_type | writeable( elt_type ),
@@ -72 +69 @@
         }
         for_each_reverse( begin, end, print );
-}
+} // ?<<?
 
 
@@ -78 +75 @@
 istype * ?>>?( istype *is, char *cp ) {
         return read( is, cp, 1 );
-}
+} // ?>>?
 
 forall( dtype istype | istream( istype ) )
@@ -100 +97 @@
         unread( is, cur );
         return is;
-}
+} // ?>>?
 
 // Local Variables: //

src/main.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Fri May 15 23:12:02 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Thu Jul 30 16:08:18 2015
-// Update Count     : 167
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Nov 19 22:31:40 2015
+// Update Count     : 168
 //
 
@@ -227 +227 @@
                 } // if
 
-                // add the assignment statement after the 
-                // initialization of a type parameter
+                // add the assignment statement after the initialization of a type parameter
                 OPTPRINT( "validate" )
                 SymTab::validate( translationUnit, symtabp );