Menu
▾
▴
[Swig-cvs] SF.net SVN: swig: [9628] trunk
|
From: <mgo...@us...> - 2006-12-26 10:15:45
|
Revision: 9628
http://swig.svn.sourceforge.net/swig/?rev=9628&view=rev
Author: mgossage
Date: 2006-12-26 02:15:35 -0800 (Tue, 26 Dec 2006)
Log Message:
-----------
Added more STL (more exceptions, map, size_t), fixed test case: conversion_ns_template.
Modified Paths:
--------------
trunk/CHANGES.current
trunk/Lib/lua/luatypemaps.swg
trunk/Lib/lua/std_except.i
trunk/Source/Modules/lua.cxx
Added Paths:
-----------
trunk/Lib/lua/std_common.i
trunk/Lib/lua/std_map.i
trunk/Lib/lua/stl.i
Modified: trunk/CHANGES.current
===================================================================
--- trunk/CHANGES.current 2006-12-24 00:09:06 UTC (rev 9627)
+++ trunk/CHANGES.current 2006-12-26 10:15:35 UTC (rev 9628)
@@ -1,6 +1,10 @@
Version 1.3.32 (in progress)
============================
+12/26/2006: mgossage
+ [Lua] Added more STL (more exceptions, map, size_t),
+ fixed test case: conversion_ns_template.
+
12/21/2006: mgossage
[Lua] Update to throw errors when setting immutables,
and allowing user addition of module variables.
Modified: trunk/Lib/lua/luatypemaps.swg
===================================================================
--- trunk/Lib/lua/luatypemaps.swg 2006-12-24 00:09:06 UTC (rev 9627)
+++ trunk/Lib/lua/luatypemaps.swg 2006-12-26 10:15:35 UTC (rev 9628)
@@ -43,6 +43,9 @@
%typemap(out) enum SWIGTYPE
%{ lua_pushnumber(L, (lua_Number)(int)($1)); SWIG_arg++;%}
+// size_t (which is just a unsigned long
+%apply unsigned long { size_t };
+
// boolean (which is a special type in lua)
// note: 1 & 0 are not booleans in lua, only true & false
%typemap(in,checkfn="lua_isboolean") bool
@@ -209,7 +212,8 @@
const unsigned int &, const unsigned short &, const unsigned long &,
const long long &, const unsigned long long &,
enum SWIGTYPE, float, double,
- const float &, const double &
+ const float &, const double&,
+ size_t,const size_t&
{
$1 = lua_isnumber(L,$input);
}
@@ -301,7 +305,9 @@
SWIG_NUMBER_BY_CONST_REF(signed long long);
SWIG_NUMBER_BY_CONST_REF(unsigned long long);
+%apply const unsigned long & { const size_t & };
+
// Also needed for object ptrs by const ref
// eg const A* ref_pointer(A* const& a);
// found in mixed_types.i
Added: trunk/Lib/lua/std_common.i
===================================================================
--- trunk/Lib/lua/std_common.i (rev 0)
+++ trunk/Lib/lua/std_common.i 2006-12-26 10:15:35 UTC (rev 9628)
@@ -0,0 +1,5 @@
+%include <std_except.i>
+
+%apply size_t { std::size_t };
+%apply const size_t& { const std::size_t& };
+
Modified: trunk/Lib/lua/std_except.i
===================================================================
--- trunk/Lib/lua/std_except.i 2006-12-24 00:09:06 UTC (rev 9627)
+++ trunk/Lib/lua/std_except.i 2006-12-26 10:15:35 UTC (rev 9628)
@@ -15,11 +15,29 @@
%}
%include <exception.i>
-%typemap(throws) std::out_of_range %{
-SWIG_exception(SWIG_IndexError, $1.what()); %}
+namespace std
+{
+ %ignore exception; // not sure if I should ignore this...
+ class exception
+ {
+ public:
+ exception() throw() { }
+ virtual ~exception() throw();
+ virtual const char* what() const throw();
+ };
+}
-%typemap(throws) std::exception %{
-SWIG_exception(SWIG_SystemError, $1.what()); %}
-
-%typemap(throws) std::exception& %{
-SWIG_exception(SWIG_SystemError, ($1)->what()); %}
+// normally object whihc are thrown are returned to interpreter as errors
+// (which potentally may have problems if they are not copied)
+// therefore all classes based upon std::exception are converted to their strings & returned as errors
+%typemap(throws) std::bad_exception "SWIG_exception(SWIG_RuntimeError, $1.what());"
+%typemap(throws) std::domain_error "SWIG_exception(SWIG_ValueError, $1.what());"
+%typemap(throws) std::exception "SWIG_exception(SWIG_SystemError, $1.what());"
+%typemap(throws) std::invalid_argument "SWIG_exception(SWIG_ValueError, $1.what());"
+%typemap(throws) std::length_error "SWIG_exception(SWIG_IndexError, $1.what());"
+%typemap(throws) std::logic_error "SWIG_exception(SWIG_RuntimeError, $1.what());"
+%typemap(throws) std::out_of_range "SWIG_exception(SWIG_IndexError, $1.what());"
+%typemap(throws) std::overflow_error "SWIG_exception(SWIG_OverflowError, $1.what());"
+%typemap(throws) std::range_error "SWIG_exception(SWIG_IndexError, $1.what());"
+%typemap(throws) std::runtime_error "SWIG_exception(SWIG_RuntimeError, $1.what());"
+%typemap(throws) std::underflow_error "SWIG_exception(SWIG_RuntimeError, $1.what());"
Added: trunk/Lib/lua/std_map.i
===================================================================
--- trunk/Lib/lua/std_map.i (rev 0)
+++ trunk/Lib/lua/std_map.i 2006-12-26 10:15:35 UTC (rev 9628)
@@ -0,0 +1,63 @@
+/* -----------------------------------------------------------------------------
+ * See the LICENSE file for information on copyright, usage and redistribution
+ * of SWIG, and the README file for authors - http://www.swig.org/release.html.
+ *
+ * std_map.i
+ *
+ * SWIG typemaps for std::map
+ * ----------------------------------------------------------------------------- */
+
+%include <std_common.i>
+
+// ------------------------------------------------------------------------
+// std::map
+// ------------------------------------------------------------------------
+
+%{
+#include <map>
+#include <algorithm>
+#include <stdexcept>
+%}
+
+// exported class
+
+namespace std {
+
+ template<class K, class T> class map {
+ // add typemaps here
+ public:
+ typedef size_t size_type;
+ typedef ptrdiff_t difference_type;
+ typedef K key_type;
+ typedef T mapped_type;
+ map();
+ map(const map<K,T> &);
+
+ unsigned int size() const;
+ bool empty() const;
+ void clear();
+ %extend {
+ const T& get(const K& key) throw (std::out_of_range) {
+ std::map<K,T >::iterator i = self->find(key);
+ if (i != self->end())
+ return i->second;
+ else
+ throw std::out_of_range("key not found");
+ }
+ void set(const K& key, const T& x) {
+ (*self)[key] = x;
+ }
+ void del(const K& key) throw (std::out_of_range) {
+ std::map<K,T >::iterator i = self->find(key);
+ if (i != self->end())
+ self->erase(i);
+ else
+ throw std::out_of_range("key not found");
+ }
+ bool has_key(const K& key) {
+ std::map<K,T >::iterator i = self->find(key);
+ return i != self->end();
+ }
+ }
+ };
+}
Added: trunk/Lib/lua/stl.i
===================================================================
--- trunk/Lib/lua/stl.i (rev 0)
+++ trunk/Lib/lua/stl.i 2006-12-26 10:15:35 UTC (rev 9628)
@@ -0,0 +1,13 @@
+/* -----------------------------------------------------------------------------
+ * See the LICENSE file for information on copyright, usage and redistribution
+ * of SWIG, and the README file for authors - http://www.swig.org/release.html.
+ *
+ * stl.i
+ * ----------------------------------------------------------------------------- */
+
+%include <std_common.i>
+%include <std_string.i>
+%include <std_vector.i>
+%include <std_map.i>
+%include <std_pair.i>
+
Modified: trunk/Source/Modules/lua.cxx
===================================================================
--- trunk/Source/Modules/lua.cxx 2006-12-24 00:09:06 UTC (rev 9627)
+++ trunk/Source/Modules/lua.cxx 2006-12-26 10:15:35 UTC (rev 9628)
@@ -52,7 +52,7 @@
#define REPORT(T,D) // no info:
//#define REPORT(T,D) {Printf(stdout,T"\n");} // only title
//#define REPORT(T,D) {Printf(stdout,T"\n");display_mapping(D);} // the works
-//#define REPORT(T,D) {Printf(stdout,T"\n");Swig_print_node(D);} // the works
+//#define REPORT(T,D) {Printf(stdout,T"\n");if(D)Swig_print_node(D);} // the works
void display_mapping(DOH *d) {
if (d == 0 || !DohIsMapping(d))
@@ -107,6 +107,7 @@
int have_destructor;
String *destructor_action;
String *class_name;
+ String *constructor_name;
public:
@@ -126,7 +127,6 @@
PrefixPlusUnderscore = 0;
s_cmd_tab = s_var_tab = s_const_tab = 0;
-
}
/* NEW LANGUAGE NOTE:***********************************************
@@ -321,7 +321,7 @@
String *iname = Getattr(n, "sym:name");
SwigType *d = Getattr(n, "type");
ParmList *l = Getattr(n, "parms");
-
+//Printf(stdout,"functionWrapper %s %s\n",name,iname);
Parm *p;
String *tm;
int i;
@@ -332,7 +332,10 @@
overname = Getattr(n, "sym:overname");
} else {
if (!addSymbol(iname, n))
+ {
+ Printf(stderr,"addSymbol(%s) failed\n",iname);
return SWIG_ERROR;
+ }
}
/* NEW LANGUAGE NOTE:***********************************************
@@ -676,7 +679,7 @@
ideally we should not have registered these as functions,
only WRT this variable will look into this later.
NEW LANGUAGE NOTE:END ************************************************/
- REPORT("variableWrapper", n);
+// REPORT("variableWrapper", n);
String *iname = Getattr(n, "sym:name");
// let SWIG generate the wrappers
int result = Language::variableWrapper(n);
@@ -696,7 +699,7 @@
if (assignable) {
setName = Swig_name_wrapper(Swig_name_set(iname));
} else {
- // TODO: how about calling a 'this is not settable' error message?
+ // how about calling a 'this is not settable' error message?
setName = NewString("SWIG_Lua_set_immutable"); // error message
//setName = NewString("0");
}
@@ -711,7 +714,7 @@
* constantWrapper()
* ------------------------------------------------------------ */
virtual int constantWrapper(Node *n) {
- REPORT("constantWrapper", n);
+// REPORT("constantWrapper", n);
String *name = Getattr(n, "name");
String *iname = Getattr(n, "sym:name");
//String *nsname = !nspace ? Copy(iname) : NewStringf("%s::%s",ns_name,iname);
@@ -758,7 +761,7 @@
* ------------------------------------------------------------ */
virtual int nativeWrapper(Node *n) {
- REPORT("nativeWrapper", n);
+// REPORT("nativeWrapper", n);
String *symname = Getattr(n, "sym:name");
String *wrapname = Getattr(n, "wrap:name");
if (!addSymbol(wrapname, n))
@@ -803,6 +806,7 @@
String *mangled_classname = 0;
String *real_classname = 0;
+ constructor_name = 0;
have_constructor = 0;
have_destructor = 0;
destructor_action = 0;
@@ -925,10 +929,13 @@
Printv(f_wrappers, "swig_lua_class _wrap_class_", mangled_classname, " = { \"", class_name, "\", &SWIGTYPE", SwigType_manglestr(t), ",", NIL);
if (have_constructor) {
- Printf(f_wrappers, "%s", Swig_name_wrapper(Swig_name_construct(class_name)));
+ Printf(f_wrappers, "%s", Swig_name_wrapper(Swig_name_construct(constructor_name)));
+ Delete(constructor_name);
+ constructor_name = 0;
} else {
Printf(f_wrappers, "0");
}
+
if (have_destructor) {
Printv(f_wrappers, ", swig_delete_", class_name, NIL);
} else {
@@ -948,6 +955,7 @@
virtual int memberfunctionHandler(Node *n) {
String *name = Getattr(n, "name");
String *iname = GetChar(n, "sym:name");
+//Printf(stdout,"memberfunctionHandler %s %s\n",name,iname);
String *realname, *rname;
@@ -992,7 +1000,9 @@
* ------------------------------------------------------------ */
virtual int constructorHandler(Node *n) {
+ REPORT("constructorHandler", n);
Language::constructorHandler(n);
+ constructor_name = NewString(Getattr(n, "sym:name"));
have_constructor = 1;
return SWIG_OK;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|