Intrusive changes in the make implementation

impls/make/README

@@ -0,0 +1,11 @@
+It is often useful to add $(warning /$0/ /$1/ /$2/ /$3/) at the very
+start of each interesting macro.
+
+Recal that foreach does nothing when the list only contains spaces,
+and adds spaces between the results even if some results are empty.
+
+If debugging the reader:
+# export READER_DEBUG=1
+
+In order to get the equivalent of DEBUG_EVAL in step2:
+# export EVAL_DEBUG=1

impls/make/env.mk

@@ -14,31 +14,21 @@ include $(_TOP_DIR)types.mk
 
 # An ENV environment is a hash-map with an __outer__ reference to an
 # outer environment
-define BIND_ARGS
-$(strip \
-  $(word 1,$(1) \
-    $(foreach fparam,$(call _nth,$(2),0),\
-      $(if $(call _EQ,&,$($(fparam)_value)),
-        $(call ENV_SET,$(1),$($(call _nth,$(2),1)_value),$(strip \
-          $(foreach new_list,$(call _list),
-            $(word 1,$(new_list) \
-              $(foreach val,$(3),$(call _conj!,$(new_list),$(val))))))),\
-        $(foreach val,$(word 1,$(3)),\
-          $(call ENV_SET,$(1),$($(fparam)_value),$(val))\
-          $(foreach left,$(call srest,$(2)),\
-            $(if $(call _EQ,0,$(call _count,$(left))),\
-              ,\
-              $(call BIND_ARGS,$(1),$(left),$(wordlist 2,$(words $(3)),$(3))))))))))
-endef
-
-# Create a new ENV and optional bind values in it
-#   $(1): outer environment (set as a key named __outer__)
-#   $(2): list/vector object of bind forms
-#   $(3): space separated list of expressions to bind
-ENV = $(strip $(foreach new_env,$(call _assoc!,$(call _hash_map),__outer__,$(if $(1),$(1),$(__nil))),$(if $(2),$(call BIND_ARGS,$(new_env),$(2),$(3)),$(new_env))))
-
-ENV_GET = $(if $(call _EQ,$(1),$(__nil)),,$(or $(_get),$(call ENV_GET,$(call _get,$(1),__outer__),$(2))))
-
-ENV_SET = $(if $(call _assoc!,$(1),$(subst =,$(__equal),$(2)),$(3)),$(1),)
+
+# Keys are stored as Make variables named $(env)_$(key).  The outer
+# environment is the content of the variable itself.
+
+# 1: outer environment, or ""  ->    new environment
+ENV = $(call __new_obj,env,$1)
+
+# 1:env  2:key  ->  value or ""
+ENV_GET = $(if $1,$(or $($1_$2),$(call ENV_GET,$($1),$2)))
+
+# 1:env  2:key  3:value
+ENV_SET = $(eval $1_$2 := $3)
+
+# 1:env  ->  (encoded) keys
+env_keys = $(foreach k,$(patsubst $1_%,%,$(filter $1_%,$(.VARIABLES)))\
+             ,$(call _symbol_val,$k))
 
 endif

impls/make/gmsl.mk

@@ -55,8 +55,4 @@ gmsl_characters += 0 1 2 3 4 5 6 7 8 9
 gmsl_characters += ` ~ ! @ \# $$ % ^ & * ( ) - _ = +
 gmsl_characters += { } [ ] \ : ; ' " < > , . / ? |
 
-gmsl_pairmap = $(strip \
-                 $(if $2$3,$(call $1,$(word 1,$2),$(word 1,$3))     \
-                           $(call gmsl_pairmap,$1,$(wordlist 2,$(words $2),$2),$(wordlist 2,$(words $3),$3))))
-
 endif

impls/make/numbers.mk

@@ -22,7 +22,7 @@ int_encode = $(strip $(call _reverse,\
                $(foreach a,- 0 1 2 3 4 5 6 7 8 9,\
                  $(eval __temp := $$(subst $$a,$$a$$(SPACE),$(__temp))))$(__temp)))
 
-int_decode = $(strip $(call _join,$(call _reverse,$(1))))
+int_decode = $(subst $(SPACE),,$(_reverse))
 
 # trim extaneous zero digits off the end (front of number)
 _trim_zeros = $(if $(call _EQ,0,$(strip $(1))),0,$(if $(call _EQ,0,$(word 1,$(1))),$(call _trim_zeros,$(wordlist 2,$(words $(1)),$(1))),$(1)))

impls/make/printer.mk

@@ -11,37 +11,45 @@ include $(_TOP_DIR)types.mk
 
 # return a printable form of the argument, the second parameter is
 # 'print_readably' which backslashes quotes in string values
-_pr_str = $(if $(1),$(foreach ot,$(call _obj_type,$(1)),$(if $(call _EQ,make,$(ot)),$(call _error,_pr_str failed on $(1)),$(call $(ot)_pr_str,$(1),$(2)))),)
+_pr_str = $(call $(_obj_type)_pr_str,$1,$2)
 
 # Like _pr_str but takes multiple values in first argument, the second
 # parameter is 'print_readably' which backslashes quotes in string
 # values, the third parameter is the delimeter to use between each
 # _pr_str'd value
-_pr_str_mult = $(call _pr_str,$(word 1,$(1)),$(2))$(if $(word 2,$(1)),$(3)$(call _pr_str_mult,$(wordlist 2,$(words $(1)),$(1)),$(2),$(3)),)
+_pr_str_mult = $(subst $(SPACE),$3,$(foreach f,$1,$(call _pr_str,$f,$2)))
 
 
 # Type specific printing
 
-nil_pr_str = nil
-true_pr_str = true
-false_pr_str = false
+nil_pr_str := nil
+true_pr_str := true
+false_pr_str := false
 
-number_pr_str = $(call int_decode,$($(1)_value))
+number_pr_str = $(_number_val)
 
-symbol_pr_str = $($(1)_value)
+symbol_pr_str = $(_symbol_val)
 
-keyword_pr_str = $(COLON)$(patsubst $(__keyword)%,%,$(call str_decode,$($(1)_value)))
+keyword_pr_str = $(encoded_colon)$(_keyword_val)
 
-string_pr_str = $(if $(filter $(__keyword)%,$(call str_decode,$($(1)_value))),$(COLON)$(patsubst $(__keyword)%,%,$(call str_decode,$($(1)_value))),$(if $(2),"$(subst $(NEWLINE),$(ESC_N),$(subst $(DQUOTE),$(ESC_DQUOTE),$(subst $(SLASH),$(SLASH)$(SLASH),$(call str_decode,$($(1)_value)))))",$(call str_decode,$($(1)_value))))
+string_pr_str = $(if $2\
+  ,"$(subst $(_NL),$(encoded_slash)n,$(rem \
+   )$(subst ",$(encoded_slash)",$(rem \
+   )$(subst $(encoded_slash),$(encoded_slash)$(encoded_slash),$(rem \
+   )$(_string_val))))"$(rem \
+else \
+  ),$(_string_val))
 
-function_pr_str = <Function>
+corefn_pr_str := <Core>
+function_pr_str := <Function>
+macro_pr_str := <Macro>
 
-list_pr_str = ($(foreach v,$(call __get_obj_values,$(1)),$(call _pr_str,$(v),$(2))))
+list_pr_str = $(_LP)$(call _pr_str_mult,$(_seq_vals),$2,$(_SP))$(_RP)
 
-vector_pr_str = [$(foreach v,$(call __get_obj_values,$(1)),$(call _pr_str,$(v),$(2)))]
+vector_pr_str = [$(call _pr_str_mult,$(_seq_vals),$2,$(_SP))]
 
-hash_map_pr_str = {$(foreach v,$(call __get_obj_values,$(1)),$(foreach vval,$(foreach hcode,$(word 3,$(subst _, ,$(1))),$(patsubst $(1)_%,%,$(v:%_value=%))),$(if $(filter $(__keyword)%,$(vval)),$(patsubst $(__keyword)%,$(COLON)%,$(vval)),"$(vval)")) $(call _pr_str,$($(v)),$(2)))}
+map_pr_str = {$(call _pr_str_mult,$(foreach k,$(_keys),$k $(call _get,$1,$k)),$2,$(_SP))}
 
-atom_pr_str = (atom $(call _pr_str,$($(1)_value),$(2)))
+atom_pr_str = $(_LP)atom$(_SP)$(call _pr_str,$(deref),$2)$(_RP)
 
 endif