[Sciviews-commits] r62 - in pkg/svUnit: . R

[noreply at r-forge.r-project.org]

Author: romain
Date: 2008-10-23 13:10:44 +0200 (Thu, 23 Oct 2008)
New Revision: 62

Modified:
   pkg/svUnit/DESCRIPTION
   pkg/svUnit/R/svSuite.R
Log:
changed the regex that identifies packages to match the correct package names better: 

(From WRE: "The name should consist of letters, numbers, and the dot character and start with a letter")

Modified: pkg/svUnit/DESCRIPTION
===================================================================
--- pkg/svUnit/DESCRIPTION	2008-10-14 16:02:35 UTC (rev 61)
+++ pkg/svUnit/DESCRIPTION	2008-10-23 11:10:44 UTC (rev 62)
@@ -3,8 +3,8 @@
 Depends: R (>= 1.9.0)
 Suggests: svGUI, datasets, utils
 Description: A complete unit test system and functions to implement its GUI part
-Version: 0.6-1
-Date: 2008-06-25
+Version: 0.6-2
+Date: 2008-10-23
 Author: Philippe Grosjean
 Maintainer: Philippe Grosjean <phgrosjean at sciviews.org>
 License: GPL 2 or above

Modified: pkg/svUnit/R/svSuite.R
===================================================================
--- pkg/svUnit/R/svSuite.R	2008-10-14 16:02:35 UTC (rev 61)
+++ pkg/svUnit/R/svSuite.R	2008-10-23 11:10:44 UTC (rev 62)
@@ -12,8 +12,8 @@
 		# * test(OBJ) where OBJ is any object with a 'test' attribute
 		# * OBJ being a 'svTest' object (with non "exotic" name!),
 		# Syntax is checked, but not existence/validity of corresponding tests!
-		check1 <- (regexpr("^package:[a-zA-Z._]+$", tests) > -1)
-		check2 <- (regexpr("^package:[a-zA-Z._]+ *\\(.+\\)$", tests) > -1)
+		check1 <- (regexpr("^package:[a-zA-Z][a-zA-Z._0-9]*$", tests) > -1)
+		check2 <- (regexpr("^package:[a-zA-Z][a-zA-Z._0-9]* *\\(.+\\)$", tests) > -1)
 		check3 <- (regexpr("^dir:.+", tests) > -1)
 		check4 <- (regexpr("^test\\(.+\\)$", tests) > -1)
 		check5 <- (regexpr("^[a-zA-Z0-9_.]+$", tests) > -1)