fix cr/lfs and remove trailing whitespaces...

[supertux.git] / tools / miniswig / create_wrapper.cpp

diff --git a/tools/miniswig/create_wrapper.cpp b/tools/miniswig/create_wrapper.cpp
index d0c9131..64318fd 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>
@@ -38,7 +40,7 @@ WrapperCreator::create_wrapper(Namespace* ns)
     for(std::vector<AtomicType*>::iterator i = ns->types.begin();
             i != ns->types.end(); ++i) {
         AtomicType* type = *i;
-        Class* _class = dynamic_cast<Class*> (type);                 
+        Class* _class = dynamic_cast<Class*> (type);
         if(_class == 0)
             continue;
 
@@ -51,7 +53,7 @@ WrapperCreator::create_wrapper(Namespace* ns)
            << "\n"
            << "#endif\n"
            << "\n";
-    
+
     // cpp header
     out << "/**\n"
         << " * WARNING: This file is automatically generated from:\n"
@@ -90,25 +92,23 @@ WrapperCreator::create_wrapper(Namespace* ns)
     out << "\n";
 
     for(std::vector<AtomicType*>::iterator i = ns->types.begin();
-            i != ns->types.end(); ++i) {                             
+            i != ns->types.end(); ++i) {
         AtomicType* type = *i;
         Class* _class = dynamic_cast<Class*> (type);
         if(_class != 0)
             create_squirrel_instance(_class);
     }
-    
+
     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";
@@ -119,13 +119,13 @@ WrapperCreator::create_register_function_code(Function* function, Class* _class)
 {
     if(function->type == Function::DESTRUCTOR)
         return;
-    
+
     out << ind << "sq_pushstring(v, \"" << function->name << "\", -1);\n";
-    out << ind << "sq_newclosure(v, &" 
-        << (_class != 0 ? _class->name + "_" : "") << function->name 
+    out << ind << "sq_newclosure(v, &"
+        << (_class != 0 ? _class->name + "_" : "") << function->name
         << "_wrapper, 0);\n";
     create_register_slot_code("function", function->name);
-    out << "\n";                                                              
+    out << "\n";
 }
 
 void
@@ -144,7 +144,7 @@ WrapperCreator::create_register_classes_code(Namespace* ns)
     for(std::vector<AtomicType*>::iterator i = ns->types.begin();
             i != ns->types.end(); ++i) {
         AtomicType* type = *i;
-        Class* _class = dynamic_cast<Class*> (type);                 
+        Class* _class = dynamic_cast<Class*> (type);
         if(_class == 0)
             continue;
         if(_class->super_classes.size() > 0)
@@ -158,9 +158,9 @@ void
 WrapperCreator::create_register_class_code(Class* _class)
 {
     out << ind << "// Register class " << _class->name << "\n";
-    out << ind << "sq_pushstring(v, \"" 
-        << _class->name << "\", -1);\n";    
-    
+    out << ind << "sq_pushstring(v, \""
+        << _class->name << "\", -1);\n";
+
     if(_class->super_classes.size() > 0) {
         if(_class->super_classes.size() > 1) {
             std::ostringstream msg;
@@ -168,7 +168,7 @@ WrapperCreator::create_register_class_code(Class* _class)
                 << _class->name << "')";
             throw std::runtime_error(msg.str());
         }
-        
+
         out << ind << "sq_pushstring(v, \""
             << _class->super_classes[0]->name << "\", -1);\n";
         out << ind << "sq_get(v, -3);\n";
@@ -177,7 +177,7 @@ WrapperCreator::create_register_class_code(Class* _class)
         << (_class->super_classes.size() > 0 ? "SQTrue" : "SQFalse")
         << ") < 0) {\n";
     out << ind << ind << "std::ostringstream msg;\n";
-    out << ind << ind << "msg << \"Couldn't create new class '" 
+    out << ind << ind << "msg << \"Couldn't create new class '"
         << _class->name << "'\";\n";
     out << ind << ind << "throw SquirrelError(v, msg.str());\n";
     out << ind << "}\n";
@@ -199,7 +199,7 @@ WrapperCreator::create_register_class_code(Class* _class)
 
     create_register_slot_code("class", _class->name);
     out << "\n";
-    
+
     for(std::vector<Class*>::iterator i = _class->sub_classes.begin();
             i != _class->sub_classes.end(); ++i) {
         Class* _class = *i;
@@ -259,26 +259,27 @@ 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 vm)\n"
         << "{\n";
     // avoid warning...
-    if(_class == 0 && function->parameters.empty() 
+    if(_class == 0 && function->parameters.empty()
             && function->return_type.is_void()
             && function->type != Function::CONSTRUCTOR) {
         out << ind << "(void) vm;\n";
     }
-    
+
     // retrieve pointer to class instance
     if(_class != 0 && function->type != Function::CONSTRUCTOR) {
-        out << ind << ns_prefix <<  _class->name << "* _this;\n";
-        out << ind << "if(SQ_FAILED(sq_getinstanceup(vm, 1, reinterpret_cast<SQUserPointer*> (&_this), 0))) {\n";
+        out << ind << "SQUserPointer data;\n";
+        out << ind << "if(SQ_FAILED(sq_getinstanceup(vm, 1, &data, 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";
+        out << ind << ns_prefix <<  _class->name << "* _this = reinterpret_cast<" << ns_prefix << _class->name << "*> (data);\n";
     }
 
     // custom function?
@@ -286,8 +287,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");
@@ -302,7 +303,7 @@ WrapperCreator::create_function_wrapper(Class* _class, Function* function)
         out << "\n";
         return;
     }
-    
+
     // declare and retrieve arguments
     int i = 0;
     int arg_offset = 2;
@@ -318,7 +319,7 @@ WrapperCreator::create_function_wrapper(Class* _class, Function* function)
         }
         ++i;
     }
-    
+
     // call function
     out << ind << "\n";
     out << ind << "try {\n";
@@ -344,7 +345,19 @@ 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) {
@@ -352,7 +365,7 @@ WrapperCreator::create_function_wrapper(Class* _class, Function* function)
         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, " 
+        out << ind << "sq_setreleasehook(vm, 1, "
             << _class->name << "_release_hook);\n";
     }
     out << ind << "\n";
@@ -381,7 +394,7 @@ WrapperCreator::create_function_wrapper(Class* _class, Function* function)
     out << ind << ind << "return SQ_ERROR;\n";
     out << ind << "}\n";
     out << ind << "\n";
-    
+
     out << "}\n";
     out << "\n";
 }
@@ -395,13 +408,13 @@ 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 << "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 << "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";
@@ -413,7 +426,7 @@ WrapperCreator::prepare_argument(const Type& type, size_t index,
         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 << "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";
@@ -440,7 +453,7 @@ WrapperCreator::push_to_stack(const Type& type, const std::string& var)
     } else if(type.atomic_type == &BasicType::BOOL) {
         out << "sq_pushbool(vm, " << var << ");\n";
     } else if(type.atomic_type == StringType::instance()) {
-        out << "sq_pushstring(vm, " << var << ".c_str(), " 
+        out << "sq_pushstring(vm, " << var << ".c_str(), "
             << var << ".size());\n";
     } else {
         std::ostringstream msg;
@@ -472,7 +485,7 @@ void
 WrapperCreator::create_squirrel_instance(Class* _class)
 {
     out << "void create_squirrel_instance(HSQUIRRELVM v, "
-        << ns_prefix << _class->name 
+        << ns_prefix << _class->name
         << "* object, bool setup_releasehook)\n"
         << "{\n"
         << ind << "using namespace Wrapper;\n"
@@ -508,14 +521,13 @@ 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, SQInteger )\n"
         << "{\n"
-        << ind << ns_prefix << _class->name 
-        << "* _this = reinterpret_cast<" << ns_prefix << _class->name 
+        << ind << ns_prefix << _class->name
+        << "* _this = reinterpret_cast<" << ns_prefix << _class->name
         << "*> (ptr);\n"
         << ind << "delete _this;\n"
         << ind << "return 0;\n"
         << "}\n"
         << "\n";
 }
-