From a2e83e5ff635f040cffe4c12cfdaa60fa320c3de Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周三, 22 4月 2015 01:59:50 +0800
Subject: [PATCH] Make public SCPI_LongToStr, SCPI_DoubleToStr
---
libscpi/src/utils.c | 85 +++++++++++++++++++++++++++++++++---------
1 files changed, 66 insertions(+), 19 deletions(-)
diff --git a/libscpi/src/utils.c b/libscpi/src/utils.c
index 6a41e54..eb74eea 100644
--- a/libscpi/src/utils.c
+++ b/libscpi/src/utils.c
@@ -41,7 +41,8 @@
#include <string.h>
#include <ctype.h>
-#include "utils.h"
+#include "scpi/utils_private.h"
+#include "scpi/utils.h"
static size_t patternSeparatorShortPos(const char * pattern, size_t len);
static size_t patternSeparatorPos(const char * pattern, size_t len);
@@ -72,12 +73,15 @@
* @param val integer value
* @param str converted textual representation
* @param len string buffer length
+ * @param base output base
* @return number of bytes written to str (without '\0')
*/
-size_t longToStr(int32_t val, char * str, size_t len) {
+size_t SCPI_LongToStr(int32_t val, char * str, size_t len, int8_t base) {
uint32_t x = 1000000000L;
int_fast8_t digit;
size_t pos = 0;
+
+ (void) base; // currently not supported
if (val == 0) {
if (pos < len) str[pos++] = '0';
@@ -110,8 +114,8 @@
* @param len string buffer length
* @return number of bytes written to str (without '\0')
*/
-size_t doubleToStr(double val, char * str, size_t len) {
- return snprintf(str, len, "%lg", val);
+size_t SCPI_DoubleToStr(double val, char * str, size_t len) {
+ return SCPIDEFINE_doubleToStr(val, str, len);
}
/**
@@ -146,16 +150,46 @@
* @param len2
* @return TRUE if len1==len2 and "len" characters of both strings are equal
*/
-bool_t compareStr(const char * str1, size_t len1, const char * str2, size_t len2) {
+scpi_bool_t compareStr(const char * str1, size_t len1, const char * str2, size_t len2) {
if (len1 != len2) {
return FALSE;
}
- if (SCPI_strncasecmp(str1, str2, len2) == 0) {
+ if (SCPIDEFINE_strncasecmp(str1, str2, len2) == 0) {
return TRUE;
}
return FALSE;
+}
+
+/**
+ * Compare two strings, one be longer but may contains only numbers in that section
+ * @param str1
+ * @param len1
+ * @param str2
+ * @param len2
+ * @return TRUE if strings match
+ */
+scpi_bool_t compareStrAndNum(const char * str1, size_t len1, const char * str2, size_t len2) {
+ scpi_bool_t result = FALSE;
+ size_t i;
+
+ if (len2 < len1) {
+ return FALSE;
+ }
+
+ if (SCPIDEFINE_strncasecmp(str1, str2, len1) == 0) {
+ result = TRUE;
+ }
+
+ for (i = len1; i<len2; i++) {
+ if (!isdigit((int) str2[i])) {
+ result = FALSE;
+ break;
+ }
+ }
+
+ return result;
}
enum _locate_text_states {
@@ -179,7 +213,7 @@
/**
* Test locate text state, if it is correct final state
*/
-static bool_t isFinalState(locate_text_states state) {
+static scpi_bool_t isFinalState(locate_text_states state) {
return (
((state) == STATE_COMMA)
|| ((state) == STATE_LAST_WHITESPACE)
@@ -193,7 +227,7 @@
* @param nfa stores automaton state
* @param c current char processed
*/
-static bool_t locateTextAutomaton(locate_text_nfa * nfa, unsigned char c) {
+static scpi_bool_t locateTextAutomaton(locate_text_nfa * nfa, unsigned char c) {
switch(nfa->state) {
/* first state locating only white spaces */
case STATE_FIRST_WHITESPACE:
@@ -257,7 +291,7 @@
* @param len2 length of result
* @return string str1 contains text and str2 was set
*/
-bool_t locateText(const char * str1, size_t len1, const char ** str2, size_t * len2) {
+scpi_bool_t locateText(const char * str1, size_t len1, const char ** str2, size_t * len2) {
locate_text_nfa nfa;
nfa.state = STATE_FIRST_WHITESPACE;
nfa.startIdx = 0;
@@ -288,7 +322,7 @@
* @param nfa stores automaton state
* @param c current char processed
*/
-static bool_t locateStrAutomaton(locate_text_nfa * nfa, unsigned char c) {
+static scpi_bool_t locateStrAutomaton(locate_text_nfa * nfa, unsigned char c) {
switch(nfa->state) {
/* first state locating only white spaces */
case STATE_FIRST_WHITESPACE:
@@ -332,7 +366,7 @@
* @param len2 length of result
* @return string str1 contains text and str2 was set
*/
-bool_t locateStr(const char * str1, size_t len1, const char ** str2, size_t * len2) {
+scpi_bool_t locateStr(const char * str1, size_t len1, const char ** str2, size_t * len2) {
locate_text_nfa nfa;
nfa.state = STATE_FIRST_WHITESPACE;
nfa.startIdx = 0;
@@ -435,10 +469,23 @@
* @param str_len
* @return
*/
-bool_t matchPattern(const char * pattern, size_t pattern_len, const char * str, size_t str_len) {
- int pattern_sep_pos_short = patternSeparatorShortPos(pattern, pattern_len);
- return compareStr(pattern, pattern_len, str, str_len) ||
- compareStr(pattern, pattern_sep_pos_short, str, str_len);
+scpi_bool_t matchPattern(const char * pattern, size_t pattern_len, const char * str, size_t str_len) {
+ int pattern_sep_pos_short;
+
+ if (pattern[pattern_len - 1] == '#') {
+ size_t new_pattern_len = pattern_len - 1;
+
+ pattern_sep_pos_short = patternSeparatorShortPos(pattern, new_pattern_len);
+
+ return compareStrAndNum(pattern, new_pattern_len, str, str_len) ||
+ compareStrAndNum(pattern, pattern_sep_pos_short, str, str_len);
+ } else {
+
+ pattern_sep_pos_short = patternSeparatorShortPos(pattern, pattern_len);
+
+ return compareStr(pattern, pattern_len, str, str_len) ||
+ compareStr(pattern, pattern_sep_pos_short, str, str_len);
+ }
}
/**
@@ -448,8 +495,8 @@
* @param len - max search length
* @return TRUE if pattern matches, FALSE otherwise
*/
-bool_t matchCommand(const char * pattern, const char * cmd, size_t len) {
- bool_t result = FALSE;
+scpi_bool_t matchCommand(const char * pattern, const char * cmd, size_t len) {
+ scpi_bool_t result = FALSE;
int leftFlag = 0; // flag for '[' on left
int rightFlag = 0; // flag for ']' on right
int cmd_sep_pos = 0;
@@ -459,7 +506,7 @@
const char * pattern_end = pattern + pattern_len;
const char * cmd_ptr = cmd;
- size_t cmd_len = SCPI_strnlen(cmd, len);
+ size_t cmd_len = SCPIDEFINE_strnlen(cmd, len);
const char * cmd_end = cmd + cmd_len;
/* now support optional keywords in pattern style, e.g. [:MEASure]:VOLTage:DC? */
@@ -598,7 +645,7 @@
*
*
*/
-bool_t composeCompoundCommand(char * ptr_prev, size_t len_prev,
+scpi_bool_t composeCompoundCommand(char * ptr_prev, size_t len_prev,
char ** pptr, size_t * plen) {
char * ptr;
size_t len;
--
Gitblit v1.9.1