Skip to content

Commit

Permalink
#96: Some useful mk utils, optimizing low level vars operations
Browse files Browse the repository at this point in the history
  • Loading branch information
@abusalimov
abusalimov committed Sep 9, 2010
1 parent 26e63d0 commit 11b935c
Showing 1 changed file with 175 additions and 12 deletions.
187 changes: 175 additions & 12 deletions mk/util.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,19 @@ _util_mk_ := 1

include gmsl.mk

empty:=#

define \n


endef
\n := $(\n)

escape = $(call assert_called,escape,$0)$(call dollar_encode,$1)

dollar_encode = $(call assert_called,dollar_encode,$0)$(subst $$,$$$$,$1)
dollar_decode = $(call assert_called,dollar_decode,$0)$(subst $$$$,$$,$1)

##
# The last word of the MAKEFILE_LIST variable.
# Actual only until another makefile is included.
Expand All @@ -28,6 +41,8 @@ already_included = \
$(or $(call get,included,$(self_makefile)), \
$(call set,included,$(self_makefile),true))

called = $()$(call seq,$1,$2)

##
# Can be used to check whether the variable is expanded using call or not.
#
Expand All @@ -38,13 +53,18 @@ already_included = \
#
# Usage: $(call assert_called,var_name,$0)
#
assert_called = $(info $1)$(strip \
ifeq (0,1)
assert_called = $(strip \
$(call __assert_called,assert_called,$0) \
$(call __assert_called,$1,$2) \
)

__assert_called = $(call assert \
,$(call seq,$1,$2),$1 must be call'ed$(if $1, (last call'ed variable is $2)))
else
assert_called :=
assert:=
endif

args_nr = $(foreach __args_nr_i,1,$(__args_nr))
__args_nr = \
Expand All @@ -53,14 +73,14 @@ __args_nr = \
$(__args_nr_i) \
)

interval = $(if $(call lt,$1,$2) \
,$(call __interval_inc,$1,$2),$(call __interval_dec,$2,$1))
__interval_inc = $1$(if $(call lt,$1,$2),$(call $0, $(call inc,$1),$2))
__interval_dec = $(if $(call lt,$1,$2),$(call $0,$(call inc,$1) ,$2))$1
sequence = $(if $(call lt,$1,$2) \
,$(call __sequence_inc,$1,$2),$(call __sequence_dec,$2,$1))
__sequence_inc = $1$(if $(call lt,$1,$2),$(call $0, $(call inc,$1),$2))
__sequence_dec = $(if $(call lt,$1,$2),$(call $0,$(call inc,$1) ,$2))$1

expand_once = $(call expand_once_0,$1)
__expand_once_def_all = \
$(foreach x,$(call interval,0,9),$(eval $(value __expand_once_def_x)))
$(foreach x,$(call sequence,0,9),$(eval $(value __expand_once_def_x)))
define __expand_once_def_x
expand_once_$x = $(foreach total_args,$x,$(__expand_once))
endef
Expand All @@ -77,7 +97,7 @@ __expand_once = $(strip \
)$($(__expansion_name))
# XXX may be encode $(value __expansion_name) inside eval ? -- Eldar

__expansion_arg_nrs = $(call interval,1,$(call inc,$(total_args)))
__expansion_arg_nrs = $(call sequence,1,$(call inc,$(total_args)))
__expansion_escape_arg = $(call dollar_encode,$($(arg_nr)))

__expansion_args = $(call split,_$$$$$$_,$(call merge,$(true:%=,), \
Expand All @@ -102,11 +122,49 @@ expansion: [$($1)]

endef

# eval is 3.81 bug (Savannah #27394) workaround.
${eval $( \
)$(\n)define __var_define_mk$( \
)$(\n)define $$1$(\n)$$2$(\n)endef$( \
)$(\n)endef$( \
)}

${eval $( \
)$(\n)define __var_assign_recursive_mk$( \
)$(\n)$(call __var_define_mk,$$1,$$2)$( \
)$(\n)endef$( \
)}

__var_assign_template_mk_def = ${eval $( \
)$(\n)define __var_assign_$(strip $1)_mk$( \
)$(\n)$(call __var_define_mk,__var_assign_tmp,$$2)$( \
)$(\n)$$1 $2 $$$$(__var_assign_tmp)$( \
)$(\n)endef$( \
)}

$(call __var_assign_template_mk_def,simple,:=)
$(call __var_assign_template_mk_def,append,+=)
$(call __var_assign_template_mk_def,conditional,?=)

ifeq (0,1)
var_assign_recursive = \
$(call assert_called,var_assign_recursive,$0)$(call __var_assign,$1 =,$2)
var_assign_recursive = \
${eval $(__var_assign_recursive_mk)}

else

${eval $( \
)$(\n)define var_assign_recursive$( \
)$(\n)$${eval $(value __var_assign_recursive_mk)}$( \
)$(\n)endef$( \
)}
endif

var_assign_simple = \
$(call assert_called,var_assign_simple,$0)$(call __var_assign,$1:=,$2)
var_assign_simple = \
${eval $(__var_assign_simple_mk)}

var_assign_append = \
$(call assert_called,var_assign_append,$0)$(call __var_assign,$1+=,$2)
Expand All @@ -125,7 +183,9 @@ var_assign_undefined = \
endif

__var_assign = $(strip \
$(call assert,$(strip $1)) \
$(call assert,$(strip $1),Must specify target variable name) \
$(call assert,$(filter undefined file,$(origin $1)), \
Invalid origin of target variable [$1] : [$(origin $1)]) \
$(eval $(call escape,$1) $(empty)$2$(empty)) \
)

Expand Down Expand Up @@ -153,12 +213,115 @@ var_restore = $(strip \
$(call var_assign_$(call get,__var_flavor,$1),$1,$(call get,__var_value,$1))\
)

escape = $(call assert_called,escape,$0)$(call dollar_encode,$1)
# ----------------------------------------------------------------------------
# Function: put
# Arguments: 1: Name of associative array
# 2: The key value to associate
# 3: The value associated with the key
# Returns: None
# ----------------------------------------------------------------------------
map_put = $(strip \
$(call assert_called,map_put,$0) \
$(__map_args_check) \
$(call var_assign_simple,$(__map_entry),$3) \
)

dollar_encode = $(call assert_called,dollar_encode,$0)$(subst $$,$$$$,$1)
dollar_decode = $(call assert_called,dollar_decode,$0)$(subst $$$$,$$,$1)
# ----------------------------------------------------------------------------
# Function: get
# Arguments: 1: Name of associative array
# 2: The key to retrieve
# Returns: The value stored in the array for that key
# ----------------------------------------------------------------------------
map_get = $(strip \
$(call assert_called,map_get,$0) \
$(__map_args_check) \
$(if $(filter-out undefined,$(origin $(__map_entry))),$($(__map_entry))) \
)

empty:=#
# ----------------------------------------------------------------------------
# Function: XXX
# Arguments: 1: Name of associative array
# 2: The key value to remove
# Returns: None
# ----------------------------------------------------------------------------
map_remove = $(strip \
$(call assert_called,map_remove,$0) \
$(__map_args_check) \
$(call var_undefine,$(__map_entry),$3) \
)

# ----------------------------------------------------------------------------
# Function: keys
# Arguments: 1: Name of associative array
# Returns: Returns a list of all defined keys in the array
# ----------------------------------------------------------------------------
map_keys = $(sort \
$(call assert_called,keys,$0) \
$(call assert,$(strip $1),Must specify map name) \
$(patsubst $(call __map_entry,$1,%),%, \
$(filter $(call __map_entry,$1,%),$(.VARIABLES)) \
)
# ----------------------------------------------------------------------------
# Function: defined
# Arguments: 1: Name of associative array
# 2: The key to test
# Returns: Returns true if the key is defined (i.e. not empty)
# ----------------------------------------------------------------------------
map_defined = $(__gmsl_tr2)$(call assert_no_dollar,$0,$1$2)$(call sne,$(call get,$1,$2),)

__map_args_check = \
$(call assert,$(and $(strip $1),$(strip $2)),Must specify map and key names)

__map_entry = \
$(__map_entry_prefix)$(call dollar_encode,$1)_$$_$(call dollar_encode,$2)
__map_entry_prefix := __map_entry_

### Version utils.

make_version_major =

__make_version_cmp_strict = \
$(call assert,$2,Must specify to compare with) \
$(call or, \
$(call $1,$(make_version_major),$(call make_version_major,$2)), \
$(call and, \
$(call eq,$(make_version_major),$(call make_version_major,$2)), \
$(call $1,$(make_version_minor),$(call make_version_minor,$2)) \
) \
) \
)

make_version_gt = $(call __gmsl_make_bool, \
$(call assert_called,make_version_gt,$0) \
$(call __make_version_cmp_strict,gt,$1) \
)
make_version_lt = $(call __gmsl_make_bool, \
$(call assert_called,make_version_lt,$0) \
$(call __make_version_cmp_strict,lt,$1) \
)
make_version_gte = $(call __gmsl_make_bool, \
$(call assert_called,make_version_gte,$0) \
$(call not,$(call make_version_lt,$1)) \
)
make_version_lte = $(call __gmsl_make_bool, \
$(call assert_called,make_version_lte,$0) \
$(call not,$(call make_version_gt,$1)) \
)
make_version_eq = $(call __gmsl_make_bool, \
$(call assert_called,make_version_eq,$0) \
$(call not,$(call or,$(call make_version_gt,$1)$(call make_version_lt,$1))) \
)
make_version_neq = $(call __gmsl_make_bool, \
$(call assert_called,make_version_neq,$0) \
$(call or,$(call make_version_gt,$1)$(call make_version_lt,$1)) \
)

gte = $(__gmsl_tr2)$(call __gmsl_int_wrap2,int_gte,$1,$2)
lt = $(__gmsl_tr2)$(call __gmsl_int_wrap2,int_lt,$1,$2)
lte = $(__gmsl_tr2)$(call __gmsl_int_wrap2,int_lte,$1,$2)
eq = $(__gmsl_tr2)$(call __gmsl_int_wrap2,int_eq,$1,$2)
ne = $(__gmsl_tr2)$(call __gmsl_int_wrap2,int_ne,$1,$2)

##
# r-patsubst stands for recursive patsubst.
Expand Down

0 comments on commit 11b935c

Please sign in to comment.