From d511fbf090b6118062898bf3684afab05ae9794f Mon Sep 17 00:00:00 2001 From: qinwf Date: Wed, 13 Sep 2017 23:09:29 +0800 Subject: [PATCH] Release: cran 0.2.0 --- DESCRIPTION | 12 +++++++++--- LICENSE | 1 + R/match.R | 4 ++-- cran-comments.md | 17 ++++++++--------- man/re2_match.Rd | 4 ++-- 5 files changed, 22 insertions(+), 16 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 258e1cd..b6f8bc3 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,17 +1,23 @@ Package: re2r Type: Package Title: RE2 Regular Expression -Version: 0.1.9999 +Version: 0.2.0 Authors@R: c( person("Qin Wenfeng", email = "mail@qinwenfeng.com", role = c("aut", "cre")), person("Toby Dylan Hocking", role = "ctb", comment = "benchmarks"), person("Marek Gagolewski", role = "ctb", comment = "stringi benchmarks and test cases"), person("RE2 developers", role = "ctb", comment = "RE2 library"), + person("Google Inc.", role = c("ctb", "cph"), comment = "RE2 library"), + person("Lucent Technologies", role = c("ctb", "cph"), comment = "RE2 library"), + person("Rob Pike", role = "ctb", comment = "RE2 library"), + person("Ken Thompson", role = "ctb", comment = "RE2 library"), + person("Julian Seward", role = c("ctb", "cph"), comment = "valgrind.h"), + person("Andrzej Krzemienski", role = "ctb", comment = "optional.hpp"), person("Jeffrey Avallone", role = "ctb", comment = "regexper library") ) Maintainer: Qin Wenfeng -Description: RE2 is a primarily Deterministic Finite Automaton based regular expression engine from Google that is very fast - at matching large amounts of text. +Description: RE2 is a primarily deterministic finite automaton based regular expression engine from Google that is very fast + at matching large amounts of text. License: BSD_3_clause + file LICENSE LazyData: TRUE Depends: R (>= 3.3) diff --git a/LICENSE b/LICENSE index 6933fc4..a09e272 100644 --- a/LICENSE +++ b/LICENSE @@ -1,2 +1,3 @@ YEAR: 2016-2017 COPYRIGHT HOLDER: Qin Wenfeng +ORGANIZATION: Xiamen University diff --git a/R/match.R b/R/match.R index c2f852e..d0fc4c8 100644 --- a/R/match.R +++ b/R/match.R @@ -107,12 +107,12 @@ #' re2_match_all(texts, pattern) #' #' texts = c("pi is 3.14529..", -#' "-15.34 °F", +#' "-15.34 F", #' "128 days", #' "1.9e10", #' "123,340.00$", #' "only texts") -#' (number_pattern = re2(".*?(?P-?\\d+(,\\d+)*(\\.\\d+(e\\d+)?)?).*?")) +#' (number_pattern = re2(".*?(?P-?\\d+(,\\d+)*(\\d+(e\\d+)?)?).*?")) #' #' (res = re2_match(texts, number_pattern)) #' res$number diff --git a/cran-comments.md b/cran-comments.md index 0ca8f1d..b1c1b70 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,3 +1,9 @@ +Changes from the last submission: + +1. Update authors with copyright holders. + +Thanks! + Test environments 1. local OS X install, release and devel @@ -25,17 +31,10 @@ R CMD check results: * checking CRAN incoming feasibility Maintainer: ‘Qin Wenfeng ’ - License components with restrictions and base license - permitting such: - BSD_3_clause + file LICENSE - File 'LICENSE': - YEAR: 2016-2017 - COPYRIGHT HOLDER: Qin Wenfeng - + Possibly mis-spelled words in DESCRIPTION: RE2 (3:8, 13:14) - Ubuntu with Valgrind Result: ==92== Use of uninitialised value of size 8 @@ -64,4 +63,4 @@ Ubuntu with UBSAN Result: dfa.cc:1385:36: runtime error: index 1 out of bounds for type 'atomic [0x10000000000000000]' dfa.cc:1471:41: runtime error: index 2 out of bounds for type 'atomic [0x10000000000000000]' -This is expected. More discussion on https://github.com/google/re2/issues/102#issuecomment-268752821 +This result is expected. More discussion on https://github.com/google/re2/issues/102#issuecomment-268752821 diff --git a/man/re2_match.Rd b/man/re2_match.Rd index bfc24b8..c57ddef 100644 --- a/man/re2_match.Rd +++ b/man/re2_match.Rd @@ -85,12 +85,12 @@ texts <- c( re2_match_all(texts, pattern) texts = c("pi is 3.14529..", - "-15.34 °F", + "-15.34 F", "128 days", "1.9e10", "123,340.00$", "only texts") -(number_pattern = re2(".*?(?P-?\\\\d+(,\\\\d+)*(\\\\.\\\\d+(e\\\\d+)?)?).*?")) +(number_pattern = re2(".*?(?P-?\\\\d+(,\\\\d+)*(\\\\d+(e\\\\d+)?)?).*?")) (res = re2_match(texts, number_pattern)) res$number