diff --git a/Makefile b/Makefile index c460cab..2040704 100644 --- a/Makefile +++ b/Makefile @@ -14,6 +14,6 @@ PATH_BIN := bin PATH_SRC := src PATH_MSXBUILD ?= . include $(PATH_MSXBUILD)/lib/make/msxbuild.mk -$(eval $(call mb_make_call,mb_doc_flow_help,MSXBUILD-Example)) -$(eval $(call mb_make_call,mb_make_flow_0module,$(PATH_SRC))) +$(call mb_make_call_eval,mb_doc_flow_help,MSXBUILD-Example) +$(call mb_make_call_eval,mb_make_flow_0module,$(PATH_SRC)) diff --git a/README.md b/README.md index 58e6bdd..126c02c 100644 --- a/README.md +++ b/README.md @@ -151,8 +151,8 @@ When you want to see whats happening do a debug run; * Add string str_lenght function * Add string str_is_ascii function (death with unicode) * Add str_lowercase and str_uppercase functions (full 21bit unicode support) -* Add `call_flow` fail on undefined argument and puts result in eval to parse flow rules -* Add `define_flow` which reverses dollar escaping so write $$(1) for $(1) and other are like normal +* Add `call_eval` fail on undefined argument and puts result in eval to parse flow rules +* Add `define_eval` which reverses dollar escaping so write $$(1) for $(1) and other are like normal * Add XML output for help system for integration with IDE's * Add rwildcard for deeper searches * Add namespace support for variables/functions/targets like: moduleX::bin/prog.o: moduleX::src/prog.c diff --git a/lib/make/mb_make.mk b/lib/make/mb_make.mk index 600e92a..1e1beed 100644 --- a/lib/make/mb_make.mk +++ b/lib/make/mb_make.mk @@ -54,6 +54,13 @@ endef MB_DOC_FIRE_FUNCTION_DEEP += $(call mb_make_call,mb_doc_function_deep,mb_make_call,"Checked origin call function wrapper."," [args...]") +define mb_make_call_eval +$(eval $(call mb_make_call,$(1),$(2),$(3),$(4),$(5),$(6),$(7),$(8),$(9))) +endef +MB_DOC_FIRE_FUNCTION_DEEP += $(call mb_make_call,mb_doc_function_deep,mb_make_call_eval,"Eval and origin checked flow injector."," [args...]") + + + define mb_make_lowercase $(subst A,a,$(subst B,b,$(subst C,c,$(subst D,d,$(subst E,e,$(subst F,f,$(subst G,g,$(subst H,h,$(subst I,i,$(subst J,j,$(subst K,k,$(subst L,l,$(subst M,m,$(subst N,n,$(subst O,o,$(subst P,p,$(subst Q,q,$(subst R,r,$(subst S,s,$(subst T,t,$(subst U,u,$(subst V,v,$(subst W,w,$(subst X,x,$(subst Y,y,$(subst Z,z,$(1))))))))))))))))))))))))))) endef