hppout <<"\n"
<< "}\n"
<< "\n"
- << "#endif\n"
- << "\n";
+ << "#endif\n";
// cpp header
out << "/**\n"
}
out << "} // end of namespace Wrapper\n";
- out << "\n";
for(std::vector<AtomicType*>::iterator i = ns->types.begin();
i != ns->types.end(); ++i) {
out << "}\n"
<< "\n"
- << "} // end of namespace Scripting\n"
- << "\n";
+ << "} // end of namespace Scripting\n";
}
void
out << ind << "sq_newclosure(v, &"
<< (_class != 0 ? _class->name + "_" : "") << function->name
<< "_wrapper, 0);\n";
+
+ if(function->custom) {
+ out << ind << "sq_setparamscheck(v, SQ_MATCHTYPEMASKSTRING, " << function->parameter_spec << ");\n";
+ } else {
+ out << ind << "sq_setparamscheck(v, SQ_MATCHTYPEMASKSTRING, \"";
+
+ out << "x|t";
+
+ if(!function->parameters.empty())
+ {
+ std::vector<Parameter>::iterator p = function->parameters.begin();
+
+ // Skip the first parameter since its a HSQUIRRELVM that is
+ // handled internally
+ if (function->suspend) {
+ ++p;
+ } else if (p->type.atomic_type == HSQUIRRELVMType::instance()) {
+ ++p;
+ }
+
+ for(; p != function->parameters.end(); ++p) {
+ if(p->type.atomic_type == &BasicType::INT) {
+ out << "i";
+ } else if(p->type.atomic_type == &BasicType::FLOAT) {
+ out << "n";
+ } else if(p->type.atomic_type == &BasicType::BOOL) {
+ out << "b";
+ } else if(p->type.atomic_type == StringType::instance()) {
+ out << "s";
+ } else {
+ out << ".";
+ }
+ }
+ }
+ out << "\");\n";
+ }
+
create_register_slot_code("function", function->name);
out << "\n";
}
// retrieve pointer to class instance
if(_class != 0 && function->type != Function::CONSTRUCTOR) {
out << ind << "SQUserPointer data;\n";
- out << ind << "if(SQ_FAILED(sq_getinstanceup(vm, 1, &data, 0))) {\n";
+ out << ind << "if(SQ_FAILED(sq_getinstanceup(vm, 1, &data, 0)) || !data) {\n";
out << ind << ind << "sq_throwerror(vm, _SC(\"'" << function->name << "' called without instance\"));\n";
out << ind << ind << "return SQ_ERROR;\n";
out << ind << "}\n";
// 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 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(
- "custom function must have 1 HSQUIRRELVM parameter");
+ "custom function '" + function->name + "' must have 1 HSQUIRRELVM parameter");
out << ind << "return ";
if(_class != 0)
}
// call function
- out << ind << "\n";
+ out << "\n";
out << ind << "try {\n";
out << ind << ind;
if(!function->return_type.is_void()) {
out << ind << "sq_setreleasehook(vm, 1, "
<< _class->name << "_release_hook);\n";
}
- out << ind << "\n";
+ out << "\n";
// push return value back on stack and return
if(function->suspend) {
if(!function->return_type.is_void()) {
out << ind << ind << "return 1;\n";
}
- out << ind << "\n";
+ out << "\n";
out << ind << "} catch(std::exception& e) {\n";
out << ind << ind << "sq_throwerror(vm, e.what());\n";
out << ind << ind << "return SQ_ERROR;\n";
out << ind << ind << "sq_throwerror(vm, _SC(\"Unexpected exception while executing function '" << function->name << "'\"));\n";
out << ind << ind << "return SQ_ERROR;\n";
out << ind << "}\n";
- out << ind << "\n";
+ out << "\n";
out << "}\n";
out << "\n";