From e016a3c9689c1ffef268def51ab134aea05041f4 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: ćšć, 06 8æ 2015 01:00:15 +0800
Subject: [PATCH] Use uppercase TRUE and FALSE everywhere
---
libscpi/src/utils.c | 118 ++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 97 insertions(+), 21 deletions(-)
diff --git a/libscpi/src/utils.c b/libscpi/src/utils.c
index 26670b9..0a9de65 100644
--- a/libscpi/src/utils.c
+++ b/libscpi/src/utils.c
@@ -42,6 +42,7 @@
#include <ctype.h>
#include "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,9 +73,10 @@
* @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, int8_t base) {
+size_t SCPI_LongToStr(int32_t val, char * str, size_t len, int8_t base) {
const char digits[] = "0123456789ABCDEF";
#define ADD_CHAR(c) if (pos < len) str[pos++] = (c)
@@ -137,8 +139,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);
}
/**
@@ -178,7 +180,7 @@
return FALSE;
}
- if (SCPI_strncasecmp(str1, str2, len2) == 0) {
+ if (SCPIDEFINE_strncasecmp(str1, str2, len2) == 0) {
return TRUE;
}
@@ -193,7 +195,7 @@
* @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 compareStrAndNum(const char * str1, size_t len1, const char * str2, size_t len2, int32_t * num) {
scpi_bool_t result = FALSE;
size_t i;
@@ -201,14 +203,28 @@
return FALSE;
}
- if (SCPI_strncasecmp(str1, str2, len1) == 0) {
+ if (SCPIDEFINE_strncasecmp(str1, str2, len1) == 0) {
result = TRUE;
- }
- for (i = len1; i < len2; i++) {
- if (!isdigit(str2[i])) {
- result = FALSE;
- break;
+ if (num) {
+ if (len1 == len2) {
+ *num = 1;
+ } else {
+ int32_t tmpNum;
+ i = len1 + strToLong(str2 + len1, &tmpNum, 10);
+ if (i != len2) {
+ result = FALSE;
+ } else {
+ *num = tmpNum;
+ }
+ }
+ } else {
+ for (i = len1; i<len2; i++) {
+ if (!isdigit((int) str2[i])) {
+ result = FALSE;
+ break;
+ }
+ }
}
}
@@ -238,7 +254,7 @@
* @param len - max search length
* @return position of separator or len
*/
-size_t patternSeparatorShortPos(const char * pattern, size_t len) {
+static size_t patternSeparatorShortPos(const char * pattern, size_t len) {
size_t i;
for (i = 0; (i < len) && pattern[i]; i++) {
if (islower((unsigned char) pattern[i])) {
@@ -254,7 +270,7 @@
* @param len - max search length
* @return position of separator or len
*/
-size_t patternSeparatorPos(const char * pattern, size_t len) {
+static size_t patternSeparatorPos(const char * pattern, size_t len) {
char * separator = strnpbrk(pattern, len, "?:[]");
if (separator == NULL) {
@@ -270,7 +286,7 @@
* @param len - max search length
* @return position of separator or len
*/
-size_t cmdSeparatorPos(const char * cmd, size_t len) {
+static size_t cmdSeparatorPos(const char * cmd, size_t len) {
char * separator = strnpbrk(cmd, len, ":?");
size_t result;
if (separator == NULL) {
@@ -290,7 +306,7 @@
* @param str_len
* @return
*/
-scpi_bool_t matchPattern(const char * pattern, size_t pattern_len, const char * str, size_t str_len) {
+scpi_bool_t matchPattern(const char * pattern, size_t pattern_len, const char * str, size_t str_len, int32_t * num) {
int pattern_sep_pos_short;
if (pattern[pattern_len - 1] == '#') {
@@ -298,8 +314,8 @@
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);
+ return compareStrAndNum(pattern, new_pattern_len, str, str_len, num) ||
+ compareStrAndNum(pattern, pattern_sep_pos_short, str, str_len, num);
} else {
pattern_sep_pos_short = patternSeparatorShortPos(pattern, pattern_len);
@@ -316,18 +332,21 @@
* @param len - max search length
* @return TRUE if pattern matches, FALSE otherwise
*/
-scpi_bool_t matchCommand(const char * pattern, const char * cmd, size_t len) {
+scpi_bool_t matchCommand(const char * pattern, const char * cmd, size_t len, int32_t *numbers, size_t numbers_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;
+
+ size_t numbers_idx = 0;
+ int32_t *number_ptr = NULL;
const char * pattern_ptr = pattern;
int pattern_len = strlen(pattern);
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? */
@@ -359,7 +378,19 @@
cmd_sep_pos = cmdSeparatorPos(cmd_ptr, cmd_end - cmd_ptr);
}
- if (matchPattern(pattern_ptr, pattern_sep_pos, cmd_ptr, cmd_sep_pos)) {
+ if (pattern_ptr[pattern_sep_pos - 1] == '#') {
+ if (numbers && (numbers_idx < numbers_len)) {
+ number_ptr = numbers + numbers_idx;
+ *number_ptr = 1; // default value
+ } else {
+ number_ptr = NULL;
+ }
+ numbers_idx++;
+ } else {
+ number_ptr = NULL;
+ }
+
+ if (matchPattern(pattern_ptr, pattern_sep_pos, cmd_ptr, cmd_sep_pos, number_ptr)) {
pattern_ptr = pattern_ptr + pattern_sep_pos;
cmd_ptr = cmd_ptr + cmd_sep_pos;
result = TRUE;
@@ -441,6 +472,51 @@
return result;
}
+/**
+ * Compose command from previsou command anc current command
+ *
+ * @param prev pointer to previous command
+ * @param current pointer of current command
+ *
+ * prev and current should be in the same memory buffer
+ */
+scpi_bool_t composeCompoundCommand(const scpi_token_t * prev, scpi_token_t * current) {
+ size_t i;
+
+ /* Invalid input */
+ if (current == NULL || current->ptr == NULL || current->len == 0)
+ return FALSE;
+
+ /* no previous command - nothing to do*/
+ if (prev->ptr == NULL || prev->len == 0)
+ return TRUE;
+
+ /* Common command or command root - nothing to do */
+ if (current->ptr[0] == '*' || current->ptr[0] == ':')
+ return TRUE;
+
+ /* Previsou command was common command - nothing to do */
+ if (prev->ptr[0] == '*')
+ return TRUE;
+
+ /* Find last occurence of ':' */
+ for (i = prev->len; i > 0; i--) {
+ if (prev->ptr[i - 1] == ':') {
+ break;
+ }
+ }
+
+ /* Previous command was simple command - nothing to do*/
+ if (i == 0)
+ return TRUE;
+
+ current->ptr -= i;
+ current->len += i;
+ memmove(current->ptr, prev->ptr, i);
+ return TRUE;
+}
+
+
#if !HAVE_STRNLEN
/* use FreeBSD strnlen */
@@ -472,7 +548,7 @@
if (c1 != c2) {
return c1 - c2;
}
- if (c1 = '\0') {
+ if (c1 == '\0') {
return 0;
}
}
--
Gitblit v1.9.1