From 6fedcce7ebdb7fae4d1f11af5194f919352235bf Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周日, 19 4月 2015 05:33:12 +0800
Subject: [PATCH] Next try to correct avr-libc detection
---
libscpi/inc/scpi/parser.h | 33 +++++++++++++++++++++------------
1 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/libscpi/inc/scpi/parser.h b/libscpi/inc/scpi/parser.h
index 6a9ebda..7940ea6 100644
--- a/libscpi/inc/scpi/parser.h
+++ b/libscpi/inc/scpi/parser.h
@@ -37,9 +37,9 @@
#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" {
@@ -51,26 +51,35 @@
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);
-
- 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_Parameter(scpi_t * context, scpi_parameter_t * parameter, bool_t mandatory);
+ 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_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_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_ParamDouble(scpi_t * context, double * value, scpi_bool_t mandatory);
+ scpi_bool_t SCPI_ParamCharacters(scpi_t * context, const char ** value, size_t * len, 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);
- 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_ParamBool(scpi_t * context, scpi_bool_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);
+
#ifdef __cplusplus
}
#endif
--
Gitblit v1.9.1