From 8cb5cda46cf3aef847ae3926dc53a5e5f87fe261 Mon Sep 17 00:00:00 2001 From: Joel Martin Date: Wed, 16 Apr 2014 23:57:50 -0500 Subject: All: move some fns to core. Major cleanup. - Don't import/require core until step4. - Define cond/or macros from step8 --- make/step3_env.mk | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'make/step3_env.mk') diff --git a/make/step3_env.mk b/make/step3_env.mk index 7c505cf..acc038d 100644 --- a/make/step3_env.mk +++ b/make/step3_env.mk @@ -86,11 +86,10 @@ REP = $(call PRINT,$(strip $(call EVAL,$(strip $(call READ,$(1))),$(REPL_ENV)))) REPL = $(info $(call REP,$(call READLINE,"user> ")))$(if $(READLINE_EOF),,$(call REPL)) # Setup the environment -_ref = $(eval REPL_ENV := $(call ENV_SET,$(REPL_ENV),$(1),$(if $(2),$(2),$(1)))) -$(call _ref,+,number_plus) -$(call _ref,-,number_subtract) -$(call _ref,*,number_multiply) -$(call _ref,/,number_divide) +REPL_ENV := $(call ENV_SET,$(REPL_ENV),+,number_plus) +REPL_ENV := $(call ENV_SET,$(REPL_ENV),-,number_subtract) +REPL_ENV := $(call ENV_SET,$(REPL_ENV),*,number_multiply) +REPL_ENV := $(call ENV_SET,$(REPL_ENV),/,number_divide) # Call the read-eval-print loop $(if $(strip $(INTERACTIVE)),$(call REPL)) -- cgit v1.2.3