projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replaced more lisp::Lisp/lisp::Writer with Reader/Writer
[supertux.git]
/
tools
/
miniswig
/
create_wrapper.cpp
diff --git
a/tools/miniswig/create_wrapper.cpp
b/tools/miniswig/create_wrapper.cpp
index
29f35b2
..
826a9ab
100644
(file)
--- a/
tools/miniswig/create_wrapper.cpp
+++ b/
tools/miniswig/create_wrapper.cpp
@@
-1,11
+1,13
@@
#include <config.h>
#include "tree.hpp"
#include <config.h>
#include "tree.hpp"
+#include "create_wrapper.hpp"
+#include "globals.hpp"
+
#include <iostream>
#include <sstream>
#include <stdexcept>
#include <iostream>
#include <sstream>
#include <stdexcept>
-#include "create_wrapper.hpp"
-#include "globals.hpp"
+#include <stdio.h>
void
WrapperCreator::create_wrapper(Namespace* ns)
void
WrapperCreator::create_wrapper(Namespace* ns)
@@
-24,14
+26,10
@@
WrapperCreator::create_wrapper(Namespace* ns)
<< " * '" << fromfile << "'\n"
<< " * DO NOT CHANGE\n"
<< " */\n"
<< " * '" << fromfile << "'\n"
<< " * DO NOT CHANGE\n"
<< " */\n"
- << "#ifndef
__" << modulename << "_WRAPPER_H__\n"
- << "#define
__" << modulename << "_WRAPPER_H__
\n"
+ << "#ifndef
HEADER_SUPERTUX_SCRIPTING_WRAPPER_HPP\n" //TODO avoid hardcoding
+ << "#define
HEADER_SUPERTUX_SCRIPTING_WRAPPER_HPP
\n"
<< "\n"
<< "\n"
- << "#include <squirrel.h>\n"
- << "#include \"wrapper.interface.hpp\"\n"
- << "\n"
- << "namespace Scripting\n"
- << "{\n"
+ << "namespace Scripting {\n"
<< "\n";
hppout << "void register_" << modulename << "_wrapper(HSQUIRRELVM v);\n"
<< "\n";
hppout << "void register_" << modulename << "_wrapper(HSQUIRRELVM v);\n"
@@
-44,6
+42,7
@@
WrapperCreator::create_wrapper(Namespace* ns)
if(_class == 0)
continue;
if(_class == 0)
continue;
+ hppout << "class " << _class->name << ";\n";
hppout << "void create_squirrel_instance(HSQUIRRELVM v, "
<< ns_prefix << _class->name
<< "* object, bool setup_releasehook = false);\n";
hppout << "void create_squirrel_instance(HSQUIRRELVM v, "
<< ns_prefix << _class->name
<< "* object, bool setup_releasehook = false);\n";
@@
-51,7
+50,9
@@
WrapperCreator::create_wrapper(Namespace* ns)
hppout <<"\n"
<< "}\n"
<< "\n"
hppout <<"\n"
<< "}\n"
<< "\n"
- << "#endif\n";
+ << "#endif\n"
+ << "\n"
+ << "/* EOF */\n";
// cpp header
out << "/**\n"
// cpp header
out << "/**\n"
@@
-59,20
+60,14
@@
WrapperCreator::create_wrapper(Namespace* ns)
<< " * '" << fromfile << "'\n"
<< " * DO NOT CHANGE\n"
<< " */\n"
<< " * '" << fromfile << "'\n"
<< " * DO NOT CHANGE\n"
<< " */\n"
- << "#include <config.h>\n"
<< "\n"
<< "\n"
- << "#include <new>\n"
- << "#include <assert.h>\n"
- << "#include <string>\n"
<< "#include <sstream>\n"
<< "#include <sstream>\n"
- << "#include <squirrel.h>\n"
- << "#include \"squirrel_error.hpp\"\n"
- << "#include \"wrapper.interface.hpp\"\n"
<< "\n"
<< "\n"
- << "namespace Scripting\n"
- << "{\n"
- << "namespace Wrapper\n"
- << "{\n"
+ << "#include \"scripting/squirrel_error.hpp\"\n"
+ << "#include \"scripting/wrapper.interface.hpp\"\n"
+ << "\n"
+ << "namespace Scripting {\n"
+ << "namespace Wrapper {\n"
<< "\n";
for(std::vector<AtomicType*>::iterator i = ns->types.begin();
<< "\n";
for(std::vector<AtomicType*>::iterator i = ns->types.begin();
@@
-108,7
+103,9
@@
WrapperCreator::create_wrapper(Namespace* ns)
out << "}\n"
<< "\n"
out << "}\n"
<< "\n"
- << "} // end of namespace Scripting\n";
+ << "} // end of namespace Scripting\n"
+ << "\n"
+ << "/* EOF */\n";
}
void
}
void
@@
-122,10
+119,12
@@
WrapperCreator::create_register_function_code(Function* function, Class* _class)
<< (_class != 0 ? _class->name + "_" : "") << function->name
<< "_wrapper, 0);\n";
<< (_class != 0 ? _class->name + "_" : "") << function->name
<< "_wrapper, 0);\n";
- if(!function->custom) {
+ if(function->custom) {
+ out << ind << "sq_setparamscheck(v, SQ_MATCHTYPEMASKSTRING, " << function->parameter_spec << ");\n";
+ } else {
out << ind << "sq_setparamscheck(v, SQ_MATCHTYPEMASKSTRING, \"";
out << ind << "sq_setparamscheck(v, SQ_MATCHTYPEMASKSTRING, \"";
- out << "x|t
";
+ out << "x|t";
if(!function->parameters.empty())
{
if(!function->parameters.empty())
{
@@
-133,20
+132,23
@@
WrapperCreator::create_register_function_code(Function* function, Class* _class)
// Skip the first parameter since its a HSQUIRRELVM that is
// handled internally
// Skip the first parameter since its a HSQUIRRELVM that is
// handled internally
- if (function->suspend)
+ if (function->suspend)
{
++p;
++p;
-
+ } else if (p->type.atomic_type == HSQUIRRELVMType::instance()) {
+ ++p;
+ }
+
for(; p != function->parameters.end(); ++p) {
if(p->type.atomic_type == &BasicType::INT) {
for(; p != function->parameters.end(); ++p) {
if(p->type.atomic_type == &BasicType::INT) {
- out << "i
";
+ out << "i";
} else if(p->type.atomic_type == &BasicType::FLOAT) {
} else if(p->type.atomic_type == &BasicType::FLOAT) {
- out << "
f|i
";
+ out << "
n
";
} else if(p->type.atomic_type == &BasicType::BOOL) {
} else if(p->type.atomic_type == &BasicType::BOOL) {
- out << "b
";
+ out << "b";
} else if(p->type.atomic_type == StringType::instance()) {
} else if(p->type.atomic_type == StringType::instance()) {
- out << "s
";
+ out << "s";
} else {
} else {
- out << ".
";
+ out << ".";
}
}
}
}
}
}
@@
-313,14
+315,14
@@
WrapperCreator::create_function_wrapper(Class* _class, Function* function)
// custom function?
if(function->custom) {
// custom function?
if(function->custom) {
- if(function->type != Function::FUNCTION)
+ if(function->type != Function::FUNCTION)
throw std::runtime_error(
"custom not allow constructor+destructor yet");
if(function->return_type.atomic_type != SQIntegerType::instance())
throw std::runtime_error(
"custom not allow constructor+destructor yet");
if(function->return_type.atomic_type != SQIntegerType::instance())
- throw std::runtime_error("custom function has to return SQInteger");
+ throw std::runtime_error("custom function
'" + function->name + "'
has to return SQInteger");
if(function->parameters.size() != 1)
throw std::runtime_error(
if(function->parameters.size() != 1)
throw std::runtime_error(
- "custom function must have 1 HSQUIRRELVM parameter");
+ "custom function
'" + function->name + "'
must have 1 HSQUIRRELVM parameter");
out << ind << "return ";
if(_class != 0)
out << ind << "return ";
if(_class != 0)