kanaka/mal
1
1
Fork 0
mirror of https://github.com/kanaka/mal.git synced 2024-09-19 09:38:28 +03:00
Code Issues Projects Releases Wiki Activity

make: move macro attr to fn rather than in env.

Browse Source
This commit is contained in:
Joel Martin 2017-10-24 09:29:51 -05:00
parent 677cfe0c18
commit 14a5c0d8bc
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
make/step8_macros.mk
View File

@ -32,7 +32,7 @@ $(strip \
endef
define IS_MACRO_CALL
$(if $(call _list?,$(1)),$(call ENV_FIND,$(2),_macro_$($(call _nth,$(1),0)_value)),)
$(if $(call _list?,$(1)),$(if $(call ENV_FIND,$(2),$($(call _nth,$(1),0)_value)),$(_macro_$(call ENV_GET,$(2),$($(call _nth,$(1),0)_value))),),)
endef
define MACROEXPAND
@ -96,7 +96,7 @@ $(if $(__ERROR),,\
$(foreach a1,$(call _nth,$(1),1),\
$(foreach a2,$(call _nth,$(1),2),\
$(foreach res,$(call EVAL,$(a2),$(2)),\
$(if $(call ENV_SET,$(2),_macro_$($(a1)_value),true),,)\
$(eval _macro_$(res) = true)\
$(if $(call ENV_SET,$(2),$($(a1)_value),$(res)),$(res),)))),\
$(if $(call _EQ,macroexpand,$($(a0)_value)),\
$(call MACROEXPAND,$(call _nth,$(1),1),$(2)),\

4
make/step9_try.mk
View File

@ -32,7 +32,7 @@ $(strip \
endef
define IS_MACRO_CALL
$(if $(call _list?,$(1)),$(call ENV_FIND,$(2),_macro_$($(call _nth,$(1),0)_value)),)
$(if $(call _list?,$(1)),$(if $(call ENV_FIND,$(2),$($(call _nth,$(1),0)_value)),$(_macro_$(call ENV_GET,$(2),$($(call _nth,$(1),0)_value))),),)
endef
define MACROEXPAND
@ -96,7 +96,7 @@ $(if $(__ERROR),,\
$(foreach a1,$(call _nth,$(1),1),\
$(foreach a2,$(call _nth,$(1),2),\
$(foreach res,$(call EVAL,$(a2),$(2)),\
$(if $(call ENV_SET,$(2),_macro_$($(a1)_value),true),,)\
$(eval _macro_$(res) = true)\
$(if $(call ENV_SET,$(2),$($(a1)_value),$(res)),$(res),)))),\
$(if $(call _EQ,macroexpand,$($(a0)_value)),\
$(call MACROEXPAND,$(call _nth,$(1),1),$(2)),\

4
make/stepA_mal.mk
View File

@ -32,7 +32,7 @@ $(strip \
endef
define IS_MACRO_CALL
$(if $(call _list?,$(1)),$(call ENV_FIND,$(2),_macro_$($(call _nth,$(1),0)_value)),)
$(if $(call _list?,$(1)),$(if $(call ENV_FIND,$(2),$($(call _nth,$(1),0)_value)),$(_macro_$(call ENV_GET,$(2),$($(call _nth,$(1),0)_value))),),)
endef
define MACROEXPAND
@ -96,7 +96,7 @@ $(if $(__ERROR),,\
$(foreach a1,$(call _nth,$(1),1),\
$(foreach a2,$(call _nth,$(1),2),\
$(foreach res,$(call EVAL,$(a2),$(2)),\
$(if $(call ENV_SET,$(2),_macro_$($(a1)_value),true),,)\
$(eval _macro_$(res) = true)\
$(if $(call ENV_SET,$(2),$($(a1)_value),$(res)),$(res),)))),\
$(if $(call _EQ,macroexpand,$($(a0)_value)),\
$(call MACROEXPAND,$(call _nth,$(1),1),$(2)),\