Changeset 1a3eab8 for doc/papers/general/evaluation/c-pair.c

Timestamp:

Apr 30, 2018, 11:59:07 AM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

7b45636

Parents:

c0453ca3 (diff), b9c432f (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' into fix-reference-overloading

File:

• doc/papers/general/evaluation/c-pair.c (modified) (1 diff)

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

@@ -2 +2 @@
 #include "c-pair.h"
 
-struct pair* new_pair(void* first, void* second) {
-        struct pair* p = malloc(sizeof(struct pair)); /***/
-        *p = (struct pair){ first, second }; /***/
+pair * new_pair( void * first, void * second ) {
+        pair * p = malloc( sizeof(pair) ); /***/
+        *p = (pair){ first, second }; /***/
         return p;
 }
 
-struct pair* copy_pair(const struct pair* src, 
-                void* (*copy_first)(const void*), void* (*copy_second)(const void*)) {
+pair * copy_pair( const pair * src, 
+                void * (* copy_first)(const void* ), void * (* copy_second)(const void *)) {
         return new_pair( copy_first(src->first), copy_second(src->second) );
 }
 
-void free_pair(struct pair* p, void (*free_first)(void*), void (*free_second)(void*)) {
-        free_first(p->first);
-        free_second(p->second);
-        free(p);
+void free_pair( pair * p, void (* free_first)(void *), void (* free_second)(void *)) {
+        free_first( p->first );
+        free_second( p->second );
+        free( p );
 }
 
-int cmp_pair(const struct pair* a, const struct pair* b, 
-                int (*cmp_first)(const void*, const void*), int (*cmp_second)(const void*, const void*)) {
-        int c = cmp_first(a->first, b->first);
-        if ( c == 0 ) c = cmp_second(a->second, b->second);
+int cmp_pair( const pair * a, const pair * b, 
+                int (* cmp_first)(const void *, const void *), int (* cmp_second)(const void *, const void *)) {
+        int c = cmp_first( a->first, b->first );
+        if ( c == 0 ) c = cmp_second( a->second, b->second );
         return c;
 }