1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-10 07:04:03 +00:00

textproc/re-flex: update to e 2.1.1

Release notes: https://github.com/Genivia/RE-flex/releases/tag/v2.1.1
This commit is contained in:
Pietro Cerutti 2020-07-09 09:33:19 +00:00
parent a602c18f3b
commit 3721c206ed
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=541735
4 changed files with 40 additions and 4 deletions

View File

@ -1,7 +1,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= re-flex PORTNAME= re-flex
PORTVERSION= 2.1.0 PORTVERSION= 2.1.1
DISTVERSIONPREFIX= v DISTVERSIONPREFIX= v
CATEGORIES= textproc CATEGORIES= textproc

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1593507667 TIMESTAMP = 1594281933
SHA256 (Genivia-RE-flex-v2.1.0_GH0.tar.gz) = b4c1b06fabf2ef6301e0210138c1ad16aa8a9384bfe7f3533155ef279e0b714f SHA256 (Genivia-RE-flex-v2.1.1_GH0.tar.gz) = 75994065b7a8aeec0c41f86afe7d33b571a73f124a001ad9a4bfe500641a9670
SIZE (Genivia-RE-flex-v2.1.0_GH0.tar.gz) = 5876919 SIZE (Genivia-RE-flex-v2.1.1_GH0.tar.gz) = 5916897

View File

@ -0,0 +1,25 @@
--- include/reflex/matcher.h.orig 2020-07-09 08:31:49 UTC
+++ include/reflex/matcher.h
@@ -139,19 +139,19 @@ class Matcher : public PatternMatcher<reflex::Pattern>
{
if (n == 0)
return std::pair<const char*,size_t>(txt_, len_);
- return std::pair<const char*,size_t>(reinterpret_cast<const char*>(NULL), 0);
+ return std::pair<const char*,size_t>(nullptr, 0);
}
/// Returns the group capture identifier containing the group capture index >0 and name (or NULL) of a named group capture, or (1,NULL) by default
virtual std::pair<size_t,const char*> group_id()
/// @returns a pair of size_t and string
{
- return std::pair<size_t,const char*>(accept(), reinterpret_cast<const char*>(NULL));
+ return std::pair<size_t,const char*>(accept(), nullptr);
}
/// Returns the next group capture identifier containing the group capture index >0 and name (or NULL) of a named group capture, or (0,NULL) when no more groups matched
virtual std::pair<size_t,const char*> group_next_id()
/// @returns (0,NULL)
{
- return std::pair<size_t,const char*>(0, reinterpret_cast<const char*>(NULL));
+ return std::pair<size_t,const char*>(0, nullptr);
}
/// Returns the position of the last indent stop.
size_t last_stop()

View File

@ -0,0 +1,11 @@
--- lib/pattern.cpp.orig 2020-07-09 08:32:41 UTC
+++ lib/pattern.cpp
@@ -2065,7 +2065,7 @@ void Pattern::encode_dfa(DFA::State *start)
// add final dead state (HALT opcode) only when needed, i.e. skip dead state if all chars 0-255 are already covered
if (hi <= 0xFF)
{
- state->edges[hi] = std::pair<Char,DFA::State*>(0xFF, reinterpret_cast<DFA::State*>(NULL));
+ state->edges[hi] = std::pair<Char,DFA::State*>(0xFF, nullptr);
++nop_;
}
#else