From 08183a36843d8f629d62c981a53b935d2da48878 Mon Sep 17 00:00:00 2001
From: Iztok Jeras <iztok.jeras@redpitaya.com>
Date: 周五, 16 10月 2015 18:36:09 +0800
Subject: [PATCH] integer parser: added test which caused issues with gcc-linaro-4.9-2014.11-x86_64_arm-linux-gnueabihf cross compiler
---
libscpi/inc/scpi/types.h | 46 +++++++++++++++++++++++++++-------------------
1 files changed, 27 insertions(+), 19 deletions(-)
diff --git a/libscpi/inc/scpi/types.h b/libscpi/inc/scpi/types.h
index 1dda5c1..38ee018 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,9 @@
#include <stddef.h>
#include <stdint.h>
+#include "scpi/config.h"
-#if defined(_CVI_)
- typedef unsigned char bool;
-#else
+#if HAVE_STDBOOL
#include <stdbool.h>
#endif
@@ -52,11 +51,15 @@
extern "C" {
#endif
+#if !HAVE_STDBOOL
+ typedef unsigned char bool;
+#endif
+
#ifndef FALSE
- #define FALSE 0
+#define FALSE 0
#endif
#ifndef TRUE
- #define TRUE (!FALSE)
+#define TRUE (!FALSE)
#endif
/* basic data types */
@@ -122,7 +125,7 @@
char * data;
};
typedef struct _scpi_buffer_t scpi_buffer_t;
-
+
struct _scpi_const_buffer_t {
size_t length;
size_t position;
@@ -138,6 +141,8 @@
enum _scpi_token_type_t {
SCPI_TOKEN_COMMA,
SCPI_TOKEN_SEMICOLON,
+ SCPI_TOKEN_COLON,
+ SCPI_TOKEN_SPECIFIC_CHARACTER,
SCPI_TOKEN_QUESTION,
SCPI_TOKEN_NL,
SCPI_TOKEN_HEXNUM,
@@ -178,14 +183,14 @@
};
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;
@@ -246,10 +251,11 @@
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 {
scpi_bool_t special;
+
union {
double value;
int32_t tag;
@@ -261,16 +267,18 @@
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;
+#if USE_COMMAND_TAGS
int32_t tag;
+#endif /* USE_COMMAND_TAGS */
};
struct _scpi_interface_t {
--
Gitblit v1.9.1