From 47bd350398607f06c093807288ffb8cf6cb7e05e Mon Sep 17 00:00:00 2001
From: Howard Li <bighorn@pursuitofchallenge.com>
Date: 周二, 28 4月 2020 13:49:19 +0800
Subject: [PATCH] Fix event commands adding semi-colons to output
---
libscpi/src/parser.c | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/libscpi/src/parser.c b/libscpi/src/parser.c
index 0e85599..fbf7b23 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);
@@ -340,7 +348,8 @@
context->buffer.position -= totcmdlen;
totcmdlen = 0;
} else {
- if (context->parser_state.programHeader.type == SCPI_TOKEN_UNKNOWN) break;
+ if (context->parser_state.programHeader.type == SCPI_TOKEN_UNKNOWN
+ && context->parser_state.termination == SCPI_MESSAGE_TERMINATION_NONE) break;
if (totcmdlen >= context->buffer.position) break;
}
}
--
Gitblit v1.9.1