expr: move 'Excc_t', 'Exccdisc_t' into excc.c

Following the previous commit, these are no longer referenced anywhere else.

diff --git a/lib/expr/excc.c b/lib/expr/excc.c
index b2c0a576667774aa0c85a79b259d818a09e4a25a..ce767956e514d6ff150b9e2b4dd0b6bf65cfb174 100644 (file)
--- a/lib/expr/excc.c
+++ b/lib/expr/excc.c
@@ -27,6 +27,29 @@
 #include <stdio.h>
 #include <string.h>
 
+typedef struct Excc_s Excc_t;
+typedef struct Exccdisc_s Exccdisc_t;
+
+struct Exccdisc_s                      /* excc() discipline            */
+{
+  Sfio_t*              text;           /* text output stream           */
+  char*                id;             /* symbol prefix                */
+  uint64_t     flags;          /* EXCC_* flags                 */
+  int          (*ccf)(Excc_t*, Exnode_t*, Exid_t*, Exref_t*, Exnode_t*, Exccdisc_t*);
+          /* program generator function        */
+};
+
+struct Excc_s                          /* excc() state                 */
+{
+       Expr_t*         expr;           /* exopen() state               */
+       Exdisc_t*       disc;           /* exopen() discipline          */
+
+#ifdef _EX_CC_PRIVATE_
+       _EX_CC_PRIVATE_
+#endif
+
+};
+
 #define EX_CC_DUMP     0x8000
 
 static const char      quote[] = "\"";

diff --git a/lib/expr/expr.h b/lib/expr/expr.h
index 6268f0042d8541f6e3b45ab3064c512c4f1af4ac..cc18492aea8682bffbb6b18da38ff671eff04393 100644 (file)
--- a/lib/expr/expr.h
+++ b/lib/expr/expr.h
@@ -239,30 +239,6 @@ struct Expr_s                              /* ex program state             */
 
 };
 
-typedef struct Excc_s Excc_t;
-typedef struct Exccdisc_s Exccdisc_t;
-
-struct Exccdisc_s                      /* excc() discipline            */
-{
-       Sfio_t*         text;           /* text output stream           */
-       char*           id;             /* symbol prefix                */
-       uint64_t        flags;          /* EXCC_* flags                 */
-       int             (*ccf)(Excc_t*, Exnode_t*, Exid_t*, Exref_t*, Exnode_t*, Exccdisc_t*);
-                                       /* program generator function   */
-};
-
-struct Excc_s                          /* excc() state                 */
-{
-       Expr_t*         expr;           /* exopen() state               */
-       Exdisc_t*       disc;           /* exopen() discipline          */
-
-#ifdef _EX_CC_PRIVATE_
-       _EX_CC_PRIVATE_
-#endif
-
-};
-
-
 extern Exnode_t*       excast(Expr_t*, Exnode_t*, int, Exnode_t*, int);
 extern Exnode_t*       exnoncast(Exnode_t *);
 extern void            exclose(Expr_t*, int);