X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fscripting%2Fsquirrel_util.cpp;h=0352d3901901b9ded5e9184ca7696282564278bd;hb=08813a74da6ac1fd045a105e4e8105f1d7f716f0;hp=f16bb63bbec2284a98f9273aea8f8e2d6fd6497a;hpb=a113d3bd1feddd510e3b2852b0d42522735eee40;p=supertux.git

diff --git a/src/scripting/squirrel_util.cpp b/src/scripting/squirrel_util.cpp
index f16bb63bb..0352d3901 100644
--- a/src/scripting/squirrel_util.cpp
+++ b/src/scripting/squirrel_util.cpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux
 //  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
-//  This program is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU General Public License
-//  as published by the Free Software Foundation; either version 2
-//  of the License, or (at your option) any later version.
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
 //
 //  This program is distributed in the hope that it will be useful,
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,33 +12,29 @@
 //  GNU General Public License for more details.
 //
 //  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#include "scripting/squirrel_util.hpp"
+
 #include <config.h>
 
-#include <stdexcept>
-#include <sstream>
-#include <stdarg.h>
-#include <squirrel.h>
-#include <sqstdmath.h>
+#include <stdio.h>
+#include <sqstdaux.h>
 #include <sqstdblob.h>
+#include <sqstdmath.h>
 #include <sqstdstring.h>
-#include <sqstdaux.h>
-#include <sqstdio.h>
-#include "squirrel_util.hpp"
-#include "log.hpp"
-#include "level.hpp"
+#include <stdarg.h>
+
 #include "physfs/physfs_stream.hpp"
-#include "../random_generator.hpp"
+#include "supertux/console.hpp"
+#include "util/log.hpp"
 
 #ifdef ENABLE_SQDBG
-#include <sqdbg/sqrdbg.h>
 
 static HSQREMOTEDBG debugger = NULL;
 #endif
 
-namespace Scripting
-{
+namespace Scripting {
 
 HSQUIRRELVM global_vm = NULL;
 
@@ -92,9 +86,6 @@ void init_squirrel(bool enable_debugger)
   // register supertux API
   register_supertux_wrapper(global_vm);
 
-  // TODO remove this at some point... it shoud just be functions not an object
-  expose_object(global_vm, -1, new Scripting::Level(), "Level", true);
-
   sq_pop(global_vm, 1);
 
   // register print function
@@ -139,7 +130,7 @@ std::string squirrel2string(HSQUIRRELVM v, SQInteger i)
 {
   std::ostringstream os;
   switch(sq_gettype(v, i))
-    {
+  {
     case OT_NULL:
       os << "<null>";
       break;
@@ -175,18 +166,18 @@ std::string squirrel2string(HSQUIRRELVM v, SQInteger i)
       os << "{";
       sq_pushnull(v);  //null iterator
       while(SQ_SUCCEEDED(sq_next(v,i-1)))
-        {
-          if (!first) {
-            os << ", ";
-          }
-          first = false;
+      {
+        if (!first) {
+          os << ", ";
+        }
+        first = false;
 
-          //here -1 is the value and -2 is the key
-          os << squirrel2string(v, -2) << " => "
-             << squirrel2string(v, -1);
+        //here -1 is the value and -2 is the key
+        os << squirrel2string(v, -2) << " => "
+           << squirrel2string(v, -1);
 
-          sq_pop(v,2); //pops key and val before the nex iteration
-        }
+        sq_pop(v,2); //pops key and val before the nex iteration
+      }
       sq_pop(v, 1);
       os << "}";
       break;
@@ -196,18 +187,18 @@ std::string squirrel2string(HSQUIRRELVM v, SQInteger i)
       os << "[";
       sq_pushnull(v);  //null iterator
       while(SQ_SUCCEEDED(sq_next(v,i-1)))
-        {
-          if (!first) {
-            os << ", ";
-          }
-          first = false;
+      {
+        if (!first) {
+          os << ", ";
+        }
+        first = false;
 
-          //here -1 is the value and -2 is the key
-          // we ignore the key, since that is just the index in an array
-          os << squirrel2string(v, -1);
+        //here -1 is the value and -2 is the key
+        // we ignore the key, since that is just the index in an array
+        os << squirrel2string(v, -1);
 
-          sq_pop(v,2); //pops key and val before the nex iteration
-        }
+        sq_pop(v,2); //pops key and val before the nex iteration
+      }
       sq_pop(v, 1);
       os << "]";
       break;
@@ -242,79 +233,79 @@ std::string squirrel2string(HSQUIRRELVM v, SQInteger i)
     default:
       os << "<unknown>";
       break;
-    }
+  }
   return os.str();
 }
 
 void print_squirrel_stack(HSQUIRRELVM v)
 {
-    printf("--------------------------------------------------------------\n");
-    int count = sq_gettop(v);
-    for(int i = 1; i <= count; ++i) {
-        printf("%d: ",i);
-        switch(sq_gettype(v, i))
-        {
-            case OT_NULL:
-                printf("null");
-                break;
-            case OT_INTEGER: {
-                SQInteger val;
-                sq_getinteger(v, i, &val);
-                printf("integer (%d)", static_cast<int> (val));
-                break;
-            }
-            case OT_FLOAT: {
-                SQFloat val;
-                sq_getfloat(v, i, &val);
-                printf("float (%f)", val);
-                break;
-            }
-            case OT_STRING: {
-                const SQChar* val;
-                sq_getstring(v, i, &val);
-                printf("string (%s)", val);
-                break;
-            }
-            case OT_TABLE:
-                printf("table");
-                break;
-            case OT_ARRAY:
-                printf("array");
-                break;
-            case OT_USERDATA:
-                printf("userdata");
-                break;
-            case OT_CLOSURE:
-                printf("closure(function)");
-                break;
-            case OT_NATIVECLOSURE:
-                printf("native closure(C function)");
-                break;
-            case OT_GENERATOR:
-                printf("generator");
-                break;
-            case OT_USERPOINTER:
-                printf("userpointer");
-                break;
-            case OT_THREAD:
-                printf("thread");
-                break;
-            case OT_CLASS:
-                printf("class");
-                break;
-            case OT_INSTANCE:
-                printf("instance");
-                break;
-            case OT_WEAKREF:
-                printf("weakref");
-                break;
-            default:
-                printf("unknown?!?");
-                break;
-        }
-        printf("\n");
+  printf("--------------------------------------------------------------\n");
+  int count = sq_gettop(v);
+  for(int i = 1; i <= count; ++i) {
+    printf("%d: ",i);
+    switch(sq_gettype(v, i))
+    {
+      case OT_NULL:
+        printf("null");
+        break;
+      case OT_INTEGER: {
+        SQInteger val;
+        sq_getinteger(v, i, &val);
+        printf("integer (%d)", static_cast<int> (val));
+        break;
+      }
+      case OT_FLOAT: {
+        SQFloat val;
+        sq_getfloat(v, i, &val);
+        printf("float (%f)", val);
+        break;
+      }
+      case OT_STRING: {
+        const SQChar* val;
+        sq_getstring(v, i, &val);
+        printf("string (%s)", val);
+        break;
+      }
+      case OT_TABLE:
+        printf("table");
+        break;
+      case OT_ARRAY:
+        printf("array");
+        break;
+      case OT_USERDATA:
+        printf("userdata");
+        break;
+      case OT_CLOSURE:
+        printf("closure(function)");
+        break;
+      case OT_NATIVECLOSURE:
+        printf("native closure(C function)");
+        break;
+      case OT_GENERATOR:
+        printf("generator");
+        break;
+      case OT_USERPOINTER:
+        printf("userpointer");
+        break;
+      case OT_THREAD:
+        printf("thread");
+        break;
+      case OT_CLASS:
+        printf("class");
+        break;
+      case OT_INSTANCE:
+        printf("instance");
+        break;
+      case OT_WEAKREF:
+        printf("weakref");
+        break;
+      default:
+        printf("unknown?!?");
+        break;
     }
-    printf("--------------------------------------------------------------\n");
+    printf("\n");
+  }
+  printf("--------------------------------------------------------------\n");
 }
 
 static SQInteger squirrel_read_char(SQUserPointer file)
@@ -389,4 +380,169 @@ HSQUIRRELVM object_to_vm(HSQOBJECT object)
   return object._unVal.pThread;
 }
 
+// begin: serialization functions
+
+void store_float(HSQUIRRELVM vm, const char* name, float val)
+{
+  sq_pushstring(vm, name, -1);
+  sq_pushfloat(vm, val);
+  if(SQ_FAILED(sq_createslot(vm, -3)))
+    throw Scripting::SquirrelError(vm, "Couldn't add float value to table");
+}
+
+void store_int(HSQUIRRELVM vm, const char* name, int val)
+{
+  sq_pushstring(vm, name, -1);
+  sq_pushinteger(vm, val);
+  if(SQ_FAILED(sq_createslot(vm, -3)))
+    throw Scripting::SquirrelError(vm, "Couldn't add int value to table");
+}
+
+void store_string(HSQUIRRELVM vm, const char* name, const std::string& val)
+{
+  sq_pushstring(vm, name, -1);
+  sq_pushstring(vm, val.c_str(), val.length());
+  if(SQ_FAILED(sq_createslot(vm, -3)))
+    throw Scripting::SquirrelError(vm, "Couldn't add float value to table");
+}
+
+void store_bool(HSQUIRRELVM vm, const char* name, bool val)
+{
+  sq_pushstring(vm, name, -1);
+  sq_pushbool(vm, val ? SQTrue : SQFalse);
+  if(SQ_FAILED(sq_createslot(vm, -3)))
+    throw Scripting::SquirrelError(vm, "Couldn't add float value to table");
+}
+
+bool has_float(HSQUIRRELVM vm, const char* name)
+{
+  sq_pushstring(vm, name, -1);
+  if (SQ_FAILED(sq_get(vm, -2))) return false;
+  sq_pop(vm, 1);
+  return true;
+}
+
+bool has_int(HSQUIRRELVM vm, const char* name)
+{
+  return has_float(vm, name);
+}
+
+bool has_string(HSQUIRRELVM vm, const char* name)
+{
+  return has_float(vm, name);
+}
+
+bool has_bool(HSQUIRRELVM vm, const char* name)
+{
+  return has_float(vm, name);
+}
+
+float read_float(HSQUIRRELVM vm, const char* name)
+{
+  sq_pushstring(vm, name, -1);
+  if(SQ_FAILED(sq_get(vm, -2))) {
+    std::ostringstream msg;
+    msg << "Couldn't get float value for '" << name << "' from table";
+    throw Scripting::SquirrelError(vm, msg.str());
+  }
+
+  float result;
+  if(SQ_FAILED(sq_getfloat(vm, -1, &result))) {
+    std::ostringstream msg;
+    msg << "Couldn't get float value for '" << name << "' from table";
+    throw Scripting::SquirrelError(vm, msg.str());
+  }
+  sq_pop(vm, 1);
+
+  return result;
 }
+
+int read_int(HSQUIRRELVM vm, const char* name)
+{
+  sq_pushstring(vm, name, -1);
+  if(SQ_FAILED(sq_get(vm, -2))) {
+    std::ostringstream msg;
+    msg << "Couldn't get int value for '" << name << "' from table";
+    throw Scripting::SquirrelError(vm, msg.str());
+  }
+
+  SQInteger result;
+  if(SQ_FAILED(sq_getinteger(vm, -1, &result))) {
+    std::ostringstream msg;
+    msg << "Couldn't get int value for '" << name << "' from table";
+    throw Scripting::SquirrelError(vm, msg.str());
+  }
+  sq_pop(vm, 1);
+
+  return result;
+}
+
+std::string read_string(HSQUIRRELVM vm, const char* name)
+{
+  sq_pushstring(vm, name, -1);
+  if(SQ_FAILED(sq_get(vm, -2))) {
+    std::ostringstream msg;
+    msg << "Couldn't get string value for '" << name << "' from table";
+    throw Scripting::SquirrelError(vm, msg.str());
+  }
+
+  const char* result;
+  if(SQ_FAILED(sq_getstring(vm, -1, &result))) {
+    std::ostringstream msg;
+    msg << "Couldn't get string value for '" << name << "' from table";
+    throw Scripting::SquirrelError(vm, msg.str());
+  }
+  sq_pop(vm, 1);
+
+  return std::string(result);
+}
+
+bool read_bool(HSQUIRRELVM vm, const char* name)
+{
+  sq_pushstring(vm, name, -1);
+  if(SQ_FAILED(sq_get(vm, -2))) {
+    std::ostringstream msg;
+    msg << "Couldn't get bool value for '" << name << "' from table";
+    throw Scripting::SquirrelError(vm, msg.str());
+  }
+
+  SQBool result;
+  if(SQ_FAILED(sq_getbool(vm, -1, &result))) {
+    std::ostringstream msg;
+    msg << "Couldn't get bool value for '" << name << "' from table";
+    throw Scripting::SquirrelError(vm, msg.str());
+  }
+  sq_pop(vm, 1);
+
+  return result == SQTrue;
+}
+
+bool get_float(HSQUIRRELVM vm, const char* name, float& val) {
+  if (!has_float(vm, name)) return false;
+  val = read_float(vm, name);
+  return true;
+}
+
+bool get_int(HSQUIRRELVM vm, const char* name, int& val) {
+  if (!has_int(vm, name)) return false;
+  val = read_int(vm, name);
+  return true;
+}
+
+bool get_string(HSQUIRRELVM vm, const char* name, std::string& val) {
+  if (!has_string(vm, name)) return false;
+  val = read_string(vm, name);
+  return true;
+}
+
+bool get_bool(HSQUIRRELVM vm, const char* name, bool& val) {
+  if (!has_bool(vm, name)) return false;
+  val = read_bool(vm, name);
+  return true;
+}
+
+// end: serialization functions
+
+}
+
+/* EOF */