Fix some edge cases.

Gozala · Gozala · commit b552dd191de6 · 2014-01-03T19:23:32.000+04:00
diff --git a/src/backend/escodegen/writer.wisp b/src/backend/escodegen/writer.wisp
@@ -1144,13 +1144,14 @@
   (let [default-type? (= type 'default)
         nil-type? (nil? type)
 
-        type-name (cond (= type 'default) '_
-                        (nil? type) (symbol "nil")
+        type-name (cond (nil? type) (symbol "nil")
+                        (= type 'default) '_
                         (= type 'number) 'Number
                         (= type 'string) 'String
                         (= type 'boolean) 'Boolean
                         (= type 'vector) 'Array
                         (= type 'function) 'Function
+                        (= type 're-pattern) 'RegExp
                         (= (namespace type) "js") type
                         :else nil)
 
diff --git a/src/runtime.wisp b/src/runtime.wisp
@@ -74,14 +74,20 @@
 (defn ^boolean satisfies?
   "Returns true if x satisfies the protocol"
   [protocol x]
-  (cond (identical? x nil)
-        (.-wisp_core$IProtocol$nil protocol)
-
-        (identical? x null)
-        (.-wisp_core$IProtocol$nil protocol)
-
-        :else (or (aget x (aget protocol 'wisp_core$IProtocol$id))
-                  (.-wisp_core$IProtocol$_ protocol))))
+  (or (.-wisp_core$IProtocol$_ protocol)
+      (cond (identical? x nil)
+            (or (.-wisp_core$IProtocol$nil protocol) false)
+
+            (identical? x null)
+            (or (.-wisp_core$IProtocol$nil protocol) false)
+
+            :else (or (aget x (aget protocol 'wisp_core$IProtocol$id))
+                      (aget protocol
+                            (str "wisp_core$IProtocol$"
+                                 (.replace (.replace (.call Object.prototype.toString x)
+                                                     "[object " "")
+                                           #"\]$" "")))
+                      false))))
 
 (defn ^boolean contains-vector?
   "Returns true if vector contains given element"
