From 7dca581454fb426dd8233a39475877dab9b3e1a6 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周日, 04 10月 2015 19:57:28 +0800
Subject: [PATCH] Add Channel list support to readme

---
 libscpi/src/parser.c |   47 ++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/libscpi/src/parser.c b/libscpi/src/parser.c
index 3475265..ca711eb 100644
--- a/libscpi/src/parser.c
+++ b/libscpi/src/parser.c
@@ -553,8 +553,9 @@
             } else {
                 return strToULong(parameter->ptr, (uint32_t *)value, 10) > 0 ? TRUE : FALSE;
             }
+        default:
+            return FALSE;
     }
-    return FALSE;
 }
 
 
@@ -589,7 +590,7 @@
  */
 #include "stdio.h"
 scpi_bool_t SCPI_ParamToDouble(scpi_t * context, scpi_parameter_t * parameter, double * value) {
-    scpi_bool_t result = FALSE;
+    scpi_bool_t result;
     uint32_t valint;
 
     if (!value) {
@@ -608,6 +609,8 @@
         case SCPI_TOKEN_DECIMAL_NUMERIC_PROGRAM_DATA_WITH_SUFFIX:
             result = strToDouble(parameter->ptr, value) > 0 ? TRUE : FALSE;
             break;
+        default:
+            result = FALSE;
     }
     return result;
 }
@@ -701,8 +704,17 @@
 
     result = SCPI_Parameter(context, &param, mandatory);
     if (result) {
-        *value = param.ptr;
-        *len = param.len;
+        switch(param.type) {
+            case SCPI_TOKEN_SINGLE_QUOTE_PROGRAM_DATA:
+            case SCPI_TOKEN_DOUBLE_QUOTE_PROGRAM_DATA:
+                *value = param.ptr + 1;
+                *len = param.len - 2;
+                break;
+            default:
+                *value = param.ptr;
+                *len = param.len;
+                break;
+        }
 
         // TODO: return also parameter type (ProgramMnemonic, ArbitraryBlockProgramData, SingleQuoteProgramData, DoubleQuoteProgramData
     }
@@ -760,7 +772,7 @@
             case SCPI_TOKEN_SINGLE_QUOTE_PROGRAM_DATA:
             case SCPI_TOKEN_DOUBLE_QUOTE_PROGRAM_DATA:
                 quote = param.type == SCPI_TOKEN_SINGLE_QUOTE_PROGRAM_DATA ? '\'' : '"';
-                for (i_from = 0, i_to = 0; i_from < (size_t) param.len; i_from++) {
+                for (i_from = 1, i_to = 0; i_from < (size_t) (param.len - 1); i_from++) {
                     if (i_from >= buffer_len) {
                         break;
                     }
@@ -769,6 +781,10 @@
                     if (param.ptr[i_from] == quote) {
                         i_from++;
                     }
+                }
+                *copy_len = i_to;
+                if (i_to < buffer_len) {
+                    buffer[i_to] = 0;
                 }
                 break;
             default:
@@ -1080,3 +1096,24 @@
 scpi_bool_t SCPI_CommandNumbers(scpi_t * context, int32_t * numbers, size_t len) {
     return matchCommand (context->param_list.cmd->pattern,  context->param_list.cmd_raw.data, context->param_list.cmd_raw.length, numbers, len);
 }
+
+/**
+ * If SCPI_Parameter() returns FALSE, this function can detect, if the parameter
+ * is just missing (TRUE) or if there was an error during processing of the command (FALSE)
+ * @param parameter
+ * @return
+ */
+scpi_bool_t SCPI_ParamIsValid(scpi_parameter_t * parameter)
+{
+    return parameter->type == SCPI_TOKEN_UNKNOWN ? FALSE : TRUE;
+}
+
+/**
+ * Returns TRUE if there was an error during parameter handling
+ * @param context
+ * @return
+ */
+scpi_bool_t SCPI_ParamErrorOccurred(scpi_t * context)
+{
+    return context->cmd_error;
+}

--
Gitblit v1.9.1