From 09a85995bb4440d2060d478eab89b7e714386ef9 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周四, 10 9月 2015 07:31:18 +0800
Subject: [PATCH] mend

---
 libscpi/inc/scpi/types.h |   55 +++++++++++++++++++++++++++++++++----------------------
 1 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/libscpi/inc/scpi/types.h b/libscpi/inc/scpi/types.h
index ade80cf..bded006 100644
--- a/libscpi/inc/scpi/types.h
+++ b/libscpi/inc/scpi/types.h
@@ -4,7 +4,7 @@
  * Copyright (c) 2012 Jan Breuer
  *
  * All Rights Reserved
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
@@ -13,7 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -30,10 +30,10 @@
 /**
  * @file   scpi_types.h
  * @date   Thu Nov 15 10:58:45 UTC 2012
- * 
+ *
  * @brief  SCPI data types
- * 
- * 
+ *
+ *
  */
 
 #ifndef SCPI_TYPES_H
@@ -41,10 +41,18 @@
 
 #include <stddef.h>
 #include <stdint.h>
+#include "scpi/config.h"
+
+#if HAVE_STDBOOL
 #include <stdbool.h>
+#endif
 
 #ifdef  __cplusplus
 extern "C" {
+#endif
+
+#if !HAVE_STDBOOL
+   typedef unsigned char bool;
 #endif
 
 #ifndef FALSE
@@ -117,7 +125,7 @@
         char * data;
     };
     typedef struct _scpi_buffer_t scpi_buffer_t;
-    
+
     struct _scpi_const_buffer_t {
         size_t length;
         size_t position;
@@ -133,6 +141,7 @@
     enum _scpi_token_type_t {
         SCPI_TOKEN_COMMA,
         SCPI_TOKEN_SEMICOLON,
+        SCPI_TOKEN_COLON,
         SCPI_TOKEN_QUESTION,
         SCPI_TOKEN_NL,
         SCPI_TOKEN_HEXNUM,
@@ -161,26 +170,26 @@
 
     struct _scpi_token_t {
         scpi_token_type_t type;
-        const char * ptr;
+        char * ptr;
         int len;
     };
     typedef struct _scpi_token_t scpi_token_t;
 
     struct _lex_state_t {
-        const char * buffer;
-        const char * pos;
+        char * buffer;
+        char * pos;
         int len;
     };
     typedef struct _lex_state_t lex_state_t;
 
-    /* scpi parser */   
+    /* scpi parser */
     enum _message_termination_t {
         SCPI_MESSAGE_TERMINATION_NONE,
         SCPI_MESSAGE_TERMINATION_NL,
-        SCPI_MESSAGE_TERMINATION_SEMICOLON,                
+        SCPI_MESSAGE_TERMINATION_SEMICOLON,
     };
     typedef enum _message_termination_t message_termination_t;
-    
+
     struct _scpi_parser_state_t {
         scpi_token_t programHeader;
         scpi_token_t programData;
@@ -190,7 +199,6 @@
     typedef struct _scpi_parser_state_t scpi_parser_state_t;
 
     typedef scpi_result_t(*scpi_command_callback_t)(scpi_t *);
-    typedef int32_t(*scpi_test_command_callback_t)(scpi_t *);
 
     /* scpi error queue */
     typedef void * scpi_error_queue_t;
@@ -225,7 +233,8 @@
         SCPI_NUM_DOWN,
         SCPI_NUM_NAN,
         SCPI_NUM_INF,
-        SCPI_NUM_NINF
+        SCPI_NUM_NINF,
+        SCPI_NUM_AUTO
     };
     typedef enum _scpi_special_number_t scpi_special_number_t;
 
@@ -241,24 +250,27 @@
         lex_state_t lex_state;
         scpi_const_buffer_t cmd_raw;
     };
-    typedef struct _scpi_param_list_t scpi_param_list_t;  
-    
+    typedef struct _scpi_param_list_t scpi_param_list_t;
+
     struct _scpi_number_parameter_t {
-        double value;
+        scpi_bool_t special;
+        union {
+            double value;
+            int32_t tag;
+        };
         scpi_unit_t unit;
         int8_t base;
-        scpi_special_number_t type;
     };
     typedef struct _scpi_number_parameter_t scpi_number_t;
 
     struct _scpi_data_parameter_t {
         const char * ptr;
-        int32_t len;        
+        int32_t len;
     };
     typedef struct _scpi_data_parameter_t scpi_data_parameter_t;
-    
+
     typedef scpi_token_t scpi_parameter_t;
-    
+
     struct _scpi_command_t {
         const char * pattern;
         scpi_command_callback_t callback;
@@ -271,7 +283,6 @@
         scpi_write_control_t control;
         scpi_command_callback_t flush;
         scpi_command_callback_t reset;
-        scpi_test_command_callback_t test;
     };
 
     struct _scpi_t {

--
Gitblit v1.9.1