jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[D] Whitespace cleanup.

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@12544 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
David Nadlinger 2011-03-16 17:20:21 +00:00
commit ac375e90a8
1 changed files with 38 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

76
Source/Modules/d.cxx
View file

@ -131,12 +131,12 @@ class D : public Language {
// split proxy module mode, the proxy class modules) from // split proxy module mode, the proxy class modules) from
// %pragma(d) globalproxyimports. // %pragma(d) globalproxyimports.
String *global_proxy_imports; String *global_proxy_imports;
// The D code for the main proxy modules. nspace_proxy_dmodules is a hash from // The D code for the main proxy modules. nspace_proxy_dmodules is a hash from
// the namespace name as key to an {"imports", "code"}. If the nspace feature // the namespace name as key to an {"imports", "code"}. If the nspace feature
// is not active, only proxy_dmodule_imports and proxy_dmodule_code are used, // is not active, only proxy_dmodule_imports and proxy_dmodule_code are used,
// which contain the code for the root proxy module. // which contain the code for the root proxy module.
// //
// These variables should not be accessed directly but rather via the // These variables should not be accessed directly but rather via the
// proxy{Imports, Code}Buffer)() helper functions which return the right // proxy{Imports, Code}Buffer)() helper functions which return the right
// buffer for a given namespace. If not in split proxy mode, they contain the // buffer for a given namespace. If not in split proxy mode, they contain the
@ -144,7 +144,7 @@ class D : public Language {
String *proxy_dmodule_imports; String *proxy_dmodule_imports;
String *proxy_dmodule_code; String *proxy_dmodule_code;
Hash *nspace_proxy_dmodules; Hash *nspace_proxy_dmodules;
// The D code generated for the currently processed enum. // The D code generated for the currently processed enum.
String *proxy_enum_code; String *proxy_enum_code;
@ -153,12 +153,12 @@ class D : public Language {
* *
* These strings are mainly used to temporarily accumulate code from the * These strings are mainly used to temporarily accumulate code from the
* various member handling functions while a single class is processed and are * various member handling functions while a single class is processed and are
* no longer relevant once that class has been finished, i.e. after * no longer relevant once that class has been finished, i.e. after
* classHandler() has returned. * classHandler() has returned.
*/ */
// The unqualified name of the current proxy class. // The unqualified name of the current proxy class.
String *proxy_class_name; String *proxy_class_name;
// The name of the current proxy class, qualified with the name of the // The name of the current proxy class, qualified with the name of the
// namespace it is in, if any. // namespace it is in, if any.
String *proxy_class_qname; String *proxy_class_qname;
@ -573,11 +573,11 @@ public:
Close(proxy_d_file); Close(proxy_d_file);
} }
// Generate the additional proxy modules for nspace support. // Generate the additional proxy modules for nspace support.
for (Iterator it = First(nspace_proxy_dmodules); it.key; it = Next(it)) { for (Iterator it = First(nspace_proxy_dmodules); it.key; it = Next(it)) {
String *module_name = createLastNamespaceName(it.key); String *module_name = createLastNamespaceName(it.key);
String *filename = NewStringf("%s%s.d", outputDirectory(it.key), module_name); String *filename = NewStringf("%s%s.d", outputDirectory(it.key), module_name);
File *file = NewFile(filename, "w", SWIG_output_files()); File *file = NewFile(filename, "w", SWIG_output_files());
if (!file) { if (!file) {
@ -585,15 +585,15 @@ public:
SWIG_exit(EXIT_FAILURE); SWIG_exit(EXIT_FAILURE);
} }
Delete(filename); Delete(filename);
emitBanner(file); emitBanner(file);
Printf(file, "module %s%s.%s;\n", package, it.key, module_name); Printf(file, "module %s%s.%s;\n", package, it.key, module_name);
Printf(file, "\nstatic import %s;\n", im_dmodule_fq_name); Printf(file, "\nstatic import %s;\n", im_dmodule_fq_name);
Printv(file, global_proxy_imports, NIL); Printv(file, global_proxy_imports, NIL);
Printv(file, Getattr(it.item, "imports"), NIL); Printv(file, Getattr(it.item, "imports"), NIL);
Printv(file, "\n", NIL); Printv(file, "\n", NIL);
String *code = Getattr(it.item, "code"); String *code = Getattr(it.item, "code");
replaceModuleVariables(code); replaceModuleVariables(code);
Printv(file, code, NIL); Printv(file, code, NIL);
@ -860,7 +860,7 @@ public:
emitBanner(class_file); emitBanner(class_file);
if (nspace) { if (nspace) {
Printf(class_file, "module %s%s.%s;\n", package, nspace, symname); Printf(class_file, "module %s%s.%s;\n", package, nspace, symname);
} else { } else {
Printf(class_file, "module %s%s;\n", package, symname); Printf(class_file, "module %s%s;\n", package, symname);
} }
@ -890,7 +890,7 @@ public:
virtual int enumvalueDeclaration(Node *n) { virtual int enumvalueDeclaration(Node *n) {
if (getCurrentClass() && (cplus_mode != PUBLIC)) if (getCurrentClass() && (cplus_mode != PUBLIC))
return SWIG_NOWRAP; return SWIG_NOWRAP;
Swig_require("enumvalueDeclaration", n, "*name", "?value", NIL); Swig_require("enumvalueDeclaration", n, "*name", "?value", NIL);
String *value = Getattr(n, "value"); String *value = Getattr(n, "value");
String *name = Getattr(n, "name"); String *name = Getattr(n, "name");
@ -1340,8 +1340,8 @@ public:
writeDirectorConnectWrapper(n); writeDirectorConnectWrapper(n);
Replaceall(proxy_class_code, "$dclassname", proxy_class_name); Replaceall(proxy_class_code, "$dclassname", proxy_class_name);
String *dclazzname = Swig_name_member(getNSpace(), proxy_class_name, ""); String *dclazzname = Swig_name_member(getNSpace(), proxy_class_name, "");
Replaceall(proxy_class_code, "$dclazzname", dclazzname); Replaceall(proxy_class_code, "$dclazzname", dclazzname);
Delete(dclazzname); Delete(dclazzname);
@ -3602,7 +3602,7 @@ private:
* If the given type is not already in scope in the current module, adds an * If the given type is not already in scope in the current module, adds an
* import statement for it. The name is considered relative to the global root * import statement for it. The name is considered relative to the global root
* package if one is set. * package if one is set.
* *
* This is only used for dependencies created in generated code, user- * This is only used for dependencies created in generated code, user-
* (i.e. typemap-) specified import statements are handeled seperately. * (i.e. typemap-) specified import statements are handeled seperately.
* --------------------------------------------------------------------------- */ * --------------------------------------------------------------------------- */
@ -3615,7 +3615,7 @@ private:
} }
if (split_proxy_dmodule) { if (split_proxy_dmodule) {
Printv(dmodule, symname, NIL); Printv(dmodule, symname, NIL);
} else { } else {
String *inner = createLastNamespaceName(nspace); String *inner = createLastNamespaceName(nspace);
Printv(dmodule, inner, NIL); Printv(dmodule, inner, NIL);
@ -3779,7 +3779,7 @@ private:
} }
Delete(outer); Delete(outer);
} }
// … and the innermost one (because of the conflict with the main proxy // … and the innermost one (because of the conflict with the main proxy
// module named like the namespace). // module named like the namespace).
String *inner = createLastNamespaceName(nspace); String *inner = createLastNamespaceName(nspace);
@ -3796,7 +3796,7 @@ private:
"Class name cannot be equal to proxy D module name: %s\n", "Class name cannot be equal to proxy D module name: %s\n",
class_name); class_name);
SWIG_exit(EXIT_FAILURE); SWIG_exit(EXIT_FAILURE);
} }
} }
} }
} }
@ -4082,7 +4082,7 @@ private:
// RESEARCH: Make sure that we really cannot get here for anonymous enums. // RESEARCH: Make sure that we really cannot get here for anonymous enums.
Node *n = enumLookup(type); Node *n = enumLookup(type);
String *enum_name = Getattr(n, "sym:name"); String *enum_name = Getattr(n, "sym:name");
Node *p = parentNode(n); Node *p = parentNode(n);
if (p && !Strcmp(nodeType(p), "class")) { if (p && !Strcmp(nodeType(p), "class")) {
// This is a nested enum. // This is a nested enum.
@ -4093,7 +4093,7 @@ private:
// would not even be possible in D), so just import the parent. // would not even be possible in D), so just import the parent.
requireDType(nspace, parent_name); requireDType(nspace, parent_name);
String *module = createModuleName(nspace, parent_name); String *module = createModuleName(nspace, parent_name);
if (inProxyModule(module)) { if (inProxyModule(module)) {
type_name = NewStringf("%s.%s", parent_name, enum_name); type_name = NewStringf("%s.%s", parent_name, enum_name);
} else { } else {
@ -4103,7 +4103,7 @@ private:
// A non-nested enum is written to a seperate module, import it. // A non-nested enum is written to a seperate module, import it.
String *nspace = Getattr(n, "sym:nspace"); String *nspace = Getattr(n, "sym:nspace");
requireDType(nspace, enum_name); requireDType(nspace, enum_name);
String *module = createModuleName(nspace, enum_name); String *module = createModuleName(nspace, enum_name);
if (inProxyModule(module)) { if (inProxyModule(module)) {
type_name = Copy(enum_name); type_name = Copy(enum_name);
@ -4117,7 +4117,7 @@ private:
String *class_name = Getattr(n, "sym:name"); String *class_name = Getattr(n, "sym:name");
String *nspace = Getattr(n, "sym:nspace"); String *nspace = Getattr(n, "sym:nspace");
requireDType(nspace, class_name); requireDType(nspace, class_name);
String *module = createModuleName(nspace, class_name); String *module = createModuleName(nspace, class_name);
if (inProxyModule(module)) { if (inProxyModule(module)) {
type_name = Copy(class_name); type_name = Copy(class_name);
@ -4253,7 +4253,7 @@ private:
String *current_macro = NewStringWithSize(start, (int)(end - start)); String *current_macro = NewStringWithSize(start, (int)(end - start));
String *current_param = NewStringWithSize(param_start, (int)(param_end - param_start)); String *current_param = NewStringWithSize(param_start, (int)(param_end - param_start));
if (inProxyModule(current_param)) { if (inProxyModule(current_param)) {
Replace(target, current_macro, "", DOH_REPLACE_ANY); Replace(target, current_macro, "", DOH_REPLACE_ANY);
} else { } else {
@ -4303,7 +4303,7 @@ private:
if (!proxyname) { if (!proxyname) {
String *nspace = Getattr(n, "sym:nspace"); String *nspace = Getattr(n, "sym:nspace");
String *symname = Getattr(n, "sym:name"); String *symname = Getattr(n, "sym:name");
if (nspace) { if (nspace) {
proxyname = NewStringf("%s.%s", nspace, symname); proxyname = NewStringf("%s.%s", nspace, symname);
} else { } else {
@ -4320,7 +4320,7 @@ private:
} }
} }
Setattr(n, "proxyname", proxyname); Setattr(n, "proxyname", proxyname);
Delete(proxyname); // Return value still valid because of the ref from n. Delete(proxyname); // Return value still valid because of the ref from n.
} }
} }
return proxyname; return proxyname;
@ -4561,7 +4561,7 @@ private:
/* --------------------------------------------------------------------------- /* ---------------------------------------------------------------------------
* D::proxyCodeBuffer() * D::proxyCodeBuffer()
* *
* Returns the buffer to write proxy code for the given namespace to. * Returns the buffer to write proxy code for the given namespace to.
* --------------------------------------------------------------------------- */ * --------------------------------------------------------------------------- */
String *proxyCodeBuffer(String *nspace) { String *proxyCodeBuffer(String *nspace) {
if (!nspace) { if (!nspace) {
@ -4582,13 +4582,13 @@ private:
* D::proxyCodeBuffer() * D::proxyCodeBuffer()
* *
* Returns the buffer to write imports for the proxy code for the given * Returns the buffer to write imports for the proxy code for the given
* namespace to. * namespace to.
* --------------------------------------------------------------------------- */ * --------------------------------------------------------------------------- */
String *proxyImportsBuffer(String *nspace) { String *proxyImportsBuffer(String *nspace) {
if (!nspace) { if (!nspace) {
return proxy_dmodule_imports; return proxy_dmodule_imports;
} }
Hash *hash = Getattr(nspace_proxy_dmodules, nspace); Hash *hash = Getattr(nspace_proxy_dmodules, nspace);
if (!hash) { if (!hash) {
hash = NewHash(); hash = NewHash();
@ -4603,7 +4603,7 @@ private:
* D::createFirstNamespaceName() * D::createFirstNamespaceName()
* *
* Returns a new string containing the name of the outermost namespace, e.g. * Returns a new string containing the name of the outermost namespace, e.g.
* »A« for the argument »A.B.C«. * »A« for the argument »A.B.C«.
* --------------------------------------------------------------------------- */ * --------------------------------------------------------------------------- */
String *createFirstNamespaceName(const String *nspace) const { String *createFirstNamespaceName(const String *nspace) const {
char *tmp = Char(nspace); char *tmp = Char(nspace);
@ -4611,9 +4611,9 @@ private:
char *co = 0; char *co = 0;
if (!strstr(c, ".")) if (!strstr(c, "."))
return 0; return 0;
co = c + Len(nspace); co = c + Len(nspace);
while (*c && (c != co)) { while (*c && (c != co)) {
if ((*c == '.')) { if ((*c == '.')) {
break; break;
@ -4625,12 +4625,12 @@ private:
} }
return NewStringWithSize(tmp, (int)(c - tmp)); return NewStringWithSize(tmp, (int)(c - tmp));
} }
/* --------------------------------------------------------------------------- /* ---------------------------------------------------------------------------
* D::createLastNamespaceName() * D::createLastNamespaceName()
* *
* Returns a new string containing the name of the innermost namespace, e.g. * Returns a new string containing the name of the innermost namespace, e.g.
* »C« for the argument »A.B.C«. * »C« for the argument »A.B.C«.
* --------------------------------------------------------------------------- */ * --------------------------------------------------------------------------- */
String *createLastNamespaceName(const String *nspace) const { String *createLastNamespaceName(const String *nspace) const {
if (!nspace) return NULL; if (!nspace) return NULL;
@ -4638,7 +4638,7 @@ private:
char *cc = c; char *cc = c;
if (!strstr(c, ".")) if (!strstr(c, "."))
return NewString(nspace); return NewString(nspace);
while (*c) { while (*c) {
if (*c == '.') { if (*c == '.') {
cc = c; cc = c;
@ -4647,13 +4647,13 @@ private:
} }
return NewString(cc + 1); return NewString(cc + 1);
} }
/* --------------------------------------------------------------------------- /* ---------------------------------------------------------------------------
* D::createOuterNamespaceNames() * D::createOuterNamespaceNames()
* *
* Returns a new string containing the name of the outer namespace, e.g. * Returns a new string containing the name of the outer namespace, e.g.
* »A.B« for the argument »A.B.C«. * »A.B« for the argument »A.B.C«.
* --------------------------------------------------------------------------- */ * --------------------------------------------------------------------------- */
String *createOuterNamespaceNames(const String *nspace) const { String *createOuterNamespaceNames(const String *nspace) const {
if (!nspace) return NULL; if (!nspace) return NULL;
char *tmp = Char(nspace); char *tmp = Char(nspace);
@ -4661,7 +4661,7 @@ private:
char *cc = c; char *cc = c;
if (!strstr(c, ".")) if (!strstr(c, "."))
return NULL; return NULL;
while (*c) { while (*c) {
if (*c == '.') { if (*c == '.') {
cc = c; cc = c;