Changeset 6603c1d for src/Parser/ParseNode.cc

Timestamp:

Aug 15, 2016, 10:18:22 AM (9 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

b1848a0

Parents:

38736854 (diff), 797347f (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

File:

• src/Parser/ParseNode.cc (modified) (3 diffs)

src/Parser/ParseNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 13:26:29 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Aug  7 23:32:47 2016
-// Update Count     : 94
+// Last Modified On : Sat Aug 13 18:55:35 2016
+// Update Count     : 98
 // 
 
@@ -31 +31 @@
         ParseNode *current = this;
 
-        while ( current->get_link() != 0 )
-        current = current->get_link();
-
+        while ( current->get_next() != 0 )
+        current = current->get_next();
         return current;
 }
 
-ParseNode *ParseNode::set_link( ParseNode *next_ ) {
+ParseNode *ParseNode::set_last( ParseNode *next_ ) {
         if ( next_ != 0 ) get_last()->next = next_;
         return this;
@@ -54 +53 @@
 
 ParseNode &ParseNode::operator,( ParseNode &p ) {
-        set_link( &p );
-
+        set_last( &p );
         return *this;
 }