projects / supertux.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
another try
[supertux.git] / tools / miniswig / create_wrapper.cpp
diff --git a/tools/miniswig/create_wrapper.cpp b/tools/miniswig/create_wrapper.cpp
index c279fa4..53e5b28 100644 (file)
--- a/tools/miniswig/create_wrapper.cpp
+++ b/tools/miniswig/create_wrapper.cpp
@@ -1,3 +1,5 @@
+#include <config.h>
+
 #include "tree.hpp"
 #include <iostream>
 #include <sstream>
@@ -100,15 +102,13 @@ WrapperCreator::create_wrapper(Namespace* ns)
     out << "void register_" << modulename << "_wrapper(HSQUIRRELVM v)\n"
         << "{\n"
         << ind << "using namespace Wrapper;\n"
-        << "\n"
-        << ind << "sq_pushroottable(v);\n";
+        << "\n";
 
     create_register_constants_code(ns);
     create_register_functions_code(ns);
     create_register_classes_code(ns);
 
-    out << ind << "sq_pop(v, 1);\n"
-        << "}\n"
+    out << "}\n"
         << "\n"
         << "} // end of namespace Scripting\n"
         << "\n";
@@ -242,10 +242,8 @@ WrapperCreator::create_register_slot_code(const std::string& what,
                                           const std::string& name)
 {
     out << ind << "if(SQ_FAILED(sq_createslot(v, -3))) {\n";
-    out << ind << ind << "std::ostringstream msg;\n";
-    out << ind << ind << "msg << \"Couldn't register " << what << "'"
-        << name << "'\";\n";
-    out << ind << ind << "throw SquirrelError(v, msg.str());\n";
+    out << ind << ind << "throw SquirrelError(v, \""
+        << "Couldn't register " << what << " '" << name << "'\");\n";
     out << ind << "}\n";
 }
 
@@ -261,23 +259,26 @@ WrapperCreator::create_function_wrapper(Class* _class, Function* function)
     if(function->type == Function::CONSTRUCTOR)
         function->name = "constructor";
 
-    out << "static int ";
+    out << "static SQInteger ";
     if(_class != 0) {
         out << _class->name << "_";
     }
-    out << function->name << "_wrapper(HSQUIRRELVM v)\n"
+    out << function->name << "_wrapper(HSQUIRRELVM vm)\n"
         << "{\n";
     // avoid warning...
     if(_class == 0 && function->parameters.empty() 
             && function->return_type.is_void()
             && function->type != Function::CONSTRUCTOR) {
-        out << ind << "(void) v;\n";
+        out << ind << "(void) vm;\n";
     }
     
-    // eventually retrieve pointer to class instance
+    // retrieve pointer to class instance
     if(_class != 0 && function->type != Function::CONSTRUCTOR) {
         out << ind << ns_prefix <<  _class->name << "* _this;\n";
-        out << ind << "sq_getinstanceup(v, 1, (SQUserPointer*) &_this, 0);\n";
+        out << ind << "if(SQ_FAILED(sq_getinstanceup(vm, 1, reinterpret_cast<SQUserPointer*> (&_this), 0))) {\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?
@@ -285,8 +286,8 @@ WrapperCreator::create_function_wrapper(Class* _class, Function* function)
         if(function->type != Function::FUNCTION)
             throw std::runtime_error(
                     "custom not allow constructor+destructor yet");
-        if(function->return_type.atomic_type != &BasicType::INT)
-            throw std::runtime_error("custom function has to return int");
+        if(function->return_type.atomic_type != SQIntegerType::instance())
+            throw std::runtime_error("custom function has to return SQInteger");
         if(function->parameters.size() != 1)
             throw std::runtime_error(
                     "custom function must have 1 HSQUIRRELVM parameter");
@@ -296,7 +297,7 @@ WrapperCreator::create_function_wrapper(Class* _class, Function* function)
             out << "_this->";
         else
             out << ns_prefix;
-        out << function->name << "(v);\n";
+        out << function->name << "(vm);\n";
         out << "}\n";
         out << "\n";
         return;
@@ -308,7 +309,7 @@ WrapperCreator::create_function_wrapper(Class* _class, Function* function)
     for(std::vector<Parameter>::iterator p = function->parameters.begin();
             p != function->parameters.end(); ++p) {
         if(i == 0 && p->type.atomic_type == HSQUIRRELVMType::instance()) {
-            out << ind << "HSQUIRRELVM arg0 = v;\n";
+            out << ind << "HSQUIRRELVM arg0 = vm;\n";
             arg_offset--;
         } else {
             char argname[64];
@@ -320,7 +321,8 @@ WrapperCreator::create_function_wrapper(Class* _class, Function* function)
     
     // call function
     out << ind << "\n";
-    out << ind;
+    out << ind << "try {\n";
+    out << ind << ind;
     if(!function->return_type.is_void()) {
         function->return_type.write_c_type(out);
         out << " return_value = ";
@@ -342,12 +344,27 @@ WrapperCreator::create_function_wrapper(Class* _class, Function* function)
     for(size_t i = 0; i < function->parameters.size(); ++i) {
         if(i != 0)
             out << ", ";
-        out << "arg" << i;
+        const Parameter param = function->parameters[i];
+        if(param.type.ref == 0 && param.type.pointer == 0) {
+            if(param.type.atomic_type == &BasicType::INT)
+                out << "static_cast<int> (arg" << i << ")";
+            else if(param.type.atomic_type == &BasicType::FLOAT)
+                out << "static_cast<float> (arg" << i << ")";
+            else if(param.type.atomic_type == &BasicType::BOOL)
+                out << "arg" << i << " == SQTrue";
+            else
+                out << "arg" << i;
+        } else {
+            out << "arg" << i;
+        }
     }
     out << ");\n";
     if(function->type == Function::CONSTRUCTOR) {
-        out << ind << "sq_setinstanceup(v, 1, _this);\n";
-        out << ind << "sq_setreleasehook(v, 1, " 
+        out << ind << "if(SQ_FAILED(sq_setinstanceup(vm, 1, _this))) {\n";
+        out << ind << ind << "sq_throwerror(vm, _SC(\"Couldn't setup instance of '" << _class->name << "' class\"));\n";
+        out << ind << ind << "return SQ_ERROR;\n";
+        out << ind << "}\n";
+        out << ind << "sq_setreleasehook(vm, 1, " 
             << _class->name << "_release_hook);\n";
     }
     out << ind << "\n";
@@ -359,13 +376,24 @@ WrapperCreator::create_function_wrapper(Class* _class, Function* function)
                 << " but has a return value.";
             throw std::runtime_error(msg.str());
         }
-        out << ind << "return sq_suspendvm(v);\n";
+        out << ind << ind << "return sq_suspendvm(vm);\n";
     } else if(function->return_type.is_void()) {
-        out << ind << "return 0;\n";
+        out << ind << ind << "return 0;\n";
     } else {
         push_to_stack(function->return_type, "return_value");
-        out << ind << "return 1;\n";
+        out << ind << ind << "return 1;\n";
     }
+
+    out << ind << "\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 << "} catch(...) {\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";
 }
@@ -379,17 +407,29 @@ WrapperCreator::prepare_argument(const Type& type, size_t index,
     if(type.pointer > 0)
         throw std::runtime_error("Pointers not handled yet");
     if(type.atomic_type == &BasicType::INT) {
-        out << ind << "int " << var << ";\n";
-        out << ind << "sq_getinteger(v, " << index << ", &" << var << ");\n";
+        out << ind << "SQInteger " << var << ";\n";
+        out << ind << "if(SQ_FAILED(sq_getinteger(vm, " << index << ", &" << var << "))) {\n";
+        out << ind << ind << "sq_throwerror(vm, _SC(\"Argument " << (index-1) << " not an integer\"));\n";
+        out << ind << ind << "return SQ_ERROR;\n";
+        out << ind << "}\n";
     } else if(type.atomic_type == &BasicType::FLOAT) {
-        out << ind << "float " << var << ";\n";
-        out << ind << "sq_getfloat(v, " << index << ", &" << var << ");\n";
+        out << ind << "SQFloat " << var << ";\n";
+        out << ind << "if(SQ_FAILED(sq_getfloat(vm, " << index << ", &" << var << "))) {\n";
+        out << ind << ind << "sq_throwerror(vm, _SC(\"Argument " << (index-1) << " not a float\"));\n";
+        out << ind << ind << "return SQ_ERROR;\n";
+        out << ind << "}\n";
     } else if(type.atomic_type == &BasicType::BOOL) {
         out << ind << "SQBool " << var << ";\n";
-        out << ind << "sq_getbool(v, " << index << ", &" << var << ");\n";
+        out << ind << "if(SQ_FAILED(sq_getbool(vm, " << index << ", &" << var << "))) {\n";
+        out << ind << ind << "sq_throwerror(vm, _SC(\"Argument " << (index-1) << " not a bool\"));\n";
+        out << ind << ind << "return SQ_ERROR;\n";
+        out << ind << "}\n";
     } else if(type.atomic_type == StringType::instance()) {
-        out << ind << "const char* " << var << ";\n";
-        out << ind << "sq_getstring(v, " << index << ", &" << var << ");\n";
+        out << ind << "const SQChar* " << var << ";\n";
+        out << ind << "if(SQ_FAILED(sq_getstring(vm, " << index << ", &" << var << "))) {\n";
+        out << ind << ind << "sq_throwerror(vm, _SC(\"Argument " << (index-1) << " not a string\"));\n";
+        out << ind << ind << "return SQ_ERROR;\n";
+        out << ind << "}\n";
     } else {
         std::ostringstream msg;
         msg << "Type '" << type.atomic_type->name << "' not supported yet.";
@@ -404,15 +444,15 @@ WrapperCreator::push_to_stack(const Type& type, const std::string& var)
         throw std::runtime_error("References not handled yet");
     if(type.pointer > 0)
         throw std::runtime_error("Pointers not handled yet");
-    out << ind;
+    out << ind << ind;
     if(type.atomic_type == &BasicType::INT) {
-        out << "sq_pushinteger(v, " << var << ");\n";
+        out << "sq_pushinteger(vm, " << var << ");\n";
     } else if(type.atomic_type == &BasicType::FLOAT) {
-        out << "sq_pushfloat(v, " << var << ");\n";
+        out << "sq_pushfloat(vm, " << var << ");\n";
     } else if(type.atomic_type == &BasicType::BOOL) {
-        out << "sq_pushbool(v, " << var << ");\n";
+        out << "sq_pushbool(vm, " << var << ");\n";
     } else if(type.atomic_type == StringType::instance()) {
-        out << "sq_pushstring(v, " << var << ".c_str(), " 
+        out << "sq_pushstring(vm, " << var << ".c_str(), " 
             << var << ".size());\n";
     } else {
         std::ostringstream msg;
@@ -480,7 +520,7 @@ WrapperCreator::create_squirrel_instance(Class* _class)
 void
 WrapperCreator::create_class_release_hook(Class* _class)
 {
-    out << "static int " << _class->name << "_release_hook(SQUserPointer ptr, int )\n"
+    out << "static SQInteger " << _class->name << "_release_hook(SQUserPointer ptr, int )\n"
         << "{\n"
         << ind << ns_prefix << _class->name 
         << "* _this = reinterpret_cast<" << ns_prefix << _class->name 
SVN import of the official repository.