diff options
| author | Joel Martin <github@martintribe.org> | 2014-04-02 22:23:37 -0500 |
|---|---|---|
| committer | Joel Martin <github@martintribe.org> | 2014-04-02 22:23:37 -0500 |
| commit | ea81a8087bcd7953b083a2be9db447f75e7ebf56 (patch) | |
| tree | 6cf47a2dbd55d42efc4a901eaabdec952f40ce89 /make/tests | |
| parent | 1617910ad342a55762f3ddabb975849d843cff85 (diff) | |
| download | mal-ea81a8087bcd7953b083a2be9db447f75e7ebf56.tar.gz mal-ea81a8087bcd7953b083a2be9db447f75e7ebf56.zip | |
All: split types into types, env, printer, core.
- types: low-level mapping to the implementation language.
- core: functions on types that are exposed directly to mal.
- printer: implementation called by pr-str, str, prn, println.
- env: the environment implementation
- Also, unindent all TCO while loops so that the diff of step4 and
step5 are minimized.
Diffstat (limited to 'make/tests')
| -rw-r--r-- | make/tests/types.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/make/tests/types.mk b/make/tests/types.mk index c1c1849..a100afe 100644 --- a/make/tests/types.mk +++ b/make/tests/types.mk @@ -63,9 +63,9 @@ $(call assert_eq,a string value - a string (with parens),$(call str_decode,$($(c $(info Testing function objects) -$(call assert_eq,function,$(call _obj_type,$(call function,abc)),\ +$(call assert_eq,function,$(call _obj_type,$(call _function,abc)),\ (type (function abc)) is not 'function') -FN1 := $(call function,arg1:'$$(word 1,$$(1))' arg2:'$$(word 2,$$(1))') +FN1 := $(call _function,arg1:'$$(word 1,$$(1))' arg2:'$$(word 2,$$(1))') $(call assert_eq,$(__true),$(call function?,$(FN1))) $(call assert_eq,arg1:'A' arg2:'B',$(call apply,$(FN1),$(call list,A B))) @@ -113,7 +113,7 @@ $(call assert_eq,A,$(call sfirst,$(call _nth,$(L4),1)),\ $(info Testing hash_maps) -X := $(call hash_map) +X := $(call _hash_map) $(call assert_eq,$(__true),$(call hash_map?,$(X)),\ (hash_map? $$(X))) $(call assert_eq,$(__false),$(call vector?,$(X)),\ @@ -130,7 +130,7 @@ $(call assert_eq,value of X a,$(call _get,$(X),a),\ $(call assert_eq,$(__true),$(call contains?,$(X) $(mykey)),\ (contains? $$(X),a)) -Y := $(call hash_map) +Y := $(call _hash_map) $(call assert_eq,0,$(call _count,$(Y)),\ (_count $$(Y))) $(call do,$(call _assoc!,$(Y),a,value of Y a)) @@ -241,7 +241,7 @@ $(info Testing smap function) L5 := $(call _conj!,$(call list),$(call number,1) $(call number,2) $(call number,3)) inc = $(call number_plus,$(call number,1) $(1)) $(call assert_eq,(2 3 4),$(call _pr_str,$(call _smap,inc,$(L5)))) -inc_func := $(call function,$$(call number_plus,$$(call number,1) $$(1))) +inc_func := $(call _function,$$(call number_plus,$$(call number,1) $$(1))) $(call assert_eq,(2 3 4),$(call _pr_str,$(call smap,$(inc_func) $(L5)))) |