CVS commit: pkgsrc/pkgtools/R2pkg/files

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sat Oct 19 22:10:58 UTC 2019

Modified Files:
        pkgsrc/pkgtools/R2pkg/files: R2pkg.R R2pkg_test.R

Log Message:
pkgtools/R2pkg: remove unused code


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/pkgtools/R2pkg/files/R2pkg.R
cvs rdiff -u -r1.20 -r1.21 pkgsrc/pkgtools/R2pkg/files/R2pkg_test.R

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/pkgtools/R2pkg/files/R2pkg.R
diff -u pkgsrc/pkgtools/R2pkg/files/R2pkg.R:1.25 pkgsrc/pkgtools/R2pkg/files/R2pkg.R:1.26
--- pkgsrc/pkgtools/R2pkg/files/R2pkg.R:1.25    Sat Oct 19 21:32:02 2019
+++ pkgsrc/pkgtools/R2pkg/files/R2pkg.R Sat Oct 19 22:10:58 2019
@@ -1,4 +1,4 @@
-# $NetBSD: R2pkg.R,v 1.25 2019/10/19 21:32:02 rillig Exp $
+# $NetBSD: R2pkg.R,v 1.26 2019/10/19 22:10:58 rillig Exp $
 #
 # Copyright (c) 2014,2015,2016,2017,2018,2019
 #      Brook Milligan.  All rights reserved.
@@ -51,11 +51,9 @@ level.message <- function(...)
 level.warning <- function(...)
   level.message('WARNING: ', ...)
 
-trim.space <- function(s) gsub('[[:space:]]','',s)
-trim.blank <- function(s) gsub('[[:blank:]]','',s)
-one.space <- function(s) gsub('[[:blank:]]+',' ',s)
-one.line <- function(s) gsub('\n',' ',s)
-pkg.vers <- function(s) gsub('_','.',s)
+trim.space <- function(s) gsub('[[:space:]]', '', s)
+one.line <- function(s) gsub('\n', ' ', s)
+pkg.vers <- function(s) gsub('_', '.', s)
 varassign <- function(varname, value) paste0(varname, '=\t', value)
 relpath_category <- function(relpath)
   unlist(sapply(strsplit(relpath, '/'), '[', 3))

Index: pkgsrc/pkgtools/R2pkg/files/R2pkg_test.R
diff -u pkgsrc/pkgtools/R2pkg/files/R2pkg_test.R:1.20 pkgsrc/pkgtools/R2pkg/files/R2pkg_test.R:1.21
--- pkgsrc/pkgtools/R2pkg/files/R2pkg_test.R:1.20       Sat Oct 19 21:32:02 2019
+++ pkgsrc/pkgtools/R2pkg/files/R2pkg_test.R    Sat Oct 19 22:10:58 2019
@@ -1,4 +1,4 @@
-# $NetBSD: R2pkg_test.R,v 1.20 2019/10/19 21:32:02 rillig Exp $
+# $NetBSD: R2pkg_test.R,v 1.21 2019/10/19 22:10:58 rillig Exp $
 #
 # Copyright (c) 2019
 #      Roland Illig.  All rights reserved.
@@ -122,16 +122,6 @@ test_that('trim.space', {
     expect_equal(trim.space(' hello, \t\nworld '), 'hello,world')
 })
 
-test_that('trim.blank', {
-    expect_equal(trim.blank(' hello, \t\nworld '), 'hello,\nworld')
-})
-
-test_that('one.space', {
-    expect_equal(
-        one.space(' \t\nhello, \t\nworld \t\n'),
-        ' \nhello, \nworld \n')
-})
-
 test_that('one.line', {
     expect_equal(
         one.line(' \t\nhello, \t\nworld \t\n'),