re2 1.15.8 → 1.17.1

package/.github/actions/linux-alpine-node-12/Dockerfile

@@ -1,6 +1,6 @@
 FROM node:12-alpine3.9
 
-RUN apk add --no-cache python make gcc g++
+RUN apk add --no-cache python3 make gcc g++
 
 COPY entrypoint.sh /entrypoint.sh
 ENTRYPOINT ["/entrypoint.sh"]

package/.github/actions/linux-alpine-node-12/entrypoint.sh

@@ -2,7 +2,7 @@
 
 npm config set unsafe-perm true
 export DEVELOPMENT_SKIP_GETTING_ASSET=true
-npm ci
+npm i
 npm run build --if-present
 npm test
 npm run save-to-github

package/.github/actions/linux-alpine-node-14/Dockerfile

@@ -1,6 +1,6 @@
 FROM node:14-alpine
 
-RUN apk add --no-cache python make gcc g++
+RUN apk add --no-cache python3 make gcc g++
 
 COPY entrypoint.sh /entrypoint.sh
 ENTRYPOINT ["/entrypoint.sh"]

package/.github/actions/linux-alpine-node-14/entrypoint.sh

@@ -2,7 +2,7 @@
 
 npm config set unsafe-perm true
 export DEVELOPMENT_SKIP_GETTING_ASSET=true
-npm ci
+npm i
 npm run build --if-present
 npm test
 npm run save-to-github

package/.github/actions/{linux-alpine-node-10 → linux-alpine-node-16}/Dockerfile

@@ -1,6 +1,6 @@
-FROM node:10-alpine3.9
+FROM node:16-alpine
 
-RUN apk add --no-cache python make gcc g++
+RUN apk add --no-cache python3 make gcc g++
 
 COPY entrypoint.sh /entrypoint.sh
 ENTRYPOINT ["/entrypoint.sh"]

package/.github/actions/linux-alpine-node-16/action.yml

@@ -0,0 +1,7 @@
+name: 'Create a binary artifact for Node 16 on Alpine Linux'
+description: 'Create a binary artifact for Node 16 on Alpine Linux using musl'
+runs:
+  using: 'docker'
+  image: 'Dockerfile'
+  args:
+    - ${{inputs.node-version}}

package/.github/actions/{linux-alpine-node-10 → linux-alpine-node-16}/entrypoint.sh

@@ -1,8 +1,9 @@
 #!/bin/sh
 
 npm config set unsafe-perm true
+export USERNAME=`whoami`
 export DEVELOPMENT_SKIP_GETTING_ASSET=true
-npm ci
+npm i
 npm run build --if-present
 npm test
 npm run save-to-github

package/.github/actions/linux-alpine-node-17/Dockerfile

@@ -0,0 +1,6 @@
+FROM node:17-alpine
+
+RUN apk add --no-cache python3 make gcc g++
+
+COPY entrypoint.sh /entrypoint.sh
+ENTRYPOINT ["/entrypoint.sh"]

package/.github/actions/linux-alpine-node-17/action.yml

@@ -0,0 +1,7 @@
+name: 'Create a binary artifact for Node 17 on Alpine Linux'
+description: 'Create a binary artifact for Node 17 on Alpine Linux using musl'
+runs:
+  using: 'docker'
+  image: 'Dockerfile'
+  args:
+    - ${{inputs.node-version}}

package/.github/actions/linux-alpine-node-17/entrypoint.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+npm config set unsafe-perm true
+export USERNAME=`whoami`
+export DEVELOPMENT_SKIP_GETTING_ASSET=true
+npm i
+npm run build --if-present
+npm test
+npm run save-to-github

package/.github/actions/linux-node-12/Dockerfile

@@ -1,12 +1,13 @@
 FROM centos:centos7
 
 RUN yum install -y centos-release-scl && \
-    INSTALL_PKGS="devtoolset-7-gcc devtoolset-7-gcc-c++ python27 make" && \
+    INSTALL_PKGS="devtoolset-7-gcc devtoolset-7-gcc-c++ python3 make" && \
     yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
     rpm -V $INSTALL_PKGS && \
-    yum -y clean all --enablerepo='*' && \
-    source scl_source enable devtoolset-7 && \
-    source scl_source enable python27
+    yum -y clean all --enablerepo='*'
+    #  && \
+    # source scl_source enable devtoolset-7 && \
+    # source scl_source enable python3
 
 ENV PATH=/opt/rh/devtoolset-7/root/usr/bin:$PATH
 

package/.github/actions/linux-node-12/entrypoint.sh

@@ -9,7 +9,7 @@ nvm install --no-progress $1
 
 npm config set unsafe-perm true
 export DEVELOPMENT_SKIP_GETTING_ASSET=true
-npm ci
+npm i
 npm run build --if-present
 npm test
 npm run save-to-github

package/.github/dependabot.yml

@@ -5,7 +5,7 @@
 
 version: 2
 updates:
-  - package-ecosystem: "nvm" # See documentation for possible values
+  - package-ecosystem: "npm" # See documentation for possible values
     directory: "/" # Location of package manifests
     schedule:
       interval: "weekly"

package/.github/workflows/build.yml

@@ -31,7 +31,7 @@ jobs:
     strategy:
       matrix:
         os: [windows-latest, macOS-latest]
-        node-version: [10, 12, 14]
+        node-version: [12, 14, 16, 17]
 
     steps:
     - uses: actions/checkout@v2
@@ -57,7 +57,7 @@ jobs:
       env:
         DEVELOPMENT_SKIP_GETTING_ASSET: true
       run: |
-        npm ci
+        npm i
         npm run build --if-present
         npm test
     - name: Save to GitHub
@@ -65,10 +65,15 @@ jobs:
         GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
       run: npm run save-to-github
 
-  build-linux-node-10:
-    name: Node.js 10 on CentOS 6
+  build-linux-node:
+    name: Node.js ${{matrix.node-version}} on CentOS 7
     needs: create-release
     runs-on: ubuntu-latest
+    continue-on-error: true
+
+    strategy:
+      matrix:
+        node-version: [12, 14, 16, 17]
 
     steps:
     - uses: actions/checkout@v2
@@ -87,18 +92,17 @@ jobs:
           Linux-node-
           Linux-
     - name: Install, test, and create artifact
-      uses: ./.github/actions/linux-node-10/
+      uses: ./.github/actions/linux-node-12/
       env:
         GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+      with:
+        node-version: ${{matrix.node-version}}
 
-  build-linux-node:
-    name: Node.js ${{matrix.node-version}} on CentOS 7
+  build-linux-alpine-node-12:
+    name: Node.js 12 on Alpine Linux
     needs: create-release
     runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        node-version: [12, 14]
+    continue-on-error: true
 
     steps:
     - uses: actions/checkout@v2
@@ -112,21 +116,20 @@ jobs:
       uses: actions/cache@v2
       with:
         path: ${{steps.npm-cache.outputs.dir}}
-        key: Linux-node-${{hashFiles('**/package-lock.json')}}
+        key: Linux-Alpine-node-${{hashFiles('**/package-lock.json')}}
         restore-keys: |
-          Linux-node-
-          Linux-
+          Linux-Alpine-node-
+          Linux-Alpine-
     - name: Install, test, and create artifact
-      uses: ./.github/actions/linux-node-12/
+      uses: ./.github/actions/linux-alpine-node-12/
       env:
         GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
-      with:
-        node-version: ${{matrix.node-version}}
 
-  build-linux-alpine-node-10:
-    name: Node.js 10 on Alpine Linux
+  build-linux-alpine-node-14:
+    name: Node.js 14 on Alpine Linux
     needs: create-release
     runs-on: ubuntu-latest
+    continue-on-error: true
 
     steps:
     - uses: actions/checkout@v2
@@ -145,14 +148,15 @@ jobs:
           Linux-Alpine-node-
           Linux-Alpine-
     - name: Install, test, and create artifact
-      uses: ./.github/actions/linux-alpine-node-10/
+      uses: ./.github/actions/linux-alpine-node-14/
       env:
         GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
 
-  build-linux-alpine-node-12:
-    name: Node.js 12 on Alpine Linux
+  build-linux-alpine-node-16:
+    name: Node.js 16 on Alpine Linux
     needs: create-release
     runs-on: ubuntu-latest
+    continue-on-error: true
 
     steps:
     - uses: actions/checkout@v2
@@ -171,14 +175,15 @@ jobs:
           Linux-Alpine-node-
           Linux-Alpine-
     - name: Install, test, and create artifact
-      uses: ./.github/actions/linux-alpine-node-12/
+      uses: ./.github/actions/linux-alpine-node-16/
       env:
         GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
 
-  build-linux-alpine-node-14:
-    name: Node.js 14 on Alpine Linux
+  build-linux-alpine-node-17:
+    name: Node.js 17 on Alpine Linux
     needs: create-release
     runs-on: ubuntu-latest
+    continue-on-error: true
 
     steps:
     - uses: actions/checkout@v2
@@ -197,6 +202,6 @@ jobs:
           Linux-Alpine-node-
           Linux-Alpine-
     - name: Install, test, and create artifact
-      uses: ./.github/actions/linux-alpine-node-14/
+      uses: ./.github/actions/linux-alpine-node-17/
       env:
         GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

package/.github/workflows/tests.yml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macOS-latest]
-        node-version: [10, 12, 14]
+        node-version: [12, 14, 16, 17]
 
     steps:
     - uses: actions/checkout@v2
@@ -39,6 +39,6 @@ jobs:
       env:
         DEVELOPMENT_SKIP_GETTING_ASSET: true
       run: |
-        npm ci
+        npm i
         npm run build --if-present
         npm test

package/README.md

@@ -211,7 +211,7 @@ For example, [yarn](https://yarnpkg.com/) is known to fail in some scenarios
 
 ### Precompiled artifacts
 
-When installing re2 the [install script](scripts/install-from-cache.js) attempts to download a prebuilt artifact for your system from the Github releases. The download location can be overridden by setting the `RE2_DOWNLOAD_MIRROR` environment variable as seen in the install script.
+When installing re2 the [install script](https://github.com/uhop/install-artifact-from-github/blob/master/bin/install-from-cache.js) attempts to download a prebuilt artifact for your system from the Github releases. The download location can be overridden by setting the `RE2_DOWNLOAD_MIRROR` environment variable as seen in the install script.
 
 If all attempts to download the prebuilt artifact for your system fails the script attempts to built re2 locally on your machine using [node-gyp](https://github.com/nodejs/node-gyp).
 
@@ -343,6 +343,10 @@ console.log('re2_res : ' + re2_res); // prints: re2_res : abc,a,b,c
 
 ## Release history
 
+- 1.17.1 *Fix for `lastIndex` for U+10000 - U+10FFFF UTF characters. Thx, [omg](https://github.com/omg).*
+- 1.17.0 *Updated GYP, added support for Node 17, updated deps.*
+- 1.16.0 *Updated the compiler (thx, [Sergei Dyshel](https://github.com/sergei-dyshel)), updated GYP, removed support for Node 10, added support for Node 16, updated TS bindings (thx, [BannerBomb](https://github.com/BannerBomb)).*
+- 1.15.9 *Updated deps.*
 - 1.15.8 *Updated deps.*
 - 1.15.7 *Updated deps.*
 - 1.15.6 *Technical release: less dependencies for the build.*
@@ -352,40 +356,8 @@ console.log('re2_res : ' + re2_res); // prints: re2_res : abc,a,b,c
 - 1.15.2 *Added `linux-musl` target for precompiled images (thx [Uzlopak](https://github.com/Uzlopak)).*
 - 1.15.1 *Refreshed dependencies, updated the verification check on installation, general maintenance.*
 - 1.15.0 *Fix for multiline expressions (thx [Frederic Rudman](https://github.com/frudman)), `toString()` uses `source` now, updated deps.*
-- 1.14.0 *New delivery mechanism for binary artifacts (thx [Brandon Kobel](https://github.com/kobelb) for the idea and the research) + minor fix to eliminate warnings on Windows.*
-- 1.13.1 *Fix for Windows builds.*
-- 1.13.0 *Got rid of a single static variable to support multithreading.*
-- 1.12.1 *Updated re2 to the latest version.*
-- 1.12.0 *Updated the way `RE2` objects are constructed.*
-- 1.11.0 *Updated the way to initialize the extension (thx [BannerBomb](https://github.com/BannerBomb)).*
-- 1.10.5 *Bugfix for optional groups (thx [Josh Yudaken](https://github.com/qix)), the latest version of re2.*
-- 1.10.4 *Technical release: even better TypeScript types (thx [Louis Brann](https://github.com/louis-brann)).*
-- 1.10.3 *Technical release: missing reference to TS types (thx [Jamie Magee](https://github.com/JamieMagee)).*
-- 1.10.2 *Technical release: added TypeScript types (thx [Jamie Magee](https://github.com/JamieMagee)).*
-- 1.10.1 *Updated re2 to the latest version (thx [Jamie Magee](https://github.com/JamieMagee)), dropped Node 6.*
-- 1.10.0 *Added back support for Node 6 and Node 8. Now Node 6-12 is supported.*
-- 1.9.0 *Refreshed dependencies to support Node 12. Only versions 10-12 are supported now (`v8` restrictions). For older versions use `node-re2@1.8`.*
-- 1.8.4 *Refreshed dependencies, removed `unistd.h` to compile on Windows.*
-- 1.8.3 *Refreshed dependencies, removed suppression of some warnings.*
-- 1.8.2 *Bugfix to support the null prototype for groups. Thx [Exter-N](https://github.com/Exter-N).*
-- 1.8.1 *Bugfix for better source escaping.*
-- 1.8.0 *Clarified Unicode support, added `unicode` flag, added named groups — thx [Exter-N](https://github.com/Exter-N)! Bugfixes — thx [Barak Amar](https://github.com/nopcoder).*
-- 1.7.0 *Implemented `sticky` and `flags` + bug fixes + more tests. Thx [Exter-N](https://github.com/Exter-N).*
-- 1.6.2 *Bugfix for a prototype access. Thx [Exter-N](https://github.com/Exter-N).*
-- 1.6.1 *Returned support for node 4 LTS. Thx [Kannan Goundan](https://github.com/cakoose).*
-- 1.6.0 *Added well-known symbol-based methods of ES6. Refreshed NAN.*
-- 1.5.0 *Bugfixes, error checks, better docs. Thx [Jamie Davis](https://github.com/davisjam), and [omg](https://github.com/omg).*
-- 1.4.1 *Minor corrections in README.*
-- 1.4.0 *Use re2 as a git submodule. Thx [Ben James](https://github.com/benhjames).*
-- 1.3.3 *Refreshed dependencies.*
-- 1.3.2 *Updated references in README (re2 was moved to github).*
-- 1.3.1 *Refreshed dependencies, new Travis-CI config.*
-- 1.3.0 *Upgraded NAN to 1.6.3, now we support node.js 0.10.36, 0.12.0, and io.js 1.3.0. Thx [Reid Burke](https://github.com/reid)!*
-- 1.2.0 *Documented getUtfXLength() functions. Added support for `\c` and `\u` commands.*
-- 1.1.1 *Minor corrections in README.*
-- 1.1.0 *Buffer-based API is public. Unicode is fully supported.*
-- 1.0.0 *Implemented all `RegExp` methods, and all relevant `String` methods.*
-- 0.9.0 *The initial public release.*
+
+The rest can be consulted in the project's wiki [Release history](https://github.com/uhop/node-re2/wiki/Release-history).
 
 ## License
 

package/binding.gyp

@@ -39,7 +39,7 @@
         "vendor/util/strutil.cc"
       ],
       "cflags": [
-        "-std=c++11",
+        "-std=c++14",
         "-Wall",
         "-Wextra",
         "-Wno-sign-compare",
@@ -62,7 +62,7 @@
         "CLANG_CXX_LANGUAGE_STANDARD": "c++11",
         "CLANG_CXX_LIBRARY": "libc++",
         "OTHER_CFLAGS": [
-          "-std=c++11",
+          "-std=c++14",
           "-Wall",
           "-Wextra",
           "-Wno-sign-compare",

package/lib/exec.cc

@@ -50,7 +50,10 @@ NAN_METHOD(WrappedRE2::Exec)
 			}
 			for (size_t n = re2->lastIndex; n; --n)
 			{
-				lastIndex += getUtf8CharSize(str.data[lastIndex]);
+				size_t s = getUtf8CharSize(str.data[lastIndex]);
+				lastIndex += s;
+				if (s == 4 && n >= 2) --n; // this utf8 character will take two utf16 characters
+				// the decrement above is protected to avoid an overflow of an unsigned integer
 			}
 		}
 	}

package/lib/match.cc

@@ -59,7 +59,10 @@ NAN_METHOD(WrappedRE2::Match)
 		{
 			for (size_t n = re2->lastIndex; n; --n)
 			{
-				lastIndex += getUtf8CharSize(a.data[lastIndex]);
+				size_t s = getUtf8CharSize(a.data[lastIndex]);
+				lastIndex += s;
+				if (s == 4 && n >= 2) --n; // this utf8 character will take two utf16 characters
+				// the decrement above is protected to avoid an overflow of an unsigned integer
 			}
 			anchor = RE2::ANCHOR_START;
 		}

package/lib/replace.cc

@@ -226,7 +226,10 @@ static Nan::Maybe<std::string> replace(WrappedRE2 *re2, const StrVal &replacee,
 			{
 				for (size_t n = re2->lastIndex; n; --n)
 				{
-					lastIndex += getUtf8CharSize(data[lastIndex]);
+					size_t s = getUtf8CharSize(data[lastIndex]);
+					lastIndex += s;
+					if (s == 4 && n >= 2) --n; // this utf8 character will take two utf16 characters
+					// the decrement above is protected to avoid an overflow of an unsigned integer
 				}
 			}
 		}
@@ -372,7 +375,10 @@ static Nan::Maybe<std::string> replace(WrappedRE2 *re2, const StrVal &replacee,
 			{
 				for (size_t n = re2->lastIndex; n; --n)
 				{
-					lastIndex += getUtf8CharSize(data[lastIndex]);
+					size_t s = getUtf8CharSize(data[lastIndex]);
+					lastIndex += s;
+					if (s == 4 && n >= 2) --n; // this utf8 character will take two utf16 characters
+					// the decrement above is protected to avoid an overflow of an unsigned integer
 				}
 			}
 		}

package/lib/test.cc

@@ -50,7 +50,10 @@ NAN_METHOD(WrappedRE2::Test)
 			}
 			for (size_t n = re2->lastIndex; n; --n)
 			{
-				lastIndex += getUtf8CharSize(str.data[lastIndex]);
+				size_t s = getUtf8CharSize(str.data[lastIndex]);
+				lastIndex += s;
+				if (s == 4 && n >= 2) --n; // this utf8 character will take two utf16 characters
+				// the decrement above is protected to avoid an overflow of an unsigned integer
 			}
 		}
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "re2",
-  "version": "1.15.8",
+  "version": "1.17.1",
   "description": "Bindings for RE2: fast, safe alternative to backtracking regular expression engines.",
   "homepage": "https://github.com/uhop/node-re2",
   "bugs": "https://github.com/uhop/node-re2/issues",
@@ -10,9 +10,9 @@
     "test": "tests"
   },
   "dependencies": {
-    "install-artifact-from-github": "^1.1.3",
-    "nan": "^2.14.2",
-    "node-gyp": "^7.1.2"
+    "install-artifact-from-github": "^1.2.0",
+    "nan": "^2.15.0",
+    "node-gyp": "^8.4.1"
   },
   "devDependencies": {
     "heya-unit": "^0.3.0"

package/re2.d.ts

@@ -1,5 +1,42 @@
 declare module 're2' {
-  class RE2 extends RegExp {}
+
+  interface RE2MatchArray<K> extends Array<K> {
+    index?: number;
+    input?: K;
+  }
+
+  interface RE2ExecArray<K> extends Array<K> {
+    index: number;
+    input: K;
+  }
+
+  interface RE2 extends RegExp {
+    exec<K extends String | Buffer>(str: K): RE2ExecArray<K> | null;
+
+    test(str: string | Buffer): boolean;
+
+    match<K extends String | Buffer>(str: K): RE2MatchArray<K> | null;
+
+    replace<K extends String | Buffer>(str: K, replaceValue: string | Buffer): K;
+    replace<K extends String | Buffer>(str: K, replacer: (substring: string, ...args: any[]) => string | Buffer): K;
+
+    search(str: string | Buffer): number;
+
+    split<K extends String | Buffer>(str: K, limit?: number): K[];
+  }
+
+  interface RE2Constructor extends RegExpConstructor {
+    new(pattern: Buffer | RegExp | string): RE2;
+    new(pattern: Buffer | string, flags?: string): RE2;
+    (pattern: Buffer | RegExp | string): RE2;
+    (pattern: Buffer | string, flags?: string): RE2;
+    readonly prototype: RE2;
+
+    unicodeWarningLevel: 'nothing' | 'warnOnce' | 'warn' | 'throw';
+    getUtf8Length(value: string): number;
+    getUtf16Length(value: Buffer): number;
+  }
+
+  var RE2: RE2Constructor;
   export = RE2;
 }
-

package/tests/test_exec.js

@@ -284,6 +284,22 @@ unit.add(module, [
 		eval(t.TEST("re2.lastIndex === 6"));
   },
 
+	function test_execSupplemental(t) {
+		"use strict";
+
+		var re = new RE2("\\w+", "g");
+		var testString = "🤡🤡🤡 Hello clown world!";
+
+		var result = re.exec(testString);
+		eval(t.TEST("t.unify(result, ['Hello'])"));
+		
+		result = re.exec(testString);
+		eval(t.TEST("t.unify(result, ['clown'])"));
+
+		result = re.exec(testString);
+		eval(t.TEST("t.unify(result, ['world'])"));
+	},
+
   // Multiline test
 
   function test_execMultiline(t) {

package/tests/test_general.js

@@ -209,6 +209,12 @@ unit.add(module, [
 		eval(t.TEST("s3.length === 1"));
 		eval(t.TEST("RE2.getUtf8Length(s3) === 3"));
 
+		var s4 = "🤡";
+
+		eval(t.TEST("s4.length === 2"));
+		eval(t.TEST("RE2.getUtf8Length(s4) === 4"));
+		eval(t.TEST("RE2.getUtf16Length(Buffer.from(s4, 'utf8')) === s4.length"));
+
 		var b3 = new Buffer([0xF0]);
 
 		eval(t.TEST("b3.length === 1"));

package/vendor/README

@@ -31,10 +31,12 @@ The Python wrapper is at https://github.com/google/re2/tree/abseil/python
 and on PyPI (https://pypi.org/project/google-re2/).
 
 A C wrapper is at https://github.com/marcomaggi/cre2/.
+A D wrapper is at https://github.com/ShigekiKarita/re2d/ and on DUB (code.dlang.org).
 An Erlang wrapper is at https://github.com/dukesoferl/re2/ and on Hex (hex.pm).
 An Inferno wrapper is at https://github.com/powerman/inferno-re2/.
 A Node.js wrapper is at https://github.com/uhop/node-re2/ and on NPM (npmjs.com).
 An OCaml wrapper is at https://github.com/janestreet/re2/ and on OPAM (opam.ocaml.org).
 A Perl wrapper is at https://github.com/dgl/re-engine-RE2/ and on CPAN (cpan.org).
-An R wrapper is at https://github.com/qinwf/re2r/ and on CRAN (cran.r-project.org).
+An R wrapper is at https://github.com/girishji/re2/ and on CRAN (cran.r-project.org).
 A Ruby wrapper is at https://github.com/mudge/re2/ and on RubyGems (rubygems.org).
+A WebAssembly wrapper is at https://github.com/google/re2-wasm/ and on NPM (npmjs.com).

package/vendor/re2/bitstate.cc

@@ -293,9 +293,9 @@ bool BitState::Search(const StringPiece& text, const StringPiece& context,
   context_ = context;
   if (context_.data() == NULL)
     context_ = text;
-  if (prog_->anchor_start() && context_.begin() != text.begin())
+  if (prog_->anchor_start() && BeginPtr(context_) != BeginPtr(text))
     return false;
-  if (prog_->anchor_end() && context_.end() != text.end())
+  if (prog_->anchor_end() && EndPtr(context_) != EndPtr(text))
     return false;
   anchored_ = anchored || prog_->anchor_start();
   longest_ = longest || prog_->anchor_end();
@@ -377,7 +377,7 @@ bool Prog::SearchBitState(const StringPiece& text,
   bool longest = kind != kFirstMatch;
   if (!b.Search(text, context, anchored, longest, match, nmatch))
     return false;
-  if (kind == kFullMatch && match[0].end() != text.end())
+  if (kind == kFullMatch && EndPtr(match[0]) != EndPtr(text))
     return false;
   return true;
 }