From af4e630a29e8ddcb11f377d3b0e6f6d580040313 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周五, 12 12月 2014 17:50:29 +0800
Subject: [PATCH] Parser refactoring
---
libscpi/src/units.c | 148 ++++++++++++++++++++++++++-----------------------
1 files changed, 78 insertions(+), 70 deletions(-)
diff --git a/libscpi/src/units.c b/libscpi/src/units.c
index 493c4ce..2b646e9 100644
--- a/libscpi/src/units.c
+++ b/libscpi/src/units.c
@@ -37,8 +37,9 @@
#include <string.h>
#include "scpi/parser.h"
#include "scpi/units.h"
-#include "utils.h"
+#include "utils_private.h"
#include "scpi/error.h"
+#include "lexer_private.h"
/*
@@ -62,39 +63,39 @@
*/
const scpi_unit_def_t scpi_units_def[] = {
/* voltage */
- {/* name */ "UV", /* unit */ SCPI_UNIT_VOLT, /* mult */ 1e-6},
- {/* name */ "MV", /* unit */ SCPI_UNIT_VOLT, /* mult */ 1e-3},
- {/* name */ "V", /* unit */ SCPI_UNIT_VOLT, /* mult */ 1},
- {/* name */ "KV", /* unit */ SCPI_UNIT_VOLT, /* mult */ 1e3},
+ {/* name */ "UV", /* unit */ SCPI_UNIT_VOLT, /* mult */ 1e-6},
+ {/* name */ "MV", /* unit */ SCPI_UNIT_VOLT, /* mult */ 1e-3},
+ {/* name */ "V", /* unit */ SCPI_UNIT_VOLT, /* mult */ 1},
+ {/* name */ "KV", /* unit */ SCPI_UNIT_VOLT, /* mult */ 1e3},
/* current */
- {/* name */ "UA", /* unit */ SCPI_UNIT_AMPER, /* mult */ 1e-6},
- {/* name */ "MA", /* unit */ SCPI_UNIT_AMPER, /* mult */ 1e-3},
- {/* name */ "A", /* unit */ SCPI_UNIT_AMPER, /* mult */ 1},
- {/* name */ "KA", /* unit */ SCPI_UNIT_AMPER, /* mult */ 1e3},
+ {/* name */ "UA", /* unit */ SCPI_UNIT_AMPER, /* mult */ 1e-6},
+ {/* name */ "MA", /* unit */ SCPI_UNIT_AMPER, /* mult */ 1e-3},
+ {/* name */ "A", /* unit */ SCPI_UNIT_AMPER, /* mult */ 1},
+ {/* name */ "KA", /* unit */ SCPI_UNIT_AMPER, /* mult */ 1e3},
/* resistance */
- {/* name */ "OHM", /* unit */ SCPI_UNIT_OHM, /* mult */ 1},
- {/* name */ "KOHM", /* unit */ SCPI_UNIT_OHM, /* mult */ 1e3},
- {/* name */ "MOHM", /* unit */ SCPI_UNIT_OHM, /* mult */ 1e6},
+ {/* name */ "OHM", /* unit */ SCPI_UNIT_OHM, /* mult */ 1},
+ {/* name */ "KOHM", /* unit */ SCPI_UNIT_OHM, /* mult */ 1e3},
+ {/* name */ "MOHM", /* unit */ SCPI_UNIT_OHM, /* mult */ 1e6},
/* frequency */
- {/* name */ "HZ", /* unit */ SCPI_UNIT_HERTZ, /* mult */ 1},
- {/* name */ "KHZ", /* unit */ SCPI_UNIT_HERTZ, /* mult */ 1e3},
- {/* name */ "MHZ", /* unit */ SCPI_UNIT_HERTZ, /* mult */ 1e6},
- {/* name */ "GHZ", /* unit */ SCPI_UNIT_HERTZ, /* mult */ 1e9},
+ {/* name */ "HZ", /* unit */ SCPI_UNIT_HERTZ, /* mult */ 1},
+ {/* name */ "KHZ", /* unit */ SCPI_UNIT_HERTZ, /* mult */ 1e3},
+ {/* name */ "MHZ", /* unit */ SCPI_UNIT_HERTZ, /* mult */ 1e6},
+ {/* name */ "GHZ", /* unit */ SCPI_UNIT_HERTZ, /* mult */ 1e9},
/* temperature */
- {/* name */ "CEL", /* unit */ SCPI_UNIT_CELSIUS, /* mult */ 1},
+ {/* name */ "CEL", /* unit */ SCPI_UNIT_CELSIUS, /* mult */ 1},
/* time */
- {/* name */ "PS", /* unit */ SCPI_UNIT_SECONDS, /* mult */ 1e-12},
- {/* name */ "NS", /* unit */ SCPI_UNIT_SECONDS, /* mult */ 1e-9},
- {/* name */ "US", /* unit */ SCPI_UNIT_SECONDS, /* mult */ 1e-6},
- {/* name */ "MS", /* unit */ SCPI_UNIT_SECONDS, /* mult */ 1e-3},
- {/* name */ "S", /* unit */ SCPI_UNIT_SECONDS, /* mult */ 1},
- {/* name */ "MIN", /* unit */ SCPI_UNIT_SECONDS, /* mult */ 60},
- {/* name */ "HR", /* unit */ SCPI_UNIT_SECONDS, /* mult */ 3600},
+ {/* name */ "PS", /* unit */ SCPI_UNIT_SECONDS, /* mult */ 1e-12},
+ {/* name */ "NS", /* unit */ SCPI_UNIT_SECONDS, /* mult */ 1e-9},
+ {/* name */ "US", /* unit */ SCPI_UNIT_SECONDS, /* mult */ 1e-6},
+ {/* name */ "MS", /* unit */ SCPI_UNIT_SECONDS, /* mult */ 1e-3},
+ {/* name */ "S", /* unit */ SCPI_UNIT_SECONDS, /* mult */ 1},
+ {/* name */ "MIN", /* unit */ SCPI_UNIT_SECONDS, /* mult */ 60},
+ {/* name */ "HR", /* unit */ SCPI_UNIT_SECONDS, /* mult */ 3600},
SCPI_UNITS_LIST_END,
};
@@ -103,14 +104,14 @@
* Special number values definition
*/
const scpi_special_number_def_t scpi_special_numbers_def[] = {
- {/* name */ "MINimum", /* type */ SCPI_NUM_MIN},
- {/* name */ "MAXimum", /* type */ SCPI_NUM_MAX},
- {/* name */ "DEFault", /* type */ SCPI_NUM_DEF},
- {/* name */ "UP", /* type */ SCPI_NUM_UP},
- {/* name */ "DOWN", /* type */ SCPI_NUM_DOWN},
- {/* name */ "NAN", /* type */ SCPI_NUM_NAN},
- {/* name */ "INF", /* type */ SCPI_NUM_INF},
- {/* name */ "NINF", /* type */ SCPI_NUM_NINF},
+ {/* name */ "MINimum", /* type */ SCPI_NUM_MIN},
+ {/* name */ "MAXimum", /* type */ SCPI_NUM_MAX},
+ {/* name */ "DEFault", /* type */ SCPI_NUM_DEF},
+ {/* name */ "UP", /* type */ SCPI_NUM_UP},
+ {/* name */ "DOWN", /* type */ SCPI_NUM_DOWN},
+ {/* name */ "NAN", /* type */ SCPI_NUM_NAN},
+ {/* name */ "INFinity", /* type */ SCPI_NUM_INF},
+ {/* name */ "NINF", /* type */ SCPI_NUM_NINF},
SCPI_SPECIAL_NUMBERS_LIST_END,
};
@@ -122,7 +123,7 @@
* @param value resultin value
* @return TRUE if str matches one of specs patterns
*/
-static bool_t translateSpecialNumber(const scpi_special_number_def_t * specs, const char * str, size_t len, scpi_number_t * value) {
+static scpi_bool_t translateSpecialNumber(const scpi_special_number_def_t * specs, const char * str, size_t len, scpi_number_t * value) {
int i;
value->value = 0.0;
@@ -155,7 +156,7 @@
if (specs == NULL) {
return NULL;
}
-
+
for (i = 0; specs[i].name != NULL; i++) {
if (specs[i].type == type) {
return specs[i].name;
@@ -174,11 +175,11 @@
*/
static const scpi_unit_def_t * translateUnit(const scpi_unit_def_t * units, const char * unit, size_t len) {
int i;
-
+
if (units == NULL) {
return NULL;
}
-
+
for (i = 0; units[i].name != NULL; i++) {
if (compareStr(unit, len, units[i].name, strlen(units[i].name))) {
return &units[i];
@@ -196,11 +197,11 @@
*/
static const char * translateUnitInverse(const scpi_unit_def_t * units, const scpi_unit_t unit) {
int i;
-
+
if (units == NULL) {
return NULL;
}
-
+
for (i = 0; units[i].name != NULL; i++) {
if ((units[i].unit == unit) && (units[i].mult == 1)) {
return units[i].name;
@@ -218,7 +219,7 @@
* @param value preparsed numeric value
* @return TRUE if value parameter was converted to base units
*/
-static bool_t transformNumber(scpi_t * context, const char * unit, size_t len, scpi_number_t * value) {
+static scpi_bool_t transformNumber(scpi_t * context, const char * unit, size_t len, scpi_number_t * value) {
size_t s;
const scpi_unit_def_t * unitDef;
s = skipWhitespace(unit, len);
@@ -248,43 +249,50 @@
* @param mandatory if the parameter is mandatory
* @return
*/
-bool_t SCPI_ParamNumber(scpi_t * context, scpi_number_t * value, bool_t mandatory) {
- bool_t result;
- const char * param;
- size_t len;
- size_t numlen;
+scpi_bool_t SCPI_ParamNumber(scpi_t * context, scpi_number_t * value, scpi_bool_t mandatory)
+{
+ scpi_token_t token;
+ lex_state_t state;
+ scpi_parameter_t param;
+ scpi_bool_t result;
+
+ result = SCPI_Parameter(context, ¶m, mandatory);
+
- /* read parameter and shift to the next one */
- result = SCPI_ParamString(context, ¶m, &len, mandatory);
+ state.buffer = param.data.ptr;
+ state.pos = state.buffer;
+ state.len = param.data.len;
- /* value not initializes */
- if (!value) {
- return FALSE;
+ switch(param.type) {
+ case TokDecimalNumericProgramData:
+ case TokHexnum:
+ case TokOctnum:
+ case TokBinnum:
+ result = TRUE;
+ break;
+ case TokDecimalNumericProgramDataWithSuffix:
+ scpiLex_DecimalNumericProgramData(&state, &token);
+ scpiLex_WhiteSpace(&state, &token);
+ scpiLex_SuffixProgramData(&state, &token);
+
+ result = transformNumber(context, token.ptr, token.len, ¶m.number);
+ break;
+ case TokProgramMnemonic:
+ scpiLex_WhiteSpace(&state, &token);
+ scpiLex_CharacterProgramData(&state, &token);
+
+ /* convert string to special number type */
+ result = translateSpecialNumber(context->special_numbers, token.ptr, token.len, ¶m.number);
+ break;
+ default:
+ result = FALSE;
}
- value->type = SCPI_NUM_DEF;
-
- /* if parameter was not found, return TRUE or FALSE according
- * to fact that parameter was mandatory or not */
- if (!result) {
- return mandatory ? FALSE : TRUE;
+ if (result) {
+ memcpy(value, ¶m.number, sizeof(scpi_number_t));
}
- /* convert string to special number type */
- if (translateSpecialNumber(context->special_numbers, param, len, value)) {
- /* found special type */
- return TRUE;
- }
-
- /* convert text from double - no special type */
- numlen = strToDouble(param, &value->value);
-
- /* transform units of value */
- if (numlen <= len) {
- return transformNumber(context, param + numlen, len - numlen, value);
- }
- return FALSE;
-
+ return result;
}
/**
--
Gitblit v1.9.1