Changeset d3e4d6c for src/tests/avltree

Timestamp:

Aug 23, 2017, 6:22:07 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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, stuck-waitfor-destruct, with_gc

Children:

87e08e24, cb811ac

Parents:

9f07232 (diff), bd37119 (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 plg2:software/cfa/cfa-cc

Location:

src/tests/avltree

Files:

• avl.h (modified) (2 diffs)
• avl1.c (modified) (2 diffs)
• avl3.c (modified) (2 diffs)
• avl_test.c (modified) (1 diff)

src/tests/avltree/avl.h

@@ -21 +21 @@
 // xxx - unbound type variable problems when trying to use new instead of create
 // forall( otype T, ttype Params | { void ?{}(T *, Params); } ) T * new( Params p );
-
-forall(dtype T | { void ^?{}(T *); })
-void delete(T * x);
 
 // To-do: properly use height or balance factor
@@ -58 +55 @@
 
 forall(otype K | Comparable(K), otype V)
-void ?{}(tree(K, V) *t, K key, V value);
+void ?{}(tree(K, V) &t, K key, V value);
 
 forall(otype K, otype V)
-void ^?{}(tree(K, V) * t);
+void ^?{}(tree(K, V) & t);
 
 forall(otype K | Comparable(K), otype V)

src/tests/avltree/avl1.c

@@ -1 +1 @@
 #include "avl.h"
 // #include "cwrap.h"
+#include <stdlib>
 
 forall(otype K | Comparable(K), otype V)
-void ?{}(tree(K, V) *t, K key, V value){
-  (&t->key) { key };
-  (&t->value) { value };
-  t->parent = NULL;
-  t->left = NULL;
-  t->right = NULL;
-  t->balance = 0;
+void ?{}(tree(K, V) &t, K key, V value){
+  (t.key) { key };
+  (t.value) { value };
+  t.parent = NULL;
+  t.left = NULL;
+  t.right = NULL;
+  t.balance = 0;
 }
 
 forall(otype K, otype V)
-void ^?{}(tree(K, V) * t){
-  delete(t->left);
-  delete(t->right);
-  ^(&t->key){};
-  ^(&t->value){};
+void ^?{}(tree(K, V) & t){
+  delete(t.left);
+  delete(t.right);
+  ^(t.key){};
+  ^(t.value){};
 }
 
@@ -24 +25 @@
   // infinite loop trying to resolve ... t = malloc();
   tree(K, V) * t = malloc(sizeof(tree(K,V)));
-  t { key, value };
+  (*t){ key, value };
   return t;
 }

src/tests/avltree/avl3.c

@@ -1 +1 @@
 #include "avl.h"
 #include "avl-private.h"
+#include <stdlib>
 
 // from stdlib
@@ -32 +33 @@
   t->left = NULL;
   t->right = NULL;
-  deleteSingleNode(t);
+  delete(t);
 }
 

src/tests/avltree/avl_test.c

@@ -1 +1 @@
 #include "avl.h"
 #include "avl-private.h"
+#include <stdlib>
 
 extern "C" {