From 1b722fe36823b1662e172226916fd73f7ae2d11b Mon Sep 17 00:00:00 2001 From: Frank Celler Date: Wed, 21 Jan 2015 22:11:52 +0100 Subject: [PATCH] generated files --- lib/Basics/voc-errors.cpp | 4 +++ lib/Basics/voc-errors.h | 48 ++++++++++++++++++++++++++++++++++ lib/JsonParser/json-parser.cpp | 13 --------- lib/V8/v8-json.cpp | 13 --------- 4 files changed, 52 insertions(+), 26 deletions(-) diff --git a/lib/Basics/voc-errors.cpp b/lib/Basics/voc-errors.cpp index 64400b0186..32a54f216d 100644 --- a/lib/Basics/voc-errors.cpp +++ b/lib/Basics/voc-errors.cpp @@ -242,6 +242,10 @@ void TRI_InitialiseErrorMessages () { REG_ERROR(SIMPLE_CLIENT_COULD_NOT_CONNECT, "could not connect to server"); REG_ERROR(SIMPLE_CLIENT_COULD_NOT_WRITE, "could not write to server"); REG_ERROR(SIMPLE_CLIENT_COULD_NOT_READ, "could not read from server"); + REG_ERROR(ERROR_MALFORMED_MANIFEST_FILE, "malformed manifest file"); + REG_ERROR(ERROR_INVALID_APPLICATION_MANIFEST, "manifest file is invalid"); + REG_ERROR(ERROR_MANIFEST_FILE_ATTRIBUTE_MISSING, "missing manifest attribute"); + REG_ERROR(ERROR_CANNOT_EXTRACT_APPLICATION_ROOT, "unable to extract app root path"); REG_ERROR(RESULT_KEY_EXISTS, "element not inserted into structure, because key already exists"); REG_ERROR(RESULT_ELEMENT_EXISTS, "element not inserted into structure, because it already exists"); REG_ERROR(RESULT_KEY_NOT_FOUND, "key not found in structure"); diff --git a/lib/Basics/voc-errors.h b/lib/Basics/voc-errors.h index 58736639d3..1d4b49178a 100644 --- a/lib/Basics/voc-errors.h +++ b/lib/Basics/voc-errors.h @@ -578,6 +578,14 @@ /// Will be raised when the client could not write data. /// - 2003: @LIT{could not read from server} /// Will be raised when the client could not read data. +/// - 3000: @LIT{malformed manifest file} +/// The manifest file is malformed. It is not in a valid JSON format. +/// - 3001: @LIT{manifest file is invalid} +/// The manifest file of this application is invalid. +/// - 3002: @LIT{missing manifest attribute} +/// The manifest file is incomplete. A required attribute is missing. +/// - 3003: @LIT{unable to extract app root path} +/// The root path of the application could not be found. /// - 10000: @LIT{element not inserted into structure, because key already exists} /// Will be returned if the element was not insert because the key already /// exists. @@ -3060,6 +3068,46 @@ void TRI_InitialiseErrorMessages (); #define TRI_SIMPLE_CLIENT_COULD_NOT_READ (2003) +//////////////////////////////////////////////////////////////////////////////// +/// @brief 3000: ERROR_MALFORMED_MANIFEST_FILE +/// +/// malformed manifest file +/// +/// The manifest file is malformed. It is not in a valid JSON format. +//////////////////////////////////////////////////////////////////////////////// + +#define TRI_ERROR_MALFORMED_MANIFEST_FILE (3000) + +//////////////////////////////////////////////////////////////////////////////// +/// @brief 3001: ERROR_INVALID_APPLICATION_MANIFEST +/// +/// manifest file is invalid +/// +/// The manifest file of this application is invalid. +//////////////////////////////////////////////////////////////////////////////// + +#define TRI_ERROR_INVALID_APPLICATION_MANIFEST (3001) + +//////////////////////////////////////////////////////////////////////////////// +/// @brief 3002: ERROR_MANIFEST_FILE_ATTRIBUTE_MISSING +/// +/// missing manifest attribute +/// +/// The manifest file is incomplete. A required attribute is missing. +//////////////////////////////////////////////////////////////////////////////// + +#define TRI_ERROR_MANIFEST_FILE_ATTRIBUTE_MISSING (3002) + +//////////////////////////////////////////////////////////////////////////////// +/// @brief 3003: ERROR_CANNOT_EXTRACT_APPLICATION_ROOT +/// +/// unable to extract app root path +/// +/// The root path of the application could not be found. +//////////////////////////////////////////////////////////////////////////////// + +#define TRI_ERROR_CANNOT_EXTRACT_APPLICATION_ROOT (3003) + //////////////////////////////////////////////////////////////////////////////// /// @brief 10000: RESULT_KEY_EXISTS /// diff --git a/lib/JsonParser/json-parser.cpp b/lib/JsonParser/json-parser.cpp index 0a02cbf3ea..d924938959 100644 --- a/lib/JsonParser/json-parser.cpp +++ b/lib/JsonParser/json-parser.cpp @@ -203,15 +203,7 @@ typedef void* yyscan_t; /* Size of default input buffer. */ #ifndef YY_BUF_SIZE -#ifdef __ia64__ -/* On IA-64, the buffer size is 16k, not 8k. - * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. - * Ditto for the __ia64__ case accordingly. - */ -#define YY_BUF_SIZE 32768 -#else #define YY_BUF_SIZE 16384 -#endif /* __ia64__ */ #endif /* The state buf must be large enough to hold one state per character in the main buffer. @@ -679,12 +671,7 @@ static int input (yyscan_t yyscanner ); /* Amount of stuff to slurp up with each read. */ #ifndef YY_READ_BUF_SIZE -#ifdef __ia64__ -/* On IA-64, the buffer size is 16k, not 8k */ -#define YY_READ_BUF_SIZE 16384 -#else #define YY_READ_BUF_SIZE 8192 -#endif /* __ia64__ */ #endif /* Copy whatever the last rule matched to the standard output. */ diff --git a/lib/V8/v8-json.cpp b/lib/V8/v8-json.cpp index 0e30402940..7cce6ef40c 100644 --- a/lib/V8/v8-json.cpp +++ b/lib/V8/v8-json.cpp @@ -196,15 +196,7 @@ typedef void* yyscan_t; /* Size of default input buffer. */ #ifndef YY_BUF_SIZE -#ifdef __ia64__ -/* On IA-64, the buffer size is 16k, not 8k. - * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. - * Ditto for the __ia64__ case accordingly. - */ -#define YY_BUF_SIZE 32768 -#else #define YY_BUF_SIZE 16384 -#endif /* __ia64__ */ #endif /* The state buf must be large enough to hold one state per character in the main buffer. @@ -665,12 +657,7 @@ static int input (yyscan_t yyscanner ); /* Amount of stuff to slurp up with each read. */ #ifndef YY_READ_BUF_SIZE -#ifdef __ia64__ -/* On IA-64, the buffer size is 16k, not 8k */ -#define YY_READ_BUF_SIZE 16384 -#else #define YY_READ_BUF_SIZE 8192 -#endif /* __ia64__ */ #endif /* Copy whatever the last rule matched to the standard output. */