Since the D 2.0 series has been found lacking at the moment, Pyd once…

… again compiles under the 1.0 series. (Specifically 1.016 or later; tested with 1.020.) git-svn-id: http://svn.dsource.org/projects/pyd/trunk@121 1df65b71-e716-0410-9316-ac55df2b1602
dansanduleac · Jul 30, 2007 · 6c5b4a7 · 6c5b4a7
1 parent f36727b
commit 6c5b4a7
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 24 deletions.
diff --git a/infrastructure/pyd/class_wrap.d b/infrastructure/pyd/class_wrap.d
@@ -582,7 +582,7 @@ template _wrap_class(_T, string name, Params...) {
 //        alias make_wrapper!(_T, Params).wrapper shim_class;
 //        alias _T T;
     } else {
-        pragma(msg, "wrap_struct: " ~ name);
+        pragma(msg, "wrap_struct: '" ~ name ~ "'");
         alias void shim_class;
         alias _T* T;
     }

diff --git a/infrastructure/pyd/ctor_wrap.d b/infrastructure/pyd/ctor_wrap.d
@@ -55,7 +55,7 @@ template wrapped_struct_init(T) {
     int init(PyObject* self, PyObject* args, PyObject* kwds) {
         return exception_catcher({
             static if (is(T S : S*)) {
-                pragma(msg, "wrapped_struct_init, S is " ~ prettynameof!(S));
+                pragma(msg, "wrapped_struct_init, S is '" ~ prettynameof!(S) ~ "'");
                 T t = new S;
                 WrapPyObject_SetObj(self, t);
             }

diff --git a/infrastructure/pyd/lib_abstract.d b/infrastructure/pyd/lib_abstract.d
@@ -44,12 +44,17 @@ version (Tango) {
     string objToStr(Object o) {
         return o.toString();
     }
-    template symbolnameof(alias symbol) {
-        static if (is(typeof(symbol) == function)) {
-            const char[] symbolnameof = (&symbol).stringof[2 .. $];
-        } else {
-            const char[] symbolnameof = symbol.stringof;
+    version (D_Version2) {
+        // D1 issues?
+        template symbolnameof(alias symbol) {
+            static if (is(typeof(symbol) == function)) {
+                const char[] symbolnameof = (&symbol).stringof[2 .. $];
+            } else {
+                const char[] symbolnameof = symbol.stringof;
+            }
         }
+    } else {
+        public import meta.Nameof : symbolnameof;
     }
     public import meta.Nameof : /*symbolnameof,*/ prettytypeof, prettynameof;
 

diff --git a/infrastructure/pyd/make_object.d b/infrastructure/pyd/make_object.d
@@ -352,8 +352,8 @@ T d_type(T) (PyObject* o) {
         PyUnicode_AsWideChar(cast(PyUnicodeObject*)o, temp, temp.length);
         return temp;
     +/
-    } else static if (is(string : T)) {
-        const(char)* result;
+    } else static if (is(string : T) || is(char[] : T)) {
+        c_str result;
         PyObject* repr;
         // If it's a string, convert it
         if (PyString_Check(o) || PyUnicode_Check(o)) {
@@ -366,22 +366,15 @@ T d_type(T) (PyObject* o) {
             Py_DECREF(repr);
         }
         if (result is null) handle_exception();
-        return .toString(result);
-    } else static if (is(char[] : T)) {
-        const(char)* result;
-        PyObject* repr;
-        // If it's a string, convert it
-        if (PyString_Check(o) || PyUnicode_Check(o)) {
-            result = PyString_AsString(o);
-        // If it's something else, convert its repr
+        version (D_Version2) {
+            static if (is(string : T)) {
+                return .toString(result);
+            } else {
+                return .toString(result).dup;
+            }
         } else {
-            repr = PyObject_Repr(o);
-            if (repr is null) handle_exception();
-            result = PyString_AsString(repr);
-            Py_DECREF(repr);
+            return .toString(result).dup;
         }
-        if (result is null) handle_exception();
-        return .toString(result).dup;
     } else static if (is(T E : E[])) {
         // Dynamic arrays
         PyObject* iter = PyObject_GetIter(o);

diff --git a/infrastructure/python/python.d b/infrastructure/python/python.d
@@ -61,7 +61,9 @@ version(Windows) {
 }
 
 version (D_Version2) {
-    alias const(char)* c_str;
+    // Need to define const(char)* in a way which is syntactically valid in a
+    // D 1.0 compiler.
+    mixin("alias const(char)* c_str;");
 } else {
     alias char* c_str;
 }