Fix set-color-scheme! and use-map-commas! functions.

src/puget/printer.clj

@@ -84,22 +84,21 @@
     (throw (IllegalArgumentException.
              (str "No canonical representation for " (class value) ": " value)))))
 
-#_
+
 (defn set-color-scheme!
   "Sets the color scheme for syntax elements. Pass either a map to merge into
   the current color scheme, or a single element/colors pair. Colors should be
   vector of color keywords."
   ([colors]
-   (alter-var-root #'*color-scheme* merge colors))
+   (alter-var-root #'*options* update-in [:color-scheme] merge colors))
   ([element colors & more]
    (set-color-scheme! (apply hash-map element colors more))))
 
 
-#_
-(defn set-map-commas!
-  "Alters the *map-delimiter* var to be a comma."
+(defn use-map-commas!
+  "Alters the map-delimiter var to be a comma."
   []
-  (alter-var-root #'*map-delimiter* (constantly ",")))
+  (alter-var-root #'*options* assoc :map-delimiter ","))
 
 
 

test/puget/printer_test.clj

@@ -7,23 +7,21 @@
       [printer :refer :all])))
 
 
-#_
 (deftest color-scheme-setting
-  (let [old-scheme *color-scheme*]
+  (let [old-scheme (:color-scheme *options*)]
     (set-color-scheme! {:tag [:green]})
-    (is (= [:green] (:tag *color-scheme*)))
+    (is (= [:green] (:tag (:color-scheme *options*))))
     (set-color-scheme! :nil [:black] :number [:bold :cyan])
-    (is (= [:black] (:nil *color-scheme*)))
-    (is (= [:bold :cyan] (:number *color-scheme*)))
+    (is (= [:black] (:nil (:color-scheme *options*))))
+    (is (= [:bold :cyan] (:number (:color-scheme *options*))))
     (set-color-scheme! old-scheme)))
 
 
-#_
 (deftest map-delimiter-setting
-  (let [old-delim *map-delimiter*]
-    (set-map-commas!)
-    (is (= "," *map-delimiter*))
-    (alter-var-root #'*map-delimiter* (constantly old-delim))))
+  (let [old-delim (:map-delimiter *options*)]
+    (use-map-commas!)
+    (is (= "," (:map-delimiter *options*)))
+    (alter-var-root #'*options* assoc :map-delimiter old-delim)))
 
 
 (deftest canonical-primitives