minor fix

[cdsspec-compiler.git] / benchmark / cliffc-hashtable / simplified_cliffc_hashtable.h

diff --git a/benchmark/cliffc-hashtable/simplified_cliffc_hashtable.h b/benchmark/cliffc-hashtable/simplified_cliffc_hashtable.h
index 299e7a320533cf9b8362b6c812a57f63c7b6f9d6..a52d238d22c6ca7de23941cc3bf2e5c14af6c4da 100644 (file)
--- a/benchmark/cliffc-hashtable/simplified_cliffc_hashtable.h
+++ b/benchmark/cliffc-hashtable/simplified_cliffc_hashtable.h
@@ -95,7 +95,6 @@ class cliffc_hashtable {
                                map = spec_hashtable<TypeK, TypeV*>();
                                id_map = spec_hashtable<TypeK, TypeV*>();
                                tag = Tag();
-                       @DefineFunc:
                        static bool equals_val(TypeV *ptr1, TypeV *ptr2) {
                                // ...
                        }
@@ -369,7 +368,7 @@ friend class CHM;
                @Commit_point_set: Read_Val_Point1 | Read_Val_Point2 | Read_Val_Point3
                @ID: __sequential.getKeyTag(key)
                @Action:
-                       @DefineVar: TypeV *_Old_Val = __sequential.map.get(key)
+                       TypeV *_Old_Val = __sequential.map.get(key)
                @Post_check:
                        __sequential.equals_val(_Old_Val, __RET__)
                @End
@@ -391,8 +390,8 @@ friend class CHM;
                @ID: __sequential.getKeyTag(key)
                @Action:
                        # Remember this old value at checking point
-                       @DefineVar: TypeV *_Old_Val = __sequential.map.get(key)
-                       @Code: __sequential.map.put(key, &val);
+                       TypeV *_Old_Val = __sequential.map.get(key)
+                       __sequential.map.put(key, &val);
                @Post_check:
                        __sequential.equals_val(__RET__, _Old_Val)
                @End
@@ -411,8 +410,7 @@ friend class CHM;
                        COND_PutIfAbsentSucc :: __RET__ == NULL
                @ID: __sequential.getKeyTag(key)
                @Action:
-                       @DefineVar: TypeV *_Old_Val = __sequential.map.get(key)
-                       @Code:
+                       TypeV *_Old_Val = __sequential.map.get(key)
                        if (__COND_SAT__)
                                __sequential.map.put(key, &value);
                @Post_check:
@@ -429,8 +427,8 @@ friend class CHM;
                @Commit_point_set: Write_Val_Point
                @ID: __sequential.getKeyTag(key)
                @Action:
-                       @DefineVar: TypeV *_Old_Val = __sequential.map.get(key)
-                       @Code: __sequential.map.put(key, NULL);
+                       TypeV *_Old_Val = __sequential.map.get(key)
+                       __sequential.map.put(key, NULL);
                @Post_check:
                        __sequential.equals_val(__RET__, _Old_Val)
                @End
@@ -450,11 +448,10 @@ friend class CHM;
                        COND_RemoveIfMatchSucc :: __RET__ == true
                @ID: __sequential.getKeyTag(key)
                @Action:
-                       @Code:
-                       if (__COND_SAY__)
+                       if (__COND_SAT__)
                                __sequential.map.put(key, NULL);
                @Post_check:
-                       __COND_SAY__ ? __RET__ : !__RET__
+                       __COND_SAT__ ? __RET__ : !__RET__
                @End
        */
        bool remove(TypeK& key, TypeV& val) {
@@ -470,7 +467,7 @@ friend class CHM;
                        Write_Val_Point
                @ID: __sequential.getKeyTag(key)
                @Action:
-                       @DefineVar: TypeV *_Old_Val = __sequential.map.get(key)
+                       TypeV *_Old_Val = __sequential.map.get(key)
                @Post_check:
                        __sequential.equals_val(__RET__, _Old_Val)
                @End
@@ -490,11 +487,10 @@ friend class CHM;
                        COND_ReplaceIfMatchSucc :: __RET__ == true
                @ID: __sequential.getKeyTag(key)
                @Action:
-                       @Code:
-                       if (__COND_SAY__)
+                       if (__COND_SAT__)
                                __sequential.map.put(key, &newval);
                @Post_check:
-                       __COND_SAY__ ? __RET__ : !__RET__
+                       __COND_SAT__ ? __RET__ : !__RET__
                @End
        */
        bool replace(TypeK& key, TypeV& oldval, TypeV& newval) {