dmd 0.163 update

git-svn-id: http://svn.dsource.org/projects/pyd/trunk@29 1df65b71-e716-0410-9316-ac55df2b1602
dansanduleac · Jul 19, 2006 · 9b59a32 · 9b59a32
1 parent b6ff9e2
commit 9b59a32
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 19 deletions.
diff --git a/dcompiler.py b/dcompiler.py
@@ -28,11 +28,11 @@
     'ctor_wrap.d',
     'def.d',
     'dg_convert.d',
+    'dpyobject.d',
     'exception.d',
     'ftype.d',
     'func_wrap.d',
     'make_object.d',
-    'object.d',
     'op_wrap.d',
     'pyd.d',
     'tuples.d',

diff --git a/infrastructure/build_ddoc.bat b/infrastructure/build_ddoc.bat
@@ -1,3 +1,3 @@
-C:\dmd\dmd\bin\dmd.exe -o- -Ddpyd\doc pyd\class_wrap.d pyd\ctor_wrap.d pyd\def.d pyd\dg_convert.d pyd\exception.d pyd\ftype.d pyd\make_object.d pyd\object.d pyd\pyd.d pyd\doc\candydoc\candy.ddoc pyd\doc\candydoc\modules.ddoc
+C:\dmd\dmd\bin\dmd.exe -o- -Ddpyd\doc pyd\class_wrap.d pyd\ctor_wrap.d pyd\def.d pyd\dg_convert.d pyd\exception.d pyd\ftype.d pyd\make_object.d pyd\dpyobject.d pyd\pyd.d pyd\doc\candydoc\candy.ddoc pyd\doc\candydoc\modules.ddoc
 
 pause
diff --git a/infrastructure/build_wiki_ddoc.bat b/infrastructure/build_wiki_ddoc.bat
@@ -1,3 +1,3 @@
-C:\dmd\dmd\bin\dmd.exe -o- -Ddpyd\wiki_doc pyd\class_wrap.d pyd\ctor_wrap.d pyd\def.d pyd\dg_convert.d pyd\exception.d pyd\ftype.d pyd\make_object.d pyd\object.d pyd\pyd.d pyd\wiki_doc\wiki_doc\wikidoc.ddoc
+C:\dmd\dmd\bin\dmd.exe -o- -Ddpyd\wiki_doc pyd\class_wrap.d pyd\ctor_wrap.d pyd\def.d pyd\dg_convert.d pyd\exception.d pyd\ftype.d pyd\make_object.d pyd\dpyobject.d pyd\pyd.d pyd\wiki_doc\wiki_doc\wikidoc.ddoc
 
 pause
diff --git a/infrastructure/pyd/object.d → infrastructure/pyd/dpyobject.d b/infrastructure/pyd/object.d → infrastructure/pyd/dpyobject.d
@@ -19,7 +19,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
-module pyd.object;
+module pyd.dpyobject;
 
 private import std.c.stdio;
 private import python;

diff --git a/infrastructure/pyd/make_object.d b/infrastructure/pyd/make_object.d
@@ -37,7 +37,7 @@ module pyd.make_object;
 private import python;
 private import std.string;
 // Base type
-private import pyd.object;
+private import pyd.dpyobject;
 private import pyd.class_wrap;
 private import pyd.func_wrap;
 

diff --git a/infrastructure/pyd/pyd.d b/infrastructure/pyd/pyd.d
@@ -26,15 +26,13 @@ SOFTWARE.
  */
 module pyd.pyd;
 
-private import python;
-import pyd.def;
-import pyd.class_wrap;
-import pyd.ctor_wrap;
-import pyd.exception;
-import pyd.ftype;
-import pyd.func_wrap;
-import pyd.make_object;
-import pyd.tuples;
-// Base type
-import pyd.object;
+public import pyd.def;
+public import pyd.class_wrap;
+public import pyd.ctor_wrap;
+public import pyd.dpyobject;
+public import pyd.exception;
+public import pyd.ftype;
+public import pyd.func_wrap;
+public import pyd.make_object;
+public import pyd.tuples;
 
diff --git a/infrastructure/python/headers/python.d b/infrastructure/python/headers/python.d
@@ -3182,6 +3182,8 @@ PyObject *PyStructSequence_SET_ITEM(PyObject *op, int i, PyObject *v) {
  * pointers to the required objects manually (see
  * python_support.d/_loadPythonSupport). */
 
+private {
+
 /* Singletons: */
 PyObject* m_Py_None;
 PyObject* m_Py_NotImplemented;
@@ -3295,8 +3297,6 @@ PyObject* m_PyExc_SyntaxWarning;
 PyObject* m_PyExc_RuntimeWarning;
 PyObject* m_PyExc_FutureWarning;
 
-private {
-
 PyObject *eval(char[] code) {
     PyObject *pyGlobals = PyEval_GetGlobals(); /* borrowed ref */
     PyObject *res = PyRun_String(code ~ \0, Py_eval_input,
@@ -3310,6 +3310,8 @@ PyObject *eval(char[] code) {
 
 PyObject* m_builtins, m_types, m_weakref;
 
+} /* end private */
+
 // These template functions will lazily-load the various singleton objects,
 // removing the need for a "load" function that does it all at once.
 typeof(Ptr) lazy_sys(alias Ptr, char[] name) () {
@@ -3341,7 +3343,6 @@ typeof(Ptr) lazy_eval(alias Ptr, char[] code) () {
     return Ptr;
 }
 
-} /* end private */
 
 //void _loadPythonSupport() {
 //static this() {