From 6104a3bcc26a05942b8062ae62a0c7b932ca8cf6 Mon Sep 17 00:00:00 2001 From: Louis Pilfold Date: Thu, 26 Aug 2021 23:13:44 +0100 Subject: Regex scan --- src/gleam_stdlib.js | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) (limited to 'src/gleam_stdlib.js') diff --git a/src/gleam_stdlib.js b/src/gleam_stdlib.js index d2454ba..652b7b5 100644 --- a/src/gleam_stdlib.js +++ b/src/gleam_stdlib.js @@ -7,7 +7,11 @@ import { toBitString, stringBits, } from "./gleam.js"; -import { CompileError as RegexCompileError } from "./gleam/regex.js"; +import { + CompileError as RegexCompileError, + Match as RegexMatch, +} from "./gleam/regex.js"; +import { Some, None } from "./gleam/option.js"; const Nil = undefined; @@ -236,13 +240,21 @@ export function regex_check(regex, string) { export function compile_regex(pattern, options) { try { - let flags = ""; + let flags = "gu"; if (options.case_insensitive) flags += "i"; if (options.multi_line) flags += "m"; return new Ok(new RegExp(pattern, flags)); } catch (error) { - return new Error( - new RegexCompileError(error.message, error.columnNumber || 0) - ); + let number = (error.columnNumber || 0) | 0; + return new Error(new RegexCompileError(error.message, number)); } } + +export function regex_scan(regex, string) { + let matches = Array.from(string.matchAll(regex)).map((match) => { + let content = match.shift(); + let submatches = match.map((x) => (x ? new Some(x) : new None())); + return new RegexMatch(content, List.fromArray(submatches)); + }); + return List.fromArray(matches); +} -- cgit v1.2.3