From 04a8df4f9739fc6d4a0f133712b62d72119372aa Mon Sep 17 00:00:00 2001 From: Matthew Fernandez Date: Thu, 4 Aug 2022 19:09:43 -0700 Subject: [PATCH] expr: move 'Excc_t', 'Exccdisc_t' into excc.c Following the previous commit, these are no longer referenced anywhere else. --- lib/expr/excc.c | 23 +++++++++++++++++++++++ lib/expr/expr.h | 24 ------------------------ 2 files changed, 23 insertions(+), 24 deletions(-) diff --git a/lib/expr/excc.c b/lib/expr/excc.c index b2c0a5766..ce767956e 100644 --- a/lib/expr/excc.c +++ b/lib/expr/excc.c @@ -27,6 +27,29 @@ #include #include +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 6268f0042..cc18492ae 100644 --- 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); -- 2.40.0