Add type check for regexp matchers

kana · Mar 1, 2010 · fdb5bb0 · fdb5bb0
1 parent fd80f6a
commit fdb5bb0
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 5 deletions.
diff --git a/autoload/vspec.vim b/autoload/vspec.vim
@@ -314,6 +314,11 @@ function! s:matches_p(value_actual, expr_matcher, value_expected)  "{{{2
       return s:FALSE
     endif
     return eval('a:value_actual ' . a:expr_matcher . ' a:value_expected')
+  elseif s:valid_matcher_regexp_p(a:expr_matcher)
+    if type(a:value_actual) != type('') || type(a:value_expected) != type('')
+      return s:FALSE
+    endif
+    return eval('a:value_actual ' . a:expr_matcher . ' a:value_expected')
   else
     return eval('a:value_actual ' . a:expr_matcher . ' a:value_expected')
   endif
@@ -408,6 +413,13 @@ endfunction
 
 
 
+function! s:valid_matcher_regexp_p(expr_matcher)  "{{{2
+  return 0 <= index(s:VALID_MATCHERS_REGEXP, a:expr_matcher)
+endfunction
+
+
+
+
 
 
 

diff --git a/test/typical-content.expected b/test/typical-content.expected
@@ -1,6 +1,6 @@
 ==== matchers with literals
 ---- It should succeed 
-.........................
+.......................
 ---- It should fail 
 xxxxxxxxxxxxxxxxxxxxxxxxx
 
@@ -12,7 +12,7 @@ xxxxxxxxxxxxxxxxxxxxxxxxx
 ---- It should succeed 
 ...
 ---- It should fail 
-xxxx
+xxxxxxxx
 
 
 
@@ -169,5 +169,25 @@ FAILED: function('type') < function('type')
        lhs: function('type')
        rhs: function('type')
 
+It should fail
+FAILED: 0 =~ '0'
+       lhs: 0
+       rhs: '0'
+
+It should fail
+FAILED: [] =~ '[]'
+       lhs: []
+       rhs: '[]'
+
+It should fail
+FAILED: {} =~ '{}'
+       lhs: {}
+       rhs: '{}'
+
+It should fail
+FAILED: function('type') =~ function('type')
+       lhs: function('type')
+       rhs: function('type')
+
 
-61 examples, 29 failures
+63 examples, 33 failures
diff --git a/test/typical-content.input b/test/typical-content.input
@@ -2,12 +2,12 @@ function! s:describe__matchers__with_literals()  "{{{1
   It should succeed
 
   Should 0 != 1
-  Should 0 !~ '1'
+  "Should 0 !~ '1'
   Should 0 < 1
   Should 0 <= 0
   Should 0 <= 1
   Should 0 == 0
-  Should 0 =~ '0'
+  "Should 0 =~ '0'
   Should 0 > -1
   Should 0 >= 0
   Should 0 >= -1
@@ -95,6 +95,11 @@ function! s:describe__matchers__with_wrong_types()  "{{{1
   Should [] < []
   Should {} < {}
   Should function('type') < function('type')
+
+  Should 0 =~ '0'
+  Should [] =~ '[]'
+  Should {} =~ '{}'
+  Should function('type') =~ function('type')
 endfunction