From 6054f2efebb898bbd32ab7388eae7b9ff4357b0a Mon Sep 17 00:00:00 2001
From: Andrey Nakin <andrey.nakin@gmail.com>
Date: 周一, 21 10月 2013 03:50:04 +0800
Subject: [PATCH] Merge remote branch 'upstream/master'

---
 libscpi/src/parser.c |   36 ++++++++++++++++++++++++++++++++++--
 1 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/libscpi/src/parser.c b/libscpi/src/parser.c
index 59713c6..b036fb0 100644
--- a/libscpi/src/parser.c
+++ b/libscpi/src/parser.c
@@ -370,7 +370,7 @@
  * @return 
  */
 size_t SCPI_ResultBool(scpi_t * context, bool_t val) {
-	return SCPI_ResultInt(context, val);
+	return SCPI_ResultInt(context, val ? 1 : 0);
 }
 
 /**
@@ -579,7 +579,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 +617,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[], size_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