From 401ab75a4af1ce626874647bb6e70c61862f31b0 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 20 Oct 2016 16:03:29 +0200 Subject: [PATCH] ecore con: generate vars instead of writing them manually --- src/lib/ecore_con/Ecore_Con_Eo.h | 59 ------------------ src/lib/ecore_con/efl_net_dialer.eo | 8 +-- src/lib/ecore_con/efl_net_http_types.eot | 102 +++++++++++++++---------------- 3 files changed, 55 insertions(+), 114 deletions(-) diff --git a/src/lib/ecore_con/Ecore_Con_Eo.h b/src/lib/ecore_con/Ecore_Con_Eo.h index 6d6fb03..00245f2 100644 --- a/src/lib/ecore_con/Ecore_Con_Eo.h +++ b/src/lib/ecore_con/Ecore_Con_Eo.h @@ -20,64 +20,5 @@ #include "efl_net_http_types.eot.h" -/* TODO: should be generated from 'var Efl.Net.Dialer.Error.*' */ -extern Eina_Error EFL_NET_DIALER_ERROR_COULDNT_CONNECT; -extern Eina_Error EFL_NET_DIALER_ERROR_COULDNT_RESOLVE_PROXY; -extern Eina_Error EFL_NET_DIALER_ERROR_COULDNT_RESOLVE_HOST; -extern Eina_Error EFL_NET_DIALER_ERROR_PROXY_AUTHENTICATION_FAILED; - -/* TODO: should be generated from 'var Efl.Net.Http.Error.*' */ -extern Eina_Error EFL_NET_HTTP_ERROR_BAD_CONTENT_ENCODING; -extern Eina_Error EFL_NET_HTTP_ERROR_BAD_DOWNLOAD_RESUME; -extern Eina_Error EFL_NET_HTTP_ERROR_BAD_FUNCTION_ARGUMENT; -extern Eina_Error EFL_NET_HTTP_ERROR_CHUNK_FAILED; -extern Eina_Error EFL_NET_HTTP_ERROR_CONV_FAILED; -extern Eina_Error EFL_NET_HTTP_ERROR_CONV_REQD; -extern Eina_Error EFL_NET_HTTP_ERROR_FAILED_INIT; -extern Eina_Error EFL_NET_HTTP_ERROR_FILE_COULDNT_READ_FILE; -extern Eina_Error EFL_NET_HTTP_ERROR_FILESIZE_EXCEEDED; -extern Eina_Error EFL_NET_HTTP_ERROR_FUNCTION_NOT_FOUND; -extern Eina_Error EFL_NET_HTTP_ERROR_GOT_NOTHING; -extern Eina_Error EFL_NET_HTTP_ERROR_HTTP2; -extern Eina_Error EFL_NET_HTTP_ERROR_HTTP2_STREAM; -extern Eina_Error EFL_NET_HTTP_ERROR_HTTP_POST_ERROR; -extern Eina_Error EFL_NET_HTTP_ERROR_HTTP_RETURNED_ERROR; -extern Eina_Error EFL_NET_HTTP_ERROR_INTERFACE_FAILED; -extern Eina_Error EFL_NET_HTTP_ERROR_LOGIN_DENIED; -extern Eina_Error EFL_NET_HTTP_ERROR_NO_CONNECTION_AVAILABLE; -extern Eina_Error EFL_NET_HTTP_ERROR_NOT_BUILT_IN; -extern Eina_Error EFL_NET_HTTP_ERROR_OPERATION_TIMEDOUT; -extern Eina_Error EFL_NET_HTTP_ERROR_PARTIAL_FILE; -extern Eina_Error EFL_NET_HTTP_ERROR_PEER_FAILED_VERIFICATION; -extern Eina_Error EFL_NET_HTTP_ERROR_RANGE_ERROR; -extern Eina_Error EFL_NET_HTTP_ERROR_READ_ERROR; -extern Eina_Error EFL_NET_HTTP_ERROR_RECV_ERROR; -extern Eina_Error EFL_NET_HTTP_ERROR_REMOTE_ACCESS_DENIED; -extern Eina_Error EFL_NET_HTTP_ERROR_REMOTE_DISK_FULL; -extern Eina_Error EFL_NET_HTTP_ERROR_REMOTE_FILE_EXISTS; -extern Eina_Error EFL_NET_HTTP_ERROR_REMOTE_FILE_NOT_FOUND; -extern Eina_Error EFL_NET_HTTP_ERROR_SEND_ERROR; -extern Eina_Error EFL_NET_HTTP_ERROR_SEND_FAIL_REWIND; -extern Eina_Error EFL_NET_HTTP_ERROR_SSL_CACERT; -extern Eina_Error EFL_NET_HTTP_ERROR_SSL_CACERT_BADFILE; -extern Eina_Error EFL_NET_HTTP_ERROR_SSL_CERTPROBLEM; -extern Eina_Error EFL_NET_HTTP_ERROR_SSL_CIPHER; -extern Eina_Error EFL_NET_HTTP_ERROR_SSL_CONNECT_ERROR; -extern Eina_Error EFL_NET_HTTP_ERROR_SSL_CRL_BADFILE; -extern Eina_Error EFL_NET_HTTP_ERROR_SSL_ENGINE_INITFAILED; -extern Eina_Error EFL_NET_HTTP_ERROR_SSL_ENGINE_NOTFOUND; -extern Eina_Error EFL_NET_HTTP_ERROR_SSL_ENGINE_SETFAILED; -extern Eina_Error EFL_NET_HTTP_ERROR_SSL_INVALIDCERTSTATUS; -extern Eina_Error EFL_NET_HTTP_ERROR_SSL_ISSUER_ERROR; -extern Eina_Error EFL_NET_HTTP_ERROR_SSL_PINNEDPUBKEYNOTMATCH; -extern Eina_Error EFL_NET_HTTP_ERROR_SSL_SHUTDOWN_FAILED; -extern Eina_Error EFL_NET_HTTP_ERROR_TOO_MANY_REDIRECTS; -extern Eina_Error EFL_NET_HTTP_ERROR_UNKNOWN_OPTION; -extern Eina_Error EFL_NET_HTTP_ERROR_UNSUPPORTED_PROTOCOL; -extern Eina_Error EFL_NET_HTTP_ERROR_UPLOAD_FAILED; -extern Eina_Error EFL_NET_HTTP_ERROR_URL_MALFORMAT; -extern Eina_Error EFL_NET_HTTP_ERROR_USE_SSL_FAILED; -extern Eina_Error EFL_NET_HTTP_ERROR_WRITE_ERROR; - #include "efl_net_dialer_http.eo.h" #include "efl_net_dialer_websocket.eo.h" diff --git a/src/lib/ecore_con/efl_net_dialer.eo b/src/lib/ecore_con/efl_net_dialer.eo index c2333f3..f1aa39c 100644 --- a/src/lib/ecore_con/efl_net_dialer.eo +++ b/src/lib/ecore_con/efl_net_dialer.eo @@ -1,7 +1,7 @@ -var @extern Efl.Net.Dialer.Error.COULDNT_CONNECT: Eina.Error; -var @extern Efl.Net.Dialer.Error.COULDNT_RESOLVE_PROXY: Eina.Error; -var @extern Efl.Net.Dialer.Error.COULDNT_RESOLVE_HOST: Eina.Error; -var @extern Efl.Net.Dialer.Error.PROXY_AUTHENTICATION_FAILED: Eina.Error; +var Efl.Net.Dialer.Error.COULDNT_CONNECT: Eina.Error; +var Efl.Net.Dialer.Error.COULDNT_RESOLVE_PROXY: Eina.Error; +var Efl.Net.Dialer.Error.COULDNT_RESOLVE_HOST: Eina.Error; +var Efl.Net.Dialer.Error.PROXY_AUTHENTICATION_FAILED: Eina.Error; interface Efl.Net.Dialer (Efl.Net.Socket) { [[Creates a client socket to reach a remote peer. diff --git a/src/lib/ecore_con/efl_net_http_types.eot b/src/lib/ecore_con/efl_net_http_types.eot index bd47012..be70e7b 100644 --- a/src/lib/ecore_con/efl_net_http_types.eot +++ b/src/lib/ecore_con/efl_net_http_types.eot @@ -120,54 +120,54 @@ struct Efl.Net.Http.Header { value: string; } -var @extern Efl.Net.Http.Error.BAD_CONTENT_ENCODING: Eina.Error; -var @extern Efl.Net.Http.Error.BAD_DOWNLOAD_RESUME: Eina.Error; -var @extern Efl.Net.Http.Error.BAD_FUNCTION_ARGUMENT: Eina.Error; -var @extern Efl.Net.Http.Error.CHUNK_FAILED: Eina.Error; -var @extern Efl.Net.Http.Error.CONV_FAILED: Eina.Error; -var @extern Efl.Net.Http.Error.CONV_REQD: Eina.Error; -var @extern Efl.Net.Http.Error.FAILED_INIT: Eina.Error; -var @extern Efl.Net.Http.Error.FILE_COULDNT_READ_FILE: Eina.Error; -var @extern Efl.Net.Http.Error.FILESIZE_EXCEEDED: Eina.Error; -var @extern Efl.Net.Http.Error.FUNCTION_NOT_FOUND: Eina.Error; -var @extern Efl.Net.Http.Error.GOT_NOTHING: Eina.Error; -var @extern Efl.Net.Http.Error.HTTP2: Eina.Error; -var @extern Efl.Net.Http.Error.HTTP2_STREAM: Eina.Error; -var @extern Efl.Net.Http.Error.HTTP_POST_ERROR: Eina.Error; -var @extern Efl.Net.Http.Error.HTTP_RETURNED_ERROR: Eina.Error; -var @extern Efl.Net.Http.Error.INTERFACE_FAILED: Eina.Error; -var @extern Efl.Net.Http.Error.LOGIN_DENIED: Eina.Error; -var @extern Efl.Net.Http.Error.NO_CONNECTION_AVAILABLE: Eina.Error; -var @extern Efl.Net.Http.Error.NOT_BUILT_IN: Eina.Error; -var @extern Efl.Net.Http.Error.OPERATION_TIMEDOUT: Eina.Error; -var @extern Efl.Net.Http.Error.PARTIAL_FILE: Eina.Error; -var @extern Efl.Net.Http.Error.PEER_FAILED_VERIFICATION: Eina.Error; -var @extern Efl.Net.Http.Error.RANGE_ERROR: Eina.Error; -var @extern Efl.Net.Http.Error.READ_ERROR: Eina.Error; -var @extern Efl.Net.Http.Error.RECV_ERROR: Eina.Error; -var @extern Efl.Net.Http.Error.REMOTE_ACCESS_DENIED: Eina.Error; -var @extern Efl.Net.Http.Error.REMOTE_DISK_FULL: Eina.Error; -var @extern Efl.Net.Http.Error.REMOTE_FILE_EXISTS: Eina.Error; -var @extern Efl.Net.Http.Error.REMOTE_FILE_NOT_FOUND: Eina.Error; -var @extern Efl.Net.Http.Error.SEND_ERROR: Eina.Error; -var @extern Efl.Net.Http.Error.SEND_FAIL_REWIND: Eina.Error; -var @extern Efl.Net.Http.Error.SSL_CACERT: Eina.Error; -var @extern Efl.Net.Http.Error.SSL_CACERT_BADFILE: Eina.Error; -var @extern Efl.Net.Http.Error.SSL_CERTPROBLEM: Eina.Error; -var @extern Efl.Net.Http.Error.SSL_CIPHER: Eina.Error; -var @extern Efl.Net.Http.Error.SSL_CONNECT_ERROR: Eina.Error; -var @extern Efl.Net.Http.Error.SSL_CRL_BADFILE: Eina.Error; -var @extern Efl.Net.Http.Error.SSL_ENGINE_INITFAILED: Eina.Error; -var @extern Efl.Net.Http.Error.SSL_ENGINE_NOTFOUND: Eina.Error; -var @extern Efl.Net.Http.Error.SSL_ENGINE_SETFAILED: Eina.Error; -var @extern Efl.Net.Http.Error.SSL_INVALIDCERTSTATUS: Eina.Error; -var @extern Efl.Net.Http.Error.SSL_ISSUER_ERROR: Eina.Error; -var @extern Efl.Net.Http.Error.SSL_PINNEDPUBKEYNOTMATCH: Eina.Error; -var @extern Efl.Net.Http.Error.SSL_SHUTDOWN_FAILED: Eina.Error; -var @extern Efl.Net.Http.Error.TOO_MANY_REDIRECTS: Eina.Error; -var @extern Efl.Net.Http.Error.UNKNOWN_OPTION: Eina.Error; -var @extern Efl.Net.Http.Error.UNSUPPORTED_PROTOCOL: Eina.Error; -var @extern Efl.Net.Http.Error.UPLOAD_FAILED: Eina.Error; -var @extern Efl.Net.Http.Error.URL_MALFORMAT: Eina.Error; -var @extern Efl.Net.Http.Error.USE_SSL_FAILED: Eina.Error; -var @extern Efl.Net.Http.Error.WRITE_ERROR: Eina.Error; +var Efl.Net.Http.Error.BAD_CONTENT_ENCODING: Eina.Error; +var Efl.Net.Http.Error.BAD_DOWNLOAD_RESUME: Eina.Error; +var Efl.Net.Http.Error.BAD_FUNCTION_ARGUMENT: Eina.Error; +var Efl.Net.Http.Error.CHUNK_FAILED: Eina.Error; +var Efl.Net.Http.Error.CONV_FAILED: Eina.Error; +var Efl.Net.Http.Error.CONV_REQD: Eina.Error; +var Efl.Net.Http.Error.FAILED_INIT: Eina.Error; +var Efl.Net.Http.Error.FILE_COULDNT_READ_FILE: Eina.Error; +var Efl.Net.Http.Error.FILESIZE_EXCEEDED: Eina.Error; +var Efl.Net.Http.Error.FUNCTION_NOT_FOUND: Eina.Error; +var Efl.Net.Http.Error.GOT_NOTHING: Eina.Error; +var Efl.Net.Http.Error.HTTP2: Eina.Error; +var Efl.Net.Http.Error.HTTP2_STREAM: Eina.Error; +var Efl.Net.Http.Error.HTTP_POST_ERROR: Eina.Error; +var Efl.Net.Http.Error.HTTP_RETURNED_ERROR: Eina.Error; +var Efl.Net.Http.Error.INTERFACE_FAILED: Eina.Error; +var Efl.Net.Http.Error.LOGIN_DENIED: Eina.Error; +var Efl.Net.Http.Error.NO_CONNECTION_AVAILABLE: Eina.Error; +var Efl.Net.Http.Error.NOT_BUILT_IN: Eina.Error; +var Efl.Net.Http.Error.OPERATION_TIMEDOUT: Eina.Error; +var Efl.Net.Http.Error.PARTIAL_FILE: Eina.Error; +var Efl.Net.Http.Error.PEER_FAILED_VERIFICATION: Eina.Error; +var Efl.Net.Http.Error.RANGE_ERROR: Eina.Error; +var Efl.Net.Http.Error.READ_ERROR: Eina.Error; +var Efl.Net.Http.Error.RECV_ERROR: Eina.Error; +var Efl.Net.Http.Error.REMOTE_ACCESS_DENIED: Eina.Error; +var Efl.Net.Http.Error.REMOTE_DISK_FULL: Eina.Error; +var Efl.Net.Http.Error.REMOTE_FILE_EXISTS: Eina.Error; +var Efl.Net.Http.Error.REMOTE_FILE_NOT_FOUND: Eina.Error; +var Efl.Net.Http.Error.SEND_ERROR: Eina.Error; +var Efl.Net.Http.Error.SEND_FAIL_REWIND: Eina.Error; +var Efl.Net.Http.Error.SSL_CACERT: Eina.Error; +var Efl.Net.Http.Error.SSL_CACERT_BADFILE: Eina.Error; +var Efl.Net.Http.Error.SSL_CERTPROBLEM: Eina.Error; +var Efl.Net.Http.Error.SSL_CIPHER: Eina.Error; +var Efl.Net.Http.Error.SSL_CONNECT_ERROR: Eina.Error; +var Efl.Net.Http.Error.SSL_CRL_BADFILE: Eina.Error; +var Efl.Net.Http.Error.SSL_ENGINE_INITFAILED: Eina.Error; +var Efl.Net.Http.Error.SSL_ENGINE_NOTFOUND: Eina.Error; +var Efl.Net.Http.Error.SSL_ENGINE_SETFAILED: Eina.Error; +var Efl.Net.Http.Error.SSL_INVALIDCERTSTATUS: Eina.Error; +var Efl.Net.Http.Error.SSL_ISSUER_ERROR: Eina.Error; +var Efl.Net.Http.Error.SSL_PINNEDPUBKEYNOTMATCH: Eina.Error; +var Efl.Net.Http.Error.SSL_SHUTDOWN_FAILED: Eina.Error; +var Efl.Net.Http.Error.TOO_MANY_REDIRECTS: Eina.Error; +var Efl.Net.Http.Error.UNKNOWN_OPTION: Eina.Error; +var Efl.Net.Http.Error.UNSUPPORTED_PROTOCOL: Eina.Error; +var Efl.Net.Http.Error.UPLOAD_FAILED: Eina.Error; +var Efl.Net.Http.Error.URL_MALFORMAT: Eina.Error; +var Efl.Net.Http.Error.USE_SSL_FAILED: Eina.Error; +var Efl.Net.Http.Error.WRITE_ERROR: Eina.Error; -- 2.7.4