Fix test cases involving spaced hashes

Author: janlelis

spec/spec_helper.rb

@@ -87,6 +87,6 @@ def tokens
 
 def ws(obj) puts Wirb::Tokenizer.run(obj.inspect).map{|*x| x.inspect + ','}*$/ end
 
-def hash34?
+def spaced_hashes?
   RUBY_VERSION >= "3.4.0"
 end

spec/tokenizer_enumerator_spec.rb

@@ -54,9 +54,9 @@
       [:whitespace, " "],
       [:open_hash, "{"],
       [:number, "1"],
-      ([:whitespace, " "] if hash34?),
+      ([:whitespace, " "] if spaced_hashes?),
       [:refers, "=>"],
-      ([:whitespace, " "] if hash34?),
+      ([:whitespace, " "] if spaced_hashes?),
       [:number, "3"],
       [:close_hash, "}"],
       [:object_description, ":each"],
@@ -76,9 +76,9 @@
       [:whitespace, " "],
       [:open_hash, "{"],
       [:number, "1"],
-      ([:whitespace, " "] if hash34?),
+      ([:whitespace, " "] if spaced_hashes?),
       [:refers, "=>"],
-      ([:whitespace, " "] if hash34?),
+      ([:whitespace, " "] if spaced_hashes?),
       [:number, "3"],
       [:close_hash, "}"],
       [:object_description, ":each"],
@@ -105,9 +105,9 @@
       [:open_set, "{"],
       [:open_hash, "{"],
       [:number, "1"],
-      ([:whitespace, " "] if hash34?),
+      ([:whitespace, " "] if spaced_hashes?),
       [:refers, "=>"],
-      ([:whitespace, " "] if hash34?),
+      ([:whitespace, " "] if spaced_hashes?),
       [:number, "2"],
       [:close_hash, "}"],
       [:close_set, "}"],
@@ -148,9 +148,9 @@
       [:open_array, "["],
       [:open_hash, "{"],
       [:number, "1"],
-      ([:whitespace, " "] if hash34?),
+      ([:whitespace, " "] if spaced_hashes?),
       [:refers, "=>"],
-      ([:whitespace, " "] if hash34?),
+      ([:whitespace, " "] if spaced_hashes?),
       [:number, "2"],
       [:close_hash, "}"],
       [:comma, ","],

spec/tokenizer_hash_spec.rb

@@ -7,9 +7,9 @@
     tokens.should == [
       [:open_hash, "{"],
       [:number, "1"],
-      ([:whitespace, " "] if hash34?),
+      ([:whitespace, " "] if spaced_hashes?),
       [:refers, "=>"],
-      ([:whitespace, " "] if hash34?),
+      ([:whitespace, " "] if spaced_hashes?),
       [:number, "2"],
       [:close_hash, "}"],
     ].compact
@@ -24,9 +24,9 @@
   #     [:refers, "=>"],
   #     [:open_hash, "{"],
   #     [:number, "1"],
-  #     ([:whitespace, " "] if hash34?),
+  #     ([:whitespace, " "] if spaced_hashes?),
   #     [:refers, "=>"],
-  #     ([:whitespace, " "] if hash34?),
+  #     ([:whitespace, " "] if spaced_hashes?),
   #     [:open_object, "#<"],
   #     [:object_class, "Set"],
   #     [:object_description_prefix, ":"],
@@ -63,7 +63,7 @@
       [:refers, "=>"],
       [:refers, "=>"],
       [:refers, "=>"],
-      *([[:whitespace, " "]] * (hash34? ? 8 : 2))
+      *([[:whitespace, " "]] * (spaced_hashes? ? 8 : 2))
     ]
   end
 end

spec/tokenizer_nested_spec.rb

@@ -36,16 +36,16 @@
       [:open_hash, "{"],
       [:open_hash, "{"],
       [:number, "5"],
-      [:whitespace, " "],
+      ([:whitespace, " "] if spaced_hashes?),
       [:refers, "=>"],
-      [:whitespace, " "],
+      ([:whitespace, " "] if spaced_hashes?),
       [:open_string, "\""],
       [:string, "4"],
       [:close_string, "\""],
       [:close_hash, "}"],
-      [:whitespace, " "],
+      ([:whitespace, " "] if spaced_hashes?),
       [:refers, "=>"],
-      [:whitespace, " "],
+      ([:whitespace, " "] if spaced_hashes?),
       [:open_hash, "{"],
       [:open_object, "#<"],
       [:object_class, "Set"],
@@ -54,9 +54,9 @@
       [:open_set, "{"],
       [:close_set, "}"],
       [:close_object, ">"],
-      [:whitespace, " "],
+      ([:whitespace, " "] if spaced_hashes?),
       [:refers, "=>"],
-      [:whitespace, " "],
+      ([:whitespace, " "] if spaced_hashes?),
       [:open_object, "#<"],
       [:object_class, "Object"],
       [:object_description_prefix, ":"],
@@ -65,6 +65,6 @@
       [:close_hash, "}"],
       [:close_hash, "}"],
       [:close_array, "]"],
-    ]
+    ].compact
   end
 end

spec/tokenizer_set_spec.rb

@@ -48,10 +48,10 @@
        [:whitespace, " "],
        [:whitespace, " "],
        [:whitespace, " "],
-       ([:whitespace, " "] if hash34?),
-       ([:whitespace, " "] if hash34?),
-       ([:whitespace, " "] if hash34?),
-       ([:whitespace, " "] if hash34?),
+       ([:whitespace, " "] if spaced_hashes?),
+       ([:whitespace, " "] if spaced_hashes?),
+       ([:whitespace, " "] if spaced_hashes?),
+       ([:whitespace, " "] if spaced_hashes?),
      ].compact
    end
 end