Changeset 1d2314f

Timestamp:

Jun 19, 2020, 8:48:12 AM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

8d321f9

Parents:

109c916 (diff), 8fc6e92a (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

Location:

examples

Files:

• hashtable.cfa (modified) (4 diffs)
• hashtable2.cfa (added)

examples/hashtable.cfa ¶

@@ -23 +23 @@
 };
 
-forall( otype K, dtype tN, dtype tE | $dlistable(tN, tE) | hkey(K, tN) | { void defaultResumptionHandler(ht_fill_limit_crossed &); } ) {
+forall( otype K, dtype tN, dtype tE | $dlistable(tN, tE) | hkey(K, tN) ) {
 
     struct hashtable {
@@ -33 +33 @@
         float ff_next_warn_up;
 
-        void (*__stashed_defaultResumptionHandler) (ht_fill_limit_crossed &);
+        void (*defaultResumptionHandler) (ht_fill_limit_crossed &);
     };
 
     void ?{}( hashtable(K, tN, tE) & this ) = void;
-//    void ?{}( hashtable(K, tN, tE) & this, size_t, dlist(tN, tE)* ) = void;
+}
+
+forall( otype K, dtype tN, dtype tE | $dlistable(tN, tE) | hkey(K, tN) | { void defaultResumptionHandler(ht_fill_limit_crossed &); } ) {
 
     void ?{}( hashtable(K, tN, tE) & this, size_t n_buckets, dlist(tN, tE) *buckets ) {
@@ -47 +49 @@
         this.ff_next_warn_up = 0.5;
 
-        this.__stashed_defaultResumptionHandler = defaultResumptionHandler;
+        this.defaultResumptionHandler = defaultResumptionHandler;
 
         for ( i; n_buckets ) {
@@ -79 +81 @@
 
     void check_ff_warning( hashtable(K, tN, tE) & this ) with (this) {
-        void (*defaultResumptionHandler) (ht_fill_limit_crossed &) = __stashed_defaultResumptionHandler;
         if (fill_frac(this) > ff_next_warn_up) {
             throwResume (ht_fill_limit_crossed){};