SWIG upgrade (->1.3.28) broke once again bindings; this time thanks to macros

that are now required to have args (looks like that anyway, nothing is
documented); fixing this.

2 files changed, 212 insertions, 213 deletions

diff --git a/swig/Lasso-wsf.i b/swig/Lasso-wsf.i
index 4edd69bf..5920610a 100644
--- a/swig/Lasso-wsf.i
+++ b/swig/Lasso-wsf.i
@@ -227,70 +227,70 @@ typedef struct {
 
 	/* Methods inherited from WsfProfile */
 
-	THROW_ERROR
+	THROW_ERROR()
 	int setIdentityFromDump(char *dump);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int setSessionFromDump(char *dump);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int buildRequestMsg();
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int buildResponseMsg();
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
 	/* Methods */
 
-	THROW_ERROR
+	THROW_ERROR()
 	int initInsert(LassoDiscoResourceOffering *newOffering, const char *security_mech_id = NULL);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int initRemove(const char *entryId);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int buildModifyResponseMsg();
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
 	LassoDiscoInsertEntry* addInsertEntry(LassoDiscoServiceInstance *serviceInstance,
 					      LassoDiscoResourceID *resourceID);
 
-	THROW_ERROR
+	THROW_ERROR()
 	int addRemoveEntry(char *entryID);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
 	LassoDiscoRequestedServiceType *addRequestedServiceType(char *serviceType,
 								char *option = NULL);
 
-	THROW_ERROR
+	THROW_ERROR()
 	int initModify(LassoDiscoResourceOffering *resourceOffering,
 			LassoDiscoDescription *description);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int initQuery(const char *security_mech_id = NULL);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int processModifyMsg(const char *modify_msg, const gchar *security_mech_id = NULL);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int processModifyResponseMsg(const char *modify_response_msg);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int processQueryMsg(char *query_msg, const char *security_mech_id = NULL);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int processQueryResponseMsg(char *query_response_msg);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
 	%newobject getService;
 	LassoDataService* getService(const char *service_type = NULL);
@@ -457,27 +457,27 @@ typedef struct {
 
 	/* Methods inherited from WsfProfile */
 
-	THROW_ERROR
+	THROW_ERROR()
 	int buildRequestMsg();
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int buildResponseMsg();
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
 	/* Methods */
 
-	THROW_ERROR
+	THROW_ERROR()
 	int initRequest();
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int processRequestMsg(char *msg);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int processResponseMsg(char *msg);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
 }
 
@@ -580,29 +580,29 @@ typedef struct {
 
 	/* Methods inherited from WsfProfile */
 
-	THROW_ERROR
+	THROW_ERROR()
 	int buildRequestMsg();
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
 	/* Methods inherited from ProfileService */
 
-	THROW_ERROR
+	THROW_ERROR()
 	gint initQuery(const char *select = NULL, const char *item_id = NULL, const char *security_mech_id = NULL);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
 	LassoDstQueryItem *addQueryItem(const char *select, const char *item_id);
 		
-	THROW_ERROR
+	THROW_ERROR()
 	int processQueryMsg(const char *message, const char *security_mech_id = NULL);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int buildResponseMsg();
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int processQueryResponseMsg(const char *message);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
 	%newobject getAnswer;
 	char* getAnswer(const char *select = NULL);
@@ -614,13 +614,13 @@ typedef struct {
 
 	LassoDstModification *addModification(char *select);
 
-	THROW_ERROR
+	THROW_ERROR()
 	int processModifyMsg(char *soap_msg, const char *security_mech_id = NULL);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int processModifyResponseMsg(char *soap_msg);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
 	/* Methods */
 
@@ -764,34 +764,34 @@ typedef struct {
 
 	/* Methods inherited from WsfProfile */
 
-	THROW_ERROR
+	THROW_ERROR()
 	int buildRequestMsg();
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
 	/* Methods */
 
-	THROW_ERROR
+	THROW_ERROR()
 	gint initQuery(const char *select = NULL, const char *item_id = NULL,
 		       const char *security_mech_id = NULL);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
 	LassoDstQueryItem *addQueryItem(const char *select, const char *item_id);
 		
-	THROW_ERROR
+	THROW_ERROR()
 	int processQueryMsg(const char *message, const char *security_mech_id = NULL);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int buildModifyResponseMsg();
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int buildResponseMsg();
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int processQueryResponseMsg(const char *message);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
 	%newobject getAnswer;
 	char* getAnswer(const char *select = NULL);
@@ -803,13 +803,13 @@ typedef struct {
 
 	LassoDstModification *addModification(char *select);
 
-	THROW_ERROR
+	THROW_ERROR()
 	int processModifyMsg(char *soap_msg, const char *security_mech_id = NULL);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int processModifyResponseMsg(const char *soap_msg);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
 	gboolean isPrincipalOnline();
 	void setPrincipalStatus(const char *status);
@@ -983,22 +983,22 @@ typedef struct {
 
 	/* Methods inherited from WsfProfile */
 
-	THROW_ERROR
+	THROW_ERROR()
 	int buildRequestMsg();
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int buildResponseMsg();
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
 	/* Methods */
 	int clientStart();
 
 	int clientStep();
 
-	THROW_ERROR
+	THROW_ERROR()
 	int getMechanismList();
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
 	int initRequest(LassoDiscoDescription *description, char *mechanisms, LassoUserAccount *account = NULL);
 
diff --git a/swig/Lasso.i b/swig/Lasso.i
index 1e44a836..4dda7056 100644
--- a/swig/Lasso.i
+++ b/swig/Lasso.i
@@ -212,7 +212,7 @@ static void throw_exception_msg(int errorCode) {
 
 %}
 
-%define THROW_ERROR
+%define THROW_ERROR()
 %exception {
 	int errorCode;
 	errorCode = $action
@@ -266,7 +266,7 @@ Error = _lasso.Error
 Warning = _lasso.Warning
 %}
 
-%define THROW_ERROR
+%define THROW_ERROR()
 %exception {
 	int errorCode;
 	errorCode = $action
@@ -290,7 +290,7 @@ static void build_exception_msg(int errorCode, char *errorMsg) {
 
 %}
 
-%define THROW_ERROR
+%define THROW_ERROR()
 %exception {
 	int errorCode;
 	errorCode = $action
@@ -310,7 +310,7 @@ static void build_exception_msg(int errorCode, char *errorMsg) {
 #endif /* ifdef SWIGPYTHON.*/
 #endif /* ifdef SWIGPHP4 */
 
-%define END_THROW_ERROR
+%define END_THROW_ERROR()
 %exception;
 %enddef
 
@@ -706,7 +706,6 @@ SET_NODE_INFO(Node, DowncastableNode)
  ***********************************************************************
  ***********************************************************************/
 
-
 #ifdef SWIGJAVA
 #if SWIG_VERSION >= 0x010322
 %include "enumsimple.swg"
@@ -5063,15 +5062,15 @@ typedef struct {
 
 	/* Methods */
 
-	THROW_ERROR
+	THROW_ERROR()
 	int addProvider(LassoProviderRole role, char *metadata, char *publicKey = NULL,
 			char *caCertChain = NULL);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
 #ifdef LASSO_WSF_ENABLED
-	THROW_ERROR
+	THROW_ERROR()
 	int addService(LassoDiscoServiceInstance *service);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 #endif
 
 	%newobject dump;
@@ -5279,9 +5278,9 @@ typedef struct {
 	LassoFederation *getFederation(char *providerId);
 
 #ifdef LASSO_WSF_ENABLED
-	THROW_ERROR
+	THROW_ERROR()
 	int addResourceOffering(LassoDiscoResourceOffering *offering);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
 	gboolean removeResourceOffering(const char *entry_id);
 
@@ -5497,32 +5496,32 @@ typedef struct {
 
 	/* Methods inherited from Profile */
 
-        THROW_ERROR
+        THROW_ERROR()
 	int setIdentityFromDump(char *dump);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int setSessionFromDump(char *dump);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
 	/* Methods */
 
-	THROW_ERROR
+	THROW_ERROR()
 	int buildNotificationMsg();
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int initNotification(char *remoteProviderId = NULL,
 			      LassoHttpMethod httpMethod = LASSO_HTTP_METHOD_ANY);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int processNotificationMsg(char *notificationMsg);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int validateNotification();
-	END_THROW_ERROR
+	END_THROW_ERROR()
 }
 
 %{
@@ -5696,96 +5695,96 @@ typedef struct {
 
 	/* Methods inherited from Profile */
 
-        THROW_ERROR
+        THROW_ERROR()
 	int setIdentityFromDump(char *dump);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int setSessionFromDump(char *dump);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
 	/* Methods */
 
-	THROW_ERROR
+	THROW_ERROR()
 	int acceptSso();
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int buildArtifactMsg(LassoHttpMethod httpMethod);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int buildAssertion(char *authenticationMethod, char *authenticationInstant,
 			char *reauthenticateOnOrAfter,
 			char *notBefore, char *notOnOrAfter);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int buildAuthnRequestMsg();
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int buildAuthnResponseMsg();
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int buildRequestMsg();
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int buildResponseMsg(char *remoteProviderId);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
 	%newobject dump;
 	char *dump();
 
-	THROW_ERROR
+	THROW_ERROR()
 	int initAuthnRequest(char *remoteProviderId = NULL,
 			     LassoHttpMethod httpMethod = LASSO_HTTP_METHOD_REDIRECT);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int initRequest(char *responseMsg,
 			 LassoHttpMethod httpMethod = LASSO_HTTP_METHOD_REDIRECT);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int initIdpInitiatedAuthnRequest(char *remoteProviderID = NULL);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
 	gboolean mustAskForConsent();
 
 	gboolean mustAuthenticate();
 
-	THROW_ERROR
+	THROW_ERROR()
 	int processAuthnRequestMsg(char *authnrequestMsg);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int processAuthnResponseMsg(char *authnResponseMsg);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int processRequestMsg(char *requestMsg);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int processResponseMsg(char *responseMsg);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
 #ifdef LASSO_WSF_ENABLED
-	THROW_ERROR
+	THROW_ERROR()
 	int setEncryptedResourceId(LassoDiscoEncryptedResourceID *encryptedResourceId);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 #endif
 
-	THROW_ERROR
+	THROW_ERROR()
 	int setResourceId(char *content);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int validateRequestMsg(gboolean authenticationResult, gboolean isConsentObtained);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 }
 
 %{
@@ -5969,23 +5968,23 @@ typedef struct {
 
 	/* Methods inherited from Profile */
 
-        THROW_ERROR
+        THROW_ERROR()
 	int setIdentityFromDump(char *dump);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int setSessionFromDump(char *dump);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
 	/* Methods */
 
-	THROW_ERROR
+	THROW_ERROR()
 	int buildRequestMsg();
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int buildResponseMsg();
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
 	%newobject dump;
 	char *dump();
@@ -5993,26 +5992,26 @@ typedef struct {
 	%newobject getNextProviderId;
 	char *getNextProviderId();
 
-	THROW_ERROR
+	THROW_ERROR()
 	int initRequest(char *remoteProviderId = NULL,
 			 LassoHttpMethod httpMethod = LASSO_HTTP_METHOD_ANY);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int processRequestMsg(char *requestMsg);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int processResponseMsg(char *responseMsg);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int resetProviderIdIndex();
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int validateRequest();
-	END_THROW_ERROR
+	END_THROW_ERROR()
 }
 
 %{
@@ -6185,69 +6184,69 @@ typedef struct {
 
 	/* Methods inherited from Profile */
 
-        THROW_ERROR
+        THROW_ERROR()
 	int setIdentityFromDump(char *dump);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int setSessionFromDump(char *dump);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
 	/* Methods inherited from Login */
 
-	THROW_ERROR
+	THROW_ERROR()
 	int buildAssertion(char *authenticationMethod, char *authenticationInstant,
 			char *reauthenticateOnOrAfter,
 			char *notBefore, char *notOnOrAfter);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
 #ifdef LASSO_WSF_ENABLED
-	THROW_ERROR
+	THROW_ERROR()
 	int setEncryptedResourceId(LassoDiscoEncryptedResourceID *encryptedResourceId);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 #endif
 
-	THROW_ERROR
+	THROW_ERROR()
 	int setResourceId(char *content);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int validateRequestMsg(gboolean authenticationResult, gboolean isConsentObtained);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
 	/* Methods */
 
-	THROW_ERROR
+	THROW_ERROR()
 	int buildAuthnRequestEnvelopeMsg();
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int buildAuthnRequestMsg();
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int buildAuthnResponseEnvelopeMsg();
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int buildAuthnResponseMsg();
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int initAuthnRequest(char *remoteProviderId = NULL);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int processAuthnRequestEnvelopeMsg(char *requestMsg);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int processAuthnRequestMsg(char *authnRequestMsg);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int processAuthnResponseEnvelopeMsg(char *responseMsg);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 }
 
 %{
@@ -6440,39 +6439,39 @@ typedef struct {
 
 	/* Methods inherited from Profile */
 
-        THROW_ERROR
+        THROW_ERROR()
 	int setIdentityFromDump(char *dump);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int setSessionFromDump(char *dump);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
 	/* Methods */
 
-	THROW_ERROR
+	THROW_ERROR()
 	int buildRequestMsg();
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int buildResponseMsg();
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int initRequest(char *targetNamespace, char *remoteProviderId = NULL);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int processRequestMsg(char *requestMsg);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int processResponseMsg(char *responseMsg);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int validateRequest();
-	END_THROW_ERROR
+	END_THROW_ERROR()
 }
 
 %{
@@ -6646,43 +6645,43 @@ typedef struct {
 
 	/* Methods inherited from Profile */
 
-        THROW_ERROR
+        THROW_ERROR()
 	int setIdentityFromDump(char *dump);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int setSessionFromDump(char *dump);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
 	/* Methods */
 
-	THROW_ERROR
+	THROW_ERROR()
 	int buildRequestMsg();
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int buildResponseMsg();
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
 	%newobject dump;
 	char *dump();
 
-	THROW_ERROR
+	THROW_ERROR()
 	int initRequest(char *remoteProviderId,
 			LassoHttpMethod httpMethod = LASSO_HTTP_METHOD_ANY);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int processRequestMsg(char *requestMsg);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int processResponseMsg(char *responseMsg);
-	END_THROW_ERROR
+	END_THROW_ERROR()
 
-	THROW_ERROR
+	THROW_ERROR()
 	int validateRequest();
-	END_THROW_ERROR
+	END_THROW_ERROR()
 }
 
 %{