From 8077143b14774ee1e9033c0db990ac9a44169687 Mon Sep 17 00:00:00 2001
From: Marcin Bielak <marcin.bieli@gmail.com>
Date: Thu, 23 Mar 2017 16:00:15 +0100
Subject: [PATCH 1/2] adding error message with pattern for RegExp errors
---
builtins.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtins.go b/builtins.go
index c024ab5..d1e2446 100644
--- a/builtins.go
+++ b/builtins.go
@@ -210,7 +210,7 @@ func regex(v interface{}, param string) error {
}
if !re.MatchString(s) {
- return ErrRegexp
+ return TextErr{errors.New(fmt.Sprintf("regular expression mismatch - expected pattern: '%s'", param))}
}
return nil
}
From 0e6b6befb4e7acbb69b0a9f6036303bdfcba53fc Mon Sep 17 00:00:00 2001
From: Marcin Bielak <marcin.bieli@gmail.com>
Date: Thu, 23 Mar 2017 16:59:35 +0100
Subject: [PATCH 2/2] adding error message with pattern for RegExp errors and
inputer value
---
builtins.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtins.go b/builtins.go
index d1e2446..9ccd3bc 100644
--- a/builtins.go
+++ b/builtins.go
@@ -210,7 +210,7 @@ func regex(v interface{}, param string) error {
}
if !re.MatchString(s) {
- return TextErr{errors.New(fmt.Sprintf("regular expression mismatch - expected pattern: '%s'", param))}
+ return TextErr{errors.New(fmt.Sprintf("regular expression mismatch - value: '%s', expected pattern: '%s'", s, param))}
}
return nil
}