From da9c3c9f74c0a7eef863798770c24ac955d770de Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周日, 04 10月 2015 18:25:40 +0800
Subject: [PATCH] Resolve #3: Chanel lists parsing
---
libscpi/inc/scpi/parser.h | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/libscpi/inc/scpi/parser.h b/libscpi/inc/scpi/parser.h
index 834a12f..fed317e 100644
--- a/libscpi/inc/scpi/parser.h
+++ b/libscpi/inc/scpi/parser.h
@@ -39,7 +39,6 @@
#include <string.h>
#include "scpi/types.h"
-#include "scpi/debug.h"
#ifdef __cplusplus
extern "C" {
@@ -47,7 +46,7 @@
void SCPI_Init(scpi_t * context);
int SCPI_Input(scpi_t * context, const char * data, int len);
- int SCPI_Parse(scpi_t * context, const char * data, int len);
+ int SCPI_Parse(scpi_t * context, char * data, int len);
size_t SCPI_ResultCharacters(scpi_t * context, const char * data, size_t len);
@@ -58,22 +57,33 @@
size_t SCPI_ResultText(scpi_t * context, const char * data);
size_t SCPI_ResultArbitraryBlock(scpi_t * context, const char * data, size_t len);
size_t SCPI_ResultBool(scpi_t * context, scpi_bool_t val);
-
scpi_bool_t SCPI_Parameter(scpi_t * context, scpi_parameter_t * parameter, scpi_bool_t mandatory);
+ scpi_bool_t SCPI_ParamIsValid(scpi_parameter_t * parameter);
+ scpi_bool_t SCPI_ParamErrorOccurred(scpi_t * context);
scpi_bool_t SCPI_ParamIsNumber(scpi_parameter_t * parameter, scpi_bool_t suffixAllowed);
+ scpi_bool_t SCPI_ParamToInt(scpi_t * context, scpi_parameter_t * parameter, int32_t * value);
+ scpi_bool_t SCPI_ParamToUnsignedInt(scpi_t * context, scpi_parameter_t * parameter, uint32_t * value);
+ scpi_bool_t SCPI_ParamToDouble(scpi_t * context, scpi_parameter_t * parameter, double * value);
+ scpi_bool_t SCPI_ParamToChoice(scpi_t * context, scpi_parameter_t * parameter, const scpi_choice_def_t * options, int32_t * value);
+ scpi_bool_t SCPI_ChoiceToName(const scpi_choice_def_t * options, int32_t tag, const char ** text);
+
scpi_bool_t SCPI_ParamInt(scpi_t * context, int32_t * value, scpi_bool_t mandatory);
+ scpi_bool_t SCPI_ParamUnsignedInt(scpi_t * context, uint32_t * value, scpi_bool_t mandatory);
scpi_bool_t SCPI_ParamDouble(scpi_t * context, double * value, scpi_bool_t mandatory);
-// scpi_bool_t SCPI_ParamString(scpi_t * context, const char ** value, size_t * len, scpi_bool_t mandatory);
scpi_bool_t SCPI_ParamCharacters(scpi_t * context, const char ** value, size_t * len, scpi_bool_t mandatory);
-#define SCPI_ParamArbitraryBlock SCPI_ParamCharacters
-// scpi_bool_t SCPI_ParamText(scpi_t * context, const char ** value, size_t * len, int * type, scpi_bool_t mandatory);
+ scpi_bool_t SCPI_ParamArbitraryBlock(scpi_t * context, const char ** value, size_t * len, scpi_bool_t mandatory);
+ scpi_bool_t SCPI_ParamCopyText(scpi_t * context, char * buffer, size_t buffer_len, size_t * copy_len, scpi_bool_t mandatory);
scpi_bool_t SCPI_ParamBool(scpi_t * context, scpi_bool_t * value, scpi_bool_t mandatory);
- scpi_bool_t SCPI_ParamChoice(scpi_t * context, const char * options[], int32_t * value, scpi_bool_t mandatory);
+ scpi_bool_t SCPI_ParamChoice(scpi_t * context, const scpi_choice_def_t * options, int32_t * value, scpi_bool_t mandatory);
-
+ scpi_bool_t SCPI_IsCmd(scpi_t * context, const char * cmd);
+ int32_t SCPI_CmdTag(scpi_t * context);
+ scpi_bool_t SCPI_Match(const char * pattern, const char * value, size_t len);
+ scpi_bool_t SCPI_CommandNumbers(scpi_t * context, int32_t * numbers, size_t len);
+
#ifdef __cplusplus
}
#endif
--
Gitblit v1.9.1