refactored names

godsme · Sep 5, 2020 · 11ec3e8 · 11ec3e8
1 parent c0a2c86
commit 11ec3e8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/include/maco/aggregate.h b/include/maco/aggregate.h
@@ -7,8 +7,8 @@
 
 #include <maco/basic.h>
 
-#define __MACO_var_full(x) __MACO_swap x
-#define __MACO_var_name(x) __MACO_1st   x
-#define __MACO_var_type(x) __MACO_rest  x
+#define __MACO_var_full(x) __MACO_merge_swap  x
+#define __MACO_var_name(x) __MACO_1st         x
+#define __MACO_var_type(x) __MACO_rest        x
 
 #endif //MACO_AGGREGATE_H
diff --git a/include/maco/basic.h b/include/maco/basic.h
@@ -34,8 +34,12 @@
 #define __MACO_merge_2__(x, y)  x y
 #define __MACO_merge_2(x, y)    __MACO_merge_2__(x,y)
 
-#define __MACO_swap__(x, y)    y x
-#define __MACO_swap(x, y)      __MACO_swap__(x, y)
+#define __MACO_swap__(x, y)     y, x
+#define __MACO_swap(x, y)       __MACO_swap__(x, y)
+
+#define __MACO_merge_swap(x, y)   y x
+
+#define __MACO_defer_invoke(f, ...)   __MACO_defer(f) (__VA_ARGS__)
 
 #define __MACO_invoke(f, ...)         f(__VA_ARGS__)
 #define __MACO_compose(f, g, ...)     __MACO_invoke(f, g(__VA_ARGS__))