From bde850752d29a9df47e6cbdd556635637214f9e0 Mon Sep 17 00:00:00 2001
From: Elara Musayelyan <elara@elara.ws>
Date: Mon, 17 Jul 2023 07:00:24 -0700
Subject: [PATCH] Move new types to the types.go file

---
 pcre.go  | 61 -------------------------------------------------------
 types.go | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+), 61 deletions(-)

diff --git a/pcre.go b/pcre.go
index 85cefa2..e3d465c 100644
--- a/pcre.go
+++ b/pcre.go
@@ -565,67 +565,6 @@ func (r *Regexp) SubexpIndex(name string) int {
 	return int(ret)
 }
 
-type CalloutFlags uint32
-
-const (
-	CalloutStartMatch = CalloutFlags(lib.DPCRE2_CALLOUT_STARTMATCH)
-	CalloutBacktrack  = CalloutFlags(lib.DPCRE2_CALLOUT_BACKTRACK)
-)
-
-type CalloutBlock struct {
-	// Version contains the version number of the block format.
-	// The current version is 2.
-	Version uint32
-
-	// CalloutNumber contains the number of the callout, in the range 0-255.
-	// This is the number that follows "?C". For callouts with string arguments,
-	// this will always be zero.
-	CalloutNumber uint32
-
-	// CaptureTop contains the number of the highest numbered substring
-	// captured so far plus one. If no substrings have yet been captured,
-	// CaptureTop will be set to 1.
-	CaptureTop uint32
-
-	// CaptureLast contains the number of the last substring that was captured.
-	CaptureLast uint32
-
-	// Substrings contains all of the substrings captured so far.
-	Substrings []string
-
-	Mark string
-
-	// Subject contains the string passed to the match function.
-	Subject string
-
-	// StartMatch contains the offset within the subject at which the current match attempt started.
-	StartMatch uint
-
-	// CurrentPosition contains the offset of the current match pointer within the subject.
-	CurrentPosition uint
-
-	// PatternPosition contains the offset within the pattern string to the next item to be matched.
-	PatternPosition uint
-
-	// NextItemLength contains the length of the next item to be processed in the pattern string.
-	NextItemLength uint
-
-	// CalloutStringOffset contains the code unit offset to the start of the callout argument string within the original pattern string.
-	CalloutStringOffset uint
-
-	// CalloutString is the string for the callout. For numerical callouts, this will always be empty.
-	CalloutString string
-
-	// CalloutFlags contains the following flags:
-	// 	CalloutStartMatch
-	// This is set for the first callout after the start of matching for each new starting position in the subject.
-	// 	CalloutBacktrack
-	// This is set if there has been a matching backtrack since the previous callout, or since the start of matching if this is the first callout from a pcre2_match() run.
-	//
-	// Both bits are set when a backtrack has caused a "bumpalong" to a new starting position in the subject.
-	CalloutFlags CalloutFlags
-}
-
 // SetCallout sets a callout function that will be called at specified points in the matching operation.
 // fn should return zero if it ran successfully or a non-zero integer to force an error.
 // See https://www.pcre.org/current/doc/html/pcre2callout.html for more information.
diff --git a/types.go b/types.go
index 9b15d4d..df99ddd 100644
--- a/types.go
+++ b/types.go
@@ -36,3 +36,65 @@ const (
 	UseOffsetLimit     = CompileOption(lib.DPCRE2_USE_OFFSET_LIMIT)
 	UTF                = CompileOption(lib.DPCRE2_UTF)
 )
+
+type CalloutFlags uint32
+
+const (
+	CalloutStartMatch = CalloutFlags(lib.DPCRE2_CALLOUT_STARTMATCH)
+	CalloutBacktrack  = CalloutFlags(lib.DPCRE2_CALLOUT_BACKTRACK)
+)
+
+// CalloutBlock contains the data passed to callout functions
+type CalloutBlock struct {
+	// Version contains the version number of the block format.
+	// The current version is 2.
+	Version uint32
+
+	// CalloutNumber contains the number of the callout, in the range 0-255.
+	// This is the number that follows "?C". For callouts with string arguments,
+	// this will always be zero.
+	CalloutNumber uint32
+
+	// CaptureTop contains the number of the highest numbered substring
+	// captured so far plus one. If no substrings have yet been captured,
+	// CaptureTop will be set to 1.
+	CaptureTop uint32
+
+	// CaptureLast contains the number of the last substring that was captured.
+	CaptureLast uint32
+
+	// Substrings contains all of the substrings captured so far.
+	Substrings []string
+
+	Mark string
+
+	// Subject contains the string passed to the match function.
+	Subject string
+
+	// StartMatch contains the offset within the subject at which the current match attempt started.
+	StartMatch uint
+
+	// CurrentPosition contains the offset of the current match pointer within the subject.
+	CurrentPosition uint
+
+	// PatternPosition contains the offset within the pattern string to the next item to be matched.
+	PatternPosition uint
+
+	// NextItemLength contains the length of the next item to be processed in the pattern string.
+	NextItemLength uint
+
+	// CalloutStringOffset contains the code unit offset to the start of the callout argument string within the original pattern string.
+	CalloutStringOffset uint
+
+	// CalloutString is the string for the callout. For numerical callouts, this will always be empty.
+	CalloutString string
+
+	// CalloutFlags contains the following flags:
+	// 	CalloutStartMatch
+	// This is set for the first callout after the start of matching for each new starting position in the subject.
+	// 	CalloutBacktrack
+	// This is set if there has been a matching backtrack since the previous callout, or since the start of matching if this is the first callout from a pcre2_match() run.
+	//
+	// Both bits are set when a backtrack has caused a "bumpalong" to a new starting position in the subject.
+	CalloutFlags CalloutFlags
+}