From 007889b4128e8656c55ba31404a698e98719c262 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@mobatime.cz>
Date: 周六, 14 7月 2018 01:57:31 +0800
Subject: [PATCH] Fix license wordings to correspond with BSD-2-Clause
---
libscpi/src/expression.c | 78 ++++++++++++++++++++-------------------
1 files changed, 40 insertions(+), 38 deletions(-)
diff --git a/libscpi/src/expression.c b/libscpi/src/expression.c
index ffbdf39..27a38dd 100644
--- a/libscpi/src/expression.c
+++ b/libscpi/src/expression.c
@@ -1,28 +1,29 @@
/*-
- * Copyright (c) 2012-2015 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,8 +50,7 @@
* SCPI_EXPR_ERROR - parser error
* SCPI_EXPR_NO_MORE - no more data
*/
-static scpi_expr_result_t numericRange(lex_state_t * state, scpi_bool_t * isRange, scpi_token_t * valueFrom, scpi_token_t * valueTo)
-{
+static scpi_expr_result_t numericRange(lex_state_t * state, scpi_bool_t * isRange, scpi_token_t * valueFrom, scpi_token_t * valueTo) {
if (scpiLex_DecimalNumericProgramData(state, valueFrom)) {
if (scpiLex_Colon(state, valueTo)) {
*isRange = TRUE;
@@ -81,8 +81,7 @@
* SCPI_EXPR_NO_MORE - no more data
* @see SCPI_ExprNumericListEntryInt, SCPI_ExprNumericListEntryDouble
*/
-scpi_expr_result_t SCPI_ExprNumericListEntry(scpi_t * context, scpi_parameter_t * param, int index, scpi_bool_t * isRange, scpi_parameter_t * valueFrom, scpi_parameter_t * valueTo)
-{
+scpi_expr_result_t SCPI_ExprNumericListEntry(scpi_t * context, scpi_parameter_t * param, int index, scpi_bool_t * isRange, scpi_parameter_t * valueFrom, scpi_parameter_t * valueTo) {
lex_state_t lex;
int i;
scpi_expr_result_t res = SCPI_EXPR_OK;
@@ -133,8 +132,7 @@
* SCPI_EXPR_NO_MORE - no more data
* @see SCPI_ExprNumericListEntry, SCPI_ExprNumericListEntryDouble
*/
-scpi_expr_result_t SCPI_ExprNumericListEntryInt(scpi_t * context, scpi_parameter_t * param, int index, scpi_bool_t * isRange, int32_t * valueFrom, int32_t * valueTo)
-{
+scpi_expr_result_t SCPI_ExprNumericListEntryInt(scpi_t * context, scpi_parameter_t * param, int index, scpi_bool_t * isRange, int32_t * valueFrom, int32_t * valueTo) {
scpi_expr_result_t res;
scpi_bool_t range = FALSE;
scpi_parameter_t paramFrom;
@@ -165,8 +163,7 @@
* SCPI_EXPR_NO_MORE - no more data
* @see SCPI_ExprNumericListEntry, SCPI_ExprNumericListEntryInt
*/
-scpi_expr_result_t SCPI_ExprNumericListEntryDouble(scpi_t * context, scpi_parameter_t * param, int index, scpi_bool_t * isRange, double * valueFrom, double * valueTo)
-{
+scpi_expr_result_t SCPI_ExprNumericListEntryDouble(scpi_t * context, scpi_parameter_t * param, int index, scpi_bool_t * isRange, double * valueFrom, double * valueTo) {
scpi_expr_result_t res;
scpi_bool_t range = FALSE;
scpi_parameter_t paramFrom;
@@ -192,13 +189,12 @@
* @param length length of values array
* @param dimensions real number of dimensions
*/
-static scpi_expr_result_t channelSpec(scpi_t * context, lex_state_t * state, int32_t * values, size_t length, size_t * dimensions)
-{
+static scpi_expr_result_t channelSpec(scpi_t * context, lex_state_t * state, int32_t * values, size_t length, size_t * dimensions) {
scpi_parameter_t param;
size_t i = 0;
- while(scpiLex_DecimalNumericProgramData(state, ¶m)) {
+ while (scpiLex_DecimalNumericProgramData(state, ¶m)) {
if (i < length) {
- SCPI_ParamToInt(context, ¶m, &values[i]);
+ SCPI_ParamToInt32(context, ¶m, &values[i]);
}
if (scpiLex_SpecificCharacter(state, ¶m, '!')) {
@@ -212,7 +208,7 @@
if (i == 0) {
return SCPI_EXPR_NO_MORE;
} else {
- // there was at least one number followed by !, but after ! was not another number
+ /* there was at least one number followed by !, but after ! was not another number */
return SCPI_EXPR_ERROR;
}
}
@@ -227,8 +223,7 @@
* @param length length of values arrays
* @param dimensions real number of dimensions
*/
-static scpi_expr_result_t channelRange(scpi_t * context, lex_state_t * state, scpi_bool_t * isRange, int32_t * valuesFrom, int32_t * valuesTo, size_t length, size_t * dimensions)
-{
+static scpi_expr_result_t channelRange(scpi_t * context, lex_state_t * state, scpi_bool_t * isRange, int32_t * valuesFrom, int32_t * valuesTo, size_t length, size_t * dimensions) {
scpi_token_t token;
scpi_expr_result_t err;
size_t fromDimensions;
@@ -251,6 +246,8 @@
*dimensions = fromDimensions;
return SCPI_EXPR_OK;
}
+ } else if (err == SCPI_EXPR_NO_MORE) {
+ err = SCPI_EXPR_ERROR;
}
return err;
@@ -267,8 +264,7 @@
* @param length length of values arrays
* @param dimensions real number of dimensions
*/
-scpi_expr_result_t SCPI_ExprChannelListEntry(scpi_t * context, scpi_parameter_t * param, int index, scpi_bool_t * isRange, int32_t * valuesFrom, int32_t * valuesTo, size_t length, size_t * dimensions)
-{
+scpi_expr_result_t SCPI_ExprChannelListEntry(scpi_t * context, scpi_parameter_t * param, int index, scpi_bool_t * isRange, int32_t * valuesFrom, int32_t * valuesTo, size_t length, size_t * dimensions) {
lex_state_t lex;
int i;
scpi_expr_result_t res = SCPI_EXPR_OK;
@@ -288,7 +284,7 @@
lex.pos = lex.buffer;
lex.len = param->len - 2;
- // detect channel list expression
+ /* detect channel list expression */
if (!scpiLex_SpecificCharacter(&lex, &token, '@')) {
SCPI_ErrorPush(context, SCPI_ERROR_EXPRESSION_PARSING_ERROR);
return SCPI_EXPR_ERROR;
@@ -310,5 +306,11 @@
if (res == SCPI_EXPR_ERROR) {
SCPI_ErrorPush(context, SCPI_ERROR_EXPRESSION_PARSING_ERROR);
}
+ if (res == SCPI_EXPR_NO_MORE) {
+ if (!scpiLex_IsEos(&lex)) {
+ res = SCPI_EXPR_ERROR;
+ SCPI_ErrorPush(context, SCPI_ERROR_EXPRESSION_PARSING_ERROR);
+ }
+ }
return res;
}
--
Gitblit v1.9.1