From 90f9c5a84c9e4c281cd665bcb41dc6b2d2abb550 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周日, 18 1月 2015 16:49:17 +0800
Subject: [PATCH] Correct type of *TST? callback function
---
libscpi/inc/scpi/parser.h | 31 ++++++++++++++++++++-----------
1 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/libscpi/inc/scpi/parser.h b/libscpi/inc/scpi/parser.h
index a8d5959..834a12f 100644
--- a/libscpi/inc/scpi/parser.h
+++ b/libscpi/inc/scpi/parser.h
@@ -37,33 +37,42 @@
#ifndef SCPI_PARSER_H
#define SCPI_PARSER_H
+#include <string.h>
#include "scpi/types.h"
#include "scpi/debug.h"
-#include "scpi/lexer.h"
#ifdef __cplusplus
extern "C" {
#endif
void SCPI_Init(scpi_t * context);
- int SCPI_Input(scpi_t * context, const char * data, size_t len);
- int SCPI_Parse(scpi_t * context, const char * data, size_t len);
+ int SCPI_Input(scpi_t * context, const char * data, int len);
+ int SCPI_Parse(scpi_t * context, const char * data, int len);
- size_t SCPI_ResultString(scpi_t * context, const char * data);
+ size_t SCPI_ResultCharacters(scpi_t * context, const char * data, size_t len);
+#define SCPI_ResultMnemonic(context, data) SCPI_ResultCharacters((context), (data), strlen(data))
size_t SCPI_ResultInt(scpi_t * context, int32_t val);
+ size_t SCPI_ResultIntBase(scpi_t * context, int32_t val, int8_t base);
size_t SCPI_ResultDouble(scpi_t * context, double val);
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);
- bool_t SCPI_ParamInt(scpi_t * context, int32_t * value, bool_t mandatory);
- bool_t SCPI_ParamDouble(scpi_t * context, double * value, bool_t mandatory);
- bool_t SCPI_ParamString(scpi_t * context, const char ** value, size_t * len, bool_t mandatory);
- bool_t SCPI_ParamText(scpi_t * context, const char ** value, size_t * len, bool_t mandatory);
+
+ scpi_bool_t SCPI_Parameter(scpi_t * context, scpi_parameter_t * parameter, scpi_bool_t mandatory);
+ scpi_bool_t SCPI_ParamIsNumber(scpi_parameter_t * parameter, scpi_bool_t suffixAllowed);
+ scpi_bool_t SCPI_ParamInt(scpi_t * context, int32_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);
- int SCPI_ParseProgramData(lex_state_t * state, token_t * token);
- int SCPI_ParseAllProgramData(lex_state_t * state, token_t * token, int * numberOfParameters);
- int SCPI_DetectProgramMessageUnit(scpi_t * context);
+ 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);
+
#ifdef __cplusplus
}
--
Gitblit v1.9.1