Changeset 63

Timestamp:

12/18/06 01:29:18 (2 years ago)

Author:

KirkMcDonald

Message:

Changed no_pyd, no_st, no_meta to with_pyd, with_st, with_meta

Files:

• trunk/dcompiler.py (modified) (4 diffs)
• trunk/html_doc/celerid.html (modified) (1 diff)
• trunk/html_doc/class_wrapping.html (modified) (1 diff)
• trunk/raw_html/celerid.html (modified) (1 diff)
• trunk/raw_html/class_wrapping.html (modified) (1 diff)
• trunk/support.py (modified) (1 diff)

trunk/dcompiler.py

@@ -155 +155 @@
-        sources.append(pythonHeaderPath)
-
-no_pyd, no_st, no
+with_pyd, with_st, with
-        flags = [f for f, category in macros if category == 'aux'][0]
-        # And Pyd!
-not 
+
-            # If we're not using StackThreads, don't use iteration.d in Pyd
-
+not 
-                _pydFiles.remove('iteration.d');
-            for file in _pydFiles:
@@ -170 +170 @@
-                sources.append(filePath)
-        # And StackThreads
-not 
+
-            for file in _stFiles:
-                filePath = os.path.join(_infraDir, 'st', file)
@@ -181 +181 @@
-            macros.append(('Pyd_with_StackThreads', 'version'))
-        # And meta
-not 
+
-            for file in _metaFiles:
-                filePath = os.path.join(_infraDir, 'meta', file)
@@ -190 +190 @@
-                sources.append(filePath)
-        # Add the infraDir to the include path for pyd, st, and meta.
-Fals
+Tru
-            includePathOpts += self._includeOpts
-            includePathOpts[-1] = includePathOpts[-1] % os.path.join(_infraDir)

trunk/html_doc/celerid.html

@@ -55 +55 @@
-    <dt><code>version_flags</code></dt> <dd>This should be a list of strings, which will be passed to the D compiler as version flags.</dd>
-    <dt><code>debug_flags</code></dt> <dd>Similar to <code>version_flags</code>, the strings in this list will be passed to D as debug flags.</dd>
-Tru
-no_pyd</code></dt> <dd>This flag defaults to <code>False</code>. When <code>Tru
-no_st</code></dt> <dd>This flag defaults to <code>False</code>. When <code>True</code>, it supresses the compilation and linkage of StackThreads. Pyd uses StackThreads for its iteration wrapping support. By specifying this, opApply wrapping, <code>wrapped_class.iter</code>, and <code>wrapped_class.alt_iter</code> will be unavailable. If <code>no_pyd</code> and this are <code>False</code>, then the <code>Pyd_with_StackThreads</code> version flag will be defined (which is used internally by Pyd). <b>Important note:</b> StackThreads does not currently work with GDC! CeleriD will always set this flag to <code>Tru
-no_meta</code></dt> <dd>This flag defaults to <code>False</code>. When <code>True</code>, it supresses the compilation and linkage of <code>meta</code> (Pyd's metaprogramming package). Because Pyd depends on meta, an exception will be raised if this is specified and <code>no_pyd</code>
+Fals
+with_pyd</code></dt> <dd>This flag defaults to <code>True</code>. When <code>Fals
+with_st</code></dt> <dd>This flag defaults to <code>True</code>. When <code>False</code>, it supresses the compilation and linkage of StackThreads. Pyd uses StackThreads for its iteration wrapping support. By setting this to <code>False</code>, opApply wrapping, <code>wrapped_class.iter</code>, and <code>wrapped_class.alt_iter</code> will be unavailable. If <code>with_pyd</code> and this are <code>True</code>, then the <code>Pyd_with_StackThreads</code> version flag will be defined (which is used internally by Pyd). <b>Important note:</b> StackThreads does not currently work with GDC! CeleriD will always set this flag to <code>Fals
+with_meta</code></dt> <dd>This flag defaults to <code>True</code>. When <code>False</code>, it supresses the compilation and linkage of <code>meta</code> (Pyd's metaprogramming package). Because Pyd depends on meta, an exception will be raised if <code>with_pyd</code> is <code>True</code> and this
-    </dl>
-</dd>

trunk/html_doc/class_wrapping.html

@@ -100 +100 @@
-
-<dl>
-no
+with
-<dt><code>opSlice, opSliceAssign</code></dt> <dd>Pyd only supports these overloads if both of their two indexes are implicitly convertable to type <code>int</code>. This is a limitation of the Python/C API. Note that this means the zero-argument form of opSlice (for allowing the "empty slice," e.g. <code>foo[]</code>) cannot be wrapped. <i>(I may work around this in the future.)</i> Because Pyd can only automatically wrap the lexically-first method in a class, it will fail to wrap opSlice and opSliceAssign if you define an empty form first.</dd>
-<dt><code>opCat, opCatAssign</code></dt> <dd>Python does not have a dedicated array concatenation operator. The plus sign (<code>+</code>) is reused for this purpose. Therefore, odd behavior may result with classes that define both <code>opAdd/opAddAssign</code> and one or both of these operators. (Consider yourself warned.) However, the Python/C API considers addition and concatenation distinct operations, and so both of these sets of operator overloads are supported.</dd>

trunk/raw_html/celerid.html

@@ -40 +40 @@
-    <dt><code>version_flags</code></dt> <dd>This should be a list of strings, which will be passed to the D compiler as version flags.</dd>
-    <dt><code>debug_flags</code></dt> <dd>Similar to <code>version_flags</code>, the strings in this list will be passed to D as debug flags.</dd>
-Tru
-no_pyd</code></dt> <dd>This flag defaults to <code>False</code>. When <code>Tru
-no_st</code></dt> <dd>This flag defaults to <code>False</code>. When <code>True</code>, it supresses the compilation and linkage of StackThreads. Pyd uses StackThreads for its iteration wrapping support. By specifying this, opApply wrapping, <code>wrapped_class.iter</code>, and <code>wrapped_class.alt_iter</code> will be unavailable. If <code>no_pyd</code> and this are <code>False</code>, then the <code>Pyd_with_StackThreads</code> version flag will be defined (which is used internally by Pyd). <b>Important note:</b> StackThreads does not currently work with GDC! CeleriD will always set this flag to <code>Tru
-no_meta</code></dt> <dd>This flag defaults to <code>False</code>. When <code>True</code>, it supresses the compilation and linkage of <code>meta</code> (Pyd's metaprogramming package). Because Pyd depends on meta, an exception will be raised if this is specified and <code>no_pyd</code>
+Fals
+with_pyd</code></dt> <dd>This flag defaults to <code>True</code>. When <code>Fals
+with_st</code></dt> <dd>This flag defaults to <code>True</code>. When <code>False</code>, it supresses the compilation and linkage of StackThreads. Pyd uses StackThreads for its iteration wrapping support. By setting this to <code>False</code>, opApply wrapping, <code>wrapped_class.iter</code>, and <code>wrapped_class.alt_iter</code> will be unavailable. If <code>with_pyd</code> and this are <code>True</code>, then the <code>Pyd_with_StackThreads</code> version flag will be defined (which is used internally by Pyd). <b>Important note:</b> StackThreads does not currently work with GDC! CeleriD will always set this flag to <code>Fals
+with_meta</code></dt> <dd>This flag defaults to <code>True</code>. When <code>False</code>, it supresses the compilation and linkage of <code>meta</code> (Pyd's metaprogramming package). Because Pyd depends on meta, an exception will be raised if <code>with_pyd</code> is <code>True</code> and this
-    </dl>
-</dd>

trunk/raw_html/class_wrapping.html

@@ -85 +85 @@
-
-<dl>
-no
+with
-<dt><code>opSlice, opSliceAssign</code></dt> <dd>Pyd only supports these overloads if both of their two indexes are implicitly convertable to type <code>int</code>. This is a limitation of the Python/C API. Note that this means the zero-argument form of opSlice (for allowing the "empty slice," e.g. <code>foo[]</code>) cannot be wrapped. <i>(I may work around this in the future.)</i> Because Pyd can only automatically wrap the lexically-first method in a class, it will fail to wrap opSlice and opSliceAssign if you define an empty form first.</dd>
-<dt><code>opCat, opCatAssign</code></dt> <dd>Python does not have a dedicated array concatenation operator. The plus sign (<code>+</code>) is reused for this purpose. Therefore, odd behavior may result with classes that define both <code>opAdd/opAddAssign</code> and one or both of these operators. (Consider yourself warned.) However, the Python/C API considers addition and concatenation distinct operations, and so both of these sets of operator overloads are supported.</dd>

trunk/support.py

@@ -41 +41 @@
-        # Similarly, pass in no_pyd, &c, via define_macros.
-        if 'raw_only' in kwargs:
-no_pyd'] = Tru
-no_st'] = Tru
-no_meta'] = Tru
+with_pyd'] = Fals
+with_st'] = Fals
+with_meta'] = Fals
-            del kwargs['raw_only']
-no_pyd  = kwargs.pop('no_pyd', Fals
-no_st   = kwargs.pop('no_st', Fals
-no_meta = kwargs.pop('no_meta', Fals
-not no_pyd and no
+with_pyd  = kwargs.pop('with_pyd', Tru
+with_st   = kwargs.pop('with_st', Tru
+with_meta = kwargs.pop('with_meta', Tru
+with_pyd and not with
-            raise DistutilsOptionError(
-no_meta
- or no_pyd
+with_meta=False
+=True or with_pyd=False
-                ' extension.'
-            )
-no_pyd, no_st, no
+with_pyd, with_st, with
-        kwargs['define_macros'] = define_macros
-