From: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date: Thu, 14 Nov 2019 12:35:47 +0000 (+0100)
Subject: - up to 0.015
X-Git-Tag: auto/th/perl-Params-Classify-0.015-1
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=3ab29723c68930658fc502f99a2bc46e9c8c04ae;p=packages%2Fperl-Params-Classify.git

- up to 0.015
---

diff --git a/op_sibling_fixes.patch b/op_sibling_fixes.patch
deleted file mode 100644
index 98dd25e..0000000
--- a/op_sibling_fixes.patch
+++ /dev/null
@@ -1,79 +0,0 @@
---- Params-Classify-0.013a/lib/Params/Classify.xs	2010-11-16 15:35:47.000000000 -0500
-+++ Params-Classify-0.013b/lib/Params/Classify.xs	2017-03-26 15:38:12.384693301 -0400
-@@ -41,6 +41,26 @@
- # define FPTR2DPTR(t,x) ((t)(UV)(x))
- #endif /* !FPTR2DPTR */
- 
-+#ifndef OpHAS_SIBLING
-+#  define OpHAS_SIBLING(o)               (cBOOL((o)->op_sibling))
-+#endif
-+
-+#ifndef OpSIBLING
-+#  define OpSIBLING(o)                   (0 + (o)->op_sibling)
-+#endif
-+
-+#ifndef OpMORESIB_set
-+#  define OpMORESIB_set(o, sib)          ((o)->op_sibling = (sib))
-+#endif
-+
-+#ifndef OpLASTSIB_set
-+#  define OpLASTSIB_set(o, parent)       ((o)->op_sibling = NULL)
-+#endif
-+
-+#ifndef OpMAYBESIB_set
-+#  define OpMAYBESIB_set(o, sib, parent) ((o)->op_sibling = (sib))
-+#endif
-+
- #ifndef ptr_table_new
- 
- struct q_ptr_tbl_ent {
-@@ -625,8 +645,8 @@
- 	OP *(*ppfunc)(pTHX);
- 	I32 cvflags;
- 	pushop = cUNOPx(op)->op_first;
--	if(!pushop->op_sibling) pushop = cUNOPx(pushop)->op_first;
--	for(cvop = pushop; cvop->op_sibling; cvop = cvop->op_sibling) ;
-+	if(!OpHAS_SIBLING(pushop)) pushop = cUNOPx(pushop)->op_first;
-+	for(cvop = pushop; OpHAS_SIBLING(cvop); cvop = OpSIBLING(cvop)) ;
- 	if(!(cvop->op_type == OP_RV2CV &&
- 			!(cvop->op_private & OPpENTERSUB_AMPER) &&
- 			(cv = rvop_cv(cUNOPx(cvop)->op_first)) &&
-@@ -635,20 +655,20 @@
- 		return nxck_entersub(aTHX_ op);
- 	cvflags = CvXSUBANY(cv).any_i32;
- 	op = nxck_entersub(aTHX_ op);   /* for prototype checking */
--	aop = pushop->op_sibling;
--	bop = aop->op_sibling;
-+	aop = OpSIBLING(pushop);
-+	bop = OpSIBLING(aop);
- 	if(bop == cvop) {
- 		if(!(cvflags & PC_ALLOW_UNARY)) return op;
- 		unary:
--		pushop->op_sibling = bop;
--		aop->op_sibling = NULL;
-+		OpLASTSIB_set(pushop, bop);
-+		OpLASTSIB_set(aop, NULL);
- 		op_free(op);
- 		op = newUNOP(OP_NULL, 0, aop);
- 		op->op_type = OP_RAND;
- 		op->op_ppaddr = ppfunc;
- 		op->op_private = (U8)cvflags;
- 		return op;
--	} else if(bop && bop->op_sibling == cvop) {
-+	} else if(bop && OpSIBLING(op) == cvop) {
- 		if(!(cvflags & PC_ALLOW_BINARY)) return op;
- 		if(ppfunc == THX_pp_check_sclass &&
- 				(cvflags & PC_TYPE_MASK) == SCLASS_REF) {
-@@ -667,9 +687,9 @@
- 			cvflags &= ~PC_TYPE_MASK;
- 			ppfunc = THX_pp_check_dyn_battr;
- 		}
--		pushop->op_sibling = cvop;
--		aop->op_sibling = NULL;
--		bop->op_sibling = NULL;
-+		OpLASTSIB_set(pushop, cvop);
-+		OpLASTSIB_set(aop, NULL);
-+		OpLASTSIB_set(bop, NULL);
- 		op_free(op);
- 		op = newBINOP(OP_NULL, 0, aop, bop);
- 		op->op_type = OP_RAND;
diff --git a/perl-Params-Classify.spec b/perl-Params-Classify.spec
index 33a9d97..ebb149a 100644
--- a/perl-Params-Classify.spec
+++ b/perl-Params-Classify.spec
@@ -8,14 +8,13 @@
 Summary:	Params::Classify - argument type classification
 Summary(pl.UTF-8):	Params::Classify - klasyfikacja typu argumentu
 Name:		perl-Params-Classify
-Version:	0.013
-Release:	10
+Version:	0.015
+Release:	1
 # same as perl
 License:	GPL v1+ or Artistic
 Group:		Development/Languages/Perl
 Source0:	http://www.cpan.org/modules/by-module/Params/%{pdir}-%{pnam}-%{version}.tar.gz
-# Source0-md5:	63d24fbec775472ada49d16bce4a9b1f
-Patch0:		op_sibling_fixes.patch
+# Source0-md5:	3c3367d759ed5bd6fe86c1f35e9b51ed
 URL:		http://search.cpan.org/dist/Params-Classify/
 BuildRequires:	perl-ExtUtils-ParseXS >= 2.2006
 BuildRequires:	perl-Module-Build
@@ -42,7 +41,6 @@ argumentów (jak przeciążone funkcje w C++).
 
 %prep
 %setup -q -n %{pdir}-%{pnam}-%{version}
-%patch0 -p1
 
 %build
 %{__perl} Build.PL \