diff --git a/src/seq/Makefile b/src/seq/Makefile
index a60b29c371bd926279766d1fc82900f579180a42..ee5e8c14cccf75d388258184a5449665d9d5772a 100644
--- a/src/seq/Makefile
+++ b/src/seq/Makefile
@@ -8,6 +8,7 @@ include $(TOP)/configure/CONFIG
INC += seqCom.h
INC += seq_release.h
INC += seq_static_assert.h
+INC += seq_prim_types.h
# seq library
LIBRARY = seq
diff --git a/src/seq/seq_main.c b/src/seq/seq_main.c
index 232fc8f1fbc3cc11750b40a16425dc7f452925da..d776edf7cd24124e820efb5713b15f2897915d3d 100644
--- a/src/seq/seq_main.c
+++ b/src/seq/seq_main.c
@@ -7,6 +7,10 @@ Copyright (c) 2010-2012 Helmholtz-Zentrum Berlin f. Materialien
This file is distributed subject to a Software License Agreement found
in the file LICENSE that is included with this distribution.
\*************************************************************************/
+#define prim_types_GLOBAL
+#include "seq_prim_types.h"
+#undef prim_types_GLOBAL
+
#include "seq.h"
#include "seq_debug.h"
diff --git a/src/seq/seq_prim_types.h b/src/seq/seq_prim_types.h
new file mode 100644
index 0000000000000000000000000000000000000000..674aecfcebad293349d55d4f4a0ae48ba975f4e3
--- /dev/null
+++ b/src/seq/seq_prim_types.h
@@ -0,0 +1,92 @@
+/*************************************************************************\
+Copyright (c) 2010-2012 Helmholtz-Zentrum Berlin f. Materialien
+ und Energie GmbH, Germany (HZB)
+This file is distributed subject to a Software License Agreement found
+in the file LICENSE that is included with this distribution.
+\*************************************************************************/
+#ifndef INCLseq_prim_typesh
+#define INCLseq_prim_typesh
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+enum prim_type_tag {
+ P_CHAR,
+ P_UCHAR,
+ P_SHORT,
+ P_USHORT,
+ P_INT,
+ P_UINT,
+ P_LONG,
+ P_ULONG,
+ P_INT8T,
+ P_UINT8T,
+ P_INT16T,
+ P_UINT16T,
+ P_INT32T,
+ P_UINT32T,
+ P_FLOAT,
+ P_DOUBLE,
+ P_STRING,
+};
+
+#ifndef prim_types_GLOBAL
+extern
+#endif
+const char *prim_type_name[]
+#ifdef prim_types_GLOBAL
+= {
+ "char",
+ "unsigned char",
+ "short",
+ "unsigned short",
+ "int",
+ "unsigned int",
+ "long",
+ "unsigned long",
+ "epicsInt8",
+ "epicsUInt8",
+ "epicsInt16",
+ "epicsUInt16",
+ "epicsInt32",
+ "epicsUInt32",
+ "float",
+ "double",
+ "string",
+}
+#endif
+;
+
+#ifndef var_types_GLOBAL
+extern
+#endif
+const char *prim_type_tag_name[]
+#ifdef var_types_GLOBAL
+= {
+ "P_CHAR",
+ "P_UCHAR",
+ "P_SHORT",
+ "P_USHORT",
+ "P_INT",
+ "P_UINT",
+ "P_LONG",
+ "P_ULONG",
+ "P_INT8T",
+ "P_UINT8T",
+ "P_INT16T",
+ "P_UINT16T",
+ "P_INT32T",
+ "P_UINT32T",
+ "P_FLOAT",
+ "P_DOUBLE",
+ "P_STRING",
+}
+#endif
+;
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /*INCLseq_prim_typesh*/
diff --git a/src/snc/Makefile b/src/snc/Makefile
index 745ee1373c32d6ff8e75b52ac7d46a2a848df9a6..35ec86490ce2c2b5294d0d4bc6001ca968f1bc49 100644
--- a/src/snc/Makefile
+++ b/src/snc/Makefile
@@ -26,7 +26,7 @@ snc_SRCS += gen_tables.c # code generation (tables)
snc_SRCS += sym_table.c # symbol table
snc_SRCS += builtin.c # builtin constants and functions
-snc_LIBS += Com
+snc_LIBS += Com seq
# locally overwrite default value for this variable
INSTALL_DOC = $(INSTALL_LOCATION)/documentation
diff --git a/src/snc/gen_tables.c b/src/snc/gen_tables.c
index f70a20fd43fdd4f11c6b787a1b2a69bc99b6562a..1ef6ba5de1cf722bbed966f5063aef011fe04545 100644
--- a/src/snc/gen_tables.c
+++ b/src/snc/gen_tables.c
@@ -110,7 +110,7 @@ static void gen_channel(Chan *cp, uint num_event_flags, int opt_reent)
if (basetype->tag == T_PRIM)
{
enum prim_type_tag type = basetype->val.prim;
- if (type == V_LONG || type == V_ULONG)
+ if (type == P_LONG || type == P_ULONG)
{
printf(
"#if LONG_MAX > 0x7fffffffL\n"
@@ -125,8 +125,8 @@ static void gen_channel(Chan *cp, uint num_event_flags, int opt_reent)
" because Channel Access does not support integral types longer than 4 bytes.\\\n"
" You can use '%s' instead, or the fixed size type '%s'.\n"
"#endif\n",
- type == V_LONG ? "int" : "unsigned int",
- type == V_LONG ? "int32_t" : "uint32_t"
+ type == P_LONG ? "int" : "unsigned int",
+ type == P_LONG ? "int32_t" : "uint32_t"
);
}
}
diff --git a/src/snc/snl.lem b/src/snc/snl.lem
index 190f12dfe7ebd784a449746c447943b9e160ee19..4881a225ed53d544443b46b65690af348e58623d 100644
--- a/src/snc/snl.lem
+++ b/src/snc/snl.lem
@@ -213,31 +213,31 @@ init_exprs(p) ::= . { p = 0; }
// Type expressions
// C standard calls this specifier-qualifier-list
+%type prim_type {enum prim_type_tag}
+prim_type(p) ::= CHAR. { p = P_CHAR; }
+prim_type(p) ::= SHORT. { p = P_SHORT; }
+prim_type(p) ::= INT. { p = P_INT; }
+prim_type(p) ::= LONG. { p = P_LONG; }
+prim_type(p) ::= UNSIGNED CHAR. { p = P_UCHAR; }
+prim_type(p) ::= UNSIGNED SHORT. { p = P_USHORT; }
+prim_type(p) ::= UNSIGNED INT. { p = P_UINT; }
+prim_type(p) ::= UNSIGNED LONG. { p = P_ULONG; }
+prim_type(p) ::= INT8T. { p = P_INT8T; }
+prim_type(p) ::= UINT8T. { p = P_UINT8T; }
+prim_type(p) ::= INT16T. { p = P_INT16T; }
+prim_type(p) ::= UINT16T. { p = P_UINT16T; }
+prim_type(p) ::= INT32T. { p = P_INT32T; }
+prim_type(p) ::= UINT32T. { p = P_UINT32T; }
+prim_type(p) ::= FLOAT. { p = P_FLOAT; }
+prim_type(p) ::= DOUBLE. { p = P_DOUBLE; }
+prim_type(p) ::= STRING. { p = P_STRING; }
+
%type basetype {Type}
-basetype(p) ::= CHAR. { p = mk_prim_type(V_CHAR); }
-basetype(p) ::= SHORT. { p = mk_prim_type(V_SHORT); }
-basetype(p) ::= INT. { p = mk_prim_type(V_INT); }
-basetype(p) ::= LONG. { p = mk_prim_type(V_LONG); }
-basetype(p) ::= UNSIGNED CHAR. { p = mk_prim_type(V_UCHAR); }
-basetype(p) ::= UNSIGNED SHORT. { p = mk_prim_type(V_USHORT); }
-basetype(p) ::= UNSIGNED INT. { p = mk_prim_type(V_UINT); }
-basetype(p) ::= UNSIGNED LONG. { p = mk_prim_type(V_ULONG); }
-
-basetype(p) ::= INT8T. { p = mk_prim_type(V_INT8T); }
-basetype(p) ::= UINT8T. { p = mk_prim_type(V_UINT8T); }
-basetype(p) ::= INT16T. { p = mk_prim_type(V_INT16T); }
-basetype(p) ::= UINT16T. { p = mk_prim_type(V_UINT16T); }
-basetype(p) ::= INT32T. { p = mk_prim_type(V_INT32T); }
-basetype(p) ::= UINT32T. { p = mk_prim_type(V_UINT32T); }
-
-basetype(p) ::= FLOAT. { p = mk_prim_type(V_FLOAT); }
-basetype(p) ::= DOUBLE. { p = mk_prim_type(V_DOUBLE); }
-basetype(p) ::= STRING. { p = mk_prim_type(V_STRING); }
-basetype(p) ::= EVFLAG. { p = mk_ef_type(); }
-
-basetype(p) ::= ENUM NAME(x). { p = mk_foreign_type(F_ENUM, x.str); }
-basetype(p) ::= STRUCT NAME(x). { p = mk_foreign_type(F_STRUCT, x.str); }
-basetype(p) ::= UNION NAME(x). { p = mk_foreign_type(F_UNION, x.str); }
+basetype(p) ::= prim_type(x). { p = mk_prim_type(x); }
+basetype(p) ::= EVFLAG. { p = mk_ef_type(); }
+basetype(p) ::= ENUM NAME(x). { p = mk_foreign_type(F_ENUM, x.str); }
+basetype(p) ::= STRUCT NAME(x). { p = mk_foreign_type(F_STRUCT, x.str); }
+basetype(p) ::= UNION NAME(x). { p = mk_foreign_type(F_UNION, x.str); }
basetype(p) ::= TYPENAME NAME(x). { p = mk_foreign_type(F_TYPENAME, x.str); }
type_expr(p) ::= basetype(t) opt_abstract_declarator(d). {
diff --git a/src/snc/var_types.h b/src/snc/var_types.h
index 5ea2ed983f98c3cec3c26b52fd2e60e3c06c3d19..482692adbbcd47543a8bbffba4394873288519b0 100644
--- a/src/snc/var_types.h
+++ b/src/snc/var_types.h
@@ -7,6 +7,8 @@ in the file LICENSE that is included with this distribution.
#ifndef INCLvar_typesh
#define INCLvar_typesh
+#include "seq_prim_types.h"
+
enum type_tag {
T_NONE, /* undeclared (or declared as foreign) variable */
T_EVFLAG, /* event flags */
@@ -14,26 +16,7 @@ enum type_tag {
T_FOREIGN, /* foreign types (declared in C code) */
T_POINTER,
T_ARRAY,
-};
-
-enum prim_type_tag {
- V_CHAR,
- V_UCHAR,
- V_SHORT,
- V_USHORT,
- V_INT,
- V_UINT,
- V_LONG,
- V_ULONG,
- V_INT8T,
- V_UINT8T,
- V_INT16T,
- V_UINT16T,
- V_INT32T,
- V_UINT32T,
- V_FLOAT,
- V_DOUBLE,
- V_STRING,
+ T_PV,
};
enum foreign_type_tag {
@@ -89,32 +72,6 @@ Type mk_foreign_type(enum foreign_type_tag tag, char *name);
Type mk_ef_type();
Type mk_no_type();
-#ifndef var_types_GLOBAL
-extern
-#endif
-const char *prim_type_name[]
-#ifdef var_types_GLOBAL
-= {
- "char",
- "unsigned char",
- "short",
- "unsigned short",
- "int",
- "unsigned int",
- "long",
- "unsigned long",
- "epicsInt8",
- "epicsUInt8",
- "epicsInt16",
- "epicsUInt16",
- "epicsInt32",
- "epicsUInt32",
- "float",
- "double",
- "string",
-}
-#endif
-;
#ifndef var_types_GLOBAL
extern