From aa05cf6073cf2a6dfa46108cd5522c0171a7f1c3 Mon Sep 17 00:00:00 2001 From: Benjamin Barenblat Date: Thu, 30 Jul 2015 16:51:31 -0400 Subject: Make library work on both client and server sides Replace the two-step compile/match process with a single compile-and-match one to avoid issues with server-client representation incompatibility. Use the browser regex engine on the client side. --- src/regex__FFI.urs | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'src/regex__FFI.urs') diff --git a/src/regex__FFI.urs b/src/regex__FFI.urs index 690ca1d..862d4f3 100644 --- a/src/regex__FFI.urs +++ b/src/regex__FFI.urs @@ -1,4 +1,5 @@ (* Copyright 2015 the Massachusetts Institute of Technology +Copyright 2015 Benjamin Barenblat Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the @@ -15,9 +16,6 @@ specific language governing permissions and limitations under the License. *) instead. *) -(* A compiled regular expression. *) -type regex - (* Data about a match. There is no function which returns all subexpression matches, as we can't build an Ur list in C. *) type match @@ -26,9 +24,7 @@ val n_subexpression_matches : match -> int val subexpression_match : match -> int -> string -(* Compiles a regular expression from a POSIX extended regular expression -string. *) -val compile : bool (* case sensitive? *) -> string -> regex - (* Matches a regular expression against any part of a string. *) -val do_match : regex -> string -> match +val do_match : string (* needle *) + -> string (* haystack *) + -> match -- cgit v1.2.3