[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-NG] [PATCH 21/33] [ng] rename: am__strip_lastword -> am.util.s
From: |
Stefano Lattarini |
Subject: |
[Automake-NG] [PATCH 21/33] [ng] rename: am__strip_lastword -> am.util.strip-last-word |
Date: |
Sat, 21 Jul 2012 14:55:53 +0200 |
Signed-off-by: Stefano Lattarini <address@hidden>
---
lib/am/header-vars.am | 6 +++---
t/internals.tap | 18 +++++++++---------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am
index ef25345..af2c6ef 100644
--- a/lib/am/header-vars.am
+++ b/lib/am/header-vars.am
@@ -149,7 +149,7 @@ am.make.dry-run := \
am.chars.empty :=
am.util.strip-first-word = $(wordlist 2,$(words $(1)),$(1))
-am__strip_lastword = $(wordlist 2,$(words $(1)),dummy $(1))
+am.util.strip-last-word = $(wordlist 2,$(words $(1)),dummy $(1))
## Remove repeated elements from the given list (without reordering),
## and return the reduced list.
@@ -159,10 +159,10 @@ am__uniq = $(strip \
## Call the function recursively on the list of all the elements
## but the last one.
$(call am__uniq, \
- $(call am__strip_lastword, $(1))) \
+ $(call am.util.strip-last-word, $(1))) \
## And append the last element, unless it was already present.
$(if $(filter $(lastword $(1)), \
- $(call am__strip_lastword, $(1))), \
+ $(call am.util.strip-last-word, $(1))), \
$(am.chars.empty), \
$(lastword $(1)))))
diff --git a/t/internals.tap b/t/internals.tap
index 05e85bc..650907a 100755
--- a/t/internals.tap
+++ b/t/internals.tap
@@ -54,14 +54,14 @@ test-strip-first-word:
test '$(call am.util.strip-first-word,1 2 3 4 5 6 7 8)' = '2 3 4 5 6 7
8'
test '$(call am.util.strip-first-word, 1 2 )' = '2'
-.PHONY: test-strip-lastword
-test-strip-lastword:
- test '$(call am__strip_lastword,)' = ''
- test '$(call am__strip_lastword,1)' = ''
- test '$(call am__strip_lastword,1 1)' = '1'
- test '$(call am__strip_lastword,1 2)' = '1'
- test '$(call am__strip_lastword,1 2 3 4 5 6 7 8)' = '1 2 3 4 5 6 7'
- test '$(call am__strip_lastword, 1 2 )' = '1'
+.PHONY: test-strip-last-word
+test-strip-last-word:
+ test '$(call am.util.strip-last-word,)' = ''
+ test '$(call am.util.strip-last-word,1)' = ''
+ test '$(call am.util.strip-last-word,1 1)' = '1'
+ test '$(call am.util.strip-last-word,1 2)' = '1'
+ test '$(call am.util.strip-last-word,1 2 3 4 5 6 7 8)' = '1 2 3 4 5 6
7'
+ test '$(call am.util.strip-last-word, 1 2 )' = '1'
.PHONY: test-uniq
test-uniq:
@@ -186,7 +186,7 @@ test-newline-3:
END
command_ok_ am.util.strip-first-word $MAKE test-strip-first-word
-command_ok_ am__strip_lastword $MAKE test-strip-lastword
+command_ok_ am.util.strip-last-word $MAKE test-strip-last-word
command_ok_ am__uniq $MAKE test-uniq
command_ok_ am__test_strip_suffixes $MAKE test-strip-suffixes
command_ok_ am__tolower $MAKE test-tolower
--
1.7.10.4
- [Automake-NG] [PATCH 11/33] [ng] rename: am__pound -> am.chars.hash, (continued)
- [Automake-NG] [PATCH 11/33] [ng] rename: am__pound -> am.chars.hash, Stefano Lattarini, 2012/07/21
- [Automake-NG] [PATCH 12/33] [ng] rename: am__lparen -> am.chars.lparen, Stefano Lattarini, 2012/07/21
- [Automake-NG] [PATCH 13/33] [ng] rename: am__rparen -> am.chars.rparen, Stefano Lattarini, 2012/07/21
- [Automake-NG] [PATCH 14/33] [ng] rename: am__bquote -> am.chars.bquote, Stefano Lattarini, 2012/07/21
- [Automake-NG] [PATCH 15/33] [ng] rename: am__dquote -> am.chars.dquote, Stefano Lattarini, 2012/07/21
- [Automake-NG] [PATCH 16/33] [ng] rename: am__squote -> am.chars.squote, Stefano Lattarini, 2012/07/21
- [Automake-NG] [PATCH 17/33] [ng] cosmetics: fix an imprecise comment, Stefano Lattarini, 2012/07/21
- [Automake-NG] [PATCH 18/33] [ng] rename: am__empty -> am.chars.empty, Stefano Lattarini, 2012/07/21
- [Automake-NG] [PATCH 20/33] [ng] rename: am__strip_firstword -> am.util.strip-first-word, Stefano Lattarini, 2012/07/21
- [Automake-NG] [PATCH 19/33] [ng] rename: am__make_dryrun -> am.make.dry-run, Stefano Lattarini, 2012/07/21
- [Automake-NG] [PATCH 21/33] [ng] rename: am__strip_lastword -> am.util.strip-last-word,
Stefano Lattarini <=
- [Automake-NG] [PATCH 22/33] [ng] am__uniq: use $0 for recursive invocations, Stefano Lattarini, 2012/07/21
- [Automake-NG] [PATCH 23/33] [ng] rename: am__uniq -> am.util.uniq, Stefano Lattarini, 2012/07/21
- [Automake-NG] [PATCH 24/33] [ng] am__strip_suffixes: use $0 for recursive invocations, Stefano Lattarini, 2012/07/21
- [Automake-NG] [PATCH 25/33] [ng] rename: am__strip_suffixes -> am.util.strip-suffixes, Stefano Lattarini, 2012/07/21
- [Automake-NG] [PATCH 26/33] [ng] rename: am__private_suffix -> am.hack.private-suffix, Stefano Lattarini, 2012/07/21
- [Automake-NG] [PATCH 27/33] [ng] rename: am__handle_exeext -> am.conf.handle-exeext, Stefano Lattarini, 2012/07/21
- [Automake-NG] [PATCH 28/33] [ng] rename: am__vpath_rewrite -> am.vpath.rewrite, Stefano Lattarini, 2012/07/21
- [Automake-NG] [PATCH 29/33] [ng] rename: am__using_parallel_tests -> am.conf.using-parallel-tests, Stefano Lattarini, 2012/07/21
- [Automake-NG] [PATCH 30/33] [ng] rename: am__tolower -> am.util.tolower, Stefano Lattarini, 2012/07/21
- [Automake-NG] [PATCH 31/33] [ng] rename: am__toupper -> am.util.toupper, Stefano Lattarini, 2012/07/21