sola/scpi-parser.git

			@@ -45,6 +45,17 @@
			return SCPI_RES_OK;
			}

			static double test_sample_received = NAN;

			static scpi_result_t SCPI_Sample(scpi_t * context) {
			const char * val;
			size_t len;
			if (!SCPI_ParamArbitraryBlock(context, &val, &len, TRUE)) return SCPI_RES_ERR;
			if (len != sizeof(test_sample_received)) return SCPI_RES_ERR;
			memcpy(&test_sample_received, val, sizeof(test_sample_received));
			return SCPI_RES_OK;
			}

			static const scpi_command_t scpi_commands[] = {
			/* IEEE Mandated Commands (SCPI std V1999.0 4.1.1) */
			{ .pattern = "*CLS", .callback = SCPI_CoreCls,},
			@@ -80,6 +91,7 @@
			{ .pattern = "STUB", .callback = SCPI_Stub,},
			{ .pattern = "STUB?", .callback = SCPI_StubQ,},

			{ .pattern = "SAMple", .callback = SCPI_Sample,},
			SCPI_CMD_LIST_END
			};

			@@ -171,8 +183,11 @@
			#define SCPI_INPUT_BUFFER_LENGTH 256
			static char scpi_input_buffer[SCPI_INPUT_BUFFER_LENGTH];

			#define SCPI_ERROR_QUEUE_SIZE 5
			static int16_t scpi_error_queue_data[SCPI_ERROR_QUEUE_SIZE];
			#define SCPI_ERROR_QUEUE_SIZE 4
			static scpi_error_t scpi_error_queue_data[SCPI_ERROR_QUEUE_SIZE];

			#define SCPI_ERROR_INFO_HEAP_SIZE 100
			static char error_info_heap[SCPI_ERROR_INFO_HEAP_SIZE];

			static int init_suite(void) {
			SCPI_Init(&scpi_context,
			@@ -182,6 +197,10 @@
			"MA", "IN", NULL, "VER",
			scpi_input_buffer, SCPI_INPUT_BUFFER_LENGTH,
			scpi_error_queue_data, SCPI_ERROR_QUEUE_SIZE);
			#if USE_DEVICE_DEPENDENT_ERROR_INFORMATION && !USE_MEMORY_ALLOCATION_FREE
			SCPI_InitHeap(&scpi_context,
			error_info_heap, SCPI_ERROR_INFO_HEAP_SIZE);
			#endif

			return 0;
			}
			@@ -315,7 +334,11 @@
			TEST_IEEE4882("*ESR?\r\n", "0\r\n");

			TEST_IEEE4882("SYST:ERR:COUNT?\r\n", "1\r\n");
			#if USE_DEVICE_DEPENDENT_ERROR_INFORMATION
			TEST_IEEE4882("SYST:ERR:NEXT?\r\n", "-113,\"Undefined header;ABCD\"\r\n");
			#else /* USE_DEVICE_DEPENDENT_ERROR_INFORMATION */
			TEST_IEEE4882("SYST:ERR:NEXT?\r\n", "-113,\"Undefined header\"\r\n");
			#endif /* USE_DEVICE_DEPENDENT_ERROR_INFORMATION */
			TEST_IEEE4882("SYST:ERR:NEXT?\r\n", "0,\"No error\"\r\n");

			TEST_IEEE4882("STB?\r\n", "0\r\n"); / Error queue is now empty */
			@@ -326,7 +349,11 @@
			CU_ASSERT_EQUAL(srq_val, 0); /* no control callback */
			TEST_IEEE4882("STB?\r\n", "100\r\n"); / Event status register + Service request */
			TEST_IEEE4882("ESR?\r\n", "32\r\n"); / Command error */
			#if USE_DEVICE_DEPENDENT_ERROR_INFORMATION
			TEST_IEEE4882("SYST:ERR:NEXT?\r\n", "-113,\"Undefined header;ABCD\"\r\n");
			#else /* USE_DEVICE_DEPENDENT_ERROR_INFORMATION */
			TEST_IEEE4882("SYST:ERR:NEXT?\r\n", "-113,\"Undefined header\"\r\n");
			#endif /* USE_DEVICE_DEPENDENT_ERROR_INFORMATION */
			scpi_context.interface->control = SCPI_Control;

			RST_executed = FALSE;
			@@ -375,7 +402,7 @@
			{ \
			int32_t value; \
			scpi_bool_t result; \
			int16_t errCode; \
			scpi_error_t errCode; \
			\
			SCPI_CoreCls(&scpi_context); \
			scpi_context.input_count = 0; \
			@@ -384,12 +411,12 @@
			scpi_context.param_list.lex_state.pos = scpi_context.param_list.lex_state.buffer; \
			result = SCPI_ParamInt32(&scpi_context, &value, mandatory); \
			\
			errCode = SCPI_ErrorPop(&scpi_context); \
			SCPI_ErrorPop(&scpi_context, &errCode); \
			CU_ASSERT_EQUAL(result, expected_result); \
			if (expected_result) { \
			CU_ASSERT_EQUAL(value, expected_value); \
			} \
			CU_ASSERT_EQUAL(errCode, expected_error_code); \
			CU_ASSERT_EQUAL(errCode.error_code, expected_error_code); \
			}

			static void testSCPI_ParamInt32(void) {
			@@ -400,10 +427,10 @@
			TEST_ParamInt32("#H101010", TRUE, 1052688, TRUE, 0);
			TEST_ParamInt32("#Q10", TRUE, 8, TRUE, 0);

			TEST_ParamInt32("", TRUE, 0, FALSE, -109); // missing parameter
			TEST_ParamInt32("abcd", TRUE, 0, FALSE, -104); // Data type error
			TEST_ParamInt32("10.5V", TRUE, 0, FALSE, -138);
			TEST_ParamInt32("10V", TRUE, 0, FALSE, -138);
			TEST_ParamInt32("", TRUE, 0, FALSE, SCPI_ERROR_MISSING_PARAMETER); // missing parameter
			TEST_ParamInt32("abcd", TRUE, 0, FALSE, SCPI_ERROR_DATA_TYPE_ERROR); // Data type error
			TEST_ParamInt32("10.5V", TRUE, 0, FALSE, SCPI_ERROR_SUFFIX_NOT_ALLOWED);
			TEST_ParamInt32("10V", TRUE, 0, FALSE, SCPI_ERROR_SUFFIX_NOT_ALLOWED);

			// test range
			TEST_ParamInt32("2147483647", TRUE, 2147483647, TRUE, 0);
			@@ -414,7 +441,7 @@
			{ \
			uint32_t value; \
			scpi_bool_t result; \
			int16_t errCode; \
			scpi_error_t errCode; \
			\
			SCPI_CoreCls(&scpi_context); \
			scpi_context.input_count = 0; \
			@@ -423,12 +450,12 @@
			scpi_context.param_list.lex_state.pos = scpi_context.param_list.lex_state.buffer; \
			result = SCPI_ParamUInt32(&scpi_context, &value, mandatory); \
			\
			errCode = SCPI_ErrorPop(&scpi_context); \
			SCPI_ErrorPop(&scpi_context, &errCode); \
			CU_ASSERT_EQUAL(result, expected_result); \
			if (expected_result) { \
			CU_ASSERT_EQUAL(value, expected_value); \
			} \
			CU_ASSERT_EQUAL(errCode, expected_error_code); \
			CU_ASSERT_EQUAL(errCode.error_code, expected_error_code); \
			}

			static void testSCPI_ParamUInt32(void) {
			@@ -439,10 +466,10 @@
			TEST_ParamUInt32("#H101010", TRUE, 1052688, TRUE, 0);
			TEST_ParamUInt32("#Q10", TRUE, 8, TRUE, 0);

			TEST_ParamUInt32("", TRUE, 0, FALSE, -109); // missing parameter
			TEST_ParamUInt32("abcd", TRUE, 0, FALSE, -104); // Data type error
			TEST_ParamUInt32("10.5V", TRUE, 0, FALSE, -138);
			TEST_ParamUInt32("10V", TRUE, 0, FALSE, -138);
			TEST_ParamUInt32("", TRUE, 0, FALSE, SCPI_ERROR_MISSING_PARAMETER); // missing parameter
			TEST_ParamUInt32("abcd", TRUE, 0, FALSE, SCPI_ERROR_DATA_TYPE_ERROR); // Data type error
			TEST_ParamUInt32("10.5V", TRUE, 0, FALSE, SCPI_ERROR_SUFFIX_NOT_ALLOWED);
			TEST_ParamUInt32("10V", TRUE, 0, FALSE, SCPI_ERROR_SUFFIX_NOT_ALLOWED);

			// test range
			TEST_ParamUInt32("2147483647", TRUE, 2147483647ULL, TRUE, 0);
			@@ -453,7 +480,7 @@
			{ \
			int64_t value; \
			scpi_bool_t result; \
			int16_t errCode; \
			scpi_error_t errCode; \
			\
			SCPI_CoreCls(&scpi_context); \
			scpi_context.input_count = 0; \
			@@ -462,12 +489,12 @@
			scpi_context.param_list.lex_state.pos = scpi_context.param_list.lex_state.buffer; \
			result = SCPI_ParamInt64(&scpi_context, &value, mandatory); \
			\
			errCode = SCPI_ErrorPop(&scpi_context); \
			SCPI_ErrorPop(&scpi_context, &errCode); \
			CU_ASSERT_EQUAL(result, expected_result); \
			if (expected_result) { \
			CU_ASSERT_EQUAL(value, expected_value); \
			} \
			CU_ASSERT_EQUAL(errCode, expected_error_code); \
			CU_ASSERT_EQUAL(errCode.error_code, expected_error_code); \
			}

			static void testSCPI_ParamInt64(void) {
			@@ -478,10 +505,10 @@
			TEST_ParamInt64("#H101010", TRUE, 1052688, TRUE, 0);
			TEST_ParamInt64("#Q10", TRUE, 8, TRUE, 0);

			TEST_ParamInt64("", TRUE, 0, FALSE, -109); // missing parameter
			TEST_ParamInt64("abcd", TRUE, 0, FALSE, -104); // Data type error
			TEST_ParamInt64("10.5V", TRUE, 0, FALSE, -138);
			TEST_ParamInt64("10V", TRUE, 0, FALSE, -138);
			TEST_ParamInt64("", TRUE, 0, FALSE, SCPI_ERROR_MISSING_PARAMETER); // missing parameter
			TEST_ParamInt64("abcd", TRUE, 0, FALSE, SCPI_ERROR_DATA_TYPE_ERROR); // Data type error
			TEST_ParamInt64("10.5V", TRUE, 0, FALSE, SCPI_ERROR_SUFFIX_NOT_ALLOWED);
			TEST_ParamInt64("10V", TRUE, 0, FALSE, SCPI_ERROR_SUFFIX_NOT_ALLOWED);

			// test range
			TEST_ParamInt64("2147483647", TRUE, 2147483647LL, TRUE, 0);
			@@ -494,7 +521,7 @@
			{ \
			uint64_t value; \
			scpi_bool_t result; \
			int16_t errCode; \
			scpi_error_t errCode; \
			\
			SCPI_CoreCls(&scpi_context); \
			scpi_context.input_count = 0; \
			@@ -503,12 +530,12 @@
			scpi_context.param_list.lex_state.pos = scpi_context.param_list.lex_state.buffer; \
			result = SCPI_ParamUInt64(&scpi_context, &value, mandatory); \
			\
			errCode = SCPI_ErrorPop(&scpi_context); \
			SCPI_ErrorPop(&scpi_context, &errCode); \
			CU_ASSERT_EQUAL(result, expected_result); \
			if (expected_result) { \
			CU_ASSERT_EQUAL(value, expected_value); \
			} \
			CU_ASSERT_EQUAL(errCode, expected_error_code); \
			CU_ASSERT_EQUAL(errCode.error_code, expected_error_code); \
			}

			static void testSCPI_ParamUInt64(void) {
			@@ -519,10 +546,10 @@
			TEST_ParamUInt64("#H101010", TRUE, 1052688, TRUE, 0);
			TEST_ParamUInt64("#Q10", TRUE, 8, TRUE, 0);

			TEST_ParamUInt64("", TRUE, 0, FALSE, -109); // missing parameter
			TEST_ParamUInt64("abcd", TRUE, 0, FALSE, -104); // Data type error
			TEST_ParamUInt64("10.5V", TRUE, 0, FALSE, -138);
			TEST_ParamUInt64("10V", TRUE, 0, FALSE, -138);
			TEST_ParamUInt64("", TRUE, 0, FALSE, SCPI_ERROR_MISSING_PARAMETER); // missing parameter
			TEST_ParamUInt64("abcd", TRUE, 0, FALSE, SCPI_ERROR_DATA_TYPE_ERROR); // Data type error
			TEST_ParamUInt64("10.5V", TRUE, 0, FALSE, SCPI_ERROR_SUFFIX_NOT_ALLOWED);
			TEST_ParamUInt64("10V", TRUE, 0, FALSE, SCPI_ERROR_SUFFIX_NOT_ALLOWED);

			// test range
			TEST_ParamUInt64("2147483647", TRUE, 2147483647ULL, TRUE, 0);
			@@ -536,7 +563,7 @@
			{ \
			float value; \
			scpi_bool_t result; \
			int16_t errCode; \
			scpi_error_t errCode; \
			\
			SCPI_CoreCls(&scpi_context); \
			scpi_context.input_count = 0; \
			@@ -545,12 +572,12 @@
			scpi_context.param_list.lex_state.pos = scpi_context.param_list.lex_state.buffer; \
			result = SCPI_ParamFloat(&scpi_context, &value, mandatory); \
			\
			errCode = SCPI_ErrorPop(&scpi_context); \
			SCPI_ErrorPop(&scpi_context, &errCode); \
			CU_ASSERT_EQUAL(result, expected_result); \
			if (expected_result) { \
			CU_ASSERT_DOUBLE_EQUAL(value, expected_value, 0.000001); \
			} \
			CU_ASSERT_EQUAL(errCode, expected_error_code); \
			CU_ASSERT_EQUAL(errCode.error_code, expected_error_code); \
			}

			static void testSCPI_ParamFloat(void) {
			@@ -562,17 +589,17 @@
			TEST_ParamFloat("#Q10", TRUE, 8, TRUE, 0);
			TEST_ParamFloat("#HFFFFFF", TRUE, 0xFFFFFFu, TRUE, 0);

			TEST_ParamFloat("", TRUE, 0, FALSE, -109); // missing parameter
			TEST_ParamFloat("abcd", TRUE, 0, FALSE, -104); // Data type error
			TEST_ParamFloat("10.5V", TRUE, 0, FALSE, -138);
			TEST_ParamFloat("10V", TRUE, 0, FALSE, -138);
			TEST_ParamFloat("", TRUE, 0, FALSE, SCPI_ERROR_MISSING_PARAMETER); // missing parameter
			TEST_ParamFloat("abcd", TRUE, 0, FALSE, SCPI_ERROR_DATA_TYPE_ERROR); // Data type error
			TEST_ParamFloat("10.5V", TRUE, 0, FALSE, SCPI_ERROR_SUFFIX_NOT_ALLOWED);
			TEST_ParamFloat("10V", TRUE, 0, FALSE, SCPI_ERROR_SUFFIX_NOT_ALLOWED);
			}

			#define TEST_ParamDouble(data, mandatory, expected_value, expected_result, expected_error_code) \
			{ \
			double value; \
			scpi_bool_t result; \
			int16_t errCode; \
			scpi_error_t errCode; \
			\
			SCPI_CoreCls(&scpi_context); \
			scpi_context.input_count = 0; \
			@@ -581,12 +608,12 @@
			scpi_context.param_list.lex_state.pos = scpi_context.param_list.lex_state.buffer; \
			result = SCPI_ParamDouble(&scpi_context, &value, mandatory); \
			\
			errCode = SCPI_ErrorPop(&scpi_context); \
			SCPI_ErrorPop(&scpi_context, &errCode); \
			CU_ASSERT_EQUAL(result, expected_result); \
			if (expected_result) { \
			CU_ASSERT_DOUBLE_EQUAL(value, expected_value, 0.000001); \
			} \
			CU_ASSERT_EQUAL(errCode, expected_error_code); \
			CU_ASSERT_EQUAL(errCode.error_code, expected_error_code); \
			}

			static void testSCPI_ParamDouble(void) {
			@@ -598,10 +625,10 @@
			TEST_ParamDouble("#Q10", TRUE, 8, TRUE, 0);
			TEST_ParamDouble("#HFFFFFFFF", TRUE, 0xFFFFFFFFu, TRUE, 0);

			TEST_ParamDouble("", TRUE, 0, FALSE, -109); // missing parameter
			TEST_ParamDouble("abcd", TRUE, 0, FALSE, -104); // Data type error
			TEST_ParamDouble("10.5V", TRUE, 0, FALSE, -138);
			TEST_ParamDouble("10V", TRUE, 0, FALSE, -138);
			TEST_ParamDouble("", TRUE, 0, FALSE, SCPI_ERROR_MISSING_PARAMETER); // missing parameter
			TEST_ParamDouble("abcd", TRUE, 0, FALSE, SCPI_ERROR_DATA_TYPE_ERROR); // Data type error
			TEST_ParamDouble("10.5V", TRUE, 0, FALSE, SCPI_ERROR_SUFFIX_NOT_ALLOWED);
			TEST_ParamDouble("10V", TRUE, 0, FALSE, SCPI_ERROR_SUFFIX_NOT_ALLOWED);
			}

			#define TEST_ParamCharacters(data, mandatory, expected_value, expected_result, expected_error_code) \
			@@ -609,7 +636,7 @@
			const char * value; \
			size_t value_len; \
			scpi_bool_t result; \
			int16_t errCode; \
			scpi_error_t errCode; \
			\
			SCPI_CoreCls(&scpi_context); \
			scpi_context.input_count = 0; \
			@@ -618,12 +645,12 @@
			scpi_context.param_list.lex_state.pos = scpi_context.param_list.lex_state.buffer; \
			result = SCPI_ParamCharacters(&scpi_context, &value, &value_len, mandatory); \
			/printf("%.s\r\n", (int)value_len, value);*/ \
			errCode = SCPI_ErrorPop(&scpi_context); \
			SCPI_ErrorPop(&scpi_context, &errCode); \
			CU_ASSERT_EQUAL(result, expected_result); \
			if (expected_result) { \
			CU_ASSERT_NSTRING_EQUAL(value, expected_value, value_len); \
			} \
			CU_ASSERT_EQUAL(errCode, expected_error_code); \
			CU_ASSERT_EQUAL(errCode.error_code, expected_error_code); \
			}

			static void testSCPI_ParamCharacters(void) {
			@@ -632,7 +659,7 @@
			TEST_ParamCharacters("\"ABCD\"", TRUE, "ABCD", TRUE, 0); // TokDoubleQuoteProgramData
			TEST_ParamCharacters("\'ABCD\'", TRUE, "ABCD", TRUE, 0); // TokSingleQuoteProgramData
			TEST_ParamCharacters("#204ABCD", TRUE, "ABCD", TRUE, 0); // TokArbitraryBlockProgramData
			TEST_ParamCharacters("#210ABCD", TRUE, "", FALSE, -151); // invalid Block Data
			TEST_ParamCharacters("#210ABCD", TRUE, "", FALSE, SCPI_ERROR_INVALID_STRING_DATA); // invalid Block Data
			}


			@@ -641,7 +668,7 @@
			char value[100]; \
			size_t value_len; \
			scpi_bool_t result; \
			int16_t errCode; \
			scpi_error_t errCode; \
			\
			SCPI_CoreCls(&scpi_context); \
			scpi_context.input_count = 0; \
			@@ -650,13 +677,13 @@
			scpi_context.param_list.lex_state.pos = scpi_context.param_list.lex_state.buffer; \
			result = SCPI_ParamCopyText(&scpi_context, value, sizeof(value), &value_len, mandatory);\
			/printf("%.s\r\n", (int)value_len, value);*/ \
			errCode = SCPI_ErrorPop(&scpi_context); \
			SCPI_ErrorPop(&scpi_context, &errCode); \
			CU_ASSERT_EQUAL(result, expected_result); \
			if (expected_result) { \
			CU_ASSERT_STRING_EQUAL(value, expected_value); \
			CU_ASSERT_EQUAL(value_len, expected_len); \
			} \
			CU_ASSERT_EQUAL(errCode, expected_error_code); \
			CU_ASSERT_EQUAL(errCode.error_code, expected_error_code); \
			}

			static void testSCPI_ParamCopyText(void) {
			@@ -672,12 +699,101 @@
			TEST_ParamCopyText("\"\"", FALSE, "", 0, TRUE, 0);
			}

			#define TEST_ParamArbitraryBlock(data, mandatory, expected_value, expected_result, expected_error_code) \
			{ \
			const char * value; \
			size_t value_len; \
			scpi_bool_t result; \
			scpi_error_t errCode; \
			\
			SCPI_CoreCls(&scpi_context); \
			scpi_context.input_count = 0; \
			scpi_context.param_list.lex_state.buffer = data; \
			scpi_context.param_list.lex_state.len = strlen(scpi_context.param_list.lex_state.buffer);\
			scpi_context.param_list.lex_state.pos = scpi_context.param_list.lex_state.buffer; \
			result = SCPI_ParamArbitraryBlock(&scpi_context, &value, &value_len, mandatory); \
			/printf("%.s\r\n", (int)value_len, value);*/ \
			SCPI_ErrorPop(&scpi_context, &errCode); \
			CU_ASSERT_EQUAL(result, expected_result); \
			if (expected_result) { \
			CU_ASSERT_NSTRING_EQUAL(value, expected_value, value_len); \
			} \
			CU_ASSERT_EQUAL(errCode.error_code, expected_error_code); \
			}
			static void testSCPI_ParamArbitraryBlock(void) {
			TEST_ParamArbitraryBlock("#204ABCD", TRUE, "ABCD", TRUE, 0);
			TEST_ParamArbitraryBlock("\"ABCD\"", TRUE, "", FALSE, SCPI_ERROR_DATA_TYPE_ERROR);
			}

			#define TEST_ParamBool(data, mandatory, expected_value, expected_result, expected_error_code) \
			{ \
			scpi_bool_t value; \
			scpi_bool_t result; \
			scpi_error_t errCode; \
			\
			SCPI_CoreCls(&scpi_context); \
			scpi_context.input_count = 0; \
			scpi_context.param_list.lex_state.buffer = data; \
			scpi_context.param_list.lex_state.len = strlen(scpi_context.param_list.lex_state.buffer);\
			scpi_context.param_list.lex_state.pos = scpi_context.param_list.lex_state.buffer; \
			result = SCPI_ParamBool(&scpi_context, &value, mandatory); \
			\
			SCPI_ErrorPop(&scpi_context, &errCode); \
			CU_ASSERT_EQUAL(result, expected_result); \
			if (expected_result) { \
			CU_ASSERT_EQUAL(value, expected_value); \
			} \
			CU_ASSERT_EQUAL(errCode.error_code, expected_error_code); \
			}
			static void testSCPI_ParamBool(void) {
			TEST_ParamBool("ON", TRUE, TRUE, TRUE, 0);
			TEST_ParamBool("1", TRUE, TRUE, TRUE, 0);
			TEST_ParamBool("100", TRUE, TRUE, TRUE, 0);
			TEST_ParamBool("OFF", TRUE, FALSE, TRUE, 0);
			TEST_ParamBool("0", TRUE, FALSE, TRUE, 0);
			TEST_ParamBool("XYZ", TRUE, FALSE, FALSE, SCPI_ERROR_ILLEGAL_PARAMETER_VALUE);
			}

			#define TEST_ParamChoice(data, mandatory, expected_value, expected_result, expected_error_code) \
			{ \
			int32_t value; \
			scpi_bool_t result; \
			scpi_error_t errCode; \
			\
			SCPI_CoreCls(&scpi_context); \
			scpi_context.input_count = 0; \
			scpi_context.param_list.lex_state.buffer = data; \
			scpi_context.param_list.lex_state.len = strlen(scpi_context.param_list.lex_state.buffer);\
			scpi_context.param_list.lex_state.pos = scpi_context.param_list.lex_state.buffer; \
			result = SCPI_ParamChoice(&scpi_context, test_options, &value, mandatory); \
			\
			SCPI_ErrorPop(&scpi_context, &errCode); \
			CU_ASSERT_EQUAL(result, expected_result); \
			if (expected_result) { \
			CU_ASSERT_EQUAL(value, expected_value); \
			} \
			CU_ASSERT_EQUAL(errCode.error_code, expected_error_code); \
			}
			static void testSCPI_ParamChoice(void) {
			scpi_choice_def_t test_options[] = {
			{"OPTIONA", 1},
			{"OPTIONB", 2},
			{"SOURce", 3},
			SCPI_CHOICE_LIST_END /* termination of option list */
			};

			TEST_ParamChoice("ON", TRUE, 0, FALSE, SCPI_ERROR_ILLEGAL_PARAMETER_VALUE);
			TEST_ParamChoice("OPTIONA", TRUE, 1, TRUE, 0);
			TEST_ParamChoice("OPTIONB", TRUE, 2, TRUE, 0);
			TEST_ParamChoice("SOURCE", TRUE, 3, TRUE, 0);
			TEST_ParamChoice("SOUR", TRUE, 3, TRUE, 0);
			}

			#define TEST_NumericListInt(data, index, expected_range, expected_from, expected_to, expected_result, expected_error_code) \
			{ \
			scpi_bool_t result; \
			scpi_expr_result_t result2; \
			int16_t errCode; \
			scpi_error_t errCode; \
			scpi_parameter_t param; \
			int32_t val_from, val_to; \
			scpi_bool_t val_range; \
			@@ -689,7 +805,7 @@
			scpi_context.param_list.lex_state.pos = scpi_context.param_list.lex_state.buffer; \
			result = SCPI_Parameter(&scpi_context, &param, TRUE); \
			result2 = SCPI_ExprNumericListEntryInt(&scpi_context, &param, index, &val_range, &val_from, &val_to);\
			errCode = SCPI_ErrorPop(&scpi_context); \
			SCPI_ErrorPop(&scpi_context, &errCode); \
			CU_ASSERT_EQUAL(result2, expected_result); \
			if (expected_result == SCPI_EXPR_OK) { \
			CU_ASSERT_EQUAL(val_range, expected_range); \
			@@ -698,14 +814,14 @@
			CU_ASSERT_EQUAL(val_to, expected_to); \
			} \
			} \
			CU_ASSERT_EQUAL(errCode, expected_error_code); \
			CU_ASSERT_EQUAL(errCode.error_code, expected_error_code); \
			}

			#define TEST_NumericListDouble(data, index, expected_range, expected_from, expected_to, expected_result, expected_error_code) \
			{ \
			scpi_bool_t result; \
			scpi_expr_result_t result2; \
			int16_t errCode; \
			scpi_error_t errCode; \
			scpi_parameter_t param; \
			double val_from, val_to; \
			scpi_bool_t val_range; \
			@@ -717,7 +833,7 @@
			scpi_context.param_list.lex_state.pos = scpi_context.param_list.lex_state.buffer; \
			result = SCPI_Parameter(&scpi_context, &param, TRUE); \
			result2 = SCPI_ExprNumericListEntryDouble(&scpi_context, &param, index, &val_range, &val_from, &val_to);\
			errCode = SCPI_ErrorPop(&scpi_context); \
			SCPI_ErrorPop(&scpi_context, &errCode); \
			CU_ASSERT_EQUAL(result2, expected_result); \
			if (expected_result == SCPI_EXPR_OK) { \
			CU_ASSERT_EQUAL(val_range, expected_range); \
			@@ -726,7 +842,7 @@
			CU_ASSERT_DOUBLE_EQUAL(val_to, expected_to, 0.0001); \
			} \
			} \
			CU_ASSERT_EQUAL(errCode, expected_error_code); \
			CU_ASSERT_EQUAL(errCode.error_code, expected_error_code); \
			}

			static void testNumericList(void) {
			@@ -763,7 +879,7 @@
			{ \
			scpi_bool_t result; \
			scpi_expr_result_t result2; \
			int16_t errCode; \
			scpi_error_t errCode; \
			scpi_parameter_t param; \
			int32_t val_from[val_len], val_to[val_len]; \
			scpi_bool_t val_range; \
			@@ -778,7 +894,7 @@
			scpi_context.param_list.lex_state.pos = scpi_context.param_list.lex_state.buffer; \
			result = SCPI_Parameter(&scpi_context, &param, TRUE); \
			result2 = SCPI_ExprChannelListEntry(&scpi_context, &param, index, &val_range, val_from, val_to, val_len, &val_dimensions);\
			errCode = SCPI_ErrorPop(&scpi_context); \
			SCPI_ErrorPop(&scpi_context, &errCode); \
			CU_ASSERT_EQUAL(result2, expected_result); \
			if (expected_result == SCPI_EXPR_OK) { \
			CU_ASSERT_EQUAL(val_dimensions, expected_dimensions); \
			@@ -792,7 +908,7 @@
			}} \
			} \
			} \
			CU_ASSERT_EQUAL(errCode, expected_error_code); \
			CU_ASSERT_EQUAL(errCode.error_code, expected_error_code); \
			}

			static void testChannelList(void) {
			@@ -834,7 +950,7 @@
			{ \
			scpi_number_t value; \
			scpi_bool_t result; \
			int16_t errCode; \
			scpi_error_t errCode; \
			\
			SCPI_CoreCls(&scpi_context); \
			scpi_context.input_count = 0; \
			@@ -843,7 +959,7 @@
			scpi_context.param_list.lex_state.pos = scpi_context.param_list.lex_state.buffer; \
			result = SCPI_ParamNumber(&scpi_context, scpi_special_numbers_def, &value, mandatory);\
			\
			errCode = SCPI_ErrorPop(&scpi_context); \
			SCPI_ErrorPop(&scpi_context, &errCode); \
			CU_ASSERT_EQUAL(result, expected_result); \
			if (expected_result) { \
			CU_ASSERT_EQUAL(value.special, expected_special); \
			@@ -852,7 +968,7 @@
			CU_ASSERT_EQUAL(value.unit, expected_unit); \
			CU_ASSERT_EQUAL(value.base, expected_base); \
			} \
			CU_ASSERT_EQUAL(errCode, expected_error_code); \
			CU_ASSERT_EQUAL(errCode.error_code, expected_error_code); \
			}

			static void testParamNumber(void) {
			@@ -868,6 +984,7 @@
			TEST_ParamNumber("min", TRUE, TRUE, SCPI_NUM_MIN, 0, SCPI_UNIT_NONE, 10, TRUE, 0);
			TEST_ParamNumber("infinity", TRUE, TRUE, SCPI_NUM_INF, 0, SCPI_UNIT_NONE, 10, TRUE, 0);
			TEST_ParamNumber("minc", TRUE, TRUE, SCPI_NUM_NUMBER, 0, SCPI_UNIT_NONE, 10, FALSE, SCPI_ERROR_ILLEGAL_PARAMETER_VALUE);
			TEST_ParamNumber("100 xyz", TRUE, FALSE, SCPI_NUM_NUMBER, 100, SCPI_UNIT_NONE, 10, FALSE, SCPI_ERROR_INVALID_SUFFIX);
			}

			#define TEST_Result(func, value, expected_result) \
			@@ -1166,7 +1283,7 @@
			number.base = 10;\
			number.special = (_special);\
			number.unit = (_unit);\
			if (number.special) { number.tag = (_value); } else { number.value = (_value); }\
			if (number.special) { number.tag = (int)(_value); } else { number.value = (_value); }\
			char buffer[100 + 1];\
			size_t res_len;\
			res_len = SCPI_NumberToStr(&scpi_context, scpi_special_numbers_def, &number, buffer, 100);\
			@@ -1180,6 +1297,7 @@
			}

			static void testErrorQueue(void) {
			scpi_error_t val;
			SCPI_ErrorClear(&scpi_context);
			CU_ASSERT_EQUAL(SCPI_ErrorCount(&scpi_context), 0);
			SCPI_ErrorPush(&scpi_context, -1);
			@@ -1195,18 +1313,144 @@
			SCPI_ErrorPush(&scpi_context, -6);
			CU_ASSERT_EQUAL(SCPI_ErrorCount(&scpi_context), 4);

			CU_ASSERT_EQUAL(SCPI_ErrorPop(&scpi_context), -1);
			SCPI_ErrorPop(&scpi_context, &val);
			CU_ASSERT_EQUAL(val.error_code, -1);
			CU_ASSERT_EQUAL(SCPI_ErrorCount(&scpi_context), 3);
			CU_ASSERT_EQUAL(SCPI_ErrorPop(&scpi_context), -2);
			SCPI_ErrorPop(&scpi_context, &val);
			CU_ASSERT_EQUAL(val.error_code, -2);
			CU_ASSERT_EQUAL(SCPI_ErrorCount(&scpi_context), 2);
			CU_ASSERT_EQUAL(SCPI_ErrorPop(&scpi_context), -3);
			SCPI_ErrorPop(&scpi_context, &val);
			CU_ASSERT_EQUAL(val.error_code, -3);
			CU_ASSERT_EQUAL(SCPI_ErrorCount(&scpi_context), 1);
			CU_ASSERT_EQUAL(SCPI_ErrorPop(&scpi_context), SCPI_ERROR_QUEUE_OVERFLOW);
			SCPI_ErrorPop(&scpi_context, &val);
			CU_ASSERT_EQUAL(val.error_code, SCPI_ERROR_QUEUE_OVERFLOW);
			CU_ASSERT_EQUAL(SCPI_ErrorCount(&scpi_context), 0);
			CU_ASSERT_EQUAL(SCPI_ErrorPop(&scpi_context), 0);
			SCPI_ErrorPop(&scpi_context, &val);
			CU_ASSERT_EQUAL(val.error_code, 0);
			CU_ASSERT_EQUAL(SCPI_ErrorCount(&scpi_context), 0);

			SCPI_ErrorClear(&scpi_context);
			}

			#define TEST_INCOMPLETE_ARB(_val, _part_len) do {\
			double val = _val;\
			char command_text[] = "SAMple #18[DOUBLE]\r";\
			char * command = command_text;\
			size_t command_len = strlen(command);\
			memcpy(command + 10, &val, sizeof(val));\
			test_sample_received = NAN;\
			size_t part_len = _part_len;\
			SCPI_ErrorClear(&scpi_context);\
			while (command_len) {\
			part_len = part_len > command_len ? command_len : part_len;\
			SCPI_Input(&scpi_context, command, part_len);\
			command += part_len;\
			command_len -= part_len;\
			}\
			CU_ASSERT_EQUAL(SCPI_ErrorCount(&scpi_context), 0);\
			CU_ASSERT_EQUAL(test_sample_received, val);\
			} while(0)

			static void testIncompleteArbitraryParameter(void) {
			TEST_INCOMPLETE_ARB(0.5, 19);
			TEST_INCOMPLETE_ARB(0.5, 18);
			TEST_INCOMPLETE_ARB(0.5, 17);
			TEST_INCOMPLETE_ARB(0.5, 16);
			TEST_INCOMPLETE_ARB(0.5, 15);
			TEST_INCOMPLETE_ARB(0.5, 14);
			TEST_INCOMPLETE_ARB(0.5, 13);
			TEST_INCOMPLETE_ARB(0.5, 12);
			TEST_INCOMPLETE_ARB(0.5, 11);
			TEST_INCOMPLETE_ARB(0.5, 10);
			TEST_INCOMPLETE_ARB(0.5, 9);
			TEST_INCOMPLETE_ARB(0.5, 8);
			TEST_INCOMPLETE_ARB(0.5, 7);
			TEST_INCOMPLETE_ARB(0.5, 6);
			TEST_INCOMPLETE_ARB(0.5, 5);
			TEST_INCOMPLETE_ARB(0.5, 4);
			TEST_INCOMPLETE_ARB(0.5, 3);
			TEST_INCOMPLETE_ARB(0.5, 2);
			TEST_INCOMPLETE_ARB(0.5, 1);

			TEST_INCOMPLETE_ARB(0.501220703125, 19);
			TEST_INCOMPLETE_ARB(0.501220703125, 18);
			TEST_INCOMPLETE_ARB(0.501220703125, 17);
			TEST_INCOMPLETE_ARB(0.501220703125, 16);
			TEST_INCOMPLETE_ARB(0.501220703125, 15);
			TEST_INCOMPLETE_ARB(0.501220703125, 14);
			TEST_INCOMPLETE_ARB(0.501220703125, 13);
			TEST_INCOMPLETE_ARB(0.501220703125, 12);
			TEST_INCOMPLETE_ARB(0.501220703125, 11);
			TEST_INCOMPLETE_ARB(0.501220703125, 10);
			TEST_INCOMPLETE_ARB(0.501220703125, 9);
			TEST_INCOMPLETE_ARB(0.501220703125, 8);
			TEST_INCOMPLETE_ARB(0.501220703125, 7);
			TEST_INCOMPLETE_ARB(0.501220703125, 6);
			TEST_INCOMPLETE_ARB(0.501220703125, 5);
			TEST_INCOMPLETE_ARB(0.501220703125, 4);
			TEST_INCOMPLETE_ARB(0.501220703125, 3);
			TEST_INCOMPLETE_ARB(0.501220703125, 2);
			TEST_INCOMPLETE_ARB(0.501220703125, 1);

			TEST_INCOMPLETE_ARB(0.500000024214387, 19);
			TEST_INCOMPLETE_ARB(0.500000024214387, 18);
			TEST_INCOMPLETE_ARB(0.500000024214387, 17);
			TEST_INCOMPLETE_ARB(0.500000024214387, 16);
			TEST_INCOMPLETE_ARB(0.500000024214387, 15);
			TEST_INCOMPLETE_ARB(0.500000024214387, 14);
			TEST_INCOMPLETE_ARB(0.500000024214387, 13);
			TEST_INCOMPLETE_ARB(0.500000024214387, 12);
			TEST_INCOMPLETE_ARB(0.500000024214387, 11);
			TEST_INCOMPLETE_ARB(0.500000024214387, 10);
			TEST_INCOMPLETE_ARB(0.500000024214387, 9);
			TEST_INCOMPLETE_ARB(0.500000024214387, 8);
			TEST_INCOMPLETE_ARB(0.500000024214387, 7);
			TEST_INCOMPLETE_ARB(0.500000024214387, 6);
			TEST_INCOMPLETE_ARB(0.500000024214387, 5);
			TEST_INCOMPLETE_ARB(0.500000024214387, 4);
			TEST_INCOMPLETE_ARB(0.500000024214387, 3);
			TEST_INCOMPLETE_ARB(0.500000024214387, 2);
			TEST_INCOMPLETE_ARB(0.500000024214387, 1);
			}

			#define TEST_INCOMPLETE_TEXT(_text, _part_len) do {\
			char command_text[] = "TEXT? \"\", \"" _text "\"\r";\
			char * command = command_text;\
			size_t command_len = strlen(command);\
			output_buffer_clear();\
			size_t part_len = _part_len;\
			SCPI_ErrorClear(&scpi_context);\
			while (command_len) {\
			part_len = part_len > command_len ? command_len : part_len;\
			SCPI_Input(&scpi_context, command, part_len);\
			command += part_len;\
			command_len -= part_len;\
			}\
			CU_ASSERT_EQUAL(SCPI_ErrorCount(&scpi_context), 0);\
			CU_ASSERT_STRING_EQUAL("\"" _text "\"\r\n", output_buffer);\
			} while(0)

			static void testIncompleteTextParameter(void) {
			TEST_INCOMPLETE_TEXT("AbcdEfgh", 20);
			TEST_INCOMPLETE_TEXT("AbcdEfgh", 19);
			TEST_INCOMPLETE_TEXT("AbcdEfgh", 18);
			TEST_INCOMPLETE_TEXT("AbcdEfgh", 17);
			TEST_INCOMPLETE_TEXT("AbcdEfgh", 16);
			TEST_INCOMPLETE_TEXT("AbcdEfgh", 15);
			TEST_INCOMPLETE_TEXT("AbcdEfgh", 14);
			TEST_INCOMPLETE_TEXT("AbcdEfgh", 13);
			TEST_INCOMPLETE_TEXT("AbcdEfgh", 12);
			TEST_INCOMPLETE_TEXT("AbcdEfgh", 11);
			TEST_INCOMPLETE_TEXT("AbcdEfgh", 10);
			TEST_INCOMPLETE_TEXT("AbcdEfgh", 9);
			TEST_INCOMPLETE_TEXT("AbcdEfgh", 8);
			TEST_INCOMPLETE_TEXT("AbcdEfgh", 7);
			TEST_INCOMPLETE_TEXT("AbcdEfgh", 6);
			TEST_INCOMPLETE_TEXT("AbcdEfgh", 5);
			TEST_INCOMPLETE_TEXT("AbcdEfgh", 4);
			TEST_INCOMPLETE_TEXT("AbcdEfgh", 3);
			TEST_INCOMPLETE_TEXT("AbcdEfgh", 2);
			TEST_INCOMPLETE_TEXT("AbcdEfgh", 1);
			}

			int main() {
			@@ -1233,6 +1477,9 @@
			\|\| (NULL == CU_add_test(pSuite, "SCPI_ParamDouble", testSCPI_ParamDouble))
			\|\| (NULL == CU_add_test(pSuite, "SCPI_ParamCharacters", testSCPI_ParamCharacters))
			\|\| (NULL == CU_add_test(pSuite, "SCPI_ParamCopyText", testSCPI_ParamCopyText))
			\|\| (NULL == CU_add_test(pSuite, "SCPI_ParamArbitraryBlock", testSCPI_ParamArbitraryBlock))
			\|\| (NULL == CU_add_test(pSuite, "SCPI_ParamBool", testSCPI_ParamBool))
			\|\| (NULL == CU_add_test(pSuite, "SCPI_ParamChoice", testSCPI_ParamChoice))
			\|\| (NULL == CU_add_test(pSuite, "Commands handling", testCommandsHandling))
			\|\| (NULL == CU_add_test(pSuite, "Error handling", testErrorHandling))
			\|\| (NULL == CU_add_test(pSuite, "IEEE 488.2 Mandatory commands", testIEEE4882))
			@@ -1256,6 +1503,8 @@
			\|\| (NULL == CU_add_test(pSuite, "SCPI_ResultArray", testResultArray))
			\|\| (NULL == CU_add_test(pSuite, "SCPI_NumberToStr", testNumberToStr))
			\|\| (NULL == CU_add_test(pSuite, "SCPI_ErrorQueue", testErrorQueue))
			\|\| (NULL == CU_add_test(pSuite, "Incomplete arbitrary parameter", testIncompleteArbitraryParameter))
			\|\| (NULL == CU_add_test(pSuite, "Incomplete text parameter", testIncompleteTextParameter))
			) {
			CU_cleanup_registry();
			return CU_get_error();