From 7230a01f1a111b84538bd81f7b7e83e5a969f686 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Sun, 27 Jul 2014 10:47:34 -0700 Subject: Update GMSL Signed-off-by: Timothy Gu --- doc/gmsl.html | 4 ++-- ext/__gmsl | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/doc/gmsl.html b/doc/gmsl.html index 540d51e..822717b 100644 --- a/doc/gmsl.html +++ b/doc/gmsl.html @@ -22,7 +22,7 @@ include the GMSL in your Makefile do
you have the right version of gmsl use the gmsl_compatible function (see -below). The current version is 1 1 5.
+below). The current version is 1 1 6.

The GMSL package also includes a test suite for GMSL.  Just run make -f gmsl-tests.

Logical Operators

GMSL has boolean $(true) (a non-empty string) @@ -491,7 +491,7 @@ Returns:   The sequence [arg1 arg2] if arg1 >= arg2 or [arg2 arg1
dec2hex, dec2bin, dec2oct

Arguments: 1: An integer
-Returns   The decimal argument converted to hexadecimal, binary or
+Returns:   The decimal argument converted to hexadecimal, binary or octal

Associative Arrays

diff --git a/ext/__gmsl b/ext/__gmsl index b2a6016..22e56dc 100644 --- a/ext/__gmsl +++ b/ext/__gmsl @@ -42,7 +42,7 @@ # This is the GNU Make Standard Library version number as a list with # three items: major, minor, revision -gmsl_version := 1 1 5 +gmsl_version := 1 1 6 __gmsl_name := GNU Make Standard Library @@ -515,7 +515,8 @@ int_decode = $(__gmsl_tr1)$(words $1) # Returns: Returns the integer encoded as a string of x's # ---------------------------------------------------------------------------- __int_encode = $(if $1,$(if $(call seq,$(words $(wordlist 1,$1,$2)),$1),$(wordlist 1,$1,$2),$(call __int_encode,$1,$(if $2,$2 $2,x)))) -int_encode = $(__gmsl_tr1)$(call __int_encode,$1) +__strip_leading_zero = $(if $1,$(if $(call seq,$(patsubst 0%,%,$1),$1),$1,$(call __strip_leading_zero,$(patsubst 0%,%,$1))),0) +int_encode = $(__gmsl_tr1)$(call __int_encode,$(call __strip_leading_zero,$1)) # The arithmetic library functions come in two forms: one form of each # function takes integers as arguments and the other form takes the -- cgit v0.12