From bd8d0b5d845b7ea5af9aee1390f60a7eb93314ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Lindqvist?= Date: Mon, 20 Jan 2014 19:24:22 +0100 Subject: [PATCH] python: function needed to make both ucs2 and ucs4 python builds work --- extra/python/ffi/ffi.factor | 5 ++++- extra/python/python.factor | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/extra/python/ffi/ffi.factor b/extra/python/ffi/ffi.factor index 9166f4c9f6..374a12bac7 100644 --- a/extra/python/ffi/ffi.factor +++ b/extra/python/ffi/ffi.factor @@ -34,6 +34,9 @@ FUNCTION: PyObject* PyImport_AddModule ( c-string name ) ; FUNCTION: long PyImport_GetMagicNumber ( ) ; FUNCTION: PyObject* PyImport_ImportModule ( c-string name ) ; +! Sys module +FUNCTION: PyObject* PySys_GetObject ( c-string name ) ; + ! Dicts FUNCTION: PyObject* PyDict_GetItemString ( PyObject* d, c-string key ) ; FUNCTION: PyObject* PyDict_New ( ) ; @@ -70,7 +73,7 @@ FUNCTION: PyObject* PyObject_GetAttrString ( PyObject* callable, FUNCTION: PyObject* PyObject_Str ( PyObject* o ) ; ! Strings -FUNCTION: void* PyString_AsString ( PyObject* string ) ; +FUNCTION: c-string PyString_AsString ( PyObject* string ) ; FUNCTION: PyObject* PyString_FromString ( c-string v ) ; ! Unicode diff --git a/extra/python/python.factor b/extra/python/python.factor index 25c9d56a47..a98d4644aa 100644 --- a/extra/python/python.factor +++ b/extra/python/python.factor @@ -86,7 +86,7 @@ ERROR: python-error type message ; ! Data marshalling to Python GENERIC: (>py) ( obj -- obj' ) -M: string (>py) PyUnicodeUCS4_FromString ; +M: string (>py) PyUnicodeUCS2_FromString ; M: math:fixnum (>py) PyLong_FromLong ; M: math:float (>py) PyFloat_FromDouble ; @@ -125,7 +125,7 @@ DEFER: >factor dup py-tuple-size iota [ py-tuple-get-item >factor ] with map ] } { "unicode" [ - PyUnicodeUCS4_AsUTF8String (check-return) + PyUnicodeUCS2_AsUTF8String (check-return) PyString_AsString (check-return) ] } } clone ;