Changeset cff1143 for src/Parser

Timestamp:

Jul 9, 2015, 3:07:32 PM (10 years ago)

Author:

Aaron Moss <a3moss@…>

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:

0215a76f, dfee306

Parents:

82dd287 (diff), e5609dd (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 plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src/Parser

Files:

• DeclarationNode.cc (modified) (3 diffs)
• ParseNode.cc (modified) (2 diffs)

src/Parser/DeclarationNode.cc

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 12:34:05 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jul  3 12:35:02 2015
-// Update Count     : 108
+// Last Modified By : Rob Schluntz
+// Last Modified On : Wed Jul 08 16:40:37 2015
+// Update Count     : 121
 //
 
@@ -284 +284 @@
         newnode->type->array->dimension = size;
         newnode->type->array->isStatic = isStatic;
-        newnode->type->array->isVarLen = false;
+        if ( newnode->type->array->dimension == 0 || dynamic_cast<ConstantNode *>( newnode->type->array->dimension ) ) {
+                newnode->type->array->isVarLen = false;
+        } else {
+                newnode->type->array->isVarLen = true;
+        } // if
         return newnode->addQualifiers( qualifiers );
 }
@@ -464 +468 @@
                         bitfieldWidth = o->bitfieldWidth;
                 } // if
+
+                // there may be typedefs chained onto the type
+                if ( o->get_link() ) {
+                        set_link( o->get_link()->clone() );
+                }
+
         } // if
         delete o;

src/Parser/ParseNode.cc

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 13:26:29 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jun  6 20:17:58 2015
-// Update Count     : 23
+// Last Modified By : Rob Schluntz
+// Last Modified On : Wed Jul 08 14:46:45 2015
+// Update Count     : 25
 // 
 
@@ -41 +41 @@
 
 ParseNode *ParseNode::set_link( ParseNode *next_ ) {
-        ParseNode *follow;
-
         if ( next_ == 0 ) return this;
 
-        for ( follow = this; follow->next != 0; follow = follow->next );
-        follow->next = next_;
+        get_last()->next = next_;
 
         return this;