X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=tools%2Fminiswig%2Fcreate_wrapper.cpp;h=2233f8334308e12d2c0020d898fa979fd435ea63;hb=f80ec06ce6d95942926c8ea8ac8c6fb872f9330e;hp=a806de41104f7ea577e12dc693e776f7cedf8f18;hpb=0b585f0dc8e185bcf1a7e281108281f5b2b96706;p=supertux.git

diff --git a/tools/miniswig/create_wrapper.cpp b/tools/miniswig/create_wrapper.cpp
index a806de411..2233f8334 100644
--- a/tools/miniswig/create_wrapper.cpp
+++ b/tools/miniswig/create_wrapper.cpp
@@ -6,7 +6,7 @@
 #include "globals.h"
 
 void
-WrapperCreator::create_wrapper(CompilationUnit* unit)
+WrapperCreator::create_wrapper(Namespace* ns)
 {
     // hpp file
     hppout
@@ -14,10 +14,10 @@ WrapperCreator::create_wrapper(CompilationUnit* unit)
         << " * WARNING: This file is automatically generated from '"
         << inputfile << "' - do not change\n"
         << " */\n"
-        << "#ifndef __" << modulename << "_WRAPPER_HPP__\n"
-        << "#define __" << modulename << "_WRAPPER_HPP__\n"
+        << "#ifndef __" << modulename << "_WRAPPER_H__\n"
+        << "#define __" << modulename << "_WRAPPER_H__\n"
         << "\n"
-        << "#include \"WrapperUtil.hpp\"\n"
+        << "#include \"wrapper_util.h\"\n"
         << "\n"
         << "extern WrappedFunction " << modulename << "_global_functions[];\n"
         << "extern WrappedClass " << modulename << "_classes[];\n"
@@ -31,29 +31,35 @@ WrapperCreator::create_wrapper(CompilationUnit* unit)
         << inputfile << "' - do not change\n"
         << " */\n"
         << "\n"
+        << "#include <config.h>\n"
         << "#include <new>\n"
+        << "#include <assert.h>\n"
         << "#include <string>\n"
         << "#include <squirrel.h>\n"
-        << "#include \"WrapperUtil.hpp\"\n"
-        << "#include \"" << inputfile << "\"\n"
+        << "#include \"wrapper_util.h\"\n"
+        << "#include \"wrapper.interface.h\"\n"
         << "\n";
+    if(selected_namespace != "") {
+        out << "using namespace " << selected_namespace << ";\n";
+        out << "\n";
+    }
     
-    for(std::vector<AtomicType*>::iterator i = unit->types.begin();
-            i != unit->types.end(); ++i) {
+    for(std::vector<AtomicType*>::iterator i = ns->types.begin();
+            i != ns->types.end(); ++i) {
         AtomicType* type = *i;
         Class* _class = dynamic_cast<Class*> (type);
         if(_class != 0)
             create_class_wrapper(_class);
     }
-    for(std::vector<Function*>::iterator i = unit->functions.begin();
-            i != unit->functions.end(); ++i) {
+    for(std::vector<Function*>::iterator i = ns->functions.begin();
+            i != ns->functions.end(); ++i) {
         create_function_wrapper(0, *i);
     }
 
     // create function list...
     out << "WrappedFunction " << modulename << "_global_functions[] = {\n";
-    for(std::vector<Function*>::iterator i = unit->functions.begin();
-            i != unit->functions.end(); ++i) {
+    for(std::vector<Function*>::iterator i = ns->functions.begin();
+            i != ns->functions.end(); ++i) {
         Function* function = *i;
         out << ind << "{ \"" << function->name << "\", &"
             << function->name << "_wrapper },\n";
@@ -66,8 +72,8 @@ WrapperCreator::create_wrapper(CompilationUnit* unit)
     std::ostringstream classlist;
     classlist << "WrappedClass " << modulename << "_classes[] = {\n";
 
-    for(std::vector<AtomicType*>::iterator i = unit->types.begin();
-            i != unit->types.end(); ++i) {
+    for(std::vector<AtomicType*>::iterator i = ns->types.begin();
+            i != ns->types.end(); ++i) {
         AtomicType* type = *i;
         Class* _class = dynamic_cast<Class*> (type);
         if(_class == 0)
@@ -79,24 +85,22 @@ WrapperCreator::create_wrapper(CompilationUnit* unit)
             
         out << "static WrappedFunction " << modulename << "_"
             << _class->name << "_methods[] = {\n";
-        out << ind << "{ \"constructor\", &"
-            << _class->name << "_" << "construct_wrapper },\n";
         for(std::vector<ClassMember*>::iterator i = _class->members.begin();
                 i != _class->members.end(); ++i) {
             ClassMember* member = *i;
             if(member->visibility != ClassMember::PUBLIC)
                 continue;
             Function* function = dynamic_cast<Function*> (member);
-            if(!function || function->type != Function::FUNCTION)
+            if(!function || function->type == Function::DESTRUCTOR)
                 continue;
 
             out << ind << "{ \"" << function->name << "\", &"
                 << _class->name << "_" << function->name << "_wrapper },\n";
         }
-        classlist << ind << "{ 0, 0 }\n";
         out << "};\n"
             << "\n";
     }
+    classlist << ind << "{ 0, 0 }\n";
     classlist << "};\n";
     out << classlist.str();
     out << "\n";
@@ -105,11 +109,15 @@ WrapperCreator::create_wrapper(CompilationUnit* unit)
 void
 WrapperCreator::create_function_wrapper(Class* _class, Function* function)
 {
-    if(function->type == Function::CONSTRUCTOR)
-        throw std::runtime_error("Constructors not supported yet");
     if(function->type == Function::DESTRUCTOR)
-        throw std::runtime_error("Destructors not supported yet");
-    
+        assert(false);
+
+    std::string ns_prefix;
+    if(selected_namespace != "")
+        ns_prefix = selected_namespace + "::";
+    if(function->type == Function::CONSTRUCTOR)
+        function->name = "constructor";
+
     out << "static int ";
     if(_class != 0) {
         out << _class->name << "_";
@@ -118,27 +126,33 @@ WrapperCreator::create_function_wrapper(Class* _class, Function* function)
         << "{\n";
     // avoid warning...
     if(_class == 0 && function->parameters.empty() 
-            && function->return_type.is_void()) {
+            && function->return_type.is_void()
+            && function->type != Function::CONSTRUCTOR) {
         out << ind << "(void) v;\n";
     }
     
-    // eventually retrieve pointer to class
-    if(_class != 0) {
-        out << ind << _class->name << "* _this;\n";
+    // eventually 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 << "assert(_this != 0);\n";
     }
     
     // declare and retrieve arguments
-    size_t i = 0;
+    int i = 0;
+    int arg_offset = 2;
     for(std::vector<Parameter>::iterator p = function->parameters.begin();
             p != function->parameters.end(); ++p) {
-        char argname[64];
-        snprintf(argname, sizeof(argname), "arg%u", i);
-        prepare_argument(p->type, i + 2, argname);
- 
+        if(i == 0 && p->type.atomic_type == HSQUIRRELVMType::instance()) {
+            out << ind << "HSQUIRRELVM arg0 = v;\n";
+            arg_offset++;
+        } else {
+            char argname[64];
+            snprintf(argname, sizeof(argname), "arg%d", i);
+            prepare_argument(p->type, i + arg_offset, argname);
+        }
         ++i;
     }
+    
     // call function
     out << ind << "\n";
     out << ind;
@@ -147,15 +161,30 @@ WrapperCreator::create_function_wrapper(Class* _class, Function* function)
         out << " return_value = ";
     }
     if(_class != 0) {
-        out << "_this->";
+        if(function->type == Function::CONSTRUCTOR) {
+            out << ns_prefix << _class->name << "* _this = new " << ns_prefix;
+        } else {
+            out << "_this->";
+        }
+    } else {
+        out << ns_prefix;
+    }
+    if(function->type == Function::CONSTRUCTOR) {
+        out << _class->name << "(";
+    } else {
+        out << function->name << "(";
     }
-    out << function->name << "(";
     for(size_t i = 0; i < function->parameters.size(); ++i) {
         if(i != 0)
             out << ", ";
         out << "arg" << i;
     }
     out << ");\n";
+    if(function->type == Function::CONSTRUCTOR) {
+        out << ind << "sq_setinstanceup(v, 1, _this);\n";
+        out << ind << "sq_setreleasehook(v, 1, " 
+            << _class->name << "_release_hook);\n";
+    }
     out << ind << "\n";
     // push return value back on stack and return
     if(function->return_type.is_void()) {
@@ -222,8 +251,7 @@ WrapperCreator::push_to_stack(const Type& type, const std::string& var)
 void
 WrapperCreator::create_class_wrapper(Class* _class)
 {
-    create_class_destruct_function(_class);
-    create_class_construct_function(_class);
+    bool release_hook_created = false;
     for(std::vector<ClassMember*>::iterator i = _class->members.begin();
             i != _class->members.end(); ++i) {
         ClassMember* member = *i;
@@ -232,37 +260,26 @@ WrapperCreator::create_class_wrapper(Class* _class)
         Function* function = dynamic_cast<Function*> (member);
         if(!function)
             continue;
-        // don't wrap constructors and destructors (for now...)
-        if(function->type != Function::FUNCTION)
+        if(function->type == Function::CONSTRUCTOR
+            && !release_hook_created) {
+          create_class_release_hook(_class);
+          release_hook_created = true;
+        }
+        // don't wrap destructors
+        if(function->type == Function::DESTRUCTOR)
             continue;
         create_function_wrapper(_class, function);
     }
 }
 
 void
-WrapperCreator::create_class_construct_function(Class* _class)
-{
-    out << "static int " << _class->name << "_construct_wrapper(HSQUIRRELVM v)\n";
-    out << "{\n";
-    out << ind << _class->name << "* _this = new "
-        << _class->name << "();\n";
-    out << ind << "sq_setinstanceup(v, 1, _this);\n";
-    out << ind << "sq_setreleasehook(v, 1, " 
-        << _class->name << "_release_wrapper);\n";
-    out << "\n";
-    out << ind << "return 0;\n";
-    out << "}\n";
-    out << "\n";
-}
-
-void
-WrapperCreator::create_class_destruct_function(Class* _class)
+WrapperCreator::create_class_release_hook(Class* _class)
 {
-    out << "static int " << _class->name << "_release_wrapper(SQUserPointer ptr, int )\n"
+    out << "static int " << _class->name << "_release_hook(SQUserPointer ptr, int )\n"
         << "{\n"
         << ind << _class->name 
         << "* _this = reinterpret_cast<" << _class->name << "*> (ptr);\n"
-        << ind << "_this->~" << _class->name << "();\n"
+        << ind << "delete _this;\n"
         << ind << "return 0;\n"
         << "}\n"
         << "\n";