From e0603097e346bf7094c6a78bc59ea951746c5d85 Mon Sep 17 00:00:00 2001 From: Nat Quayle Nelson Date: Mon, 29 Nov 2021 16:20:31 -0700 Subject: [PATCH] add namedGroup function to nodejs RMatch --- projects/re-flex/src/re_flex/R.hx | 1 + projects/re-flex/src/re_flex/R.kiss | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/projects/re-flex/src/re_flex/R.hx b/projects/re-flex/src/re_flex/R.hx index 88e55b81..9177de76 100644 --- a/projects/re-flex/src/re_flex/R.hx +++ b/projects/re-flex/src/re_flex/R.hx @@ -15,6 +15,7 @@ typedef RMatch = { #if hxnodejs groups:Array, namedGroups:DynamicAccess, + namedGroup:String->String, #end group:Int->String }; diff --git a/projects/re-flex/src/re_flex/R.kiss b/projects/re-flex/src/re_flex/R.kiss index 509fa6b3..3ebf165a 100644 --- a/projects/re-flex/src/re_flex/R.kiss +++ b/projects/re-flex/src/re_flex/R.kiss @@ -6,6 +6,7 @@ (var capitalLetter "[A-Z]") (var smallLetter "[a-z]") (var anyLetter "[A-Za-z]") +(var anyDigit "[0-9]") (function :String _group [:Array exprs] (+ "(" (apply + (assert exprs)) ")")) @@ -59,7 +60,9 @@ groups match namedGroups - match.groups)) + match.groups + namedGroup + ->name (dictGet match.groups name))) (let [r (new EReg regex /*TODO use or for this once fixed */(if flags flags ""))] (if (r.match textToSearch) (object