diff options
| author | Tyge Lovset <[email protected]> | 2023-01-04 22:55:08 +0100 |
|---|---|---|
| committer | Tyge Lovset <[email protected]> | 2023-01-04 22:55:08 +0100 |
| commit | f89ba241b30a9335a8354c435c377cfcf9841de2 (patch) | |
| tree | 233b72f88793dbd4fcb93ff3965b83986ea01eef /include | |
| parent | 3812789b283f59d2cc4ca0bd32c4edbd7742ef99 (diff) | |
| download | STC-modified-f89ba241b30a9335a8354c435c377cfcf9841de2.tar.gz STC-modified-f89ba241b30a9335a8354c435c377cfcf9841de2.zip | |
Removed the experimental c_AUTODROP macro.
Diffstat (limited to 'include')
| -rw-r--r-- | include/stc/ccommon.h | 6 | ||||
| -rw-r--r-- | include/stc/priv/lowcase.h | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/include/stc/ccommon.h b/include/stc/ccommon.h index 191709fb..90abb186 100644 --- a/include/stc/ccommon.h +++ b/include/stc/ccommon.h @@ -122,8 +122,6 @@ typedef const char* crawstr; #define c_SV2(str, n) (c_INIT(csview){str, n}) #define c_ARGSV(sv) (int)(sv).size, (sv).str /* use with "%.*s" */ #define c_PAIR(ref) (ref)->first, (ref)->second -#define c_sv c_SV /* [deprecated] */ -#define c_ARGsv(sv) c_ARGSV(sv) /* [deprecated] */ #define _c_ROTL(x, k) (x << (k) | x >> (8*sizeof(x) - (k))) @@ -203,7 +201,7 @@ STC_INLINE char* cstrnstrn(const char *str, const char *needle, #define c_WITH3(declvar, pred, drop) for (declvar, **_c_i = NULL; !_c_i && (pred); ++_c_i, drop) #define c_SCOPE(init, drop) for (int _c_i = (init, 0); !_c_i; ++_c_i, drop) #define c_DEFER(...) for (int _c_i = 0; !_c_i; ++_c_i, __VA_ARGS__) -#define c_AUTODROP(C, a, ...) for (C a = __VA_ARGS__, **_c_i = NULL; !_c_i; ++_c_i, C##_drop(&a)) +#define c_DROP(C, ...) do { c_FORLIST (_i, C*, {__VA_ARGS__}) C##_drop(*_i.ref); } while(0) #define c_AUTO(...) c_MACRO_OVERLOAD(c_AUTO, __VA_ARGS__) #define c_AUTO2(C, a) \ @@ -218,8 +216,6 @@ STC_INLINE char* cstrnstrn(const char *str, const char *needle, c_WITH2(c_EXPAND(C a = C##_init(), b = C##_init(), c = C##_init(), d = C##_init()), \ (C##_drop(&d), C##_drop(&c), C##_drop(&b), C##_drop(&a))) -#define c_DROP(C, ...) do { c_FORLIST (_i, C*, {__VA_ARGS__}) C##_drop(*_i.ref); } while(0) - #define c_FIND_IF(...) c_MACRO_OVERLOAD(c_FIND_IF, __VA_ARGS__) #define c_FIND_IF4(it, C, cnt, pred) do { \ size_t index = 0; \ diff --git a/include/stc/priv/lowcase.h b/include/stc/priv/lowcase.h index 94de4578..8b37fa23 100644 --- a/include/stc/priv/lowcase.h +++ b/include/stc/priv/lowcase.h @@ -42,11 +42,12 @@ #define c_fortoken c_FORTOKEN #define c_fortoken_sv c_FORTOKEN_SV #define c_auto c_AUTO -#define c_autodrop c_AUTODROP #define c_with c_WITH #define c_scope c_SCOPE #define c_defer c_DEFER #define c_drop c_DROP +#define c_sv c_SV +#define c_ARGsv c_ARGSV #define c_find_if c_FIND_IF #define c_erase_if c_ERASE_IF #define c_flt_take c_FLT_TAKE |