From b0326fb63170801353cbc4d53b80846381de82f4 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周五, 08 11月 2013 02:14:38 +0800
Subject: [PATCH] Implement compose compound command functionality

---
 libscpi/src/parser.c |   77 +++++++++++++++++++++++++++++++++-----
 1 files changed, 66 insertions(+), 11 deletions(-)

diff --git a/libscpi/src/parser.c b/libscpi/src/parser.c
index 22e9b04..d5728af 100644
--- a/libscpi/src/parser.c
+++ b/libscpi/src/parser.c
@@ -41,13 +41,14 @@
 #include "scpi/parser.h"
 #include "utils.h"
 #include "scpi/error.h"
+#include "scpi/constants.h"
 
 
 static size_t cmdTerminatorPos(const char * cmd, size_t len);
 static size_t cmdlineSeparatorPos(const char * cmd, size_t len);
 static const char * cmdlineSeparator(const char * cmd, size_t len);
 static const char * cmdlineTerminator(const char * cmd, size_t len);
-static const char * cmdlineNext(const char * cmd, size_t len);
+static size_t skipCmdLine(const char * cmd, size_t len);
 
 static void paramSkipBytes(scpi_t * context, size_t num);
 static void paramSkipWhitespace(scpi_t * context);
@@ -125,14 +126,14 @@
  * Find next part of command
  * @param cmd - input command
  * @param len - max search length
- * @return Pointer to next part of command
+ * @return number of characters to be skipped
  */
-const char * cmdlineNext(const char * cmd, size_t len) {
+size_t skipCmdLine(const char * cmd, size_t len) {
     const char * separator = cmdlineSeparator(cmd, len);
     if (separator == NULL) {
-        return cmd + len;
+        return len;
     } else {
-        return separator + 1;
+        return separator + 1 - cmd;
     }
 }
 
@@ -248,12 +249,14 @@
  * @param len - command line length
  * @return 1 if the last evaluated command was found
  */
-int SCPI_Parse(scpi_t * context, const char * data, size_t len) {
+int SCPI_Parse(scpi_t * context, char * data, size_t len) {
     int result = 0;
     const char * cmdline_end = data + len;
-    const char * cmdline_ptr = data;
+    char * cmdline_ptr = data;
     size_t cmd_len;
     size_t cmdline_len;
+    char * cmdline_ptr_prev = NULL;
+    size_t cmd_len_prev = 0;
 
     if (context == NULL) {
         return -1;
@@ -262,16 +265,20 @@
     while (cmdline_ptr < cmdline_end) {
         result = 0;
         cmd_len = cmdTerminatorPos(cmdline_ptr, cmdline_end - cmdline_ptr);
-        cmdline_len = cmdlineSeparatorPos(cmdline_ptr, cmdline_end - cmdline_ptr);
         if (cmd_len > 0) {
+            composeCompoundCommand(cmdline_ptr_prev, cmd_len_prev,
+                                    &cmdline_ptr, &cmd_len);
+            cmdline_len = cmdlineSeparatorPos(cmdline_ptr, cmdline_end - cmdline_ptr);
             if(findCommand(context, cmdline_ptr, cmdline_len, cmd_len)) {
                 processCommand(context);
                 result = 1;
+                cmdline_ptr_prev = cmdline_ptr;
+                cmd_len_prev = cmd_len;
             } else {
                 SCPI_ErrorPush(context, SCPI_ERROR_UNDEFINED_HEADER);
             }
         }
-        cmdline_ptr = cmdlineNext(cmdline_ptr, cmdline_end - cmdline_ptr);
+        cmdline_ptr += skipCmdLine(cmdline_ptr, cmdline_end - cmdline_ptr);
         cmdline_ptr += skipWhitespace(cmdline_ptr, cmdline_end - cmdline_ptr);
     }
     return result;
@@ -285,6 +292,19 @@
  * @param interface
  */
 void SCPI_Init(scpi_t * context) {
+    if (context->idn[0] == NULL) {
+        context->idn[0] = SCPI_DEFAULT_1_MANUFACTURE;
+    }
+    if (context->idn[1] == NULL) {
+        context->idn[1] = SCPI_DEFAULT_2_MODEL;
+    }
+    if (context->idn[2] == NULL) {
+        context->idn[2] = SCPI_DEFAULT_3;
+    }
+    if (context->idn[3] == NULL) {
+        context->idn[3] = SCPI_DEFAULT_4_REVISION;
+    }
+    
     context->buffer.position = 0;
     SCPI_ErrorInit(context);
 }
@@ -319,11 +339,14 @@
 
         ws = skipWhitespace(context->buffer.data, context->buffer.position);
         cmd_term = cmdlineTerminator(context->buffer.data + ws, context->buffer.position - ws);
-        if (cmd_term != NULL) {
+        while (cmd_term != NULL) {
             int curr_len = cmd_term - context->buffer.data;
             result = SCPI_Parse(context, context->buffer.data + ws, curr_len - ws);
             memmove(context->buffer.data, cmd_term, context->buffer.position - curr_len);
             context->buffer.position -= curr_len;
+    
+            ws = skipWhitespace(context->buffer.data, context->buffer.position);
+            cmd_term = cmdlineTerminator(context->buffer.data + ws, context->buffer.position - ws);
         }
     }
 
@@ -579,7 +602,7 @@
 }
 
 /**
- * Parse boolean parameter
+ * Parse boolean parameter as described in the spec SCPI-99 7.3 Boolean Program Data
  * @param context
  * @param value
  * @param mandatory
@@ -617,3 +640,35 @@
     return TRUE;
 }
 
+/**
+ * Parse choice parameter
+ * @param context
+ * @param options
+ * @param value
+ * @param mandatory
+ * @return 
+ */
+bool_t SCPI_ParamChoice(scpi_t * context, const char * options[], int32_t * value, bool_t mandatory) {
+    const char * param;
+    size_t param_len;
+    size_t res;
+
+    if (!options || !value) {
+        return FALSE;
+    }
+
+    if (!SCPI_ParamString(context, &param, &param_len, mandatory)) {
+        return FALSE;
+    }
+
+    for (res = 0; options[res]; ++res) {
+        if (matchPattern(options[res], strlen(options[res]), param, param_len)) {
+            *value = res;
+            return TRUE;
+        }
+    }
+
+    SCPI_ErrorPush(context, SCPI_ERROR_ILLEGAL_PARAMETER_VALUE);
+    return FALSE;
+}
+

--
Gitblit v1.9.1