From 988b36805ab5608e759fbf56c8d78a95459c6bd6 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周六, 03 10月 2015 00:20:51 +0800
Subject: [PATCH] Comment numeric list
---
libscpi/src/units.c | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/libscpi/src/units.c b/libscpi/src/units.c
index d4f3784..517bb1a 100644
--- a/libscpi/src/units.c
+++ b/libscpi/src/units.c
@@ -38,6 +38,7 @@
#include "scpi/parser.h"
#include "scpi/units.h"
#include "utils_private.h"
+#include "scpi/utils.h"
#include "scpi/error.h"
#include "lexer_private.h"
@@ -205,7 +206,7 @@
lex_state_t state;
scpi_parameter_t param;
scpi_bool_t result;
- int32_t intval;
+ int32_t tag;
if (!value) {
SCPI_ErrorPush(context, SCPI_ERROR_SYSTEM_ERROR);
@@ -230,7 +231,7 @@
case SCPI_TOKEN_DECIMAL_NUMERIC_PROGRAM_DATA_WITH_SUFFIX:
case SCPI_TOKEN_PROGRAM_MNEMONIC:
value->unit = SCPI_UNIT_NONE;
- value->type = SCPI_NUM_NUMBER;
+ value->special = FALSE;
result = TRUE;
break;
}
@@ -279,10 +280,10 @@
scpiLex_CharacterProgramData(&state, &token);
/* convert string to special number type */
- SCPI_ParamToChoice(context, &token, special, &intval);
+ SCPI_ParamToChoice(context, &token, special, &tag);
- value->type = intval;
- value->value = 0;
+ value->special = TRUE;
+ value->tag = tag;
break;
default:
@@ -309,12 +310,17 @@
return 0;
}
- if (SCPI_ChoiceToName(special, value->type, &type)) {
- strncpy(str, type, len);
- return min(strlen(type), len);
+ if (value->special) {
+ if (SCPI_ChoiceToName(special, value->tag, &type)) {
+ strncpy(str, type, len);
+ return min(strlen(type), len);
+ } else {
+ str[0] = 0;
+ return 0;
+ }
}
- result = doubleToStr(value->value, str, len);
+ result = SCPI_DoubleToStr(value->value, str, len);
unit = translateUnitInverse(context->units, value->unit);
--
Gitblit v1.9.1