Changeset 39e81f7

Timestamp:

Oct 3, 2009, 8:45:52 PM (15 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

0c4a190

Parents:

09ff1eb

git-author:

Nelson Elhage <nelhage@mit.edu> (10/02/09 22:25:31)

git-committer:

Nelson Elhage <nelhage@mit.edu> (10/03/09 20:45:52)

Message:

Return unicode strings to perl.

Define a new typedef, 'utf8', in perlglue.xs, and use a typemap that
indicates that values of type utf8* should be returned to perl as
Unicode strings.

There is no good reason that get_{data,config}_dir should not also
return unicode, except that making them do so crashes my barnowl in
some extremely strange and hard-to-debug manner.

Files:

• Makefile.am (modified) (2 diffs)
• perlglue.xs (modified) (11 diffs)
• typemap (added)

Makefile.am

@@ -43 +43 @@
 GEN_H = owl_prototypes.h
 
+TYPEMAP = typemap
+
 BUILT_SOURCES = $(GEN_C) $(GEN_H)
 
@@ -54 +56 @@
 proto: owl_prototypes.h
 
-perlglue.c: perlglue.xs
-        $(AM_V_GEN)perl $(XSUBPPDIR)/xsubpp $(XSUBPPFLAGS) -prototypes perlglue.xs > perlglue.c
+perlglue.c: perlglue.xs $(TYPEMAP)
+        $(AM_V_GEN)perl $(XSUBPPDIR)/xsubpp $(XSUBPPFLAGS) -prototypes perlglue.xs -typemap $(TYPEMAP) > perlglue.c
 
 varstubs.c: stubgen.pl variable.c

perlglue.xs

@@ -9 +9 @@
 
 #define SV_IS_CODEREF(sv) (SvROK((sv)) && SvTYPE(SvRV((sv))) == SVt_PVCV)
+
+typedef char utf8;
 
         /*************************************************************
@@ -29 +31 @@
 MODULE = BarnOwl                PACKAGE = BarnOwl
 
-const char *
+const utf8 *
 command(cmd, ...)
         const char *cmd
@@ -77 +79 @@
                 RETVAL
 
-const char *
+const utf8 *
 zephyr_getrealm()
         CODE:
@@ -84 +86 @@
                 RETVAL
 
-const char *
+const utf8 *
 zephyr_getsender()
         CODE:
@@ -100 +102 @@
                 i = owl_zwrite_create_and_send_from_line(cmd, msg);
 
-const char *
+const utf8 *
 ztext_stylestrip(ztext)
         const char *ztext
@@ -113 +115 @@
                 if (rv) owl_free(rv);
 
-const char *
+const utf8 *
 zephyr_smartstrip_user(in)
         const char *in
@@ -128 +130 @@
                 owl_free(rv);
 
-const char *
+const utf8 *
 zephyr_getsubs()
         PREINIT:
@@ -309 +311 @@
         }
 
-const char *
+const utf8 *
 wordwrap(in, cols)
         const char *in
@@ -321 +323 @@
                 RETVAL
         CLEANUP:
-                if (rv) owl_free(rv);
+                if (rv)
+                        owl_free(rv);
 
 void
@@ -424 +427 @@
                 RETVAL
 
-const char *
+const utf8 *
 skiptokens(str, n)
         const char *str;
@@ -564 +567 @@
                 RETVAL
 
-const char *
+const utf8 *
 get_region()
         PREINIT: