From d2a06893015a9e2845f9278af9e2ba15f9b37d9d Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周一, 31 8月 2015 17:35:32 +0800
Subject: [PATCH] Fix #44: incorrect handling of empty string
---
libscpi/src/lexer.c | 6 +++---
libscpi/src/parser.c | 15 ++++++++++++---
libscpi/test/test_lexer_parser.c | 25 ++++++++++++++-----------
libscpi/test/test_parser.c | 3 +++
examples/common/scpi-def.cpp | 5 +++--
examples/common/scpi-def.c | 5 +++--
6 files changed, 38 insertions(+), 21 deletions(-)
diff --git a/examples/common/scpi-def.c b/examples/common/scpi-def.c
index 4e690b8..da8e847 100644
--- a/examples/common/scpi-def.c
+++ b/examples/common/scpi-def.c
@@ -170,8 +170,9 @@
char buffer[100];
size_t copy_len;
- SCPI_ParamCopyText(context, buffer, sizeof(buffer), ©_len, FALSE);
- buffer[copy_len] = '\0';
+ if (!SCPI_ParamCopyText(context, buffer, sizeof(buffer), ©_len, FALSE)) {
+ buffer[0] = '\0';
+ }
fprintf(stderr, "TEXT: ***%s***\r\n", buffer);
diff --git a/examples/common/scpi-def.cpp b/examples/common/scpi-def.cpp
index d3b737c..c69af2e 100644
--- a/examples/common/scpi-def.cpp
+++ b/examples/common/scpi-def.cpp
@@ -167,8 +167,9 @@
char buffer[100];
size_t copy_len;
- SCPI_ParamCopyText(context, buffer, sizeof(buffer), ©_len, false);
- buffer[copy_len] = '\0';
+ if(!SCPI_ParamCopyText(context, buffer, sizeof(buffer), ©_len, false)) {
+ buffer[0] = '\0';
+ }
fprintf(stderr, "TEXT: ***%s***\r\n", buffer);
diff --git a/libscpi/src/lexer.c b/libscpi/src/lexer.c
index 45b19ce..aaca475 100644
--- a/libscpi/src/lexer.c
+++ b/libscpi/src/lexer.c
@@ -690,15 +690,15 @@
token->len = state->pos - token->ptr;
if ((token->len > 0)) {
- token->ptr++;
- token->len -= 2;
+ //token->ptr++;
+ //token->len -= 2;
} else {
token->type = SCPI_TOKEN_UNKNOWN;
state->pos = token->ptr;
token->len = 0;
}
- return token->len > 0 ? token->len + 2 : 0;
+ return token->len > 0 ? token->len : 0;
}
/* 7.7.6 <ARBITRARY BLOCK PROGRAM DATA> */
diff --git a/libscpi/src/parser.c b/libscpi/src/parser.c
index 6a7b776..c307a37 100644
--- a/libscpi/src/parser.c
+++ b/libscpi/src/parser.c
@@ -701,8 +701,17 @@
result = SCPI_Parameter(context, ¶m, mandatory);
if (result) {
- *value = param.ptr;
- *len = param.len;
+ switch(param.type) {
+ case SCPI_TOKEN_SINGLE_QUOTE_PROGRAM_DATA:
+ case SCPI_TOKEN_DOUBLE_QUOTE_PROGRAM_DATA:
+ *value = param.ptr + 1;
+ *len = param.len - 2;
+ break;
+ default:
+ *value = param.ptr;
+ *len = param.len;
+ break;
+ }
// TODO: return also parameter type (ProgramMnemonic, ArbitraryBlockProgramData, SingleQuoteProgramData, DoubleQuoteProgramData
}
@@ -760,7 +769,7 @@
case SCPI_TOKEN_SINGLE_QUOTE_PROGRAM_DATA:
case SCPI_TOKEN_DOUBLE_QUOTE_PROGRAM_DATA:
quote = param.type == SCPI_TOKEN_SINGLE_QUOTE_PROGRAM_DATA ? '\'' : '"';
- for (i_from = 0, i_to = 0; i_from < (size_t) param.len; i_from++) {
+ for (i_from = 1, i_to = 0; i_from < (size_t) (param.len - 1); i_from++) {
if (i_from >= buffer_len) {
break;
}
diff --git a/libscpi/test/test_lexer_parser.c b/libscpi/test/test_lexer_parser.c
index 3599f4e..011acd4 100644
--- a/libscpi/test/test_lexer_parser.c
+++ b/libscpi/test/test_lexer_parser.c
@@ -164,13 +164,15 @@
}
static void testString(void) {
- TEST_TOKEN("\"ahoj\"", scpiLex_StringProgramData, 1, 4, SCPI_TOKEN_DOUBLE_QUOTE_PROGRAM_DATA);
- TEST_TOKEN("\"ahoj\" ", scpiLex_StringProgramData, 1, 4, SCPI_TOKEN_DOUBLE_QUOTE_PROGRAM_DATA);
- TEST_TOKEN("'ahoj' ", scpiLex_StringProgramData, 1, 4, SCPI_TOKEN_SINGLE_QUOTE_PROGRAM_DATA);
+ TEST_TOKEN("\"ahoj\"", scpiLex_StringProgramData, 0, 6, SCPI_TOKEN_DOUBLE_QUOTE_PROGRAM_DATA);
+ TEST_TOKEN("\"ahoj\" ", scpiLex_StringProgramData, 0, 6, SCPI_TOKEN_DOUBLE_QUOTE_PROGRAM_DATA);
+ TEST_TOKEN("'ahoj' ", scpiLex_StringProgramData, 0, 6, SCPI_TOKEN_SINGLE_QUOTE_PROGRAM_DATA);
TEST_TOKEN("'ahoj ", scpiLex_StringProgramData, 0, 0, SCPI_TOKEN_UNKNOWN);
- TEST_TOKEN("'ah''oj' ", scpiLex_StringProgramData, 1, 6, SCPI_TOKEN_SINGLE_QUOTE_PROGRAM_DATA);
- TEST_TOKEN("'ah\"oj' ", scpiLex_StringProgramData, 1, 5, SCPI_TOKEN_SINGLE_QUOTE_PROGRAM_DATA);
- TEST_TOKEN("\"ah\"\"oj\" ", scpiLex_StringProgramData, 1, 6, SCPI_TOKEN_DOUBLE_QUOTE_PROGRAM_DATA);
+ TEST_TOKEN("'ah''oj' ", scpiLex_StringProgramData, 0, 8, SCPI_TOKEN_SINGLE_QUOTE_PROGRAM_DATA);
+ TEST_TOKEN("'ah\"oj' ", scpiLex_StringProgramData, 0, 7, SCPI_TOKEN_SINGLE_QUOTE_PROGRAM_DATA);
+ TEST_TOKEN("\"ah\"\"oj\" ", scpiLex_StringProgramData, 0, 8, SCPI_TOKEN_DOUBLE_QUOTE_PROGRAM_DATA);
+ TEST_TOKEN("\"\"", scpiLex_StringProgramData, 0, 2, SCPI_TOKEN_DOUBLE_QUOTE_PROGRAM_DATA);
+ TEST_TOKEN("''", scpiLex_StringProgramData, 0, 2, SCPI_TOKEN_SINGLE_QUOTE_PROGRAM_DATA);
}
static void testProgramData(void) {
@@ -197,12 +199,13 @@
TEST_TOKEN("( 1 + 2 ) , ", scpiParser_parseProgramData, 0, 9, SCPI_TOKEN_PROGRAM_EXPRESSION);
TEST_TOKEN("( 1 + 2 , ", scpiParser_parseProgramData, 0, 0, SCPI_TOKEN_UNKNOWN);
- TEST_TOKEN("\"ahoj\" ", scpiParser_parseProgramData, 1, 4, SCPI_TOKEN_DOUBLE_QUOTE_PROGRAM_DATA);
- TEST_TOKEN("'ahoj' ", scpiParser_parseProgramData, 1, 4, SCPI_TOKEN_SINGLE_QUOTE_PROGRAM_DATA);
+ TEST_TOKEN("\"ahoj\" ", scpiParser_parseProgramData, 0, 6, SCPI_TOKEN_DOUBLE_QUOTE_PROGRAM_DATA);
+ TEST_TOKEN("'ahoj' ", scpiParser_parseProgramData, 0, 6, SCPI_TOKEN_SINGLE_QUOTE_PROGRAM_DATA);
TEST_TOKEN("'ahoj ", scpiParser_parseProgramData, 0, 0, SCPI_TOKEN_UNKNOWN);
- TEST_TOKEN("'ah''oj' ", scpiParser_parseProgramData, 1, 6, SCPI_TOKEN_SINGLE_QUOTE_PROGRAM_DATA);
- TEST_TOKEN("'ah\"oj' ", scpiParser_parseProgramData, 1, 5, SCPI_TOKEN_SINGLE_QUOTE_PROGRAM_DATA);
- TEST_TOKEN("\"ah\"\"oj\" ", scpiParser_parseProgramData, 1, 6, SCPI_TOKEN_DOUBLE_QUOTE_PROGRAM_DATA);
+ TEST_TOKEN("'ah''oj' ", scpiParser_parseProgramData, 0, 8, SCPI_TOKEN_SINGLE_QUOTE_PROGRAM_DATA);
+ TEST_TOKEN("'ah\"oj' ", scpiParser_parseProgramData, 0, 7, SCPI_TOKEN_SINGLE_QUOTE_PROGRAM_DATA);
+ TEST_TOKEN("\"ah\"\"oj\" ", scpiParser_parseProgramData, 0, 8, SCPI_TOKEN_DOUBLE_QUOTE_PROGRAM_DATA);
+ TEST_TOKEN("\"\"", scpiParser_parseProgramData, 0, 2, SCPI_TOKEN_DOUBLE_QUOTE_PROGRAM_DATA);
TEST_TOKEN("abc_213as564 , ", scpiLex_CharacterProgramData, 0, 12, SCPI_TOKEN_PROGRAM_MNEMONIC);
diff --git a/libscpi/test/test_parser.c b/libscpi/test/test_parser.c
index 5365f84..5306caf 100644
--- a/libscpi/test/test_parser.c
+++ b/libscpi/test/test_parser.c
@@ -438,6 +438,9 @@
TEST_ParamCopyText("\'a\"c\'", TRUE, "a\"c", 3, TRUE, 0);
TEST_ParamCopyText("\"a\"\"c\"", TRUE, "a\"c", 3, TRUE, 0);
TEST_ParamCopyText("\"a\'c\"", TRUE, "a\'c", 3, TRUE, 0);
+ TEST_ParamCopyText("\"\"", TRUE, "", 0, TRUE, 0);
+ TEST_ParamCopyText("", FALSE, "", 0, FALSE, 0);
+ TEST_ParamCopyText("\"\"", FALSE, "", 0, TRUE, 0);
}
--
Gitblit v1.9.1