From 6bc097eba30c30c45bd7c89d97991428b53660dc Mon Sep 17 00:00:00 2001 From: Jan Breuer <jan.breuer@jaybee.cz> Date: 周三, 24 9月 2014 22:50:27 +0800 Subject: [PATCH] Update units.c - add support for INFinity --- libscpi/inc/scpi/parser.h | 13 +++---------- 1 files changed, 3 insertions(+), 10 deletions(-) diff --git a/libscpi/inc/scpi/parser.h b/libscpi/inc/scpi/parser.h index 1a6966e..290832a 100644 --- a/libscpi/inc/scpi/parser.h +++ b/libscpi/inc/scpi/parser.h @@ -40,7 +40,6 @@ #include <string.h> #include "scpi/types.h" #include "scpi/debug.h" -#include "scpi/lexer.h" #ifdef __cplusplus extern "C" { @@ -58,23 +57,17 @@ 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, bool_t val); + size_t SCPI_ResultBool(scpi_t * context, scpi_bool_t val); int32_t SCPI_ParamGetIntVal(scpi_t * context, scpi_parameter_t * parameter); double SCPI_ParamGetDoubleVal(scpi_t * context, scpi_parameter_t * parameter); void SCPI_ParamGetTextVal(scpi_t * context, scpi_parameter_t * parameter, const char ** data, int32_t * len); #define SCPI_ParamGetCharactersVal SCPI_ParamGetTextVal #define SCPI_ParamGetArbitraryBlockVal SCPI_ParamGetTextVal - bool_t SCPI_ParamGetBoolVal(scpi_t * context, scpi_parameter_t * parameter); + scpi_bool_t SCPI_ParamGetBoolVal(scpi_t * context, scpi_parameter_t * parameter); int32_t SCPI_ParamGetChoiceVal(scpi_t * context, scpi_parameter_t * parameter, const char * options[]); - bool_t SCPI_Parameter(scpi_t * context, scpi_parameter_t * parameter, 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_parser_state_t * state, const char * buffer, int len); + scpi_bool_t SCPI_Parameter(scpi_t * context, scpi_parameter_t * parameter, scpi_bool_t mandatory); #ifdef __cplusplus } -- Gitblit v1.9.1