diff -Nru gmsl-1.1.5/debian/changelog gmsl-1.1.7/debian/changelog --- gmsl-1.1.5/debian/changelog 2014-05-13 03:33:59.000000000 +0000 +++ gmsl-1.1.7/debian/changelog 2016-06-21 04:35:31.000000000 +0000 @@ -1,3 +1,10 @@ +gmsl (1.1.7-1) unstable; urgency=medium + + * New upstream release + - new function set_is_not_member + + -- Dima Kogan Mon, 20 Jun 2016 21:35:30 -0700 + gmsl (1.1.5-1) unstable; urgency=medium * New upstream release @@ -7,7 +14,7 @@ * HTML docs no longer display external logos (fixes lintian 'privacy-breach-logo' error) - -- Dima Kogan Mon, 12 May 2014 20:33:58 -0700 + -- Dima Kogan Mon, 06 Oct 2014 23:35:18 -0700 gmsl (1.1.3-2) unstable; urgency=low diff -Nru gmsl-1.1.5/debian/control gmsl-1.1.7/debian/control --- gmsl-1.1.5/debian/control 2013-04-23 20:32:11.000000000 +0000 +++ gmsl-1.1.7/debian/control 2015-08-25 03:53:33.000000000 +0000 @@ -3,7 +3,7 @@ Priority: optional Build-Depends: debhelper (>= 7.0.50~) Maintainer: Dima Kogan -Standards-Version: 3.9.4 +Standards-Version: 3.9.6 Homepage: http://gmsl.sourceforge.net/ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=users/dkogan-guest/gmsl.git Vcs-Git: git://anonscm.debian.org/users/dkogan-guest/gmsl.git diff -Nru gmsl-1.1.5/debian/copyright gmsl-1.1.7/debian/copyright --- gmsl-1.1.5/debian/copyright 2013-03-23 10:16:12.000000000 +0000 +++ gmsl-1.1.7/debian/copyright 2015-08-25 03:56:29.000000000 +0000 @@ -4,14 +4,14 @@ Upstream-Name: GMSL Files: * -Copyright: 2005-2013 John Graham-Cumming -License: BSD +Copyright: 2005-2014 John Graham-Cumming +License: BSD-4clause Files: debian/* Copyright: 2012 Dima Kogan -License: BSD +License: BSD-4clause -License: BSD +License: BSD-4clause Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff -Nru gmsl-1.1.5/debian/patches/0001-HTML-docs-no-longer-display-external-images.patch gmsl-1.1.7/debian/patches/0001-HTML-docs-no-longer-display-external-images.patch --- gmsl-1.1.5/debian/patches/0001-HTML-docs-no-longer-display-external-images.patch 2014-05-13 03:24:29.000000000 +0000 +++ gmsl-1.1.7/debian/patches/0001-HTML-docs-no-longer-display-external-images.patch 2015-08-25 03:52:25.000000000 +0000 @@ -8,10 +8,10 @@ 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/index.html b/index.html -index 540d51e..7ff32d3 100644 +index 28fd58d..fec41b7 100644 --- a/index.html +++ b/index.html -@@ -696,11 +696,7 @@ Copyright (c) 2005-2014 John Graham-Cumming.John Graham-Cumming. John Graham-Cumming's work on this project was sponsored by Electric diff -Nru gmsl-1.1.5/gmsl gmsl-1.1.7/gmsl --- gmsl-1.1.5/gmsl 2014-04-07 10:51:59.000000000 +0000 +++ gmsl-1.1.7/gmsl 2014-12-22 11:50:01.000000000 +0000 @@ -5,7 +5,7 @@ # A library of functions to be used with GNU Make's $(call) that # provides functionality not available in standard GNU Make. # -# Copyright (c) 2005-2013 John Graham-Cumming +# Copyright (c) 2005-2014 John Graham-Cumming # # This file is part of GMSL # diff -Nru gmsl-1.1.5/__gmsl gmsl-1.1.7/__gmsl --- gmsl-1.1.5/__gmsl 2014-04-07 10:51:59.000000000 +0000 +++ gmsl-1.1.7/__gmsl 2014-12-22 11:50:01.000000000 +0000 @@ -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 7 __gmsl_name := GNU Make Standard Library @@ -383,6 +383,11 @@ # Arguments: 1: A string # Returns: Returns the length of the string # ---------------------------------------------------------------------------- + +# This results in __gmsl_tab containing a tab + +__gmsl_tab := # + __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 @@ -403,10 +408,6 @@ endef -# This results in __gmsl_tab containing a tab - -__gmsl_tab := # - # ---------------------------------------------------------------------------- # Function: substr # Arguments: 1: A string @@ -455,12 +456,14 @@ set_remove = $(__gmsl_tr2)$(filter-out $1,$2) # ---------------------------------------------------------------------------- -# Function: set_is_member +# Function: set_is_member, set_is_not_member # Arguments: 1: A single element # 2: A set -# Returns: Returns $(true) if the element is in the set +# Returns: (set_is_member) Returns $(true) if the element is in the set +# (set_is_not_member) Returns $(false) if the element is in the set # ---------------------------------------------------------------------------- set_is_member = $(__gmsl_tr2)$(if $(filter $1,$2),$(true),$(false)) +set_is_not_member = $(__gmsl_tr2)$(if $(filter $1,$2),$(false),$(true)) # ---------------------------------------------------------------------------- # Function: set_union @@ -515,7 +518,8 @@ # 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 diff -Nru gmsl-1.1.5/gmsl-tests gmsl-1.1.7/gmsl-tests --- gmsl-1.1.5/gmsl-tests 2014-04-07 10:51:59.000000000 +0000 +++ gmsl-1.1.7/gmsl-tests 2014-12-22 11:50:01.000000000 +0000 @@ -174,6 +174,7 @@ $(call test_assert,$(call seq,, ),) $(call test_assert,$(call seq, ,),) $(call test_assert,$(call seq,y,xy),) +$(call test_assert,$(call seq,$(__gmsl_space),$(__gmsl_tab)),) $(call stop_test) $(call start_test,sne) @@ -286,6 +287,13 @@ $(call test_assert,$(call set_is_member,1,$(call set_create,1)),T) $(call stop_test) +$(call start_test,set_is_not_member) +$(call test_assert,$(call set_is_not_member,1,$(empty_set)),T) +$(call test_assert,$(call set_is_not_member,1,$(call set_create,2 3)),T) +$(call test_assert,$(call set_is_not_member,1,$(call set_create,1 2 3)),) +$(call test_assert,$(call set_is_not_member,1,$(call set_create,1)),) +$(call stop_test) + $(call start_test,set_union) $(call test_assert,$(call set_union,,),) $(call test_assert,$(call set_union,1 2,),1 2) @@ -322,14 +330,28 @@ $(call test_assert,$(call set_equal,1 2,1 2 3),) $(call stop_test) +$(call start_test,__strip_leading_zero) +$(call test_assert,$(call __strip_leading_zero,),0) +$(call test_assert,$(call __strip_leading_zero,0),0) +$(call test_assert,$(call __strip_leading_zero,0000),0) +$(call test_assert,$(call __strip_leading_zero,1),1) +$(call test_assert,$(call __strip_leading_zero,10),10) +$(call test_assert,$(call __strip_leading_zero,01),1) +$(call test_assert,$(call __strip_leading_zero,001),1) +$(call test_assert,$(call __strip_leading_zero,0010),10) +$(call test_assert,$(call __strip_leading_zero,00000011000),11000) +$(call stop_test) + $(call start_test,int_encode) $(call test_assert,$(call int_encode,0),) $(call test_assert,$(call int_encode,1),x) +$(call test_assert,$(call int_encode,001),x) $(call test_assert,$(call int_encode,2),x x) $(call test_assert,$(call int_encode,10),x x x x x x x x x x) $(call test_assert,$(words $(call int_encode,123)),123) $(call test_assert,$(words $(call int_encode,1234)),1234) $(call test_assert,$(words $(call int_encode,12345)),12345) +$(call test_assert,$(words $(call int_encode,012345)),12345) $(call test_assert,$(words $(call int_encode,1000000)),1000000) $(call stop_test) @@ -353,6 +375,7 @@ $(call test_assert,$(call plus,4,3),7) $(call test_assert,$(call plus,0,4),4) $(call test_assert,$(call plus,3,0),3) +$(call test_assert,$(call plus,03,00),3) $(call test_assert,$(call plus,0,0),0) $(call stop_test) @@ -759,7 +782,9 @@ $(call test_assert,$(call gmsl_compatible,1 1 3),$(true)) $(call test_assert,$(call gmsl_compatible,1 1 4),$(true)) $(call test_assert,$(call gmsl_compatible,1 1 5),$(true)) -$(call test_assert,$(call gmsl_compatible,1 1 6),) +$(call test_assert,$(call gmsl_compatible,1 1 6),$(true)) +$(call test_assert,$(call gmsl_compatible,1 1 7),$(true)) +$(call test_assert,$(call gmsl_compatible,1 1 8),) $(call test_assert,$(call gmsl_compatible,1 2 0),) $(call test_assert,$(call gmsl_compatible,2 0 0),) $(call stop_test) diff -Nru gmsl-1.1.5/index.html gmsl-1.1.7/index.html --- gmsl-1.1.5/index.html 2014-04-07 10:51:59.000000000 +0000 +++ gmsl-1.1.7/index.html 2014-12-22 11:50:01.000000000 +0000 @@ -22,7 +22,7 @@ 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) @@ -250,6 +250,13 @@ Returns:   Returns $(true) if the element is in the set
+
set_is_not_member
+
+Arguments: 1: A single element
+           2: A set
+Returns:   Returns $(false) if the element is in the set
+ +
set_union

Arguments: 1: A set
@@ -491,7 +498,7 @@
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