Make: refactor number type. Support large numbers.

- Can support numbers up to 100 decimal digits in length.
- Still no support for negative numbers or floating point.
- Change time-secs to time-ms and remove conditional in perf.mal

Author: kanaka

make/Makefile

@@ -1,7 +1,8 @@
 
 TESTS = tests/types.mk tests/reader.mk tests/stepA_interop.mk
 
-SOURCES_BASE = util.mk readline.mk gmsl.mk types.mk reader.mk printer.mk
+SOURCES_BASE = util.mk numbers.mk readline.mk gmsl.mk types.mk \
+               reader.mk printer.mk
 SOURCES_LISP = env.mk core.mk stepA_interop.mk
 SOURCES = $(SOURCES_BASE) $(SOURCES_LISP)
 

make/core.mk

@@ -43,18 +43,17 @@ keyword? = $(if $(call _keyword?,$(1)),$(__true),$(__false))
 # Number functions
 number? = $(if $(call _number?,$(1)),$(__true),$(__false))
 
-number_lt = $(if $(call int_lt,$($(word 1,$(1))_value),$($(word 2,$(1))_value)),$(__true),$(__false))
-number_lte = $(if $(call int_lte,$($(word 1,$(1))_value),$($(word 2,$(1))_value)),$(__true),$(__false))
-number_gt = $(if $(call int_gt,$($(word 1,$(1))_value),$($(word 2,$(1))_value)),$(__true),$(__false))
-number_gte = $(if $(call int_gte,$($(word 1,$(1))_value),$($(word 2,$(1))_value)),$(__true),$(__false))
+number_lt = $(if $(call int_lt_encoded,$($(word 1,$(1))_value),$($(word 2,$(1))_value)),$(__true),$(__false))
+number_lte = $(if $(call int_lte_encoded,$($(word 1,$(1))_value),$($(word 2,$(1))_value)),$(__true),$(__false))
+number_gt = $(if $(call int_gt_encoded,$($(word 1,$(1))_value),$($(word 2,$(1))_value)),$(__true),$(__false))
+number_gte = $(if $(call int_gte_encoded,$($(word 1,$(1))_value),$($(word 2,$(1))_value)),$(__true),$(__false))
 
-number_plus = $(call _pnumber,$(call int_plus,$($(word 1,$(1))_value),$($(word 2,$(1))_value)))
-number_subtract = $(call _pnumber,$(call int_subtract,$($(word 1,$(1))_value),$($(word 2,$(1))_value)))
-number_multiply = $(call _pnumber,$(call int_multiply,$($(word 1,$(1))_value),$($(word 2,$(1))_value)))
-number_divide = $(call _pnumber,$(call int_divide,$($(word 1,$(1))_value),$($(word 2,$(1))_value)))
-
-time_secs = $(call _number,$(shell echo $$(( $$(date +%s) % 65536 ))))
+number_plus = $(call _pnumber,$(call int_add_encoded,$($(word 1,$(1))_value),$($(word 2,$(1))_value)))
+number_subtract = $(call _pnumber,$(call int_sub_encoded,$($(word 1,$(1))_value),$($(word 2,$(1))_value)))
+number_multiply = $(call _pnumber,$(call int_mult_encoded,$($(word 1,$(1))_value),$($(word 2,$(1))_value)))
+number_divide = $(call _pnumber,$(call int_div_encoded,$($(word 1,$(1))_value),$($(word 2,$(1))_value)))
 
+time_ms = $(call _number,$(shell echo $$(date +%s%3N)))
 
 # String functions
 
@@ -70,7 +69,7 @@ read_str= $(call READ_STR,$(1))
 slurp   = $(call _string,$(call _read_file,$(call str_decode,$($(1)_value))))
 
 subs = $(strip \
-         $(foreach start,$(call gmsl_plus,1,$(call int_decode,$($(word 2,$(1))_value))),\
+         $(foreach start,$(call int_add,1,$(call int_decode,$($(word 2,$(1))_value))),\
            $(foreach end,$(if $(3),$(call int_decode,$($(3)_value)),$(words $($(word 1,$(1))_value))),\
              $(call _string,$(wordlist $(start),$(end),$($(word 1,$(1))_value))))))
 
@@ -133,7 +132,7 @@ concat = $(word 1,$(foreach new_list,$(call _list),$(new_list) $(eval $(new_list
 
 nth = $(strip \
         $(if $(call int_lt,$($(word 2,$(1))_value),$(call int_encode,$(call _count,$(word 1,$(1))))),\
-          $(word $(call gmsl_plus,1,$(call int_decode,$($(word 2,$(1))_value))),$($(word 1,$(1))_value)),\
+          $(word $(call int_add,1,$(call int_decode,$($(word 2,$(1))_value))),$($(word 1,$(1))_value)),\
           $(call _error,nth: index out of range)))
 
 sfirst = $(word 1,$($(1)_value))
@@ -162,7 +161,7 @@ srest = $(word 1,$(foreach new_list,$(call _list),\
 # (function object) using the remaining arguments.
 sapply = $(call $(word 1,$(1))_value,\
                 $(strip \
-                  $(wordlist 2,$(call gmsl_subtract,$(words $(1)),1),$(1)) \
+                  $(wordlist 2,$(call int_sub,$(words $(1)),1),$(1)) \
                   $($(word $(words $(1)),$(1))_value)))
 
 # Map a function object over a list object
@@ -240,7 +239,7 @@ core_ns = type obj_type \
           - number_subtract \
           * number_multiply \
           / number_divide \
-          time-secs time_secs \
+          time-ms time_ms \
           \
           list _list \
           list? list? \

make/gmsl.mk

@@ -47,66 +47,13 @@ __mal_gmsl_included := true
 #
 # ----------------------------------------------------------------------------
 
-
-# Numbers
-__gmsl_sixteen := x x x x x x x x x x x x x x x x
-__gmsl_input_int := $(foreach a,$(__gmsl_sixteen),         \
-                        $(foreach b,$(__gmsl_sixteen),     \
-                            $(foreach c,$(__gmsl_sixteen), \
-                                $(__gmsl_sixteen)))))
-
-int_decode = $(words $1)
-int_encode = $(wordlist 1,$1,$(__gmsl_input_int))
-
-__gmsl_int_wrap = $(call int_decode,$(call $1,$(call int_encode,$2),$(call int_encode,$3)))
-
-int_plus = $(strip $1 $2)
-int_subtract = $(strip $(if $(call int_gte,$1,$2), \
-                $(filter-out xx,$(join $1,$2)),    \
-                $(warning Subtraction underflow)))
-int_multiply = $(strip $(foreach a,$1,$2))
-# _error function must be provided to report/catch division by zero
-int_divide = $(strip $(if $2,                                              \
-                 $(if $(call int_gte,$1,$2),                               \
-                     x $(call int_divide,$(call int_subtract,$1,$2),$2),), \
-                 $(call _error,Division by zero)))
-
-int_max = $(subst xx,x,$(join $1,$2))
-int_min = $(subst xx,x,$(filter xx,$(join $1,$2)))
-int_gt = $(strip $(filter-out $(words $2),$(words $(call int_max,$1,$2))))
-int_gte = $(strip $(call int_gt,$1,$2)$(call int_eq,$1,$2))
-int_lt = $(strip $(filter-out $(words $1),$(words $(call int_max,$1,$2))))
-int_lte = $(strip $(call int_lt,$1,$2)$(call int_eq,$1,$2))
-int_eq = $(strip $(filter $(words $1),$(words $2)))
-int_ne = $(strip $(filter-out $(words $1),$(words $2)))
-
-gmsl_plus = $(call __gmsl_int_wrap,int_plus,$1,$2)
-gmsl_subtract = $(call __gmsl_int_wrap,int_subtract,$1,$2)
-gmsl_multiply = $(call __gmsl_int_wrap,int_multiply,$1,$2)
-gmsl_divide = $(call __gmsl_int_wrap,int_divide,$1,$2)
-
-
 # Strings
 
-__gmsl_characters := A B C D E F G H I J K L M N O P Q R S T U V W X Y Z
-__gmsl_characters += a b c d e f g h i j k l m n o p q r s t u v w x y z
-__gmsl_characters += 0 1 2 3 4 5 6 7 8 9
-__gmsl_characters += ` ~ ! @ \# $$ % ^ & * ( ) - _ = +
-__gmsl_characters += { } [ ] \ : ; ' " < > , . / ? |
-__syntax_highlight_protect = #"'`
-
-
-__gmsl_space := 
-__gmsl_space +=
-
-gmsl_strlen = $(strip $(eval __temp := $(subst $(__gmsl_space),x,$1)) \
-                $(foreach a,$(__gmsl_characters),$(eval __temp := $$(subst $$a,x,$(__temp)))) \
-                $(eval __temp := $(subst x,x ,$(__temp))) \
-                $(words $(__temp)))
-
-gmsl_merge = $(strip $(if $2, \
-               $(if $(call _EQ,1,$(words $2)), \
-                  $2,$(firstword $2)$1$(call gmsl_merge,$1,$(wordlist 2,$(words $2),$2)))))
+gmsl_characters := A B C D E F G H I J K L M N O P Q R S T U V W X Y Z
+gmsl_characters += a b c d e f g h i j k l m n o p q r s t u v w x y z
+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))     \