From 39fdcb0c57bfeba598f00d77f190e731f26b25a1 Mon Sep 17 00:00:00 2001
From: sola.lu <sola.lu@greentest.com.cn>
Date: 周四, 24 4月 2025 18:25:01 +0800
Subject: [PATCH] 1.修改一下，把当前库改为刚从origin仓库拉去下来，然后添加了cmake构建文件的状态。
---
libscpi/src/parser.c | 115 ++++++++++++++++++++++++++++++---------------------------
1 files changed, 60 insertions(+), 55 deletions(-)
diff --git a/libscpi/src/parser.c b/libscpi/src/parser.c
index 114fe3a..de14418 100644
--- a/libscpi/src/parser.c
+++ b/libscpi/src/parser.c
@@ -1,28 +1,29 @@
/*-
- * Copyright (c) 2012-2013 Jan Breuer,
+ * BSD 2-Clause License
*
- * All Rights Reserved
+ * Copyright (c) 2012-2018, Jan Breuer
+ * All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
+ * modification, are permitted provided that the following conditions are met:
*
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
/**
@@ -49,11 +50,11 @@
* Write data to SCPI output
* @param context
* @param data
- * @param len - lenght of data to be written
+ * @param len - length of data to be written
* @return number of bytes written
*/
static size_t writeData(scpi_t * context, const char * data, size_t len) {
- if (len > 0) {
+ if ((len > 0) && (data != NULL)) {
return context->interface->write(context, data, len);
} else {
return 0;
@@ -92,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
@@ -126,14 +127,17 @@
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;
context->input_count = 0;
- context->arbitrary_reminding = 0;
+ context->arbitrary_remaining = 0;
/* if callback exists - call command callback */
if (cmd->callback != NULL) {
@@ -145,6 +149,10 @@
} else {
if (context->cmd_error) {
result = FALSE;
+ } else {
+ if(context->first_output && is_query) {
+ context->first_output = FALSE;
+ }
}
}
}
@@ -196,6 +204,7 @@
state = &context->parser_state;
context->output_count = 0;
+ context->first_output = TRUE;
while (1) {
r = scpiParser_detectProgramMessageUnit(state, data, len);
@@ -220,7 +229,7 @@
cmd_prev = state->programHeader;
} else {
/* place undefined header with error */
- /* calculate length of errornouse header and trim \r\n */
+ /* calculate length of errorenous header and trim \r\n */
size_t r2 = r;
while (r2 > 0 && (data[r2 - 1] == '\r' || data[r2 - 1] == '\n')) r2--;
SCPI_ErrorPushEx(context, SCPI_ERROR_UNDEFINED_HEADER, data, r2);
@@ -237,7 +246,7 @@
}
- /* conditionaly write new line */
+ /* conditionally write new line */
writeNewLine(context);
return result;
@@ -339,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;
}
}
@@ -504,7 +514,7 @@
}
/**
- * Write string withn " to the result
+ * Write string within "" to the result
* @param context
* @param data
* @return
@@ -604,6 +614,7 @@
* @return
*/
size_t SCPI_ResultArbitraryBlockHeader(scpi_t * context, size_t len) {
+ size_t result = 0;
char block_header[12];
size_t header_len;
block_header[0] = '#';
@@ -612,8 +623,10 @@
header_len = strlen(block_header + 2);
block_header[1] = (char) (header_len + '0');
- context->arbitrary_reminding = len;
- return writeData(context, block_header, header_len + 2);
+ context->arbitrary_remaining = len;
+ result = writeDelimiter(context);
+ result += writeData(context, block_header, header_len + 2);
+ return result;
}
/**
@@ -625,14 +638,14 @@
*/
size_t SCPI_ResultArbitraryBlockData(scpi_t * context, const void * data, size_t len) {
- if (context->arbitrary_reminding < len) {
+ if (context->arbitrary_remaining < len) {
SCPI_ErrorPush(context, SCPI_ERROR_SYSTEM_ERROR);
return 0;
}
- context->arbitrary_reminding -= len;
+ context->arbitrary_remaining -= len;
- if (context->arbitrary_reminding == 0) {
+ if (context->arbitrary_remaining == 0) {
context->output_count++;
}
@@ -699,7 +712,7 @@
if (mandatory) {
SCPI_ErrorPush(context, SCPI_ERROR_MISSING_PARAMETER);
} else {
- parameter->type = SCPI_TOKEN_PROGRAM_MNEMONIC; // TODO: select something different
+ parameter->type = SCPI_TOKEN_PROGRAM_MNEMONIC; /* TODO: select something different */
}
return FALSE;
}
@@ -1134,7 +1147,7 @@
break;
}
- // TODO: return also parameter type (ProgramMnemonic, ArbitraryBlockProgramData, SingleQuoteProgramData, DoubleQuoteProgramData
+ /* TODO: return also parameter type (ProgramMnemonic, ArbitraryBlockProgramData, SingleQuoteProgramData, DoubleQuoteProgramData */
}
return result;
@@ -1270,6 +1283,15 @@
return FALSE;
}
+/*
+ * Definition of BOOL choice list
+ */
+const scpi_choice_def_t scpi_bool_def[] = {
+ {"OFF", 0},
+ {"ON", 1},
+ SCPI_CHOICE_LIST_END /* termination of option list */
+};
+
/**
* Read BOOL parameter (0,1,ON,OFF)
* @param context
@@ -1281,12 +1303,6 @@
scpi_bool_t result;
scpi_parameter_t param;
int32_t intval;
-
- scpi_choice_def_t bool_options[] = {
- {"OFF", 0},
- {"ON", 1},
- SCPI_CHOICE_LIST_END /* termination of option list */
- };
if (!value) {
SCPI_ErrorPush(context, SCPI_ERROR_SYSTEM_ERROR);
@@ -1300,7 +1316,7 @@
SCPI_ParamToInt32(context, ¶m, &intval);
*value = intval ? TRUE : FALSE;
} else {
- result = SCPI_ParamToChoice(context, ¶m, bool_options, &intval);
+ result = SCPI_ParamToChoice(context, ¶m, scpi_bool_def, &intval);
if (result) {
*value = intval ? TRUE : FALSE;
}
@@ -1394,13 +1410,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;
@@ -1411,10 +1420,6 @@
break;
}
paramCount++;
- }
-
- if (token->len == -1) {
- token->len = 0;
}
if (numberOfParameters != NULL) {
--
Gitblit v1.9.1