Bash, PHP: fix nested hash-map equality.

kanaka · Dec 3, 2015 · 33d33bb · 33d33bb
1 parent fef22d1
commit 33d33bb
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 12 deletions.
diff --git a/bash/step2_eval.sh b/bash/step2_eval.sh
@@ -24,7 +24,7 @@ EVAL_AST () {
     vector)
         _map_with_type _vector EVAL "${ast}" "${env}" ;;
     hash_map)
-        local res="" val="" hm="${ANON["${ast}"]}"
+        local res="" key= val="" hm="${ANON["${ast}"]}"
         _hash_map; local new_hm="${r}"
         eval local keys="\${!${hm}[@]}"
         for key in ${keys}; do

diff --git a/bash/step3_env.sh b/bash/step3_env.sh
@@ -24,7 +24,7 @@ EVAL_AST () {
     vector)
         _map_with_type _vector EVAL "${ast}" "${env}" ;;
     hash_map)
-        local res="" val="" hm="${ANON["${ast}"]}"
+        local res="" key= val="" hm="${ANON["${ast}"]}"
         _hash_map; local new_hm="${r}"
         eval local keys="\${!${hm}[@]}"
         for key in ${keys}; do

diff --git a/bash/step4_if_fn_do.sh b/bash/step4_if_fn_do.sh
@@ -25,7 +25,7 @@ EVAL_AST () {
     vector)
         _map_with_type _vector EVAL "${ast}" "${env}" ;;
     hash_map)
-        local res="" val="" hm="${ANON["${ast}"]}"
+        local res="" key= val="" hm="${ANON["${ast}"]}"
         _hash_map; local new_hm="${r}"
         eval local keys="\${!${hm}[@]}"
         for key in ${keys}; do

diff --git a/bash/step5_tco.sh b/bash/step5_tco.sh
@@ -25,7 +25,7 @@ EVAL_AST () {
     vector)
         _map_with_type _vector EVAL "${ast}" "${env}" ;;
     hash_map)
-        local res="" val="" hm="${ANON["${ast}"]}"
+        local res="" key= val="" hm="${ANON["${ast}"]}"
         _hash_map; local new_hm="${r}"
         eval local keys="\${!${hm}[@]}"
         for key in ${keys}; do

diff --git a/bash/step6_file.sh b/bash/step6_file.sh
@@ -25,7 +25,7 @@ EVAL_AST () {
     vector)
         _map_with_type _vector EVAL "${ast}" "${env}" ;;
     hash_map)
-        local res="" val="" hm="${ANON["${ast}"]}"
+        local res="" key= val="" hm="${ANON["${ast}"]}"
         _hash_map; local new_hm="${r}"
         eval local keys="\${!${hm}[@]}"
         for key in ${keys}; do

diff --git a/bash/step7_quote.sh b/bash/step7_quote.sh
@@ -63,7 +63,7 @@ EVAL_AST () {
     vector)
         _map_with_type _vector EVAL "${ast}" "${env}" ;;
     hash_map)
-        local res="" val="" hm="${ANON["${ast}"]}"
+        local res="" key= val="" hm="${ANON["${ast}"]}"
         _hash_map; local new_hm="${r}"
         eval local keys="\${!${hm}[@]}"
         for key in ${keys}; do

diff --git a/bash/step8_macros.sh b/bash/step8_macros.sh
@@ -90,7 +90,7 @@ EVAL_AST () {
     vector)
         _map_with_type _vector EVAL "${ast}" "${env}" ;;
     hash_map)
-        local res="" val="" hm="${ANON["${ast}"]}"
+        local res="" key= val="" hm="${ANON["${ast}"]}"
         _hash_map; local new_hm="${r}"
         eval local keys="\${!${hm}[@]}"
         for key in ${keys}; do

diff --git a/bash/step9_try.sh b/bash/step9_try.sh
@@ -90,7 +90,7 @@ EVAL_AST () {
     vector)
         _map_with_type _vector EVAL "${ast}" "${env}" ;;
     hash_map)
-        local res="" val="" hm="${ANON["${ast}"]}"
+        local res="" key= val="" hm="${ANON["${ast}"]}"
         _hash_map; local new_hm="${r}"
         eval local keys="\${!${hm}[@]}"
         for key in ${keys}; do

diff --git a/bash/stepA_mal.sh b/bash/stepA_mal.sh
@@ -90,7 +90,7 @@ EVAL_AST () {
     vector)
         _map_with_type _vector EVAL "${ast}" "${env}" ;;
     hash_map)
-        local res="" val="" hm="${ANON["${ast}"]}"
+        local res="" key= val="" hm="${ANON["${ast}"]}"
         _hash_map; local new_hm="${r}"
         eval local keys="\${!${hm}[@]}"
         for key in ${keys}; do

diff --git a/php/types.php b/php/types.php
@@ -32,9 +32,7 @@ function _equal_Q($a, $b) {
         $hm1 = $a->getArrayCopy();
         $hm2 = $b->getArrayCopy();
         foreach (array_keys($hm1) as $k) {
-            if ($hm1[$k] !== $hm2[$k]) {
-                return false;
-            }
+            if (!_equal_Q($hm1[$k], $hm2[$k])) { return false; }
         }
         return true;
     } else {