Changeset 5189888 for src/SynTree

Timestamp:

Nov 20, 2015, 4:44:27 PM (10 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

7e23d0a, bdf1954

Parents:

66a2a61 (diff), 839ccbb (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.

Message:

Merge branch 'master' of /u/cforall/software/cfa/cfa-cc

Conflicts:

src/SymTab/Validate.cc

Location:

src/SynTree

Files:

• Mutator.h (modified) (2 diffs)
• Type.h (modified) (4 diffs)

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/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
@@ -239 +239 @@
 
         /// Accesses generic parameters of base struct (NULL if none such)
-        std::list<TypeDecl*>* get_baseParameters();
+        std::list<TypeDecl*> * get_baseParameters();
         
         /// Looks up the members of this struct named "name" and places them into "foundDecls".
@@ -266 +266 @@
 
         /// Accesses generic parameters of base union (NULL if none such)
-        std::list<TypeDecl*>* get_baseParameters();
+        std::list<TypeDecl*> * get_baseParameters();
         
         /// looks up the members of this union named "name" and places them into "foundDecls"