add else statements and stuff so you can tell and all dat

1 files changed, 73 insertions, 73 deletions

diff --git a/tests/std/test_regex.zc b/tests/std/test_regex.zc
index 91c5d70..4fe176c 100644
--- a/tests/std/test_regex.zc
+++ b/tests/std/test_regex.zc
@@ -3,11 +3,11 @@ import "std/regex.zc"
 fn test_basic_matching() {
     "testing: basic matching";
     let re = Regex::compile("abc");
-    
-    if (re.match("abc")) { "literal match works"; }
-    if (re.match("abcdef")) { "substring match works"; }
-    if (!re.match("xyz")) { "not matching correctly returns false"; }
-    
+
+    if (re.match("abc")) { "literal match works"; } else { "FAILED: literal match"; }
+    if (re.match("abcdef")) { "substring match works"; } else { "FAILED: substring match"; }
+    if (!re.match("xyz")) { "not matching correctly returns false"; } else { "FAILED: mismatching"; }
+
     re.destroy();
     "";
 }
@@ -15,16 +15,16 @@ fn test_basic_matching() {
 fn test_anchors() {
     "testing: anchors";
     let re = Regex::compile("^start");
-    
-    if (re.match("start here")) { " ^ anchor works for start"; }
-    if (!re.match("no start")) { " ^ anchor rejects non-start"; }
-    
+
+    if (re.match("start here")) { " ^ anchor works for start"; } else { "FAILED: ^ anchor start"; }
+    if (!re.match("no start")) { " ^ anchor rejects non-start"; } else { "FAILED: ^ anchor reject"; }
+
     re.destroy();
-    
+
     let re2 = Regex::compile("end$");
-    if (re2.match("the end")) { " $ anchor works for end"; }
-    if (!re2.match("end here")) { " $ anchor rejects non-end"; }
-    
+    if (re2.match("the end")) { " $ anchor works for end"; } else { "FAILED: $ anchor end"; }
+    if (!re2.match("end here")) { " $ anchor rejects non-end"; } else { "FAILED: $ anchor reject"; }
+
     re2.destroy();
     "";
 }
@@ -32,11 +32,11 @@ fn test_anchors() {
 fn test_wildcards() {
     "testing: wild cards";
     let re = Regex::compile("a.c");
-    
-    if (re.match("abc")) { " . matches single char"; }
-    if (re.match("axc")) { " . matches different char"; }
-    if (!re.match("ac")) { " . requires exactly one char"; }
-    
+
+    if (re.match("abc")) { " . matches single char"; } else { "FAILED: . match 1"; }
+    if (re.match("axc")) { " . matches different char"; } else { "FAILED: . match 2"; }
+    if (!re.match("ac")) { " . requires exactly one char"; } else { "FAILED: . match 3"; }
+
     re.destroy();
     "";
 }
@@ -44,20 +44,20 @@ fn test_wildcards() {
 fn test_quantifiers() {
     "testing: quantifiers";
     let re1 = Regex::compile("a*b");
-    if (re1.match("b")) { " * matches zero occurrences"; }
-    if (re1.match("ab")) { " * matches one occurrence"; }
-    if (re1.match("aaab")) { " * matches multiple occurrences"; }
+    if (re1.match("b")) { " * matches zero occurrences"; } else { "FAILED: * 0"; }
+    if (re1.match("ab")) { " * matches one occurrence"; } else { "FAILED: * 1"; }
+    if (re1.match("aaab")) { " * matches multiple occurrences"; } else { "FAILED: * many"; }
     re1.destroy();
-    
+
     let re2 = Regex::compile("a+b");
-    if (!re2.match("b")) { " + requires at least one"; }
-    if (re2.match("ab")) { " + matches one occurrence"; }
-    if (re2.match("aaab")) { " + matches multiple occurrences"; }
+    if (!re2.match("b")) { " + requires at least one"; } else { "FAILED: + 0"; }
+    if (re2.match("ab")) { " + matches one occurrence"; } else { "FAILED: + 1"; }
+    if (re2.match("aaab")) { " + matches multiple occurrences"; } else { "FAILED: + many"; }
     re2.destroy();
-    
+
     let re3 = Regex::compile("colou?r");
-    if (re3.match("color")) { " ? matches with char"; }
-    if (re3.match("colour")) { " ? matches without char"; }
+    if (re3.match("color")) { " ? matches with char"; } else { "FAILED: ? with"; }
+    if (re3.match("colour")) { " ? matches without char"; } else { "FAILED: ? without"; }
     re3.destroy();
     "";
 }
@@ -65,11 +65,11 @@ fn test_quantifiers() {
 fn test_character_classes() {
     "testing: character class stuff"
     let re = Regex::compile("[0-9]+");
-    
-    if (re.match("123")) { " [0-9] matches digits"; }
-    if (re.match("abc123")) { " [0-9] finds digits in string"; }
-    if (!re.match("abc")) { " [0-9] rejects non-digits"; }
-    
+
+    if (re.match("123")) { " [0-9] matches digits"; } else { "FAILED: [0-9] match"; }
+    if (re.match("abc123")) { " [0-9] finds digits in string"; } else { "FAILED: [0-9] find"; }
+    if (!re.match("abc")) { " [0-9] rejects non-digits"; } else { "FAILED: [0-9] reject"; }
+
     re.destroy();
     "";
 }
@@ -77,11 +77,11 @@ fn test_character_classes() {
 fn test_alternation() {
     "test: alternation";
     let re = Regex::compile("cat|dog");
-    
-    if (re.match("cat")) { " | matches first alternative"; }
-    if (re.match("dog")) { " | matches second alternative"; }
-    if (!re.match("bird")) { " | rejects non-matching"; }
-    
+
+    if (re.match("cat")) { " | matches first alternative"; } else { "FAILED: | match 1"; }
+    if (re.match("dog")) { " | matches second alternative"; } else { "FAILED: | match 2"; }
+    if (!re.match("bird")) { " | rejects non-matching"; } else { "FAILED: | reject"; }
+
     re.destroy();
     "";
 }
@@ -89,21 +89,21 @@ fn test_alternation() {
 fn test_word_boundaries() {
     "testing: word matching";
     let re = Regex::compile("[a-zA-Z]+");
-    
-    if (re.match("hello")) { " letter class matches words"; }
-    if (re.match("hello123")) { " letter class finds word part"; }
-    if (!re.match("123")) { " letter class rejects non-letters"; }
-    
+
+    if (re.match("hello")) { " letter class matches words"; } else { "FAILED: letter match"; }
+    if (re.match("hello123")) { " letter class finds word part"; } else { "FAILED: letter part"; }
+    if (!re.match("123")) { " letter class rejects non-letters"; } else { "FAILED: letter reject"; }
+
     re.destroy();
     "";
 }
 
 fn test_is_valid() {
     "testing: patern validation"
-    
-    if (Regex::is_valid_pattern("^[a-z]+$")) { " valid pattern accepted"; }
-    if (Regex::is_valid_pattern("(hello|world)")) { " complex pattern accepted"; }
-    
+
+    if (Regex::is_valid_pattern("^[a-z]+$")) { " valid pattern accepted"; } else { "FAILED: pattern validation 1"; }
+    if (Regex::is_valid_pattern("(hello|world)")) { " complex pattern accepted"; } else { "FAILED: pattern validation 2"; }
+
     "";
 }
 
@@ -111,9 +111,9 @@ fn test_find() {
     "testing: find functionality";
     let re = Regex::compile("[0-9]+");
     let m = re.find("abc123def456");
-    
-    if (m.is_some()) { " find locates match"; }
-    
+
+    if (m.is_some()) { " find locates match"; } else { "FAILED: find match"; }
+
     re.destroy();
     "";
 }
@@ -122,33 +122,33 @@ fn test_count() {
     "testing: count";
     let re = Regex::compile("[0-9]+");
     let count = re.count("123 456 789");
-    
-    if (count >= 1) { " count finds matches"; }
-    
+
+    if (count >= 1) { " count finds matches"; } else { "FAILED: count matches"; }
+
     re.destroy();
     "";
 }
 
 fn test_convenience_functions() {
     "testing: just some other functions and stuff";
-    
-    if (regex_match("^test", "testing")) { " regex_match works"; }
-    if (regex_count("a", "banana") >= 1) { " regex_count works"; }
-    
+
+    if (regex_match("^test", "testing")) { " regex_match works"; } else { "FAILED: regex_match"; }
+    if (regex_count("a", "banana") >= 1) { " regex_count works"; } else { "FAILED: regex_count"; }
+
     let m = regex_find("[0-9]+", "id: 42");
-    if (m.is_some()) { " regex_find works"; }
-    
+    if (m.is_some()) { " regex_find works"; } else { "FAILED: regex_find"; }
+
     "";
 }
 
 fn test_email_pattern() {
     "test: email pattern stuff"
-    let email_re = Regex::compile("^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$");
-    
-    if (email_re.match("swag@swag.com")) { " valid email accepted"; }
-    if (email_re.match("swag.swag@swag.swag.swag")) { " complex email accepted"; }
-    if (!email_re.match("invalid.email")) { " invalid email rejected"; }
-    
+    let email_re = Regex::compile("^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z][a-zA-Z]+$");
+
+    if (email_re.match("swag@swag.com")) { " valid email accepted"; } else { "FAILED: valid email"; }
+    if (email_re.match("swag.swag@swag.swag.swag")) { " complex email accepted"; } else { "FAILED: complex email"; }
+    if (!email_re.match("invalid.email")) { " invalid email rejected"; } else { "FAILED: invalid email reject"; }
+
     email_re.destroy();
     "";
 }
@@ -156,18 +156,18 @@ fn test_email_pattern() {
 fn test_url_pattern() {
     "testing: url pattern stuff"
     let url_re = Regex::compile("https?://[a-zA-Z0-9.-]+");
-    
-    if (url_re.match("http://example.com")) { " http url matched matched"; }
-    if (url_re.match("https://secure.example.com")) { " https url  matched"; }
-    if (!url_re.match("ftp://something.com")) { " ftp url rejected"; }
-    
+
+    if (url_re.match("http://example.com")) { " http url matched matched"; } else { "FAILED: http url"; }
+    if (url_re.match("https://secure.example.com")) { " https url  matched"; } else { "FAILED: https url"; }
+    if (!url_re.match("ftp://something.com")) { " ftp url rejected"; } else { "FAILED: ftp url reject"; }
+
     url_re.destroy();
     "";
 }
 
 fn main() {
     "testing....";
-    
+
     test_basic_matching();
     test_anchors();
     test_wildcards();
@@ -181,7 +181,7 @@ fn main() {
     test_convenience_functions();
     test_email_pattern();
     test_url_pattern();
-    
-    "all tests worked...";
+
+    "all tests worked... (hopefully.. look around for \"FAILED\" messages)";
     "";
 }