Changeset e84382b for doc/papers/general/evaluation/c-stack.c

Timestamp:

Mar 9, 2018, 1:34:04 PM (7 years ago)

Author:

Aaron Moss <a3moss@…>

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, resolv-new, with_gc

Children:

860f19f

Parents:

b51e5fdb (diff), 3d8f2f8 (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

@@ -3 +3 @@
 
 struct stack_node {
-        void* value;
-        struct stack_node* next;
+        void * value;
+        struct stack_node * next;
 };
+
+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 );
+        }
+        s->head = NULL;
+}
 
 struct stack new_stack() { return (struct 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);
+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, 
-                void* (*copy_el)(const void*), void (*free_el)(void*)) {
+struct stack * assign_stack( struct stack * s, const struct stack * t, 
+                void * (*copy_el)( const void * ), void (*free_el)( void * ) ) {
         if ( s->head == t->head ) return s;
         clear_stack( s, free_el ); /***/
@@ -27 +36 @@
 }
 
-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);
-        }
-        s->head = NULL;
-}
+_Bool stack_empty( const struct stack * s ) { return s->head == NULL; }
 
-_Bool stack_empty(const struct stack* s) { return s->head == NULL; }
-
-void push_stack(struct stack* s, void* value) {
-        struct stack_node* n = malloc(sizeof(struct stack_node)); /***/
+void push_stack( struct stack * s, void * value ) {
+        struct stack_node * n = malloc( sizeof(struct stack_node) ); /***/
         *n = (struct stack_node){ value, s->head }; /***/
         s->head = n;
 }
 
-void* pop_stack(struct stack* s) {
-        struct stack_node* n = s->head;
+void * pop_stack( struct stack * s ) {
+        struct stack_node * n = s->head;
         s->head = n->next;
-        void* x = n->value;
-        free(n);
-        return x;
+        void * v = n->value;
+        free( n );
+        return v;
 }