From b97d4493b3c997477b85a35de0a4ffa15cf742eb Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周三, 23 10月 2013 22:46:57 +0800
Subject: [PATCH] Correct optional command pattern matching
---
libscpi/inc/scpi/types.h | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/libscpi/inc/scpi/types.h b/libscpi/inc/scpi/types.h
index 5369cdc..3791c9d 100644
--- a/libscpi/inc/scpi/types.h
+++ b/libscpi/inc/scpi/types.h
@@ -47,8 +47,12 @@
extern "C" {
#endif
-#define FALSE false
-#define TRUE true
+#ifndef FALSE
+ #define FALSE 0
+#endif
+#ifndef TRUE
+ #define TRUE (!FALSE)
+#endif
/* basic data types */
typedef bool bool_t;
@@ -136,11 +140,14 @@
TokDoubleQuoteProgramData,
TokProgramExpression,
TokCompoundProgramHeader,
+ TokIncompleteCompoundProgramHeader,
TokCommonProgramHeader,
+ TokIncompleteCommonProgramHeader,
TokCompoundQueryProgramHeader,
TokCommonQueryProgramHeader,
TokWhiteSpace,
TokAllProgramData,
+ TokInvalid,
TokUnknown,
};
typedef enum _token_type_t token_type_t;
@@ -276,6 +283,7 @@
const scpi_special_number_def_t * special_numbers;
void * user_context;
scpi_parser_state_t parser_state;
+ const char * idn[4];
};
#ifdef __cplusplus
--
Gitblit v1.9.1