From d79496358dbb81bb5eb16a49ea6b5d2cdc2f8714 Mon Sep 17 00:00:00 2001
From: Andrey Nakin <andrey.nakin@gmail.com>
Date: 周六, 18 4月 2015 20:46:41 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/j123b567/scpi-parser
---
libscpi/src/parser.c | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/libscpi/src/parser.c b/libscpi/src/parser.c
index 1f4e9d7..5940432 100644
--- a/libscpi/src/parser.c
+++ b/libscpi/src/parser.c
@@ -39,7 +39,7 @@
#include "scpi/config.h"
#include "scpi/parser.h"
-#include "utils.h"
+#include "scpi/utils_private.h"
#include "scpi/error.h"
#include "scpi/constants.h"
@@ -236,6 +236,9 @@
context->paramlist.cmd = cmd;
context->paramlist.parameters = cmdline_ptr + cmd_len;
context->paramlist.length = cmdline_len - cmd_len;
+ context->paramlist.cmd_raw.data = cmdline_ptr;
+ context->paramlist.cmd_raw.length = cmd_len;
+ context->paramlist.cmd_raw.position = 0;
return TRUE;
}
}
@@ -543,8 +546,8 @@
/**
* Parse string parameter
* @param context
- * @param value
- * @param len
+ * @param value Pointer to string buffer where pointer to non-null terminated string will be returned
+ * @param len Length of returned non-null terminated string
* @param mandatory
* @return
*/
@@ -574,8 +577,8 @@
/**
* Parse text parameter (can be inside "")
* @param context
- * @param value
- * @param len
+ * @param value Pointer to string buffer where pointer to non-null terminated string will be returned
+ * @param len Length of returned non-null terminated string
* @param mandatory
* @return
*/
@@ -590,8 +593,10 @@
return FALSE;
}
+ paramSkipWhitespace(context);
if (locateText(context->paramlist.parameters, context->paramlist.length, value, &length)) {
- paramSkipBytes(context, length);
+ paramSkipBytes(context, length + 2);
+ paramSkipWhitespace(context);
if (len) {
*len = length;
}
@@ -672,3 +677,15 @@
return FALSE;
}
+scpi_bool_t SCPI_IsCmd(scpi_t * context, const char * cmd) {
+ if (! context->paramlist.cmd) {
+ return FALSE;
+ }
+
+ const char * pattern = context->paramlist.cmd->pattern;
+ return matchCommand (pattern, cmd, strlen (cmd));
+}
+
+scpi_bool_t SCPI_Match(const char * pattern, const char * value, size_t len) {
+ return matchCommand (pattern, value, len);
+}
--
Gitblit v1.9.1