fix parsing pattern for month == 10 in ym() and my()

Author: Stefan Fleck

DESCRIPTION

@@ -2,7 +2,7 @@ Type: Package
 Package: dint
 Title: A Toolkit for Year-Quarter, Year-Month and Year-Isoweek
     Dates
-Version: 2.1.0.9002
+Version: 2.1.0.9003
 Authors@R: 
     person(given = "Stefan",
            family = "Fleck",

R/parser.R

@@ -63,7 +63,7 @@ ym <- function(x, quiet = FALSE){
   assert(is.character(x), "'x' must be a character vector")
   assert(is_scalar_bool(quiet))
 
-  r <- vapply(x, parse_ym, integer(1), pattern = "^[^0-9]*\\d{4}[^0-9]*((0[1-9])|11|12)[^0-9]*$", USE.NAMES = FALSE)
+  r <- vapply(x, parse_ym, integer(1), pattern = "^[^0-9]*\\d{4}[^0-9]*((0[1-9])|10|11|12)[^0-9]*$", USE.NAMES = FALSE)
 
   if (!quiet){
     failed <- sum(is.na(r)) - sum(is.na(x))
@@ -83,7 +83,7 @@ ym <- function(x, quiet = FALSE){
 #' @export
 my <- function(x, quiet = FALSE){
   assert(is.character(x), "'x' must be a character vector")
-  r <- vapply(x, parse_my, integer(1), pattern = "^[^0-9]*((0[1-9])|11|12)[^0-9]*\\d{4}[^0-9]*$", USE.NAMES = FALSE)
+  r <- vapply(x, parse_my, integer(1), pattern = "^[^0-9]*((0[1-9])|10|11|12)[^0-9]*\\d{4}[^0-9]*$", USE.NAMES = FALSE)
 
   if (!quiet){
     failed <- sum(is.na(r)) - sum(is.na(x))
@@ -144,7 +144,7 @@ parse_ym <- function(x, pattern){
       as.integer(substr(string, pos, pos + length))
   }
 
-  pos_m <- regexpr("((0[1-9])|11|12)[^0-9]*$", x)
+  pos_m <- regexpr("((0[1-9])|10|11|12)[^0-9]*$", x)
   month <- extr(x, pos_m, 1)
   x <- strtrim(x, pos_m - 1L)
 

tests/testthat/test_parser.R

@@ -36,7 +36,7 @@ test_that("yq/qy work as expected", {
 
 test_that("ym/my work as expected", {
 
-  x <- c("dfw2018m02", "bl2017qasdg12sadgfas", "2017Q4", "blubb", "2017-2016", NA)
+  x <- c("dfw2018m02", "bl2017qasdg12sadgfas", "2017Q4", "blubb", "2017-2016", NA, "gvship_ais_2019-M10.fst")
 
   expect_warning(
     r <- as.integer(ym(x)),
@@ -45,7 +45,7 @@ test_that("ym/my work as expected", {
 
   expect_identical(
     r,
-    c(201802L, 201712L, NA_integer_, NA_integer_, NA_integer_, NA_integer_)
+    c(201802L, 201712L, NA_integer_, NA_integer_, NA_integer_, NA_integer_, 201910L)
   )