重写中

zaoqi · Aug 13, 2018 · f14c6bf · f14c6bf
1 parent 7cf6fc6
commit f14c6bf
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/example-lambda.c b/example-lambda.c
@@ -1,5 +1,11 @@
 #include "module<"
-define_public_lambda_withTypeOfBody(add(var(int, x), var(int, y)) __ int)(
-	x+y;
-)
+define_public_lambda_withTypeOfBody(add(var(x, int), var(y, int)) __ int)(
+	x+y;)
+define_public_withTypeOfBody_lambda(int add2(int x, var(y, int)))(
+	x+y;)
+define_public_inline_withTypeOfBody_lambda(int add3(int x, int y))(
+	x+y;)
+define_private_inline_lambda_s_withTypeOfBody(add4 __ var(x, int), var(y, int)__ int)(
+	make_void();
+	add3(x,y);)
 #include ">module"
diff --git a/make.c b/make.c
@@ -328,7 +328,7 @@ LANG_define => 全局定義
 			/* 例 lambda_s(int, int x)(x+y;) */\
 			/* 例 lambda_s_withTypeOfBody(int, int x __ int)(x+y;) */\
 			/* 例 lambda_withTypeOfBody((int, int x) __ int)(x+y;) */\
-			/* 例 withTypeOfBody_lambda(int __ (int, int x))(x+y;) */\
+			/* 例 withTypeOfBody_lambda(int __(int, int x))(x+y;) */\
 			DEFINE(X(LANG_prefix"lambda_error"),Call1(X(TOOLS_prefix"error"),String( \
 				"lambda_s requires C++11 or later," \
 				"lambda_s_withTypeOfBody, withTypeOfBody_lambda and lambda_withTypeOfBody requires GCC or C++11 or later" \
@@ -398,10 +398,10 @@ LANG_define => 全局定義
 			DEFINE_FUNCTION(X(LANG_prefix"hELPEr_define_lambda_withTypeOfBody"),X("prefix,iderargs,ret"), \
 				X("prefix ret iderargs ") \
 				X(LANG_prefix"hELPEr_define_lambda_hELPEr")) \
-			DEFINE_FUNCTION(X(LANG_prefix"hELPEr_declare_withTypeOfBody_lambda"),X("prefix,ret,iderargs"), \
-				X("prefix ret iderargs;")) \
-			DEFINE_FUNCTION(X(LANG_prefix"hELPEr_define_withTypeOfBody_lambda"),X("prefix,ret,iderargs"), \
-				X("prefix ret iderargs ") \
+			DEFINE_FUNCTION(X(LANG_prefix"hELPEr_declare_withTypeOfBody_lambda"),X("prefix,retiderargs"), \
+				X("prefix retiderargs;")) \
+			DEFINE_FUNCTION(X(LANG_prefix"hELPEr_define_withTypeOfBody_lambda"),X("prefix,retiderargs"), \
+				X("prefix retiderargs ") \
 				X(LANG_prefix"hELPEr_define_lambda_hELPEr")) \
 			DEFINE_FUNCTION(X(LANG_prefix"hELPEr_define_lambda_hELPEr"),X("x"),X("{return ({x});}")) \
 			\

diff --git a/module< b/module<
@@ -398,8 +398,8 @@ typedef intptr_t exprOrientedC_LANG_int_pointer;
 #define exprOrientedC_LANG_hELPEr_define_lambda_s_withTypeOfBody(prefix,ider,...) prefix exprOrientedC_TOOLS_last(__VA_ARGS__) ider(exprOrientedC_TOOLS_init(__VA_ARGS__))exprOrientedC_LANG_hELPEr_define_lambda_hELPEr
 #define exprOrientedC_LANG_hELPEr_declare_lambda_withTypeOfBody(prefix,iderargs,ret) prefix ret iderargs;
 #define exprOrientedC_LANG_hELPEr_define_lambda_withTypeOfBody(prefix,iderargs,ret) prefix ret iderargs exprOrientedC_LANG_hELPEr_define_lambda_hELPEr
-#define exprOrientedC_LANG_hELPEr_declare_withTypeOfBody_lambda(prefix,ret,iderargs) prefix ret iderargs;
-#define exprOrientedC_LANG_hELPEr_define_withTypeOfBody_lambda(prefix,ret,iderargs) prefix ret iderargs exprOrientedC_LANG_hELPEr_define_lambda_hELPEr
+#define exprOrientedC_LANG_hELPEr_declare_withTypeOfBody_lambda(prefix,retiderargs) prefix retiderargs;
+#define exprOrientedC_LANG_hELPEr_define_withTypeOfBody_lambda(prefix,retiderargs) prefix retiderargs exprOrientedC_LANG_hELPEr_define_lambda_hELPEr
 #define exprOrientedC_LANG_hELPEr_define_lambda_hELPEr(x) {return ({x});}
 #define declare_public exprOrientedC_LANG_declare_public
 #define exprOrientedC_LANG_declare_public(typename) extern typename;