From c875ffe53f680aa4d396c64dca7b0c0719e36b41 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周一, 16 1月 2023 16:53:03 +0800
Subject: [PATCH] Merge pull request #139 from j123b567/feature/add-cxx-stdbool
---
libscpi/src/parser.c | 25 +++++++++++--------------
1 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/libscpi/src/parser.c b/libscpi/src/parser.c
index 67b9bd5..2e83ced 100644
--- a/libscpi/src/parser.c
+++ b/libscpi/src/parser.c
@@ -93,7 +93,7 @@
* @return number of characters written
*/
static size_t writeNewLine(scpi_t * context) {
- if (context->output_count > 0) {
+ if (!context->first_output) {
size_t len;
#ifndef SCPI_LINE_ENDING
#error no termination character defined
@@ -127,9 +127,12 @@
const scpi_command_t * cmd = context->param_list.cmd;
lex_state_t * state = &context->param_list.lex_state;
scpi_bool_t result = TRUE;
+ scpi_bool_t is_query = context->param_list.cmd_raw.data[context->param_list.cmd_raw.length - 1] == '?';
- /* conditionaly write ; */
- writeSemicolon(context);
+ /* conditionally write ; */
+ if(!context->first_output && is_query) {
+ writeData(context, ";", 1);
+ }
context->cmd_error = FALSE;
context->output_count = 0;
@@ -146,6 +149,10 @@
} else {
if (context->cmd_error) {
result = FALSE;
+ } else {
+ if(context->first_output && is_query) {
+ context->first_output = FALSE;
+ }
}
}
}
@@ -197,6 +204,7 @@
state = &context->parser_state;
context->output_count = 0;
+ context->first_output = TRUE;
while (1) {
r = scpiParser_detectProgramMessageUnit(state, data, len);
@@ -1399,13 +1407,6 @@
for (result = 1; result != 0; result = scpiLex_Comma(state, &tmp)) {
token->len += result;
- if (result == 0) {
- token->type = SCPI_TOKEN_UNKNOWN;
- token->len = 0;
- paramCount = -1;
- break;
- }
-
result = scpiParser_parseProgramData(state, &tmp);
if (tmp.type != SCPI_TOKEN_UNKNOWN) {
token->len += result;
@@ -1416,10 +1417,6 @@
break;
}
paramCount++;
- }
-
- if (token->len == -1) {
- token->len = 0;
}
if (numberOfParameters != NULL) {
--
Gitblit v1.9.1