Changeset 8a5bdf0 for doc/papers/general/evaluation/c-stack.c

Timestamp:

Apr 30, 2018, 2:31:18 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

4c80a75

Parents:

5248789 (diff), 5e5dbc2 (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:

• doc/papers/general/evaluation/c-stack.c (modified) (2 diffs)

doc/papers/general/evaluation/c-stack.c

@@ -2 +2 @@
 #include "c-stack.h"
 
-struct stack_node {
+typedef struct node {
         void * value;
-        struct stack_node * next;
-};
+        struct node * next;
+} node;
 
-void clear_stack( struct stack * s, void (*free_el)( void * ) ) {
-        for ( struct stack_node * next = s->head; next; ) {
-                struct stack_node * crnt = next;
-                next = crnt->next;
-                free_el( crnt->value );
-                free( crnt );
+void copy_stack( stack * s, const stack * t, void * (*copy)( const void * ) ) {
+        node ** cr = &s->head;
+        for ( node * nx = t->head; nx; nx = nx->next ) {
+                *cr = malloc( sizeof(node) ); /***/
+                (*cr)->value = copy( nx->value );
+                cr = &(*cr)->next;
+        }
+        *cr = NULL;
+}
+
+void clear_stack( stack * s, void (* free_el)( void * ) ) {
+        for ( node * nx = s->head; nx; ) {
+                node * cr = nx;
+                nx = cr->next;
+                free_el( cr->value );
+                free( cr );
         }
         s->head = NULL;
 }
 
-struct stack new_stack() { return (struct stack){ NULL }; /***/ }
+stack new_stack() { return (stack){ NULL }; /***/ }
 
-void copy_stack( struct stack * s, const struct stack * t, void * (*copy)( const void * ) ) {
-        struct stack_node ** crnt = &s->head;
-        for ( struct stack_node * next = t->head; next; next = next->next ) {
-                *crnt = malloc( sizeof(struct stack_node) ); /***/
-                (*crnt)->value = copy( next->value );
-                crnt = &(*crnt)->next;
-        }
-        *crnt = NULL;
-}
-struct stack * assign_stack( struct stack * s, const struct stack * t, 
+stack * assign_stack( stack * s, const stack * t, 
                 void * (*copy_el)( const void * ), void (*free_el)( void * ) ) {
         if ( s->head == t->head ) return s;
@@ -36 +37 @@
 }
 
-_Bool stack_empty( const struct stack * s ) { return s->head == NULL; }
+_Bool stack_empty( const stack * s ) { return s->head == NULL; }
 
-void push_stack( struct stack * s, void * v ) {
-        struct stack_node * n = malloc( sizeof(struct stack_node) ); /***/
-        *n = (struct stack_node){ v, s->head }; /***/
+void push_stack( stack * s, void * v ) {
+        node * n = malloc( sizeof(node) ); /***/
+        *n = (node){ v, s->head }; /***/
         s->head = n;
 }
 
-void * pop_stack( struct stack * s ) {
-        struct stack_node * n = s->head;
+void * pop_stack( stack * s ) {
+        node * n = s->head;
         s->head = n->next;
         void * v = n->value;