- Changed slightly the behavior of the smartmatch operator (~~)

[1,2] ~~ [1,2,3]; # true; all elements from the first array exists in the second array
trizen · Jul 2, 2015 · b1d44e1 · b1d44e1
1 parent 5108fe7
commit b1d44e1
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 19 deletions.
diff --git a/lib/Sidef/Object/Object.pm b/lib/Sidef/Object/Object.pm
@@ -89,7 +89,7 @@ package Sidef::Object::Object {
 
             # Array ~~ Array
             if ($s_type eq 'Sidef::Types::Array::Array') {
-                return $first->contains_all($second);
+                return $second->contains_all($first);
             }
 
             # Array ~~ Regex
@@ -99,7 +99,7 @@ package Sidef::Object::Object {
 
             # Array ~~ Hash
             if ($s_type eq 'Sidef::Types::Hash::Hash') {
-                return $second->keys->contains_any($first);
+                return $second->keys->contains_all($first);
             }
 
             # Array ~~ Any
@@ -111,12 +111,12 @@ package Sidef::Object::Object {
 
             # Hash ~~ Array
             if ($s_type eq 'Sidef::Types::Array::Array') {
-                return $first->keys->contains_all($second);
+                return $second->contains_all($first->keys);
             }
 
             # Hash ~~ Hash
             if ($s_type eq 'Sidef::Types::Hash::Hash') {
-                return $first->keys->contains_all($second->keys);
+                return $second->keys->contains_all($first->keys);
             }
 
             # Hash ~~ Any

diff --git a/scripts/smart_match_operator.sf b/scripts/smart_match_operator.sf
@@ -13,49 +13,65 @@ var array = <red blue green>;
 #
 if (array ~~ hash) {
     say "some array elements in hash keys";
-} else {
-    "a ~~ h error".die;
+}
+else {
+    die "a ~~ h error";
 }
 
 #
 ## Any ~~ Array
 #
 if ("red" ~~ array) {
     say "red in array";
-} else {
-    "s ~~ a error".die;
+}
+else {
+    die "s ~~ a error";
 }
 
 #
 ## Regex ~~ Hash
 #
 if (/e$/ ~~ hash) {
     say "some keys end in e";
-} else {
-    "r ~~ h error".die;
+}
+else {
+    die "r ~~ h error";
 }
 
 #
 ## Hash ~~ Hash
 #
 var sub_h = :(red => 5, :white => 1);
-if (hash ~~ sub_h) {
+if (sub_h ~~ hash) {
     say "sub-hash contained in larger hash";
-} else {
-    "h ~~ h error".die;
+}
+else {
+    die "h ~~ h error";
+}
+
+#
+## Hash ~~ Array
+#
+
+if (:(a => 1, b => 2) ~~ ["a", "b", "c"]) {
+    say "all hash-keys contained in array";
+}
+else {
+    die "h ~~ a error";
 }
 
 #
 ## Array ~~ Array
 #
-var arr1 = [1,2,3];
-var arr2 = [3,2];
+var arr1 = [3,2];
+var arr2 = [1,2,3];
 
 if (arr1 ~~ arr2) {
     say "sub-array contained in larger array";
-} else {
-    "a ~~ a error".die;
+}
+else {
+    die "a ~~ a error";
 }
 
-arr2.append(0);
-arr1 ~~ arr2 && "a ~~ a error(2)".die;
+arr1.append(0);
+arr1 ~~ arr2 && die "a ~~ a error(2)";