FS-10427: move libesl to use swig3.0 so we can reswig on debian9

This commit is contained in:
Mike Jerris 2017-06-27 12:10:04 -05:00
parent 10e7e3429b
commit 3347820c1e
33 changed files with 2168 additions and 1145 deletions

3
libs/esl/.gitignore vendored
View File

@ -10,3 +10,6 @@ Makefile.in
!python/Makefile !python/Makefile
!ruby/Makefile !ruby/Makefile
!tcl/Makefile !tcl/Makefile
java/classes/org/
java/esl.jar

View File

@ -5,7 +5,7 @@ CLASSES=org/freeswitch/esl/*
all: esl.jar all: esl.jar
esl_wrap.cpp: esl_wrap.cpp:
swig2.0 -module esl -java -c++ $(LOCAL_CFLAGS) -package org.freeswitch.esl -outdir org/freeswitch/esl -o esl_wrap.cpp ../ESL.i swig3.0 -module esl -java -c++ $(LOCAL_CFLAGS) -package org.freeswitch.esl -outdir org/freeswitch/esl -o esl_wrap.cpp ../ESL.i
esl_wrap.o: esl_wrap.cpp esl_wrap.o: esl_wrap.cpp
$(CXX) $(CXX_CFLAGS) $(LOCAL_CFLAGS) $(CXXFLAGS) $(GCC_WARNING_JUNK) $(PERL_INC) -c esl_wrap.cpp -o esl_wrap.o $(CXX) $(CXX_CFLAGS) $(LOCAL_CFLAGS) $(CXXFLAGS) $(GCC_WARNING_JUNK) $(PERL_INC) -c esl_wrap.cpp -o esl_wrap.o

View File

@ -1,6 +1,6 @@
/* ---------------------------------------------------------------------------- /* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org). * This file was automatically generated by SWIG (http://www.swig.org).
* Version 2.0.12 * Version 3.0.2
* *
* This file is not intended to be easily readable and contains a number of * This file is not intended to be easily readable and contains a number of
* coding conventions designed to improve portability and efficiency. Do not make * coding conventions designed to improve portability and efficiency. Do not make

View File

@ -1,6 +1,6 @@
/* ---------------------------------------------------------------------------- /* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org). * This file was automatically generated by SWIG (http://www.swig.org).
* Version 2.0.12 * Version 3.0.2
* *
* Do not make changes to this file unless you know what you are doing--modify * Do not make changes to this file unless you know what you are doing--modify
* the SWIG interface file instead. * the SWIG interface file instead.

View File

@ -1,6 +1,6 @@
/* ---------------------------------------------------------------------------- /* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org). * This file was automatically generated by SWIG (http://www.swig.org).
* Version 2.0.12 * Version 3.0.2
* *
* Do not make changes to this file unless you know what you are doing--modify * Do not make changes to this file unless you know what you are doing--modify
* the SWIG interface file instead. * the SWIG interface file instead.

View File

@ -1,6 +1,6 @@
/* ---------------------------------------------------------------------------- /* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org). * This file was automatically generated by SWIG (http://www.swig.org).
* Version 2.0.12 * Version 3.0.2
* *
* Do not make changes to this file unless you know what you are doing--modify * Do not make changes to this file unless you know what you are doing--modify
* the SWIG interface file instead. * the SWIG interface file instead.

View File

@ -1,6 +1,6 @@
/* ---------------------------------------------------------------------------- /* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org). * This file was automatically generated by SWIG (http://www.swig.org).
* Version 2.0.12 * Version 3.0.2
* *
* Do not make changes to this file unless you know what you are doing--modify * Do not make changes to this file unless you know what you are doing--modify
* the SWIG interface file instead. * the SWIG interface file instead.

View File

@ -1,6 +1,6 @@
/* ---------------------------------------------------------------------------- /* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org). * This file was automatically generated by SWIG (http://www.swig.org).
* Version 2.0.12 * Version 3.0.2
* *
* Do not make changes to this file unless you know what you are doing--modify * Do not make changes to this file unless you know what you are doing--modify
* the SWIG interface file instead. * the SWIG interface file instead.

View File

@ -1,6 +1,6 @@
/* ---------------------------------------------------------------------------- /* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org). * This file was automatically generated by SWIG (http://www.swig.org).
* Version 2.0.12 * Version 3.0.2
* *
* Do not make changes to this file unless you know what you are doing--modify * Do not make changes to this file unless you know what you are doing--modify
* the SWIG interface file instead. * the SWIG interface file instead.

View File

@ -5,7 +5,7 @@ WRAP_GCC_WARNING_SILENCE=-Wno-unused-function
all: ESL.so all: ESL.so
esl_wrap.cpp: esl_wrap.cpp:
swig2.0 -module ESL -lua -c++ -DMULTIPLICITY -I../src/include -o esl_wrap.cpp ../ESL.i swig3.0 -module ESL -lua -c++ -DMULTIPLICITY -I../src/include -o esl_wrap.cpp ../ESL.i
esl_wrap.o: esl_wrap.cpp esl_wrap.o: esl_wrap.cpp
$(CXX) $(CXX_CFLAGS) $(LUA_CFLAGS) $(CXXFLAGS) $(LOCAL_CFLAGS) $(WRAP_GCC_WARNING_SILENCE) -c esl_wrap.cpp -o esl_wrap.o $(CXX) $(CXX_CFLAGS) $(LUA_CFLAGS) $(CXXFLAGS) $(LOCAL_CFLAGS) $(WRAP_GCC_WARNING_SILENCE) -c esl_wrap.cpp -o esl_wrap.o

File diff suppressed because it is too large Load Diff

View File

@ -1,15 +1,12 @@
/* ---------------------------------------------------------------------------- /* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org). * This file was automatically generated by SWIG (http://www.swig.org).
* Version 2.0.12 * Version 3.0.2
* *
* Do not make changes to this file unless you know what you are doing--modify * Do not make changes to this file unless you know what you are doing--modify
* the SWIG interface file instead. * the SWIG interface file instead.
* ----------------------------------------------------------------------------- */ * ----------------------------------------------------------------------------- */
using System;
using System.Runtime.InteropServices;
public class ESL { public class ESL {
public static void eslSetLogLevel(int level) { public static void eslSetLogLevel(int level) {
ESLPINVOKE.eslSetLogLevel(level); ESLPINVOKE.eslSetLogLevel(level);

View File

@ -1,15 +1,12 @@
/* ---------------------------------------------------------------------------- /* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org). * This file was automatically generated by SWIG (http://www.swig.org).
* Version 2.0.12 * Version 3.0.2
* *
* Do not make changes to this file unless you know what you are doing--modify * Do not make changes to this file unless you know what you are doing--modify
* the SWIG interface file instead. * the SWIG interface file instead.
* ----------------------------------------------------------------------------- */ * ----------------------------------------------------------------------------- */
using System;
using System.Runtime.InteropServices;
class ESLPINVOKE { class ESLPINVOKE {
protected class SWIGExceptionHelper { protected class SWIGExceptionHelper {
@ -33,7 +30,7 @@ class ESLPINVOKE {
static ExceptionArgumentDelegate argumentNullDelegate = new ExceptionArgumentDelegate(SetPendingArgumentNullException); static ExceptionArgumentDelegate argumentNullDelegate = new ExceptionArgumentDelegate(SetPendingArgumentNullException);
static ExceptionArgumentDelegate argumentOutOfRangeDelegate = new ExceptionArgumentDelegate(SetPendingArgumentOutOfRangeException); static ExceptionArgumentDelegate argumentOutOfRangeDelegate = new ExceptionArgumentDelegate(SetPendingArgumentOutOfRangeException);
[DllImport("ESL", EntryPoint="SWIGRegisterExceptionCallbacks_ESL")] [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="SWIGRegisterExceptionCallbacks_ESL")]
public static extern void SWIGRegisterExceptionCallbacks_ESL( public static extern void SWIGRegisterExceptionCallbacks_ESL(
ExceptionDelegate applicationDelegate, ExceptionDelegate applicationDelegate,
ExceptionDelegate arithmeticDelegate, ExceptionDelegate arithmeticDelegate,
@ -47,58 +44,58 @@ class ESLPINVOKE {
ExceptionDelegate overflowDelegate, ExceptionDelegate overflowDelegate,
ExceptionDelegate systemExceptionDelegate); ExceptionDelegate systemExceptionDelegate);
[DllImport("ESL", EntryPoint="SWIGRegisterExceptionArgumentCallbacks_ESL")] [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="SWIGRegisterExceptionArgumentCallbacks_ESL")]
public static extern void SWIGRegisterExceptionCallbacksArgument_ESL( public static extern void SWIGRegisterExceptionCallbacksArgument_ESL(
ExceptionArgumentDelegate argumentDelegate, ExceptionArgumentDelegate argumentDelegate,
ExceptionArgumentDelegate argumentNullDelegate, ExceptionArgumentDelegate argumentNullDelegate,
ExceptionArgumentDelegate argumentOutOfRangeDelegate); ExceptionArgumentDelegate argumentOutOfRangeDelegate);
static void SetPendingApplicationException(string message) { static void SetPendingApplicationException(string message) {
SWIGPendingException.Set(new System.ApplicationException(message, SWIGPendingException.Retrieve())); SWIGPendingException.Set(new global::System.ApplicationException(message, SWIGPendingException.Retrieve()));
} }
static void SetPendingArithmeticException(string message) { static void SetPendingArithmeticException(string message) {
SWIGPendingException.Set(new System.ArithmeticException(message, SWIGPendingException.Retrieve())); SWIGPendingException.Set(new global::System.ArithmeticException(message, SWIGPendingException.Retrieve()));
} }
static void SetPendingDivideByZeroException(string message) { static void SetPendingDivideByZeroException(string message) {
SWIGPendingException.Set(new System.DivideByZeroException(message, SWIGPendingException.Retrieve())); SWIGPendingException.Set(new global::System.DivideByZeroException(message, SWIGPendingException.Retrieve()));
} }
static void SetPendingIndexOutOfRangeException(string message) { static void SetPendingIndexOutOfRangeException(string message) {
SWIGPendingException.Set(new System.IndexOutOfRangeException(message, SWIGPendingException.Retrieve())); SWIGPendingException.Set(new global::System.IndexOutOfRangeException(message, SWIGPendingException.Retrieve()));
} }
static void SetPendingInvalidCastException(string message) { static void SetPendingInvalidCastException(string message) {
SWIGPendingException.Set(new System.InvalidCastException(message, SWIGPendingException.Retrieve())); SWIGPendingException.Set(new global::System.InvalidCastException(message, SWIGPendingException.Retrieve()));
} }
static void SetPendingInvalidOperationException(string message) { static void SetPendingInvalidOperationException(string message) {
SWIGPendingException.Set(new System.InvalidOperationException(message, SWIGPendingException.Retrieve())); SWIGPendingException.Set(new global::System.InvalidOperationException(message, SWIGPendingException.Retrieve()));
} }
static void SetPendingIOException(string message) { static void SetPendingIOException(string message) {
SWIGPendingException.Set(new System.IO.IOException(message, SWIGPendingException.Retrieve())); SWIGPendingException.Set(new global::System.IO.IOException(message, SWIGPendingException.Retrieve()));
} }
static void SetPendingNullReferenceException(string message) { static void SetPendingNullReferenceException(string message) {
SWIGPendingException.Set(new System.NullReferenceException(message, SWIGPendingException.Retrieve())); SWIGPendingException.Set(new global::System.NullReferenceException(message, SWIGPendingException.Retrieve()));
} }
static void SetPendingOutOfMemoryException(string message) { static void SetPendingOutOfMemoryException(string message) {
SWIGPendingException.Set(new System.OutOfMemoryException(message, SWIGPendingException.Retrieve())); SWIGPendingException.Set(new global::System.OutOfMemoryException(message, SWIGPendingException.Retrieve()));
} }
static void SetPendingOverflowException(string message) { static void SetPendingOverflowException(string message) {
SWIGPendingException.Set(new System.OverflowException(message, SWIGPendingException.Retrieve())); SWIGPendingException.Set(new global::System.OverflowException(message, SWIGPendingException.Retrieve()));
} }
static void SetPendingSystemException(string message) { static void SetPendingSystemException(string message) {
SWIGPendingException.Set(new System.SystemException(message, SWIGPendingException.Retrieve())); SWIGPendingException.Set(new global::System.SystemException(message, SWIGPendingException.Retrieve()));
} }
static void SetPendingArgumentException(string message, string paramName) { static void SetPendingArgumentException(string message, string paramName) {
SWIGPendingException.Set(new System.ArgumentException(message, paramName, SWIGPendingException.Retrieve())); SWIGPendingException.Set(new global::System.ArgumentException(message, paramName, SWIGPendingException.Retrieve()));
} }
static void SetPendingArgumentNullException(string message, string paramName) { static void SetPendingArgumentNullException(string message, string paramName) {
Exception e = SWIGPendingException.Retrieve(); global::System.Exception e = SWIGPendingException.Retrieve();
if (e != null) message = message + " Inner Exception: " + e.Message; if (e != null) message = message + " Inner Exception: " + e.Message;
SWIGPendingException.Set(new System.ArgumentNullException(paramName, message)); SWIGPendingException.Set(new global::System.ArgumentNullException(paramName, message));
} }
static void SetPendingArgumentOutOfRangeException(string message, string paramName) { static void SetPendingArgumentOutOfRangeException(string message, string paramName) {
Exception e = SWIGPendingException.Retrieve(); global::System.Exception e = SWIGPendingException.Retrieve();
if (e != null) message = message + " Inner Exception: " + e.Message; if (e != null) message = message + " Inner Exception: " + e.Message;
SWIGPendingException.Set(new System.ArgumentOutOfRangeException(paramName, message)); SWIGPendingException.Set(new global::System.ArgumentOutOfRangeException(paramName, message));
} }
static SWIGExceptionHelper() { static SWIGExceptionHelper() {
@ -125,8 +122,8 @@ class ESLPINVOKE {
protected static SWIGExceptionHelper swigExceptionHelper = new SWIGExceptionHelper(); protected static SWIGExceptionHelper swigExceptionHelper = new SWIGExceptionHelper();
public class SWIGPendingException { public class SWIGPendingException {
[ThreadStatic] [global::System.ThreadStatic]
private static Exception pendingException = null; private static global::System.Exception pendingException = null;
private static int numExceptionsPending = 0; private static int numExceptionsPending = 0;
public static bool Pending { public static bool Pending {
@ -139,17 +136,17 @@ class ESLPINVOKE {
} }
} }
public static void Set(Exception e) { public static void Set(global::System.Exception e) {
if (pendingException != null) if (pendingException != null)
throw new ApplicationException("FATAL: An earlier pending exception from unmanaged code was missed and thus not thrown (" + pendingException.ToString() + ")", e); throw new global::System.ApplicationException("FATAL: An earlier pending exception from unmanaged code was missed and thus not thrown (" + pendingException.ToString() + ")", e);
pendingException = e; pendingException = e;
lock(typeof(ESLPINVOKE)) { lock(typeof(ESLPINVOKE)) {
numExceptionsPending++; numExceptionsPending++;
} }
} }
public static Exception Retrieve() { public static global::System.Exception Retrieve() {
Exception e = null; global::System.Exception e = null;
if (numExceptionsPending > 0) { if (numExceptionsPending > 0) {
if (pendingException != null) { if (pendingException != null) {
e = pendingException; e = pendingException;
@ -169,7 +166,7 @@ class ESLPINVOKE {
public delegate string SWIGStringDelegate(string message); public delegate string SWIGStringDelegate(string message);
static SWIGStringDelegate stringDelegate = new SWIGStringDelegate(CreateString); static SWIGStringDelegate stringDelegate = new SWIGStringDelegate(CreateString);
[DllImport("ESL", EntryPoint="SWIGRegisterStringCallback_ESL")] [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="SWIGRegisterStringCallback_ESL")]
public static extern void SWIGRegisterStringCallback_ESL(SWIGStringDelegate stringDelegate); public static extern void SWIGRegisterStringCallback_ESL(SWIGStringDelegate stringDelegate);
static string CreateString(string cString) { static string CreateString(string cString) {
@ -188,144 +185,144 @@ class ESLPINVOKE {
} }
[DllImport("ESL", EntryPoint="CSharp_ESLevent_Event_set")] [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLevent_Event_set")]
public static extern void ESLevent_Event_set(HandleRef jarg1, HandleRef jarg2); public static extern void ESLevent_Event_set(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
[DllImport("ESL", EntryPoint="CSharp_ESLevent_Event_get")] [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLevent_Event_get")]
public static extern IntPtr ESLevent_Event_get(HandleRef jarg1); public static extern global::System.IntPtr ESLevent_Event_get(global::System.Runtime.InteropServices.HandleRef jarg1);
[DllImport("ESL", EntryPoint="CSharp_ESLevent_SerializedString_set")] [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLevent_SerializedString_set")]
public static extern void ESLevent_SerializedString_set(HandleRef jarg1, string jarg2); public static extern void ESLevent_SerializedString_set(global::System.Runtime.InteropServices.HandleRef jarg1, string jarg2);
[DllImport("ESL", EntryPoint="CSharp_ESLevent_SerializedString_get")] [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLevent_SerializedString_get")]
public static extern string ESLevent_SerializedString_get(HandleRef jarg1); public static extern string ESLevent_SerializedString_get(global::System.Runtime.InteropServices.HandleRef jarg1);
[DllImport("ESL", EntryPoint="CSharp_ESLevent_Mine_set")] [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLevent_Mine_set")]
public static extern void ESLevent_Mine_set(HandleRef jarg1, int jarg2); public static extern void ESLevent_Mine_set(global::System.Runtime.InteropServices.HandleRef jarg1, int jarg2);
[DllImport("ESL", EntryPoint="CSharp_ESLevent_Mine_get")] [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLevent_Mine_get")]
public static extern int ESLevent_Mine_get(HandleRef jarg1); public static extern int ESLevent_Mine_get(global::System.Runtime.InteropServices.HandleRef jarg1);
[DllImport("ESL", EntryPoint="CSharp_new_ESLevent__SWIG_0")] [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_new_ESLevent__SWIG_0")]
public static extern IntPtr new_ESLevent__SWIG_0(string jarg1, string jarg2); public static extern global::System.IntPtr new_ESLevent__SWIG_0(string jarg1, string jarg2);
[DllImport("ESL", EntryPoint="CSharp_new_ESLevent__SWIG_1")] [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_new_ESLevent__SWIG_1")]
public static extern IntPtr new_ESLevent__SWIG_1(HandleRef jarg1, int jarg2); public static extern global::System.IntPtr new_ESLevent__SWIG_1(global::System.Runtime.InteropServices.HandleRef jarg1, int jarg2);
[DllImport("ESL", EntryPoint="CSharp_new_ESLevent__SWIG_2")] [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_new_ESLevent__SWIG_2")]
public static extern IntPtr new_ESLevent__SWIG_2(HandleRef jarg1); public static extern global::System.IntPtr new_ESLevent__SWIG_2(global::System.Runtime.InteropServices.HandleRef jarg1);
[DllImport("ESL", EntryPoint="CSharp_delete_ESLevent")] [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_delete_ESLevent")]
public static extern void delete_ESLevent(HandleRef jarg1); public static extern void delete_ESLevent(global::System.Runtime.InteropServices.HandleRef jarg1);
[DllImport("ESL", EntryPoint="CSharp_ESLevent_Serialize")] [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLevent_Serialize")]
public static extern string ESLevent_Serialize(HandleRef jarg1, string jarg2); public static extern string ESLevent_Serialize(global::System.Runtime.InteropServices.HandleRef jarg1, string jarg2);
[DllImport("ESL", EntryPoint="CSharp_ESLevent_SetPriority")] [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLevent_SetPriority")]
public static extern bool ESLevent_SetPriority(HandleRef jarg1, HandleRef jarg2); public static extern bool ESLevent_SetPriority(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
[DllImport("ESL", EntryPoint="CSharp_ESLevent_GetHeader")] [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLevent_GetHeader")]
public static extern string ESLevent_GetHeader(HandleRef jarg1, string jarg2, int jarg3); public static extern string ESLevent_GetHeader(global::System.Runtime.InteropServices.HandleRef jarg1, string jarg2, int jarg3);
[DllImport("ESL", EntryPoint="CSharp_ESLevent_GetBody")] [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLevent_GetBody")]
public static extern string ESLevent_GetBody(HandleRef jarg1); public static extern string ESLevent_GetBody(global::System.Runtime.InteropServices.HandleRef jarg1);
[DllImport("ESL", EntryPoint="CSharp_ESLevent_getType")] [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLevent_getType")]
public static extern string ESLevent_getType(HandleRef jarg1); public static extern string ESLevent_getType(global::System.Runtime.InteropServices.HandleRef jarg1);
[DllImport("ESL", EntryPoint="CSharp_ESLevent_AddBody")] [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLevent_AddBody")]
public static extern bool ESLevent_AddBody(HandleRef jarg1, string jarg2); public static extern bool ESLevent_AddBody(global::System.Runtime.InteropServices.HandleRef jarg1, string jarg2);
[DllImport("ESL", EntryPoint="CSharp_ESLevent_AddHeader")] [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLevent_AddHeader")]
public static extern bool ESLevent_AddHeader(HandleRef jarg1, string jarg2, string jarg3); public static extern bool ESLevent_AddHeader(global::System.Runtime.InteropServices.HandleRef jarg1, string jarg2, string jarg3);
[DllImport("ESL", EntryPoint="CSharp_ESLevent_pushHeader")] [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLevent_pushHeader")]
public static extern bool ESLevent_pushHeader(HandleRef jarg1, string jarg2, string jarg3); public static extern bool ESLevent_pushHeader(global::System.Runtime.InteropServices.HandleRef jarg1, string jarg2, string jarg3);
[DllImport("ESL", EntryPoint="CSharp_ESLevent_unshiftHeader")] [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLevent_unshiftHeader")]
public static extern bool ESLevent_unshiftHeader(HandleRef jarg1, string jarg2, string jarg3); public static extern bool ESLevent_unshiftHeader(global::System.Runtime.InteropServices.HandleRef jarg1, string jarg2, string jarg3);
[DllImport("ESL", EntryPoint="CSharp_ESLevent_DelHeader")] [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLevent_DelHeader")]
public static extern bool ESLevent_DelHeader(HandleRef jarg1, string jarg2); public static extern bool ESLevent_DelHeader(global::System.Runtime.InteropServices.HandleRef jarg1, string jarg2);
[DllImport("ESL", EntryPoint="CSharp_ESLevent_FirstHeader")] [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLevent_FirstHeader")]
public static extern string ESLevent_FirstHeader(HandleRef jarg1); public static extern string ESLevent_FirstHeader(global::System.Runtime.InteropServices.HandleRef jarg1);
[DllImport("ESL", EntryPoint="CSharp_ESLevent_NextHeader")] [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLevent_NextHeader")]
public static extern string ESLevent_NextHeader(HandleRef jarg1); public static extern string ESLevent_NextHeader(global::System.Runtime.InteropServices.HandleRef jarg1);
[DllImport("ESL", EntryPoint="CSharp_new_ESLconnection__SWIG_0")] [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_new_ESLconnection__SWIG_0")]
public static extern IntPtr new_ESLconnection__SWIG_0(string jarg1, int jarg2, string jarg3, string jarg4); public static extern global::System.IntPtr new_ESLconnection__SWIG_0(string jarg1, int jarg2, string jarg3, string jarg4);
[DllImport("ESL", EntryPoint="CSharp_new_ESLconnection__SWIG_1")] [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_new_ESLconnection__SWIG_1")]
public static extern IntPtr new_ESLconnection__SWIG_1(string jarg1, int jarg2, string jarg3); public static extern global::System.IntPtr new_ESLconnection__SWIG_1(string jarg1, int jarg2, string jarg3);
[DllImport("ESL", EntryPoint="CSharp_new_ESLconnection__SWIG_2")] [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_new_ESLconnection__SWIG_2")]
public static extern IntPtr new_ESLconnection__SWIG_2(string jarg1, string jarg2, string jarg3, string jarg4); public static extern global::System.IntPtr new_ESLconnection__SWIG_2(string jarg1, string jarg2, string jarg3, string jarg4);
[DllImport("ESL", EntryPoint="CSharp_new_ESLconnection__SWIG_3")] [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_new_ESLconnection__SWIG_3")]
public static extern IntPtr new_ESLconnection__SWIG_3(string jarg1, string jarg2, string jarg3); public static extern global::System.IntPtr new_ESLconnection__SWIG_3(string jarg1, string jarg2, string jarg3);
[DllImport("ESL", EntryPoint="CSharp_new_ESLconnection__SWIG_4")] [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_new_ESLconnection__SWIG_4")]
public static extern IntPtr new_ESLconnection__SWIG_4(int jarg1); public static extern global::System.IntPtr new_ESLconnection__SWIG_4(int jarg1);
[DllImport("ESL", EntryPoint="CSharp_delete_ESLconnection")] [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_delete_ESLconnection")]
public static extern void delete_ESLconnection(HandleRef jarg1); public static extern void delete_ESLconnection(global::System.Runtime.InteropServices.HandleRef jarg1);
[DllImport("ESL", EntryPoint="CSharp_ESLconnection_SocketDescriptor")] [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLconnection_SocketDescriptor")]
public static extern int ESLconnection_SocketDescriptor(HandleRef jarg1); public static extern int ESLconnection_SocketDescriptor(global::System.Runtime.InteropServices.HandleRef jarg1);
[DllImport("ESL", EntryPoint="CSharp_ESLconnection_Connected")] [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLconnection_Connected")]
public static extern int ESLconnection_Connected(HandleRef jarg1); public static extern int ESLconnection_Connected(global::System.Runtime.InteropServices.HandleRef jarg1);
[DllImport("ESL", EntryPoint="CSharp_ESLconnection_GetInfo")] [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLconnection_GetInfo")]
public static extern IntPtr ESLconnection_GetInfo(HandleRef jarg1); public static extern global::System.IntPtr ESLconnection_GetInfo(global::System.Runtime.InteropServices.HandleRef jarg1);
[DllImport("ESL", EntryPoint="CSharp_ESLconnection_Send")] [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLconnection_Send")]
public static extern int ESLconnection_Send(HandleRef jarg1, string jarg2); public static extern int ESLconnection_Send(global::System.Runtime.InteropServices.HandleRef jarg1, string jarg2);
[DllImport("ESL", EntryPoint="CSharp_ESLconnection_SendRecv")] [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLconnection_SendRecv")]
public static extern IntPtr ESLconnection_SendRecv(HandleRef jarg1, string jarg2); public static extern global::System.IntPtr ESLconnection_SendRecv(global::System.Runtime.InteropServices.HandleRef jarg1, string jarg2);
[DllImport("ESL", EntryPoint="CSharp_ESLconnection_Api")] [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLconnection_Api")]
public static extern IntPtr ESLconnection_Api(HandleRef jarg1, string jarg2, string jarg3); public static extern global::System.IntPtr ESLconnection_Api(global::System.Runtime.InteropServices.HandleRef jarg1, string jarg2, string jarg3);
[DllImport("ESL", EntryPoint="CSharp_ESLconnection_Bgapi")] [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLconnection_Bgapi")]
public static extern IntPtr ESLconnection_Bgapi(HandleRef jarg1, string jarg2, string jarg3, string jarg4); public static extern global::System.IntPtr ESLconnection_Bgapi(global::System.Runtime.InteropServices.HandleRef jarg1, string jarg2, string jarg3, string jarg4);
[DllImport("ESL", EntryPoint="CSharp_ESLconnection_SendEvent")] [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLconnection_SendEvent")]
public static extern IntPtr ESLconnection_SendEvent(HandleRef jarg1, HandleRef jarg2); public static extern global::System.IntPtr ESLconnection_SendEvent(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
[DllImport("ESL", EntryPoint="CSharp_ESLconnection_sendMSG")] [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLconnection_sendMSG")]
public static extern int ESLconnection_sendMSG(HandleRef jarg1, HandleRef jarg2, string jarg3); public static extern int ESLconnection_sendMSG(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2, string jarg3);
[DllImport("ESL", EntryPoint="CSharp_ESLconnection_RecvEvent")] [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLconnection_RecvEvent")]
public static extern IntPtr ESLconnection_RecvEvent(HandleRef jarg1); public static extern global::System.IntPtr ESLconnection_RecvEvent(global::System.Runtime.InteropServices.HandleRef jarg1);
[DllImport("ESL", EntryPoint="CSharp_ESLconnection_RecvEventTimed")] [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLconnection_RecvEventTimed")]
public static extern IntPtr ESLconnection_RecvEventTimed(HandleRef jarg1, int jarg2); public static extern global::System.IntPtr ESLconnection_RecvEventTimed(global::System.Runtime.InteropServices.HandleRef jarg1, int jarg2);
[DllImport("ESL", EntryPoint="CSharp_ESLconnection_Filter")] [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLconnection_Filter")]
public static extern IntPtr ESLconnection_Filter(HandleRef jarg1, string jarg2, string jarg3); public static extern global::System.IntPtr ESLconnection_Filter(global::System.Runtime.InteropServices.HandleRef jarg1, string jarg2, string jarg3);
[DllImport("ESL", EntryPoint="CSharp_ESLconnection_Events")] [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLconnection_Events")]
public static extern int ESLconnection_Events(HandleRef jarg1, string jarg2, string jarg3); public static extern int ESLconnection_Events(global::System.Runtime.InteropServices.HandleRef jarg1, string jarg2, string jarg3);
[DllImport("ESL", EntryPoint="CSharp_ESLconnection_Execute")] [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLconnection_Execute")]
public static extern IntPtr ESLconnection_Execute(HandleRef jarg1, string jarg2, string jarg3, string jarg4); public static extern global::System.IntPtr ESLconnection_Execute(global::System.Runtime.InteropServices.HandleRef jarg1, string jarg2, string jarg3, string jarg4);
[DllImport("ESL", EntryPoint="CSharp_ESLconnection_ExecuteAsync")] [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLconnection_ExecuteAsync")]
public static extern IntPtr ESLconnection_ExecuteAsync(HandleRef jarg1, string jarg2, string jarg3, string jarg4); public static extern global::System.IntPtr ESLconnection_ExecuteAsync(global::System.Runtime.InteropServices.HandleRef jarg1, string jarg2, string jarg3, string jarg4);
[DllImport("ESL", EntryPoint="CSharp_ESLconnection_SetAsyncExecute")] [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLconnection_SetAsyncExecute")]
public static extern int ESLconnection_SetAsyncExecute(HandleRef jarg1, string jarg2); public static extern int ESLconnection_SetAsyncExecute(global::System.Runtime.InteropServices.HandleRef jarg1, string jarg2);
[DllImport("ESL", EntryPoint="CSharp_ESLconnection_SetEventLock")] [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLconnection_SetEventLock")]
public static extern int ESLconnection_SetEventLock(HandleRef jarg1, string jarg2); public static extern int ESLconnection_SetEventLock(global::System.Runtime.InteropServices.HandleRef jarg1, string jarg2);
[DllImport("ESL", EntryPoint="CSharp_ESLconnection_Disconnect")] [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLconnection_Disconnect")]
public static extern int ESLconnection_Disconnect(HandleRef jarg1); public static extern int ESLconnection_Disconnect(global::System.Runtime.InteropServices.HandleRef jarg1);
[DllImport("ESL", EntryPoint="CSharp_eslSetLogLevel")] [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_eslSetLogLevel")]
public static extern void eslSetLogLevel(int jarg1); public static extern void eslSetLogLevel(int jarg1);
} }

View File

@ -1,26 +1,23 @@
/* ---------------------------------------------------------------------------- /* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org). * This file was automatically generated by SWIG (http://www.swig.org).
* Version 2.0.12 * Version 3.0.2
* *
* Do not make changes to this file unless you know what you are doing--modify * Do not make changes to this file unless you know what you are doing--modify
* the SWIG interface file instead. * the SWIG interface file instead.
* ----------------------------------------------------------------------------- */ * ----------------------------------------------------------------------------- */
using System; public class ESLconnection : global::System.IDisposable {
using System.Runtime.InteropServices; private global::System.Runtime.InteropServices.HandleRef swigCPtr;
public class ESLconnection : IDisposable {
private HandleRef swigCPtr;
protected bool swigCMemOwn; protected bool swigCMemOwn;
internal ESLconnection(IntPtr cPtr, bool cMemoryOwn) { internal ESLconnection(global::System.IntPtr cPtr, bool cMemoryOwn) {
swigCMemOwn = cMemoryOwn; swigCMemOwn = cMemoryOwn;
swigCPtr = new HandleRef(this, cPtr); swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
} }
internal static HandleRef getCPtr(ESLconnection obj) { internal static global::System.Runtime.InteropServices.HandleRef getCPtr(ESLconnection obj) {
return (obj == null) ? new HandleRef(null, IntPtr.Zero) : obj.swigCPtr; return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
} }
~ESLconnection() { ~ESLconnection() {
@ -29,14 +26,14 @@ public class ESLconnection : IDisposable {
public virtual void Dispose() { public virtual void Dispose() {
lock(this) { lock(this) {
if (swigCPtr.Handle != IntPtr.Zero) { if (swigCPtr.Handle != global::System.IntPtr.Zero) {
if (swigCMemOwn) { if (swigCMemOwn) {
swigCMemOwn = false; swigCMemOwn = false;
ESLPINVOKE.delete_ESLconnection(swigCPtr); ESLPINVOKE.delete_ESLconnection(swigCPtr);
} }
swigCPtr = new HandleRef(null, IntPtr.Zero); swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
} }
GC.SuppressFinalize(this); global::System.GC.SuppressFinalize(this);
} }
} }
@ -66,8 +63,8 @@ public class ESLconnection : IDisposable {
} }
public ESLevent GetInfo() { public ESLevent GetInfo() {
IntPtr cPtr = ESLPINVOKE.ESLconnection_GetInfo(swigCPtr); global::System.IntPtr cPtr = ESLPINVOKE.ESLconnection_GetInfo(swigCPtr);
ESLevent ret = (cPtr == IntPtr.Zero) ? null : new ESLevent(cPtr, true); ESLevent ret = (cPtr == global::System.IntPtr.Zero) ? null : new ESLevent(cPtr, true);
return ret; return ret;
} }
@ -77,26 +74,26 @@ public class ESLconnection : IDisposable {
} }
public ESLevent SendRecv(string cmd) { public ESLevent SendRecv(string cmd) {
IntPtr cPtr = ESLPINVOKE.ESLconnection_SendRecv(swigCPtr, cmd); global::System.IntPtr cPtr = ESLPINVOKE.ESLconnection_SendRecv(swigCPtr, cmd);
ESLevent ret = (cPtr == IntPtr.Zero) ? null : new ESLevent(cPtr, true); ESLevent ret = (cPtr == global::System.IntPtr.Zero) ? null : new ESLevent(cPtr, true);
return ret; return ret;
} }
public ESLevent Api(string cmd, string arg) { public ESLevent Api(string cmd, string arg) {
IntPtr cPtr = ESLPINVOKE.ESLconnection_Api(swigCPtr, cmd, arg); global::System.IntPtr cPtr = ESLPINVOKE.ESLconnection_Api(swigCPtr, cmd, arg);
ESLevent ret = (cPtr == IntPtr.Zero) ? null : new ESLevent(cPtr, true); ESLevent ret = (cPtr == global::System.IntPtr.Zero) ? null : new ESLevent(cPtr, true);
return ret; return ret;
} }
public ESLevent Bgapi(string cmd, string arg, string job_uuid) { public ESLevent Bgapi(string cmd, string arg, string job_uuid) {
IntPtr cPtr = ESLPINVOKE.ESLconnection_Bgapi(swigCPtr, cmd, arg, job_uuid); global::System.IntPtr cPtr = ESLPINVOKE.ESLconnection_Bgapi(swigCPtr, cmd, arg, job_uuid);
ESLevent ret = (cPtr == IntPtr.Zero) ? null : new ESLevent(cPtr, true); ESLevent ret = (cPtr == global::System.IntPtr.Zero) ? null : new ESLevent(cPtr, true);
return ret; return ret;
} }
public ESLevent SendEvent(ESLevent send_me) { public ESLevent SendEvent(ESLevent send_me) {
IntPtr cPtr = ESLPINVOKE.ESLconnection_SendEvent(swigCPtr, ESLevent.getCPtr(send_me)); global::System.IntPtr cPtr = ESLPINVOKE.ESLconnection_SendEvent(swigCPtr, ESLevent.getCPtr(send_me));
ESLevent ret = (cPtr == IntPtr.Zero) ? null : new ESLevent(cPtr, true); ESLevent ret = (cPtr == global::System.IntPtr.Zero) ? null : new ESLevent(cPtr, true);
return ret; return ret;
} }
@ -106,20 +103,20 @@ public class ESLconnection : IDisposable {
} }
public ESLevent RecvEvent() { public ESLevent RecvEvent() {
IntPtr cPtr = ESLPINVOKE.ESLconnection_RecvEvent(swigCPtr); global::System.IntPtr cPtr = ESLPINVOKE.ESLconnection_RecvEvent(swigCPtr);
ESLevent ret = (cPtr == IntPtr.Zero) ? null : new ESLevent(cPtr, true); ESLevent ret = (cPtr == global::System.IntPtr.Zero) ? null : new ESLevent(cPtr, true);
return ret; return ret;
} }
public ESLevent RecvEventTimed(int ms) { public ESLevent RecvEventTimed(int ms) {
IntPtr cPtr = ESLPINVOKE.ESLconnection_RecvEventTimed(swigCPtr, ms); global::System.IntPtr cPtr = ESLPINVOKE.ESLconnection_RecvEventTimed(swigCPtr, ms);
ESLevent ret = (cPtr == IntPtr.Zero) ? null : new ESLevent(cPtr, true); ESLevent ret = (cPtr == global::System.IntPtr.Zero) ? null : new ESLevent(cPtr, true);
return ret; return ret;
} }
public ESLevent Filter(string header, string value) { public ESLevent Filter(string header, string value) {
IntPtr cPtr = ESLPINVOKE.ESLconnection_Filter(swigCPtr, header, value); global::System.IntPtr cPtr = ESLPINVOKE.ESLconnection_Filter(swigCPtr, header, value);
ESLevent ret = (cPtr == IntPtr.Zero) ? null : new ESLevent(cPtr, true); ESLevent ret = (cPtr == global::System.IntPtr.Zero) ? null : new ESLevent(cPtr, true);
return ret; return ret;
} }
@ -129,14 +126,14 @@ public class ESLconnection : IDisposable {
} }
public ESLevent Execute(string app, string arg, string uuid) { public ESLevent Execute(string app, string arg, string uuid) {
IntPtr cPtr = ESLPINVOKE.ESLconnection_Execute(swigCPtr, app, arg, uuid); global::System.IntPtr cPtr = ESLPINVOKE.ESLconnection_Execute(swigCPtr, app, arg, uuid);
ESLevent ret = (cPtr == IntPtr.Zero) ? null : new ESLevent(cPtr, true); ESLevent ret = (cPtr == global::System.IntPtr.Zero) ? null : new ESLevent(cPtr, true);
return ret; return ret;
} }
public ESLevent ExecuteAsync(string app, string arg, string uuid) { public ESLevent ExecuteAsync(string app, string arg, string uuid) {
IntPtr cPtr = ESLPINVOKE.ESLconnection_ExecuteAsync(swigCPtr, app, arg, uuid); global::System.IntPtr cPtr = ESLPINVOKE.ESLconnection_ExecuteAsync(swigCPtr, app, arg, uuid);
ESLevent ret = (cPtr == IntPtr.Zero) ? null : new ESLevent(cPtr, true); ESLevent ret = (cPtr == global::System.IntPtr.Zero) ? null : new ESLevent(cPtr, true);
return ret; return ret;
} }

View File

@ -1,26 +1,23 @@
/* ---------------------------------------------------------------------------- /* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org). * This file was automatically generated by SWIG (http://www.swig.org).
* Version 2.0.12 * Version 3.0.2
* *
* Do not make changes to this file unless you know what you are doing--modify * Do not make changes to this file unless you know what you are doing--modify
* the SWIG interface file instead. * the SWIG interface file instead.
* ----------------------------------------------------------------------------- */ * ----------------------------------------------------------------------------- */
using System; public class ESLevent : global::System.IDisposable {
using System.Runtime.InteropServices; private global::System.Runtime.InteropServices.HandleRef swigCPtr;
public class ESLevent : IDisposable {
private HandleRef swigCPtr;
protected bool swigCMemOwn; protected bool swigCMemOwn;
internal ESLevent(IntPtr cPtr, bool cMemoryOwn) { internal ESLevent(global::System.IntPtr cPtr, bool cMemoryOwn) {
swigCMemOwn = cMemoryOwn; swigCMemOwn = cMemoryOwn;
swigCPtr = new HandleRef(this, cPtr); swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
} }
internal static HandleRef getCPtr(ESLevent obj) { internal static global::System.Runtime.InteropServices.HandleRef getCPtr(ESLevent obj) {
return (obj == null) ? new HandleRef(null, IntPtr.Zero) : obj.swigCPtr; return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
} }
~ESLevent() { ~ESLevent() {
@ -29,14 +26,14 @@ public class ESLevent : IDisposable {
public virtual void Dispose() { public virtual void Dispose() {
lock(this) { lock(this) {
if (swigCPtr.Handle != IntPtr.Zero) { if (swigCPtr.Handle != global::System.IntPtr.Zero) {
if (swigCMemOwn) { if (swigCMemOwn) {
swigCMemOwn = false; swigCMemOwn = false;
ESLPINVOKE.delete_ESLevent(swigCPtr); ESLPINVOKE.delete_ESLevent(swigCPtr);
} }
swigCPtr = new HandleRef(null, IntPtr.Zero); swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
} }
GC.SuppressFinalize(this); global::System.GC.SuppressFinalize(this);
} }
} }
@ -45,8 +42,8 @@ public class ESLevent : IDisposable {
ESLPINVOKE.ESLevent_Event_set(swigCPtr, SWIGTYPE_p_esl_event_t.getCPtr(value)); ESLPINVOKE.ESLevent_Event_set(swigCPtr, SWIGTYPE_p_esl_event_t.getCPtr(value));
} }
get { get {
IntPtr cPtr = ESLPINVOKE.ESLevent_Event_get(swigCPtr); global::System.IntPtr cPtr = ESLPINVOKE.ESLevent_Event_get(swigCPtr);
SWIGTYPE_p_esl_event_t ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_esl_event_t(cPtr, false); SWIGTYPE_p_esl_event_t ret = (cPtr == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_esl_event_t(cPtr, false);
return ret; return ret;
} }
} }

View File

@ -5,7 +5,7 @@ WRAP_GCC_WARNING_SILENCE=-Wno-unused-function
all: ESL.so all: ESL.so
esl_wrap.cpp: esl_wrap.cpp:
swig2.0 -module ESL -csharp -c++ -DMULTIPLICITY -I../src/include -o esl_wrap.cpp ../ESL.i swig3.0 -module ESL -csharp -c++ -DMULTIPLICITY -I../src/include -o esl_wrap.cpp ../ESL.i
esl_wrap.o: esl_wrap.cpp esl_wrap.o: esl_wrap.cpp
$(CXX) $(CXX_CFLAGS) $(CXXFLAGS) $(LOCAL_CFLAGS) $(WRAP_GCC_WARNING_SILENCE) -c esl_wrap.cpp -o esl_wrap.o $(CXX) $(CXX_CFLAGS) $(CXXFLAGS) $(LOCAL_CFLAGS) $(WRAP_GCC_WARNING_SILENCE) -c esl_wrap.cpp -o esl_wrap.o

View File

@ -1,27 +1,24 @@
/* ---------------------------------------------------------------------------- /* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org). * This file was automatically generated by SWIG (http://www.swig.org).
* Version 2.0.12 * Version 3.0.2
* *
* Do not make changes to this file unless you know what you are doing--modify * Do not make changes to this file unless you know what you are doing--modify
* the SWIG interface file instead. * the SWIG interface file instead.
* ----------------------------------------------------------------------------- */ * ----------------------------------------------------------------------------- */
using System;
using System.Runtime.InteropServices;
public class SWIGTYPE_p_esl_event_t { public class SWIGTYPE_p_esl_event_t {
private HandleRef swigCPtr; private global::System.Runtime.InteropServices.HandleRef swigCPtr;
internal SWIGTYPE_p_esl_event_t(IntPtr cPtr, bool futureUse) { internal SWIGTYPE_p_esl_event_t(global::System.IntPtr cPtr, bool futureUse) {
swigCPtr = new HandleRef(this, cPtr); swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
} }
protected SWIGTYPE_p_esl_event_t() { protected SWIGTYPE_p_esl_event_t() {
swigCPtr = new HandleRef(null, IntPtr.Zero); swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
} }
internal static HandleRef getCPtr(SWIGTYPE_p_esl_event_t obj) { internal static global::System.Runtime.InteropServices.HandleRef getCPtr(SWIGTYPE_p_esl_event_t obj) {
return (obj == null) ? new HandleRef(null, IntPtr.Zero) : obj.swigCPtr; return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
} }
} }

View File

@ -1,27 +1,24 @@
/* ---------------------------------------------------------------------------- /* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org). * This file was automatically generated by SWIG (http://www.swig.org).
* Version 2.0.12 * Version 3.0.2
* *
* Do not make changes to this file unless you know what you are doing--modify * Do not make changes to this file unless you know what you are doing--modify
* the SWIG interface file instead. * the SWIG interface file instead.
* ----------------------------------------------------------------------------- */ * ----------------------------------------------------------------------------- */
using System;
using System.Runtime.InteropServices;
public class SWIGTYPE_p_esl_priority_t { public class SWIGTYPE_p_esl_priority_t {
private HandleRef swigCPtr; private global::System.Runtime.InteropServices.HandleRef swigCPtr;
internal SWIGTYPE_p_esl_priority_t(IntPtr cPtr, bool futureUse) { internal SWIGTYPE_p_esl_priority_t(global::System.IntPtr cPtr, bool futureUse) {
swigCPtr = new HandleRef(this, cPtr); swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
} }
protected SWIGTYPE_p_esl_priority_t() { protected SWIGTYPE_p_esl_priority_t() {
swigCPtr = new HandleRef(null, IntPtr.Zero); swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
} }
internal static HandleRef getCPtr(SWIGTYPE_p_esl_priority_t obj) { internal static global::System.Runtime.InteropServices.HandleRef getCPtr(SWIGTYPE_p_esl_priority_t obj) {
return (obj == null) ? new HandleRef(null, IntPtr.Zero) : obj.swigCPtr; return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
} }
} }

View File

@ -1,6 +1,6 @@
/* ---------------------------------------------------------------------------- /* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org). * This file was automatically generated by SWIG (http://www.swig.org).
* Version 2.0.12 * Version 3.0.2
* *
* This file is not intended to be easily readable and contains a number of * This file is not intended to be easily readable and contains a number of
* coding conventions designed to improve portability and efficiency. Do not make * coding conventions designed to improve portability and efficiency. Do not make

View File

@ -1,5 +1,5 @@
# This file was automatically generated by SWIG (http://www.swig.org). # This file was automatically generated by SWIG (http://www.swig.org).
# Version 2.0.12 # Version 3.0.2
# #
# Do not make changes to this file unless you know what you are doing--modify # Do not make changes to this file unless you know what you are doing--modify
# the SWIG interface file instead. # the SWIG interface file instead.

View File

@ -21,7 +21,7 @@ endif
$(MAKE) -C .. $(MAKE) -C ..
esl_wrap.cpp: esl_wrap.cpp:
swig2.0 -module ESL -shadow -perl5 -c++ -DMULTIPLICITY -I../src/include -o esl_wrap.cpp ../ESL.i swig3.0 -module ESL -shadow -perl5 -c++ -DMULTIPLICITY -I../src/include -o esl_wrap.cpp ../ESL.i
perlxsi.c: perlxsi.c:
$(PERL) -MExtUtils::Embed -e xsinit -- -o perlxsi.c $(PERL) -MExtUtils::Embed -e xsinit -- -o perlxsi.c

View File

@ -1,6 +1,6 @@
/* ---------------------------------------------------------------------------- /* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org). * This file was automatically generated by SWIG (http://www.swig.org).
* Version 2.0.12 * Version 3.0.2
* *
* This file is not intended to be easily readable and contains a number of * This file is not intended to be easily readable and contains a number of
* coding conventions designed to improve portability and efficiency. Do not make * coding conventions designed to improve portability and efficiency. Do not make
@ -550,14 +550,14 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
swig_module_info *iter = start; swig_module_info *iter = start;
do { do {
if (iter->size) { if (iter->size) {
register size_t l = 0; size_t l = 0;
register size_t r = iter->size - 1; size_t r = iter->size - 1;
do { do {
/* since l+r >= 0, we can (>> 1) instead (/ 2) */ /* since l+r >= 0, we can (>> 1) instead (/ 2) */
register size_t i = (l + r) >> 1; size_t i = (l + r) >> 1;
const char *iname = iter->types[i]->name; const char *iname = iter->types[i]->name;
if (iname) { if (iname) {
register int compare = strcmp(name, iname); int compare = strcmp(name, iname);
if (compare == 0) { if (compare == 0) {
return iter->types[i]; return iter->types[i];
} else if (compare < 0) { } else if (compare < 0) {
@ -601,7 +601,7 @@ SWIG_TypeQueryModule(swig_module_info *start,
of the str field (the human readable name) */ of the str field (the human readable name) */
swig_module_info *iter = start; swig_module_info *iter = start;
do { do {
register size_t i = 0; size_t i = 0;
for (; i < iter->size; ++i) { for (; i < iter->size; ++i) {
if (iter->types[i]->str && (SWIG_TypeEquiv(iter->types[i]->str, name))) if (iter->types[i]->str && (SWIG_TypeEquiv(iter->types[i]->str, name)))
return iter->types[i]; return iter->types[i];
@ -620,10 +620,10 @@ SWIG_TypeQueryModule(swig_module_info *start,
SWIGRUNTIME char * SWIGRUNTIME char *
SWIG_PackData(char *c, void *ptr, size_t sz) { SWIG_PackData(char *c, void *ptr, size_t sz) {
static const char hex[17] = "0123456789abcdef"; static const char hex[17] = "0123456789abcdef";
register const unsigned char *u = (unsigned char *) ptr; const unsigned char *u = (unsigned char *) ptr;
register const unsigned char *eu = u + sz; const unsigned char *eu = u + sz;
for (; u != eu; ++u) { for (; u != eu; ++u) {
register unsigned char uu = *u; unsigned char uu = *u;
*(c++) = hex[(uu & 0xf0) >> 4]; *(c++) = hex[(uu & 0xf0) >> 4];
*(c++) = hex[uu & 0xf]; *(c++) = hex[uu & 0xf];
} }
@ -635,11 +635,11 @@ SWIG_PackData(char *c, void *ptr, size_t sz) {
*/ */
SWIGRUNTIME const char * SWIGRUNTIME const char *
SWIG_UnpackData(const char *c, void *ptr, size_t sz) { SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
register unsigned char *u = (unsigned char *) ptr; unsigned char *u = (unsigned char *) ptr;
register const unsigned char *eu = u + sz; const unsigned char *eu = u + sz;
for (; u != eu; ++u) { for (; u != eu; ++u) {
register char d = *(c++); char d = *(c++);
register unsigned char uu; unsigned char uu;
if ((d >= '0') && (d <= '9')) if ((d >= '0') && (d <= '9'))
uu = ((d - '0') << 4); uu = ((d - '0') << 4);
else if ((d >= 'a') && (d <= 'f')) else if ((d >= 'a') && (d <= 'f'))
@ -894,6 +894,7 @@ SWIG_Perl_ErrorType(int code) {
#define SWIG_ConvertPtr(obj, pp, type, flags) SWIG_Perl_ConvertPtr(SWIG_PERL_OBJECT_CALL obj, pp, type, flags) #define SWIG_ConvertPtr(obj, pp, type, flags) SWIG_Perl_ConvertPtr(SWIG_PERL_OBJECT_CALL obj, pp, type, flags)
#define SWIG_ConvertPtrAndOwn(obj, pp, type, flags,own) SWIG_Perl_ConvertPtrAndOwn(SWIG_PERL_OBJECT_CALL obj, pp, type, flags, own) #define SWIG_ConvertPtrAndOwn(obj, pp, type, flags,own) SWIG_Perl_ConvertPtrAndOwn(SWIG_PERL_OBJECT_CALL obj, pp, type, flags, own)
#define SWIG_NewPointerObj(p, type, flags) SWIG_Perl_NewPointerObj(SWIG_PERL_OBJECT_CALL p, type, flags) #define SWIG_NewPointerObj(p, type, flags) SWIG_Perl_NewPointerObj(SWIG_PERL_OBJECT_CALL p, type, flags)
#define swig_owntype int
/* for raw packed data */ /* for raw packed data */
#define SWIG_ConvertPacked(obj, p, s, type) SWIG_Perl_ConvertPacked(SWIG_PERL_OBJECT_CALL obj, p, s, type) #define SWIG_ConvertPacked(obj, p, s, type) SWIG_Perl_ConvertPacked(SWIG_PERL_OBJECT_CALL obj, p, s, type)
@ -1162,7 +1163,11 @@ SWIG_Perl_ConvertPtrAndOwn(SWIG_MAYBE_PERL_OBJECT SV *sv, void **ptr, swig_type_
/* Now see if the types match */ /* Now see if the types match */
char *_c = HvNAME(SvSTASH(SvRV(sv))); char *_c = HvNAME(SvSTASH(SvRV(sv)));
tc = SWIG_TypeProxyCheck(_c,_t); tc = SWIG_TypeProxyCheck(_c,_t);
#ifdef SWIG_DIRECTORS
if (!tc && !sv_derived_from(sv,SWIG_Perl_TypeProxyName(_t))) {
#else
if (!tc) { if (!tc) {
#endif
return SWIG_ERROR; return SWIG_ERROR;
} }
{ {
@ -1520,7 +1525,7 @@ static swig_module_info swig_module = {swig_types, 5, 0, 0, 0, 0};
#define SWIG_name "ESLc::boot_ESL" #define SWIG_name "ESLc::boot_ESL"
#define SWIG_prefix "ESLc::" #define SWIG_prefix "ESLc::"
#define SWIGVERSION 0x020012 #define SWIGVERSION 0x030002
#define SWIG_VERSION SWIGVERSION #define SWIG_VERSION SWIGVERSION
@ -4129,7 +4134,7 @@ static swig_command_info swig_commands[] = {
* array with the correct data and linking the correct swig_cast_info * array with the correct data and linking the correct swig_cast_info
* structures together. * structures together.
* *
* The generated swig_type_info structures are assigned staticly to an initial * The generated swig_type_info structures are assigned statically to an initial
* array. We just loop through that array, and handle each type individually. * array. We just loop through that array, and handle each type individually.
* First we lookup if this type has been already loaded, and if so, use the * First we lookup if this type has been already loaded, and if so, use the
* loaded structure instead of the generated one. Then we have to fill in the * loaded structure instead of the generated one. Then we have to fill in the

View File

@ -2,7 +2,7 @@
/* ---------------------------------------------------------------------------- /* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org). * This file was automatically generated by SWIG (http://www.swig.org).
* Version 2.0.12 * Version 3.0.2
* *
* This file is not intended to be easily readable and contains a number of * This file is not intended to be easily readable and contains a number of
* coding conventions designed to improve portability and efficiency. Do not make * coding conventions designed to improve portability and efficiency. Do not make
@ -44,12 +44,6 @@ class ESLevent {
$this->_pData[$var] = $value; $this->_pData[$var] = $value;
} }
function __isset($var) {
if (function_exists('ESLevent_'.$var.'_set')) return true;
if ($var === 'thisown') return true;
return array_key_exists($var, $this->_pData);
}
function __get($var) { function __get($var) {
$func = 'ESLevent_'.$var.'_get'; $func = 'ESLevent_'.$var.'_get';
if (function_exists($func)) return call_user_func($func,$this->_cPtr); if (function_exists($func)) return call_user_func($func,$this->_cPtr);
@ -57,6 +51,12 @@ class ESLevent {
return $this->_pData[$var]; return $this->_pData[$var];
} }
function __isset($var) {
if (function_exists('ESLevent_'.$var.'_get')) return true;
if ($var === 'thisown') return true;
return array_key_exists($var, $this->_pData);
}
function __construct($type_or_wrap_me_or_me,$subclass_name_or_free_me=null) { function __construct($type_or_wrap_me_or_me,$subclass_name_or_free_me=null) {
if (is_resource($type_or_wrap_me_or_me) && get_resource_type($type_or_wrap_me_or_me) === '_p_ESLevent') { if (is_resource($type_or_wrap_me_or_me) && get_resource_type($type_or_wrap_me_or_me) === '_p_ESLevent') {
$this->_cPtr=$type_or_wrap_me_or_me; $this->_cPtr=$type_or_wrap_me_or_me;
@ -134,16 +134,16 @@ class ESLconnection {
$this->_pData[$var] = $value; $this->_pData[$var] = $value;
} }
function __isset($var) {
if ($var === 'thisown') return true;
return array_key_exists($var, $this->_pData);
}
function __get($var) { function __get($var) {
if ($var === 'thisown') return swig_ESL_get_newobject($this->_cPtr); if ($var === 'thisown') return swig_ESL_get_newobject($this->_cPtr);
return $this->_pData[$var]; return $this->_pData[$var];
} }
function __isset($var) {
if ($var === 'thisown') return true;
return array_key_exists($var, $this->_pData);
}
function __construct($host_or_socket,$port=null,$user_or_password=null,$password=null) { function __construct($host_or_socket,$port=null,$user_or_password=null,$password=null) {
if (is_resource($host_or_socket) && get_resource_type($host_or_socket) === '_p_ESLconnection') { if (is_resource($host_or_socket) && get_resource_type($host_or_socket) === '_p_ESLconnection') {
$this->_cPtr=$host_or_socket; $this->_cPtr=$host_or_socket;

View File

@ -3,7 +3,7 @@ WRAP_GCC_WARNING_SILENCE=-Wno-unused-label -Wno-unused-function
all: ESL.so all: ESL.so
esl_wrap.cpp: esl_wrap.cpp:
swig2.0 -module ESL -php5 -c++ -DMULTIPLICITY -I../src/include -o esl_wrap.cpp ../ESL.i swig3.0 -module ESL -php5 -c++ -DMULTIPLICITY -I../src/include -o esl_wrap.cpp ../ESL.i
sed -e 's/ char \*type_name;/ const char \*type_name;/' -i esl_wrap.cpp sed -e 's/ char \*type_name;/ const char \*type_name;/' -i esl_wrap.cpp
esl_wrap.o: esl_wrap.cpp esl_wrap.o: esl_wrap.cpp

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
/* ---------------------------------------------------------------------------- /* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org). * This file was automatically generated by SWIG (http://www.swig.org).
* Version 2.0.12 * Version 3.0.2
* *
* This file is not intended to be easily readable and contains a number of * This file is not intended to be easily readable and contains a number of
* coding conventions designed to improve portability and efficiency. Do not make * coding conventions designed to improve portability and efficiency. Do not make

View File

@ -1,5 +1,5 @@
# This file was automatically generated by SWIG (http://www.swig.org). # This file was automatically generated by SWIG (http://www.swig.org).
# Version 2.0.12 # Version 3.0.2
# #
# Do not make changes to this file unless you know what you are doing--modify # Do not make changes to this file unless you know what you are doing--modify
# the SWIG interface file instead. # the SWIG interface file instead.

View File

@ -5,7 +5,7 @@ SITE_DIR=$(DESTDIR)/`python -c "from distutils.sysconfig import get_python_lib;
all: _ESL.so all: _ESL.so
esl_wrap.cpp: esl_wrap.cpp:
swig2.0 -module ESL -classic -python -c++ -DMULTIPLICITY -threads -I../src/include -o esl_wrap.cpp ../ESL.i swig3.0 -module ESL -classic -python -c++ -DMULTIPLICITY -threads -I../src/include -o esl_wrap.cpp ../ESL.i
esl_wrap.o: esl_wrap.cpp esl_wrap.o: esl_wrap.cpp
$(CXX) $(CXX_CFLAGS) $(CXXFLAGS) $(LOCAL_CFLAGS) -c esl_wrap.cpp -o esl_wrap.o $(CXX) $(CXX_CFLAGS) $(CXXFLAGS) $(LOCAL_CFLAGS) -c esl_wrap.cpp -o esl_wrap.o

View File

@ -1,6 +1,6 @@
/* ---------------------------------------------------------------------------- /* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org). * This file was automatically generated by SWIG (http://www.swig.org).
* Version 2.0.12 * Version 3.0.2
* *
* This file is not intended to be easily readable and contains a number of * This file is not intended to be easily readable and contains a number of
* coding conventions designed to improve portability and efficiency. Do not make * coding conventions designed to improve portability and efficiency. Do not make
@ -562,14 +562,14 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
swig_module_info *iter = start; swig_module_info *iter = start;
do { do {
if (iter->size) { if (iter->size) {
register size_t l = 0; size_t l = 0;
register size_t r = iter->size - 1; size_t r = iter->size - 1;
do { do {
/* since l+r >= 0, we can (>> 1) instead (/ 2) */ /* since l+r >= 0, we can (>> 1) instead (/ 2) */
register size_t i = (l + r) >> 1; size_t i = (l + r) >> 1;
const char *iname = iter->types[i]->name; const char *iname = iter->types[i]->name;
if (iname) { if (iname) {
register int compare = strcmp(name, iname); int compare = strcmp(name, iname);
if (compare == 0) { if (compare == 0) {
return iter->types[i]; return iter->types[i];
} else if (compare < 0) { } else if (compare < 0) {
@ -613,7 +613,7 @@ SWIG_TypeQueryModule(swig_module_info *start,
of the str field (the human readable name) */ of the str field (the human readable name) */
swig_module_info *iter = start; swig_module_info *iter = start;
do { do {
register size_t i = 0; size_t i = 0;
for (; i < iter->size; ++i) { for (; i < iter->size; ++i) {
if (iter->types[i]->str && (SWIG_TypeEquiv(iter->types[i]->str, name))) if (iter->types[i]->str && (SWIG_TypeEquiv(iter->types[i]->str, name)))
return iter->types[i]; return iter->types[i];
@ -632,10 +632,10 @@ SWIG_TypeQueryModule(swig_module_info *start,
SWIGRUNTIME char * SWIGRUNTIME char *
SWIG_PackData(char *c, void *ptr, size_t sz) { SWIG_PackData(char *c, void *ptr, size_t sz) {
static const char hex[17] = "0123456789abcdef"; static const char hex[17] = "0123456789abcdef";
register const unsigned char *u = (unsigned char *) ptr; const unsigned char *u = (unsigned char *) ptr;
register const unsigned char *eu = u + sz; const unsigned char *eu = u + sz;
for (; u != eu; ++u) { for (; u != eu; ++u) {
register unsigned char uu = *u; unsigned char uu = *u;
*(c++) = hex[(uu & 0xf0) >> 4]; *(c++) = hex[(uu & 0xf0) >> 4];
*(c++) = hex[uu & 0xf]; *(c++) = hex[uu & 0xf];
} }
@ -647,11 +647,11 @@ SWIG_PackData(char *c, void *ptr, size_t sz) {
*/ */
SWIGRUNTIME const char * SWIGRUNTIME const char *
SWIG_UnpackData(const char *c, void *ptr, size_t sz) { SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
register unsigned char *u = (unsigned char *) ptr; unsigned char *u = (unsigned char *) ptr;
register const unsigned char *eu = u + sz; const unsigned char *eu = u + sz;
for (; u != eu; ++u) { for (; u != eu; ++u) {
register char d = *(c++); char d = *(c++);
register unsigned char uu; unsigned char uu;
if ((d >= '0') && (d <= '9')) if ((d >= '0') && (d <= '9'))
uu = ((d - '0') << 4); uu = ((d - '0') << 4);
else if ((d >= 'a') && (d <= 'f')) else if ((d >= 'a') && (d <= 'f'))
@ -1328,7 +1328,7 @@ SWIG_Python_UnpackTuple(PyObject *args, const char *name, Py_ssize_t min, Py_ssi
} }
if (!PyTuple_Check(args)) { if (!PyTuple_Check(args)) {
if (min <= 1 && max >= 1) { if (min <= 1 && max >= 1) {
register int i; int i;
objs[0] = args; objs[0] = args;
for (i = 1; i < max; ++i) { for (i = 1; i < max; ++i) {
objs[i] = 0; objs[i] = 0;
@ -1338,7 +1338,7 @@ SWIG_Python_UnpackTuple(PyObject *args, const char *name, Py_ssize_t min, Py_ssi
PyErr_SetString(PyExc_SystemError, "UnpackTuple() argument list is not a tuple"); PyErr_SetString(PyExc_SystemError, "UnpackTuple() argument list is not a tuple");
return 0; return 0;
} else { } else {
register Py_ssize_t l = PyTuple_GET_SIZE(args); Py_ssize_t l = PyTuple_GET_SIZE(args);
if (l < min) { if (l < min) {
PyErr_Format(PyExc_TypeError, "%s expected %s%d arguments, got %d", PyErr_Format(PyExc_TypeError, "%s expected %s%d arguments, got %d",
name, (min == max ? "" : "at least "), (int)min, (int)l); name, (min == max ? "" : "at least "), (int)min, (int)l);
@ -1348,7 +1348,7 @@ SWIG_Python_UnpackTuple(PyObject *args, const char *name, Py_ssize_t min, Py_ssi
name, (min == max ? "" : "at most "), (int)max, (int)l); name, (min == max ? "" : "at most "), (int)max, (int)l);
return 0; return 0;
} else { } else {
register int i; int i;
for (i = 0; i < l; ++i) { for (i = 0; i < l; ++i) {
objs[i] = PyTuple_GET_ITEM(args, i); objs[i] = PyTuple_GET_ITEM(args, i);
} }
@ -2463,7 +2463,7 @@ SWIG_Python_NewShadowInstance(SwigPyClientData *data, PyObject *swig_this)
} }
} else { } else {
#if PY_VERSION_HEX >= 0x03000000 #if PY_VERSION_HEX >= 0x03000000
inst = PyBaseObject_Type.tp_new((PyTypeObject*) data->newargs, Py_None, Py_None); inst = ((PyTypeObject*) data->newargs)->tp_new((PyTypeObject*) data->newargs, Py_None, Py_None);
if (inst) { if (inst) {
PyObject_SetAttr(inst, SWIG_This(), swig_this); PyObject_SetAttr(inst, SWIG_This(), swig_this);
Py_TYPE(inst)->tp_flags &= ~Py_TPFLAGS_VALID_VERSION_TAG; Py_TYPE(inst)->tp_flags &= ~Py_TPFLAGS_VALID_VERSION_TAG;
@ -2966,7 +2966,7 @@ static swig_module_info swig_module = {swig_types, 5, 0, 0, 0, 0};
#endif #endif
#define SWIG_name "_ESL" #define SWIG_name "_ESL"
#define SWIGVERSION 0x020012 #define SWIGVERSION 0x030002
#define SWIG_VERSION SWIGVERSION #define SWIG_VERSION SWIGVERSION
@ -3145,7 +3145,11 @@ SWIG_FromCharPtrAndSize(const char* carray, size_t size)
SWIG_InternalNewPointerObj(const_cast< char * >(carray), pchar_descriptor, 0) : SWIG_Py_Void(); SWIG_InternalNewPointerObj(const_cast< char * >(carray), pchar_descriptor, 0) : SWIG_Py_Void();
} else { } else {
#if PY_VERSION_HEX >= 0x03000000 #if PY_VERSION_HEX >= 0x03000000
#if PY_VERSION_HEX >= 0x03010000
return PyUnicode_DecodeUTF8(carray, static_cast< int >(size), "surrogateescape");
#else
return PyUnicode_FromStringAndSize(carray, static_cast< int >(size)); return PyUnicode_FromStringAndSize(carray, static_cast< int >(size));
#endif
#else #else
return PyString_FromStringAndSize(carray, static_cast< int >(size)); return PyString_FromStringAndSize(carray, static_cast< int >(size));
#endif #endif
@ -5452,7 +5456,7 @@ static swig_const_info swig_const_table[] = {
* array with the correct data and linking the correct swig_cast_info * array with the correct data and linking the correct swig_cast_info
* structures together. * structures together.
* *
* The generated swig_type_info structures are assigned staticly to an initial * The generated swig_type_info structures are assigned statically to an initial
* array. We just loop through that array, and handle each type individually. * array. We just loop through that array, and handle each type individually.
* First we lookup if this type has been already loaded, and if so, use the * First we lookup if this type has been already loaded, and if so, use the
* loaded structure instead of the generated one. Then we have to fill in the * loaded structure instead of the generated one. Then we have to fill in the
@ -5782,7 +5786,7 @@ extern "C" {
var = var->next; var = var->next;
} }
if (res == NULL && !PyErr_Occurred()) { if (res == NULL && !PyErr_Occurred()) {
PyErr_SetString(PyExc_NameError,"Unknown C global variable"); PyErr_Format(PyExc_AttributeError, "Unknown C global variable '%s'", n);
} }
return res; return res;
} }
@ -5799,7 +5803,7 @@ extern "C" {
var = var->next; var = var->next;
} }
if (res == 1 && !PyErr_Occurred()) { if (res == 1 && !PyErr_Occurred()) {
PyErr_SetString(PyExc_NameError,"Unknown C global variable"); PyErr_Format(PyExc_AttributeError, "Unknown C global variable '%s'", n);
} }
return res; return res;
} }

View File

@ -6,7 +6,7 @@ RUBY_GEM_DIR=$(shell $(RUBY) -e 'puts RbConfig::CONFIG["rubylibdir"]')
all: ESL.so all: ESL.so
esl_wrap.cpp: esl_wrap.cpp:
swig2.0 -module ESL -ruby -c++ -DMULTIPLICITY -I../src/include -o esl_wrap.cpp ../ESL.i swig3.0 -module ESL -ruby -c++ -DMULTIPLICITY -I../src/include -o esl_wrap.cpp ../ESL.i
esl_wrap.o: esl_wrap.cpp esl_wrap.o: esl_wrap.cpp
$(CXX) $(CXX_CFLAGS) $(CXXFLAGS) $(LOCAL_CFLAGS) -c esl_wrap.cpp -o esl_wrap.o $(CXX) $(CXX_CFLAGS) $(CXXFLAGS) $(LOCAL_CFLAGS) -c esl_wrap.cpp -o esl_wrap.o

View File

@ -1,6 +1,6 @@
/* ---------------------------------------------------------------------------- /* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org). * This file was automatically generated by SWIG (http://www.swig.org).
* Version 2.0.12 * Version 3.0.2
* *
* This file is not intended to be easily readable and contains a number of * This file is not intended to be easily readable and contains a number of
* coding conventions designed to improve portability and efficiency. Do not make * coding conventions designed to improve portability and efficiency. Do not make
@ -658,14 +658,14 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
swig_module_info *iter = start; swig_module_info *iter = start;
do { do {
if (iter->size) { if (iter->size) {
register size_t l = 0; size_t l = 0;
register size_t r = iter->size - 1; size_t r = iter->size - 1;
do { do {
/* since l+r >= 0, we can (>> 1) instead (/ 2) */ /* since l+r >= 0, we can (>> 1) instead (/ 2) */
register size_t i = (l + r) >> 1; size_t i = (l + r) >> 1;
const char *iname = iter->types[i]->name; const char *iname = iter->types[i]->name;
if (iname) { if (iname) {
register int compare = strcmp(name, iname); int compare = strcmp(name, iname);
if (compare == 0) { if (compare == 0) {
return iter->types[i]; return iter->types[i];
} else if (compare < 0) { } else if (compare < 0) {
@ -709,7 +709,7 @@ SWIG_TypeQueryModule(swig_module_info *start,
of the str field (the human readable name) */ of the str field (the human readable name) */
swig_module_info *iter = start; swig_module_info *iter = start;
do { do {
register size_t i = 0; size_t i = 0;
for (; i < iter->size; ++i) { for (; i < iter->size; ++i) {
if (iter->types[i]->str && (SWIG_TypeEquiv(iter->types[i]->str, name))) if (iter->types[i]->str && (SWIG_TypeEquiv(iter->types[i]->str, name)))
return iter->types[i]; return iter->types[i];
@ -728,10 +728,10 @@ SWIG_TypeQueryModule(swig_module_info *start,
SWIGRUNTIME char * SWIGRUNTIME char *
SWIG_PackData(char *c, void *ptr, size_t sz) { SWIG_PackData(char *c, void *ptr, size_t sz) {
static const char hex[17] = "0123456789abcdef"; static const char hex[17] = "0123456789abcdef";
register const unsigned char *u = (unsigned char *) ptr; const unsigned char *u = (unsigned char *) ptr;
register const unsigned char *eu = u + sz; const unsigned char *eu = u + sz;
for (; u != eu; ++u) { for (; u != eu; ++u) {
register unsigned char uu = *u; unsigned char uu = *u;
*(c++) = hex[(uu & 0xf0) >> 4]; *(c++) = hex[(uu & 0xf0) >> 4];
*(c++) = hex[uu & 0xf]; *(c++) = hex[uu & 0xf];
} }
@ -743,11 +743,11 @@ SWIG_PackData(char *c, void *ptr, size_t sz) {
*/ */
SWIGRUNTIME const char * SWIGRUNTIME const char *
SWIG_UnpackData(const char *c, void *ptr, size_t sz) { SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
register unsigned char *u = (unsigned char *) ptr; unsigned char *u = (unsigned char *) ptr;
register const unsigned char *eu = u + sz; const unsigned char *eu = u + sz;
for (; u != eu; ++u) { for (; u != eu; ++u) {
register char d = *(c++); char d = *(c++);
register unsigned char uu; unsigned char uu;
if ((d >= '0') && (d <= '9')) if ((d >= '0') && (d <= '9'))
uu = ((d - '0') << 4); uu = ((d - '0') << 4);
else if ((d >= 'a') && (d <= 'f')) else if ((d >= 'a') && (d <= 'f'))
@ -1503,14 +1503,13 @@ SWIG_Ruby_InitRuntime(void)
SWIGRUNTIME void SWIGRUNTIME void
SWIG_Ruby_define_class(swig_type_info *type) SWIG_Ruby_define_class(swig_type_info *type)
{ {
VALUE klass;
char *klass_name = (char *) malloc(4 + strlen(type->name) + 1); char *klass_name = (char *) malloc(4 + strlen(type->name) + 1);
sprintf(klass_name, "TYPE%s", type->name); sprintf(klass_name, "TYPE%s", type->name);
if (NIL_P(_cSWIG_Pointer)) { if (NIL_P(_cSWIG_Pointer)) {
_cSWIG_Pointer = rb_define_class_under(_mSWIG, "Pointer", rb_cObject); _cSWIG_Pointer = rb_define_class_under(_mSWIG, "Pointer", rb_cObject);
rb_undef_method(CLASS_OF(_cSWIG_Pointer), "new"); rb_undef_method(CLASS_OF(_cSWIG_Pointer), "new");
} }
klass = rb_define_class_under(_mSWIG, klass_name, _cSWIG_Pointer); rb_define_class_under(_mSWIG, klass_name, _cSWIG_Pointer);
free((void *) klass_name); free((void *) klass_name);
} }
@ -1823,7 +1822,7 @@ static VALUE mESL;
#define SWIG_RUBY_THREAD_END_BLOCK #define SWIG_RUBY_THREAD_END_BLOCK
#define SWIGVERSION 0x020012 #define SWIGVERSION 0x030002
#define SWIG_VERSION SWIGVERSION #define SWIG_VERSION SWIGVERSION
@ -1929,7 +1928,7 @@ SWIG_ruby_failed(void)
} }
/*@SWIG:/usr/share/swig2.0/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/ /*@SWIG:/usr/share/swig3.0/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args) SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
{ {
VALUE obj = args[0]; VALUE obj = args[0];
@ -3890,7 +3889,7 @@ static swig_cast_info *swig_cast_initial[] = {
* array with the correct data and linking the correct swig_cast_info * array with the correct data and linking the correct swig_cast_info
* structures together. * structures together.
* *
* The generated swig_type_info structures are assigned staticly to an initial * The generated swig_type_info structures are assigned statically to an initial
* array. We just loop through that array, and handle each type individually. * array. We just loop through that array, and handle each type individually.
* First we lookup if this type has been already loaded, and if so, use the * First we lookup if this type has been already loaded, and if so, use the
* loaded structure instead of the generated one. Then we have to fill in the * loaded structure instead of the generated one. Then we have to fill in the

View File

@ -5,7 +5,7 @@ WRAP_GCC_WARNING_SILENCE=-Wno-unused-function
all: ESL.so all: ESL.so
esl_wrap.cpp: esl_wrap.cpp:
swig -module ESL -tcl -c++ -DMULTIPLICITY -I../src/include -o esl_wrap.cpp ../ESL.i swig3.0 -module ESL -tcl -c++ -DMULTIPLICITY -I../src/include -o esl_wrap.cpp ../ESL.i
esl_wrap.o: esl_wrap.cpp esl_wrap.o: esl_wrap.cpp
$(CXX) $(CXX_CFLAGS) $(CXXFLAGS) $(LOCAL_CFLAGS) $(WRAP_GCC_WARNING_SILENCE) -c esl_wrap.cpp -o esl_wrap.o $(CXX) $(CXX_CFLAGS) $(CXXFLAGS) $(LOCAL_CFLAGS) $(WRAP_GCC_WARNING_SILENCE) -c esl_wrap.cpp -o esl_wrap.o

File diff suppressed because it is too large Load Diff