]> gitweb.factorcode.org Git - factor.git/commitdiff
utf16 string unboxing tweak
authorSlava Pestov <slava@factorcode.org>
Sat, 3 Sep 2005 21:59:53 +0000 (21:59 +0000)
committerSlava Pestov <slava@factorcode.org>
Sat, 3 Sep 2005 21:59:53 +0000 (21:59 +0000)
actions.xml
native/string.c

index be5949b468a09aee16fdc38abf3e3d2fa05ddf0d..7272b7acd47f9dfa1c56e41acc093a76101a1b62 100644 (file)
@@ -64,7 +64,7 @@
                                FactorPlugin.evalInListener(view,
                                        "\""
                                        + FactorReader.charsToEscapes(word)
-                                       + "\" apropos.");
+                                       + "\" apropos");
                        }
                </CODE>
        </ACTION>
index 8aa2f3c55305aa1571bab130d1061415475a8732..d353c980211b585477dd4a2552d9fd7f1e03b43e 100644 (file)
@@ -163,7 +163,11 @@ char* unbox_c_string(void)
 u16* unbox_utf16_string(void)
 {
        /* Return pointer to first character */
-       return (u16*)(untag_string(dpop()) + 1);
+       CELL str = dpop();
+       if(type_of(str) == STRING_TYPE)
+               return (u16*)(untag_string(str) + 1);
+       else
+               return (u16*)alien_offset(str);
 }
 
 void primitive_char_slot(void)