annotate generator/containergenerator.cpp @ 357:9784459f0750

An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables Q_CLASSINFO implementation Now Qtd can be built on Windows
author Max Samukha <maxter@spambox.com>
date Wed, 02 Jun 2010 19:38:05 +0300
parents 08c1ca7975ab
children a032df77b6ab
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1
e78566595089 initial import
mandel
parents:
diff changeset
1 /****************************************************************************
e78566595089 initial import
mandel
parents:
diff changeset
2 **
e78566595089 initial import
mandel
parents:
diff changeset
3 ** Copyright (C) 1992-2008 Nokia. All rights reserved.
e78566595089 initial import
mandel
parents:
diff changeset
4 **
e78566595089 initial import
mandel
parents:
diff changeset
5 ** This file is part of Qt Jambi.
e78566595089 initial import
mandel
parents:
diff changeset
6 **
e78566595089 initial import
mandel
parents:
diff changeset
7 ** * Commercial Usage
e78566595089 initial import
mandel
parents:
diff changeset
8 * Licensees holding valid Qt Commercial licenses may use this file in
e78566595089 initial import
mandel
parents:
diff changeset
9 * accordance with the Qt Commercial License Agreement provided with the
e78566595089 initial import
mandel
parents:
diff changeset
10 * Software or, alternatively, in accordance with the terms contained in
e78566595089 initial import
mandel
parents:
diff changeset
11 * a written agreement between you and Nokia.
e78566595089 initial import
mandel
parents:
diff changeset
12 *
e78566595089 initial import
mandel
parents:
diff changeset
13 *
e78566595089 initial import
mandel
parents:
diff changeset
14 * GNU General Public License Usage
e78566595089 initial import
mandel
parents:
diff changeset
15 * Alternatively, this file may be used under the terms of the GNU
e78566595089 initial import
mandel
parents:
diff changeset
16 * General Public License versions 2.0 or 3.0 as published by the Free
e78566595089 initial import
mandel
parents:
diff changeset
17 * Software Foundation and appearing in the file LICENSE.GPL included in
e78566595089 initial import
mandel
parents:
diff changeset
18 * the packaging of this file. Please review the following information
e78566595089 initial import
mandel
parents:
diff changeset
19 * to ensure GNU General Public Licensing requirements will be met:
e78566595089 initial import
mandel
parents:
diff changeset
20 * http://www.fsf.org/licensing/licenses/info/GPLv2.html and
e78566595089 initial import
mandel
parents:
diff changeset
21 * http://www.gnu.org/copyleft/gpl.html. In addition, as a special
e78566595089 initial import
mandel
parents:
diff changeset
22 * exception, Nokia gives you certain additional rights. These rights
e78566595089 initial import
mandel
parents:
diff changeset
23 * are described in the Nokia Qt GPL Exception version 1.2, included in
e78566595089 initial import
mandel
parents:
diff changeset
24 * the file GPL_EXCEPTION.txt in this package.
e78566595089 initial import
mandel
parents:
diff changeset
25 *
e78566595089 initial import
mandel
parents:
diff changeset
26 * Qt for Windows(R) Licensees
e78566595089 initial import
mandel
parents:
diff changeset
27 * As a special exception, Nokia, as the sole copyright holder for Qt
e78566595089 initial import
mandel
parents:
diff changeset
28 * Designer, grants users of the Qt/Eclipse Integration plug-in the
e78566595089 initial import
mandel
parents:
diff changeset
29 * right for the Qt/Eclipse Integration to link to functionality
e78566595089 initial import
mandel
parents:
diff changeset
30 * provided by Qt Designer and its related libraries.
e78566595089 initial import
mandel
parents:
diff changeset
31 *
e78566595089 initial import
mandel
parents:
diff changeset
32 *
e78566595089 initial import
mandel
parents:
diff changeset
33 * If you are unsure which license is appropriate for your use, please
e78566595089 initial import
mandel
parents:
diff changeset
34 * contact the sales department at qt-sales@nokia.com.
e78566595089 initial import
mandel
parents:
diff changeset
35
e78566595089 initial import
mandel
parents:
diff changeset
36 **
e78566595089 initial import
mandel
parents:
diff changeset
37 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
e78566595089 initial import
mandel
parents:
diff changeset
38 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
e78566595089 initial import
mandel
parents:
diff changeset
39 **
e78566595089 initial import
mandel
parents:
diff changeset
40 ****************************************************************************/
e78566595089 initial import
mandel
parents:
diff changeset
41
e78566595089 initial import
mandel
parents:
diff changeset
42 #include "containergenerator.h"
e78566595089 initial import
mandel
parents:
diff changeset
43 #include "cppimplgenerator.h"
e78566595089 initial import
mandel
parents:
diff changeset
44 #include "fileout.h"
e78566595089 initial import
mandel
parents:
diff changeset
45
e78566595089 initial import
mandel
parents:
diff changeset
46 static Indentor INDENT;
e78566595089 initial import
mandel
parents:
diff changeset
47
167
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
48 ContainerGenerator::ContainerGenerator(CppImplGenerator *cpp_impl_generator):
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
49 DGenerator(), m_cpp_impl_generator(cpp_impl_generator)
1
e78566595089 initial import
mandel
parents:
diff changeset
50
e78566595089 initial import
mandel
parents:
diff changeset
51 {
e78566595089 initial import
mandel
parents:
diff changeset
52 setFilenameStub("ArrayOps");
e78566595089 initial import
mandel
parents:
diff changeset
53 excludedTypes.clear();
e78566595089 initial import
mandel
parents:
diff changeset
54
e78566595089 initial import
mandel
parents:
diff changeset
55 // qtd2
e78566595089 initial import
mandel
parents:
diff changeset
56 excludedTypes << "QFuture";
e78566595089 initial import
mandel
parents:
diff changeset
57 }
e78566595089 initial import
mandel
parents:
diff changeset
58
e78566595089 initial import
mandel
parents:
diff changeset
59 QString ContainerGenerator::subDirectoryForPackage(const QString &package, OutputDirectoryType type) const
e78566595089 initial import
mandel
parents:
diff changeset
60 {
e78566595089 initial import
mandel
parents:
diff changeset
61 switch (type) {
e78566595089 initial import
mandel
parents:
diff changeset
62 case CppDirectory:
e78566595089 initial import
mandel
parents:
diff changeset
63 return "cpp/" + QString(package).replace(".", "_") + "/";
e78566595089 initial import
mandel
parents:
diff changeset
64 case DDirectory:
e78566595089 initial import
mandel
parents:
diff changeset
65 return QString(package).replace(".", "/");
e78566595089 initial import
mandel
parents:
diff changeset
66 case HDirectory:
e78566595089 initial import
mandel
parents:
diff changeset
67 return "include/";
e78566595089 initial import
mandel
parents:
diff changeset
68 default:
e78566595089 initial import
mandel
parents:
diff changeset
69 return QString(); // kill nonsense warnings
e78566595089 initial import
mandel
parents:
diff changeset
70 }
e78566595089 initial import
mandel
parents:
diff changeset
71 }
e78566595089 initial import
mandel
parents:
diff changeset
72
e78566595089 initial import
mandel
parents:
diff changeset
73 void ContainerGenerator::write(QTextStream &, const AbstractMetaClass *)
e78566595089 initial import
mandel
parents:
diff changeset
74 {
e78566595089 initial import
mandel
parents:
diff changeset
75 // not used
e78566595089 initial import
mandel
parents:
diff changeset
76 }
e78566595089 initial import
mandel
parents:
diff changeset
77
e78566595089 initial import
mandel
parents:
diff changeset
78 void ContainerGenerator::addTypeEntry(const TypeEntry* te)
e78566595089 initial import
mandel
parents:
diff changeset
79 {
e78566595089 initial import
mandel
parents:
diff changeset
80 if (!excludedTypes.contains(te->name()))
e78566595089 initial import
mandel
parents:
diff changeset
81 containerTypes << te;
e78566595089 initial import
mandel
parents:
diff changeset
82 }
e78566595089 initial import
mandel
parents:
diff changeset
83
e78566595089 initial import
mandel
parents:
diff changeset
84 void ContainerGenerator::processType(AbstractMetaType *d_type)
e78566595089 initial import
mandel
parents:
diff changeset
85 {
e78566595089 initial import
mandel
parents:
diff changeset
86 if (d_type->isContainer()) {
e78566595089 initial import
mandel
parents:
diff changeset
87 QList<AbstractMetaType *> args = d_type->instantiations();
e78566595089 initial import
mandel
parents:
diff changeset
88
e78566595089 initial import
mandel
parents:
diff changeset
89 if (args.size() == 1) // QVector or QList
e78566595089 initial import
mandel
parents:
diff changeset
90 if (args.at(0)->typeEntry()->isComplex()
e78566595089 initial import
mandel
parents:
diff changeset
91 && !args.at(0)->isContainer()
e78566595089 initial import
mandel
parents:
diff changeset
92 && !args.at(0)->isTargetLangString())
e78566595089 initial import
mandel
parents:
diff changeset
93 addTypeEntry(args.at(0)->typeEntry()); // qMakePair(args.at(0)->typeEntry(), m_class);
e78566595089 initial import
mandel
parents:
diff changeset
94 }
e78566595089 initial import
mandel
parents:
diff changeset
95 }
e78566595089 initial import
mandel
parents:
diff changeset
96
e78566595089 initial import
mandel
parents:
diff changeset
97 void ContainerGenerator::processFunction(const AbstractMetaFunction *d_function)
e78566595089 initial import
mandel
parents:
diff changeset
98 {
e78566595089 initial import
mandel
parents:
diff changeset
99 if (notWrappedYet(d_function)) // qtd2
e78566595089 initial import
mandel
parents:
diff changeset
100 return;
e78566595089 initial import
mandel
parents:
diff changeset
101
e78566595089 initial import
mandel
parents:
diff changeset
102 if (d_function->type()) {
e78566595089 initial import
mandel
parents:
diff changeset
103 AbstractMetaType *d_type = d_function->type();
e78566595089 initial import
mandel
parents:
diff changeset
104 if (d_type->isContainer()) {
e78566595089 initial import
mandel
parents:
diff changeset
105 processType(d_type);
e78566595089 initial import
mandel
parents:
diff changeset
106 }
e78566595089 initial import
mandel
parents:
diff changeset
107 }
e78566595089 initial import
mandel
parents:
diff changeset
108
e78566595089 initial import
mandel
parents:
diff changeset
109 AbstractMetaArgumentList arguments = d_function->arguments();
e78566595089 initial import
mandel
parents:
diff changeset
110 for (int i=0; i<arguments.count(); ++i) {
e78566595089 initial import
mandel
parents:
diff changeset
111 const AbstractMetaArgument *arg = arguments.at(i);
e78566595089 initial import
mandel
parents:
diff changeset
112 processType(arg->type());
e78566595089 initial import
mandel
parents:
diff changeset
113 }
e78566595089 initial import
mandel
parents:
diff changeset
114 }
e78566595089 initial import
mandel
parents:
diff changeset
115
e78566595089 initial import
mandel
parents:
diff changeset
116 void ContainerGenerator::buildTypeList()
e78566595089 initial import
mandel
parents:
diff changeset
117 {
e78566595089 initial import
mandel
parents:
diff changeset
118 foreach (AbstractMetaClass *d_class, classes()) {
e78566595089 initial import
mandel
parents:
diff changeset
119 m_class = d_class;
e78566595089 initial import
mandel
parents:
diff changeset
120 AbstractMetaFunctionList d_funcs = d_class->functionsInTargetLang();
e78566595089 initial import
mandel
parents:
diff changeset
121 for (int i=0; i<d_funcs.size(); ++i) {
e78566595089 initial import
mandel
parents:
diff changeset
122 AbstractMetaFunction *function = d_funcs.at(i);
e78566595089 initial import
mandel
parents:
diff changeset
123
e78566595089 initial import
mandel
parents:
diff changeset
124 // If a method in an interface class is modified to be private, this should
e78566595089 initial import
mandel
parents:
diff changeset
125 // not be present in the interface at all, only in the implementation.
e78566595089 initial import
mandel
parents:
diff changeset
126 if (d_class->isInterface()) {
e78566595089 initial import
mandel
parents:
diff changeset
127 uint includedAttributes = 0;
e78566595089 initial import
mandel
parents:
diff changeset
128 uint excludedAttributes = 0;
e78566595089 initial import
mandel
parents:
diff changeset
129 retrieveModifications(function, d_class, &excludedAttributes, &includedAttributes);
e78566595089 initial import
mandel
parents:
diff changeset
130 if (includedAttributes & AbstractMetaAttributes::Private)
e78566595089 initial import
mandel
parents:
diff changeset
131 continue;
e78566595089 initial import
mandel
parents:
diff changeset
132 }
e78566595089 initial import
mandel
parents:
diff changeset
133
e78566595089 initial import
mandel
parents:
diff changeset
134 processFunction(function);
e78566595089 initial import
mandel
parents:
diff changeset
135 }
167
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
136
1
e78566595089 initial import
mandel
parents:
diff changeset
137 AbstractMetaFieldList fields = d_class->fields();
e78566595089 initial import
mandel
parents:
diff changeset
138 foreach (const AbstractMetaField *field, fields) {
e78566595089 initial import
mandel
parents:
diff changeset
139 if (field->wasPublic() || (field->wasProtected() && !d_class->isFinal())) {
e78566595089 initial import
mandel
parents:
diff changeset
140 processFunction(field->setter());
e78566595089 initial import
mandel
parents:
diff changeset
141 processFunction(field->getter());
e78566595089 initial import
mandel
parents:
diff changeset
142 }
e78566595089 initial import
mandel
parents:
diff changeset
143 }
e78566595089 initial import
mandel
parents:
diff changeset
144
167
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
145 AbstractMetaFunctionList signal_funcs = signalFunctions(d_class);
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
146 for(int i = 0; i < signal_funcs.size(); i++) {
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
147 AbstractMetaFunction *signal = signal_funcs.at(i);
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
148
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
149 AbstractMetaArgumentList arguments = signal->arguments();
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
150 foreach (AbstractMetaArgument *argument, arguments) {
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
151 if(argument->type()->isContainer()) {
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
152 bool inList = false;
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
153 foreach(AbstractMetaType* type, signalEntries[d_class->package()]) {
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
154 const TypeEntry *teInList = type->instantiations().first()->typeEntry();
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
155 const TypeEntry *te = argument->type()->instantiations().first()->typeEntry();
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
156
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
157 if ((te == teInList) && (argument->type()->typeEntry() == type->typeEntry()))
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
158 inList = true;
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
159 }
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
160 if (!inList)
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
161 (signalEntries[d_class->package()]) << argument->type();
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
162 // (signalEntries[d_class->package()])[argument->type()->instantiations().first()->typeEntry()] = argument->type();
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
163 }
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
164 }
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
165 }
1
e78566595089 initial import
mandel
parents:
diff changeset
166 }
e78566595089 initial import
mandel
parents:
diff changeset
167 }
e78566595089 initial import
mandel
parents:
diff changeset
168
e78566595089 initial import
mandel
parents:
diff changeset
169 void ContainerGenerator::generate()
e78566595089 initial import
mandel
parents:
diff changeset
170 {
e78566595089 initial import
mandel
parents:
diff changeset
171 buildTypeList();
e78566595089 initial import
mandel
parents:
diff changeset
172
e78566595089 initial import
mandel
parents:
diff changeset
173 writeFile(cppFilename(), CppDirectory, &ContainerGenerator::writeCppContent); // cpp file
e78566595089 initial import
mandel
parents:
diff changeset
174 writeFile("ArrayOps_%1.h", HDirectory, &ContainerGenerator::writeHeaderContent); // header file
e78566595089 initial import
mandel
parents:
diff changeset
175 writeFile(dFilename(), DDirectory, &ContainerGenerator::writeDContent); // d file
167
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
176 writeFile("ArrayOps2.d", DDirectory, &ContainerGenerator::writeDContent2); // d file
1
e78566595089 initial import
mandel
parents:
diff changeset
177 }
e78566595089 initial import
mandel
parents:
diff changeset
178
e78566595089 initial import
mandel
parents:
diff changeset
179 void ContainerGenerator::writeFile(const QString& fileName, OutputDirectoryType dirType, WriteOut writeOut)
e78566595089 initial import
mandel
parents:
diff changeset
180 {
e78566595089 initial import
mandel
parents:
diff changeset
181 AbstractMetaClassList classList = classes();
e78566595089 initial import
mandel
parents:
diff changeset
182 QHash<QString, FileOut *> fileHash;
e78566595089 initial import
mandel
parents:
diff changeset
183
e78566595089 initial import
mandel
parents:
diff changeset
184 // Seems continue is not supported by our foreach loop, so
e78566595089 initial import
mandel
parents:
diff changeset
185 foreach (AbstractMetaClass *cls, classList) {
e78566595089 initial import
mandel
parents:
diff changeset
186
e78566595089 initial import
mandel
parents:
diff changeset
187 FileOut *f = fileHash.value(cls->package(), 0);
e78566595089 initial import
mandel
parents:
diff changeset
188 if (f == 0) {
e78566595089 initial import
mandel
parents:
diff changeset
189 f = new FileOut(outputDirectory() + "/" + subDirectoryForPackage(cls->package(), dirType) + "/" +
e78566595089 initial import
mandel
parents:
diff changeset
190 fileName.arg(cls->package().replace(".", "_")));
e78566595089 initial import
mandel
parents:
diff changeset
191 writeNotice(f->stream);
e78566595089 initial import
mandel
parents:
diff changeset
192
e78566595089 initial import
mandel
parents:
diff changeset
193 (this->*writeOut)(f->stream, cls);
e78566595089 initial import
mandel
parents:
diff changeset
194
e78566595089 initial import
mandel
parents:
diff changeset
195 fileHash.insert(cls->package(), f);
e78566595089 initial import
mandel
parents:
diff changeset
196
e78566595089 initial import
mandel
parents:
diff changeset
197 // QString pro_file_name = cls->package().replace(".", "_") + "/" + cls->package().replace(".", "_") + ".pri";
e78566595089 initial import
mandel
parents:
diff changeset
198 // priGenerator->addSource(pro_file_name, cppFilename());
e78566595089 initial import
mandel
parents:
diff changeset
199 }
e78566595089 initial import
mandel
parents:
diff changeset
200 }
e78566595089 initial import
mandel
parents:
diff changeset
201
e78566595089 initial import
mandel
parents:
diff changeset
202 foreach (QString package, fileHash.keys()) {
e78566595089 initial import
mandel
parents:
diff changeset
203 FileOut *f = fileHash.value(package, 0);
e78566595089 initial import
mandel
parents:
diff changeset
204 if (f != 0) {
e78566595089 initial import
mandel
parents:
diff changeset
205 if( f->done() )
e78566595089 initial import
mandel
parents:
diff changeset
206 ++m_num_generated_written;
e78566595089 initial import
mandel
parents:
diff changeset
207 ++m_num_generated;
e78566595089 initial import
mandel
parents:
diff changeset
208
e78566595089 initial import
mandel
parents:
diff changeset
209 delete f;
e78566595089 initial import
mandel
parents:
diff changeset
210 }
e78566595089 initial import
mandel
parents:
diff changeset
211 }
e78566595089 initial import
mandel
parents:
diff changeset
212 }
e78566595089 initial import
mandel
parents:
diff changeset
213
e78566595089 initial import
mandel
parents:
diff changeset
214 void ContainerGenerator::writeCppContent(QTextStream &s, AbstractMetaClass *cls)
e78566595089 initial import
mandel
parents:
diff changeset
215 {
e78566595089 initial import
mandel
parents:
diff changeset
216 QString package = cls->package().replace(".", "_");
e78566595089 initial import
mandel
parents:
diff changeset
217
e78566595089 initial import
mandel
parents:
diff changeset
218 s << "// stuff for passing D function pointers" << endl << endl
167
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
219 << "#include \"qtd_masterinclude.h\"" << endl << endl
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
220 << "#include \"qtd_core.h\"" << endl
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
221 << "#include \"ArrayOps_" << package << ".h\"" << endl
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
222 << "#include \"ArrayOps_qt_core.h\"" << endl
357
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 355
diff changeset
223 << "#include \"ArrayOpsPrimitive.h\"" << endl << endl;
1
e78566595089 initial import
mandel
parents:
diff changeset
224
e78566595089 initial import
mandel
parents:
diff changeset
225 foreach (const TypeEntry *te, containerTypes) {
e78566595089 initial import
mandel
parents:
diff changeset
226 if (te->javaPackage() == cls->package()) {
e78566595089 initial import
mandel
parents:
diff changeset
227 const ComplexTypeEntry *centry = static_cast<const ComplexTypeEntry *>(te);
e78566595089 initial import
mandel
parents:
diff changeset
228 QString cls_name = centry->name();
e78566595089 initial import
mandel
parents:
diff changeset
229
357
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 355
diff changeset
230 QString module = packageToQtModule(cls->package());
1
e78566595089 initial import
mandel
parents:
diff changeset
231 setFuncNames(cls_name);
357
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 355
diff changeset
232 s << "QTD_EXPORT(" << module << ", " << all_name << ")" << endl
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 355
diff changeset
233 << "QTD_EXPORT(" << module << ", " << ass_name << ")" << endl
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 355
diff changeset
234 << "QTD_EXPORT(" << module << ", " << get_name << ")" << endl << endl;
1
e78566595089 initial import
mandel
parents:
diff changeset
235 }
e78566595089 initial import
mandel
parents:
diff changeset
236 }
e78566595089 initial import
mandel
parents:
diff changeset
237
357
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 355
diff changeset
238 /*
167
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
239 QMap<const TypeEntry*, AbstractMetaType*> typeList = signalEntries[cls->package()];
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
240
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
241 QMapIterator<const TypeEntry*, AbstractMetaType*> i(typeList);
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
242 while (i.hasNext()) {
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
243 i.next();
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
244 s << "// " << i.key()->targetLangName() << endl
357
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 355
diff changeset
245 << "QTD_EXTERN QTD_DLL_PUBLIC void qtd_" << package << "_" << i.key()->targetLangName() << "_to_d_array(void *cpp_ptr, DArray* __d_container) {" << endl;
167
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
246
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
247 AbstractMetaType *arg_type = i.value();
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
248 m_cpp_impl_generator->writeTypeInfo(s, arg_type, NoOption);
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
249 s << "container = (*reinterpret_cast< ";
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
250 m_cpp_impl_generator->writeTypeInfo(s, arg_type, ExcludeReference);
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
251 s << "(*)>(cpp_ptr));" << endl;
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
252
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
253 m_cpp_impl_generator->writeQtToJavaContainer(s, arg_type, "container", "__d_container", 0, -1);
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
254 s << "}" << endl;
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
255 }*/
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
256
270
49bfc86ff583 true emit of Qt signals.
eldar
parents: 254
diff changeset
257 s << "// signal conversion functions" << endl;
49bfc86ff583 true emit of Qt signals.
eldar
parents: 254
diff changeset
258
167
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
259 foreach(AbstractMetaType* arg_type, signalEntries[cls->package()]) {
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
260 const TypeEntry *te = arg_type->instantiations().first()->typeEntry();
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
261 s << "// " << te->targetLangName() << endl
357
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 355
diff changeset
262 << "QTD_EXTERN QTD_DLL_PUBLIC void " << cppContainerConversionName(cls, arg_type, FromCpp) << "(void *cpp_ptr, DArray* __d_container) {" << endl;
167
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
263
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
264 m_cpp_impl_generator->writeTypeInfo(s, arg_type, NoOption);
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
265 s << "container = (*reinterpret_cast< ";
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
266 m_cpp_impl_generator->writeTypeInfo(s, arg_type, ExcludeReference);
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
267 s << "(*)>(cpp_ptr));" << endl;
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
268
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
269 m_cpp_impl_generator->writeQtToJavaContainer(s, arg_type, "container", "__d_container", 0, -1);
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
270 s << "}" << endl;
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
271 }
1
e78566595089 initial import
mandel
parents:
diff changeset
272 }
e78566595089 initial import
mandel
parents:
diff changeset
273
e78566595089 initial import
mandel
parents:
diff changeset
274 void ContainerGenerator::writeHeaderContent(QTextStream &s, AbstractMetaClass *cls)
e78566595089 initial import
mandel
parents:
diff changeset
275 {
35
5917a613d118 wrapping of QtXml
eldar
parents: 1
diff changeset
276 QString file_upper = "ArrayOps_" + QString(cls->package()).replace(".", "_") + "_h";
5917a613d118 wrapping of QtXml
eldar
parents: 1
diff changeset
277 file_upper = file_upper.toUpper();
5917a613d118 wrapping of QtXml
eldar
parents: 1
diff changeset
278 s << "#ifndef " << file_upper << endl
5917a613d118 wrapping of QtXml
eldar
parents: 1
diff changeset
279 << "#define " << file_upper << endl << endl
5917a613d118 wrapping of QtXml
eldar
parents: 1
diff changeset
280 << "#include <cstring>" << endl
1
e78566595089 initial import
mandel
parents:
diff changeset
281 << "#include \"qtd_core.h\"" << endl << endl;
e78566595089 initial import
mandel
parents:
diff changeset
282
e78566595089 initial import
mandel
parents:
diff changeset
283 foreach (const TypeEntry *te, containerTypes) {
e78566595089 initial import
mandel
parents:
diff changeset
284 if (te->javaPackage() == cls->package()) {
e78566595089 initial import
mandel
parents:
diff changeset
285 const ComplexTypeEntry *typeEntry = static_cast<const ComplexTypeEntry *>(te);
e78566595089 initial import
mandel
parents:
diff changeset
286 s << "// " << typeEntry->name() << endl; // " in " << it.second->name() << endl;
e78566595089 initial import
mandel
parents:
diff changeset
287
e78566595089 initial import
mandel
parents:
diff changeset
288 Indentation indent(INDENT);
e78566595089 initial import
mandel
parents:
diff changeset
289 writeHeaderArrayFunctions(s, typeEntry);
e78566595089 initial import
mandel
parents:
diff changeset
290 }
e78566595089 initial import
mandel
parents:
diff changeset
291 }
35
5917a613d118 wrapping of QtXml
eldar
parents: 1
diff changeset
292
5917a613d118 wrapping of QtXml
eldar
parents: 1
diff changeset
293 s << "#endif // " << file_upper << endl;
1
e78566595089 initial import
mandel
parents:
diff changeset
294 }
e78566595089 initial import
mandel
parents:
diff changeset
295
e78566595089 initial import
mandel
parents:
diff changeset
296 void ContainerGenerator::setFuncNames(const QString& cls_name)
e78566595089 initial import
mandel
parents:
diff changeset
297 {
357
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 355
diff changeset
298 all_name = QString("allocate_%1_array").arg(cls_name);
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 355
diff changeset
299 ass_name = QString("assign_%1_array_element").arg(cls_name);
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 355
diff changeset
300 get_name = QString("get_%1_from_array").arg(cls_name);
1
e78566595089 initial import
mandel
parents:
diff changeset
301 }
e78566595089 initial import
mandel
parents:
diff changeset
302
e78566595089 initial import
mandel
parents:
diff changeset
303 void ContainerGenerator::writeHeaderArrayFunctions(QTextStream &s, const ComplexTypeEntry *centry)
e78566595089 initial import
mandel
parents:
diff changeset
304 {
e78566595089 initial import
mandel
parents:
diff changeset
305 QString cls_name = centry->name();
e78566595089 initial import
mandel
parents:
diff changeset
306 bool d_export = true;
e78566595089 initial import
mandel
parents:
diff changeset
307 QString d_type, cpp_type, cpp_type_assign;
e78566595089 initial import
mandel
parents:
diff changeset
308
e78566595089 initial import
mandel
parents:
diff changeset
309 if (centry->name() == "QModelIndex") {
e78566595089 initial import
mandel
parents:
diff changeset
310 cpp_type = "QModelIndexAccessor*";
e78566595089 initial import
mandel
parents:
diff changeset
311 } else if (centry->isStructInD()) {
e78566595089 initial import
mandel
parents:
diff changeset
312 cpp_type = centry->qualifiedCppName() + "*";
e78566595089 initial import
mandel
parents:
diff changeset
313 } else if (centry->isObject() || centry->isQObject() || centry->isValue() || centry->isInterface() || centry->isVariant()) {
e78566595089 initial import
mandel
parents:
diff changeset
314 cpp_type = "void*";
e78566595089 initial import
mandel
parents:
diff changeset
315 }
e78566595089 initial import
mandel
parents:
diff changeset
316
e78566595089 initial import
mandel
parents:
diff changeset
317 setFuncNames(cls_name);
e78566595089 initial import
mandel
parents:
diff changeset
318
357
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 355
diff changeset
319 QString module = packageToQtModule(centry->javaPackage());
1
e78566595089 initial import
mandel
parents:
diff changeset
320
357
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 355
diff changeset
321 s << "QTD_EXPORT_DECL(" << module << ", void, " << all_name << ", (void* arr, size_t len))" << endl
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 355
diff changeset
322 << "QTD_EXPORT_DECL(" << module << ", void, " << ass_name << ", (void* arr, size_t pos, " << cpp_type << " elem))" << endl
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 355
diff changeset
323 << "QTD_EXPORT_DECL(" << module << ", void, " << get_name << ", (void* arr, size_t pos, " << cpp_type << " elem))" << endl;
1
e78566595089 initial import
mandel
parents:
diff changeset
324
e78566595089 initial import
mandel
parents:
diff changeset
325 s << endl;
357
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 355
diff changeset
326
1
e78566595089 initial import
mandel
parents:
diff changeset
327 }
e78566595089 initial import
mandel
parents:
diff changeset
328
e78566595089 initial import
mandel
parents:
diff changeset
329 void ContainerGenerator::writeDContent(QTextStream &s, AbstractMetaClass *cls)
e78566595089 initial import
mandel
parents:
diff changeset
330 {
e78566595089 initial import
mandel
parents:
diff changeset
331 s << "module " << cls->package() << ".ArrayOps;" << endl << endl;
e78566595089 initial import
mandel
parents:
diff changeset
332
e78566595089 initial import
mandel
parents:
diff changeset
333 int num_funcs = 0;
e78566595089 initial import
mandel
parents:
diff changeset
334 foreach (const TypeEntry *te, containerTypes) {
e78566595089 initial import
mandel
parents:
diff changeset
335 if (te->javaPackage() == cls->package()) {
e78566595089 initial import
mandel
parents:
diff changeset
336 const ComplexTypeEntry *typeEntry = static_cast<const ComplexTypeEntry *>(te);
e78566595089 initial import
mandel
parents:
diff changeset
337 s << "// " << typeEntry->name() << endl;
e78566595089 initial import
mandel
parents:
diff changeset
338 writeImportString(s, typeEntry);
e78566595089 initial import
mandel
parents:
diff changeset
339 s << endl;
e78566595089 initial import
mandel
parents:
diff changeset
340
e78566595089 initial import
mandel
parents:
diff changeset
341 Indentation indent(INDENT);
e78566595089 initial import
mandel
parents:
diff changeset
342
e78566595089 initial import
mandel
parents:
diff changeset
343 writeArrayFunctions(s, typeEntry);
e78566595089 initial import
mandel
parents:
diff changeset
344 s << endl;
e78566595089 initial import
mandel
parents:
diff changeset
345 num_funcs += NUM_ARRAY_FUNCS;
e78566595089 initial import
mandel
parents:
diff changeset
346 }
e78566595089 initial import
mandel
parents:
diff changeset
347 }
e78566595089 initial import
mandel
parents:
diff changeset
348 if (num_funcs == 0)
e78566595089 initial import
mandel
parents:
diff changeset
349 return;
167
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
350 }
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
351
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
352 void ContainerGenerator::writeDContent2(QTextStream &s, AbstractMetaClass *cls)
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
353 {
179
d69b58c01131 fix ArrayOps2 bug
eldar
parents: 167
diff changeset
354 s << "module " << cls->package() << ".ArrayOps2;" << endl << endl
d69b58c01131 fix ArrayOps2 bug
eldar
parents: 167
diff changeset
355 << "import qt.QGlobal;" << endl << endl;
167
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
356
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
357 foreach(AbstractMetaType* arg_type, signalEntries[cls->package()]) {
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
358 const TypeEntry *te = arg_type->instantiations().first()->typeEntry();
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
359 if(!te->isPrimitive() && !te->isString())
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
360 writeImportString(s, te);
270
49bfc86ff583 true emit of Qt signals.
eldar
parents: 254
diff changeset
361 s << "extern (C) void " << cppContainerConversionName(cls, arg_type, FromCpp) << "(void *cpp_ptr, " << te->targetLangName() << "[]* __d_container);" << endl;
167
ae06da58ec25 fixed hacky conversion of arguments when emmitting a signal
eldar
parents: 125
diff changeset
362 }
1
e78566595089 initial import
mandel
parents:
diff changeset
363 }
e78566595089 initial import
mandel
parents:
diff changeset
364
e78566595089 initial import
mandel
parents:
diff changeset
365 void ContainerGenerator::writeNotice(QTextStream &s)
e78566595089 initial import
mandel
parents:
diff changeset
366 {
e78566595089 initial import
mandel
parents:
diff changeset
367 s << "/****************************************************************************" << endl
e78566595089 initial import
mandel
parents:
diff changeset
368 << "**" << endl
e78566595089 initial import
mandel
parents:
diff changeset
369 << "** This is a generated file, please don't touch." << endl
e78566595089 initial import
mandel
parents:
diff changeset
370 << "**" << endl
e78566595089 initial import
mandel
parents:
diff changeset
371 << "****************************************************************************/" << endl << endl;
e78566595089 initial import
mandel
parents:
diff changeset
372 }
e78566595089 initial import
mandel
parents:
diff changeset
373
357
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 355
diff changeset
374
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 355
diff changeset
375 // TODO: rewrite
1
e78566595089 initial import
mandel
parents:
diff changeset
376 void ContainerGenerator::writeArrayFunctions(QTextStream &s, const ComplexTypeEntry *centry)
e78566595089 initial import
mandel
parents:
diff changeset
377 {
e78566595089 initial import
mandel
parents:
diff changeset
378 QString cls_name = centry->name();
e78566595089 initial import
mandel
parents:
diff changeset
379 QString type_name = cls_name;
e78566595089 initial import
mandel
parents:
diff changeset
380
e78566595089 initial import
mandel
parents:
diff changeset
381 bool d_export = true;
e78566595089 initial import
mandel
parents:
diff changeset
382 QString d_type, cpp_type, cpp_assign_type, convert, nativeId;
e78566595089 initial import
mandel
parents:
diff changeset
383
e78566595089 initial import
mandel
parents:
diff changeset
384 convert = "qtd_" + cls_name + "_cpp_to_d(elem)";
e78566595089 initial import
mandel
parents:
diff changeset
385 nativeId = "";
e78566595089 initial import
mandel
parents:
diff changeset
386
e78566595089 initial import
mandel
parents:
diff changeset
387 if (centry->name() == "QModelIndex") {
e78566595089 initial import
mandel
parents:
diff changeset
388 cpp_type = "QModelIndexAccessor*";
e78566595089 initial import
mandel
parents:
diff changeset
389 cpp_assign_type = cpp_type;
e78566595089 initial import
mandel
parents:
diff changeset
390 d_type = cpp_type;
e78566595089 initial import
mandel
parents:
diff changeset
391 convert = "*elem";
e78566595089 initial import
mandel
parents:
diff changeset
392 } else if (centry->isStructInD()) {
e78566595089 initial import
mandel
parents:
diff changeset
393 cpp_type = centry->qualifiedCppName() + "*";
e78566595089 initial import
mandel
parents:
diff changeset
394 cpp_assign_type = cpp_type;
e78566595089 initial import
mandel
parents:
diff changeset
395 d_type = cpp_type;
e78566595089 initial import
mandel
parents:
diff changeset
396 convert = "*elem";
e78566595089 initial import
mandel
parents:
diff changeset
397 } else if (centry->isObject() || centry->isQObject() || centry->isValue() || centry->isInterface() || centry->isVariant()) {
e78566595089 initial import
mandel
parents:
diff changeset
398 cpp_type = "void*";
e78566595089 initial import
mandel
parents:
diff changeset
399 cpp_assign_type = cpp_type + "*";
e78566595089 initial import
mandel
parents:
diff changeset
400 d_type = cls_name;
110
136c9ee83ee5 put conversion code in separate functions
eldar
parents: 35
diff changeset
401 if (centry->designatedInterface())
136c9ee83ee5 put conversion code in separate functions
eldar
parents: 35
diff changeset
402 d_type = centry->designatedInterface()->name();
254
maxter
parents: 252
diff changeset
403 nativeId = ".__nativeId";
1
e78566595089 initial import
mandel
parents:
diff changeset
404 }
e78566595089 initial import
mandel
parents:
diff changeset
405
e78566595089 initial import
mandel
parents:
diff changeset
406 if (centry->designatedInterface()) {
e78566595089 initial import
mandel
parents:
diff changeset
407 type_name = centry->designatedInterface()->name();
e78566595089 initial import
mandel
parents:
diff changeset
408 nativeId = ".__ptr_" + type_name;
e78566595089 initial import
mandel
parents:
diff changeset
409 }
e78566595089 initial import
mandel
parents:
diff changeset
410
357
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 355
diff changeset
411 DGenerator::writeDExport(s, "void", QString("allocate_%1_array").arg(cls_name), QString("%1[]* arr, size_t len").arg(type_name),
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 355
diff changeset
412 QString(" *arr = new %1[len]; ").arg(type_name));
1
e78566595089 initial import
mandel
parents:
diff changeset
413
357
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 355
diff changeset
414 DGenerator::writeDExport(s, "void", QString("assign_%1_array_element").arg(cls_name), QString("%1[]* arr, size_t pos, %2 elem").arg(type_name, cpp_type),
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 355
diff changeset
415 QString(" (*arr)[pos] = %1; ").arg(convert));
1
e78566595089 initial import
mandel
parents:
diff changeset
416
357
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 355
diff changeset
417 DGenerator::writeDExport(s, "void", QString("get_%1_from_array").arg(cls_name), QString("%1* arr, size_t pos, %2 elem").arg(type_name, cpp_assign_type),
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 355
diff changeset
418 QString(" *elem = arr[pos]%1; ").arg(nativeId));
1
e78566595089 initial import
mandel
parents:
diff changeset
419
357
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 355
diff changeset
420 s << "package " << d_type << " qtd_" << cls_name << "_cpp_to_d(" << cpp_type << " ret)" << endl
1
e78566595089 initial import
mandel
parents:
diff changeset
421 << "{" << endl;
e78566595089 initial import
mandel
parents:
diff changeset
422
355
08c1ca7975ab obviated redundant virtual dispatch callbacks
Max Samukha <maxter@spambox.com>
parents: 270
diff changeset
423 marshalFromCppToD(s, centry);
1
e78566595089 initial import
mandel
parents:
diff changeset
424
e78566595089 initial import
mandel
parents:
diff changeset
425 s << "}" << endl;
e78566595089 initial import
mandel
parents:
diff changeset
426 }