Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 9 Jul 2020 09:33:20 +0000 (UTC)
From:      Pietro Cerutti <gahr@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r541735 - in head/textproc/re-flex: . files
Message-ID:  <202007090933.0699XKVo020855@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: gahr
Date: Thu Jul  9 09:33:19 2020
New Revision: 541735
URL: https://svnweb.freebsd.org/changeset/ports/541735

Log:
  textproc/re-flex: update to e 2.1.1
  
  Release notes: https://github.com/Genivia/RE-flex/releases/tag/v2.1.1

Added:
  head/textproc/re-flex/files/
  head/textproc/re-flex/files/patch-include_reflex_matcher.h   (contents, props changed)
  head/textproc/re-flex/files/patch-lib_pattern.cpp   (contents, props changed)
Modified:
  head/textproc/re-flex/Makefile
  head/textproc/re-flex/distinfo

Modified: head/textproc/re-flex/Makefile
==============================================================================
--- head/textproc/re-flex/Makefile	Thu Jul  9 08:47:53 2020	(r541734)
+++ head/textproc/re-flex/Makefile	Thu Jul  9 09:33:19 2020	(r541735)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	re-flex
-PORTVERSION=	2.1.0
+PORTVERSION=	2.1.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	textproc
 

Modified: head/textproc/re-flex/distinfo
==============================================================================
--- head/textproc/re-flex/distinfo	Thu Jul  9 08:47:53 2020	(r541734)
+++ head/textproc/re-flex/distinfo	Thu Jul  9 09:33:19 2020	(r541735)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1593507667
-SHA256 (Genivia-RE-flex-v2.1.0_GH0.tar.gz) = b4c1b06fabf2ef6301e0210138c1ad16aa8a9384bfe7f3533155ef279e0b714f
-SIZE (Genivia-RE-flex-v2.1.0_GH0.tar.gz) = 5876919
+TIMESTAMP = 1594281933
+SHA256 (Genivia-RE-flex-v2.1.1_GH0.tar.gz) = 75994065b7a8aeec0c41f86afe7d33b571a73f124a001ad9a4bfe500641a9670
+SIZE (Genivia-RE-flex-v2.1.1_GH0.tar.gz) = 5916897

Added: head/textproc/re-flex/files/patch-include_reflex_matcher.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/re-flex/files/patch-include_reflex_matcher.h	Thu Jul  9 09:33:19 2020	(r541735)
@@ -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()

Added: head/textproc/re-flex/files/patch-lib_pattern.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/re-flex/files/patch-lib_pattern.cpp	Thu Jul  9 09:33:19 2020	(r541735)
@@ -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

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202007090933.0699XKVo020855>