Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitc44550d

Browse files
committed
fu_util: some simplification and optimization.
1 parentcdc0d15 commitc44550d

File tree

16 files changed

+590
-588
lines changed

16 files changed

+590
-588
lines changed

‎Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ PROGRAM := pg_probackup
3737
# pg_probackup sources
3838
OBJS := src/utils/configuration.o src/utils/json.o src/utils/logger.o\
3939
src/utils/parray.o src/utils/pgut.o src/utils/thread.o src/utils/remote.o src/utils/file.o
40-
OBJS += src/fu_util/impl/ft_impl.o src/fu_util/impl/fo_impl.o
4140
OBJS += src/archive.o src/backup.o src/catalog.o src/checkdb.o src/configure.o src/data.o\
4241
src/delete.o src/dir.o src/fetch.o src/help.o src/init.o src/merge.o\
4342
src/parsexlog.o src/ptrack.o src/pg_probackup.o src/restore.o src/show.o src/stream.o\
@@ -60,6 +59,8 @@ BORROWED_C_SRC += \
6059
src/bin/pg_basebackup/walmethods.c
6160
endif
6261

62+
OBJS += src/fu_util/impl/ft_impl.o src/fu_util/impl/fo_impl.o
63+
6364
BORROW_DIR := src/borrowed
6465
BORROWED_H :=$(addprefix$(BORROW_DIR)/,$(notdir$(BORROWED_H_SRC)))
6566
BORROWED_C :=$(addprefix$(BORROW_DIR)/,$(notdir$(BORROWED_C_SRC)))

‎src/fu_util/fm_util.h

Lines changed: 138 additions & 117 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,28 @@
22
#ifndefFM_UTIL_H
33
#defineFM_UTIL_H
44

5-
#definefm_cat_impl(x,y)x##y
6-
#definefm_cat(x,y)fm_cat_impl(x, y)
7-
#definefm_cat3_impl(x,y,z)x##y##z
8-
#definefm_cat3(x,y,z)fm_cat3_impl(x, y, z)
9-
#definefm_cat4_impl(w,x,y,z)w##x##y##z
10-
#definefm_cat4(w,x,y,z)fm_cat4_impl(w, x, y, z)
11-
#definefm_str_impl(...)#__VA_ARGS__
12-
#definefm_str(...)fm_str_impl(__VA_ARGS__)
5+
#definefm_cat(x,y)fm__cat(x, y)
6+
#definefm__cat(x,y)x##y
7+
#definefm_cat3(x,y,z)fm__cat3(x, y, z)
8+
#definefm__cat3(x,y,z)x##y##z
9+
#definefm_cat4(w,x,y,z)fm__cat4(w, x, y, z)
10+
#definefm__cat4(w,x,y,z)w##x##y##z
11+
#definefm_str(...)fm__str(__VA_ARGS__)
12+
#definefm__str(...)#__VA_ARGS__
1313
#definefm_uniq(x) fm_cat(_##x##_, __COUNTER__)
1414

1515
#definefm_expand(...) __VA_ARGS__
1616
#definefm_empty(...)
1717

18+
#definefm_comma(...) ,
19+
#definefm__comma ,
20+
21+
#definefm_apply(macro, ...) \
22+
macro(__VA_ARGS__)
23+
24+
/****************************************/
25+
// LOGIC
26+
1827
#definefm_compl(v) fm_cat(fm_compl_, v)
1928
#definefm_compl_0 1
2029
#definefm_compl_1 0
@@ -54,59 +63,69 @@
5463
#definefm__iif_1(...) __VA_ARGS__ fm_empty
5564
#definefm__iif_0(...) fm_expand
5665

57-
#definefm_va_comma(...) \
58-
fm_cat(fm__va_comma_, fm_va_01(__VA_ARGS__))()
59-
#definefm__va_comma_0()
60-
#definefm__va_comma_1() ,
61-
62-
#definefm_or_default(...) \
63-
fm_iif(fm_va_01(__VA_ARGS__))(__VA_ARGS__)
66+
/****************************************/
67+
// COMPARISON
6468

65-
#definefm__primitive_compare(x,y) fm_is_tuple(COMPARE_##x(COMPARE_##y)(()))
66-
#definefm__is_comparable(x) fm_is_tuple(fm_cat(COMPARE_,x)(()))
67-
#definefm_not_equal(x,y) \
68-
fm_if(fm_and(fm__is_comparable(x),fm__is_comparable(y)), fm__primitive_compare, 1 fm_empty)(x, y)
6969
#definefm_equal(x,y) \
7070
fm_compl(fm_not_equal(x, y))
71+
#definefm_not_equal(x,y) \
72+
fm_if(fm_and(fm__is_comparable(x),fm__is_comparable(y)), fm__primitive_compare, 1 fm_empty)(x, y)
73+
#definefm__primitive_compare(x,y) fm_is_tuple(COMPARE_##x(COMPARE_##y)(()))
74+
#definefm__is_comparable(x) fm_is_tuple(fm_cat(COMPARE_,x)(()))
7175

72-
#definefm_comma(...) ,
73-
#definefm__comma ,
76+
/****************************************/
77+
// __VA_ARGS__
78+
79+
#definefm_head(...) fm__head(__VA_ARGS__)
80+
#definefm__head(x, ...) x
81+
#definefm_tail(...) fm__tail(__VA_ARGS__)
82+
#definefm__tail(x, ...) __VA_ARGS__
83+
84+
#definefm_or_default(...) \
85+
fm_iif(fm_va_01(__VA_ARGS__))(__VA_ARGS__)
7486
#definefm_va_single(...) fm__va_single(__VA_ARGS__, fm__comma)
7587
#definefm_va_many(...) fm__va_many(__VA_ARGS__, fm__comma)
7688
#definefm__va_single(x,y, ...) fm__va_result(y, 1, 0)
7789
#definefm__va_many(x,y, ...) fm__va_result(y, 0, 1)
7890
#definefm__va_result(x,y,res, ...) res
7991

80-
#if !__STRICT_ANSI__
81-
#definefm_no_va(...) fm__no_va(__VA_ARGS__)
82-
#definefm__no_va(...) fm_va_single(~, ##__VA_ARGS__)
83-
#definefm_va_01(...) fm__va_01(__VA_ARGS__)
84-
#definefm__va_01(...) fm_va_many(~, ##__VA_ARGS__)
85-
#else
8692
#definefm_no_va fm_is_empty
8793
#definefm_va_01 fm_isnt_empty
94+
#definefm_va_01n(...) fm_cat3(fm__va_01n_, fm__isnt_empty(__VA_ARGS__), fm_va_many(__VA_ARGS__))
95+
#definefm__va_01n_00 0
96+
#definefm__va_01n_10 1
97+
#definefm__va_01n_11 n
98+
99+
#if !__STRICT_ANSI__
100+
#definefm_is_empty(...) fm__is_empty(__VA_ARGS__)
101+
#definefm__is_empty(...) fm_va_single(~, ##__VA_ARGS__)
102+
#definefm_isnt_empty(...) fm__isnt_empty(__VA_ARGS__)
103+
#definefm__isnt_empty(...) fm_va_many(~, ##__VA_ARGS__)
104+
#else
105+
#definefm_is_empty(...) fm_and(fm__is_emptyfirst(__VA_ARGS__), fm_va_single(__VA_ARGS__))
106+
#definefm_isnt_empty(...) fm_nand(fm__is_emptyfirst(__VA_ARGS__), fm_va_single(__VA_ARGS__))
107+
108+
#definefm__is_emptyfirst(x, ...) fm_iif(fm_is_tuple(x))(0)(fm__is_emptyfirst_impl(x))
109+
#definefm__is_emptyfirst_impl(x,...) fm_tuple_2((\
110+
fm__is_emptyfirst_do1 x (fm__is_emptyfirst_do2), 1, 0))
111+
#definefm__is_emptyfirst_do1(F) F()
112+
#definefm__is_emptyfirst_do2(...) ,
88113
#endif
89114

115+
#definefm_when_isnt_empty(...) fm_cat(fm__when_, fm__isnt_empty(__VA_ARGS__))
116+
#definefm_va_comma(...) \
117+
fm_when_isnt_empty(__VA_ARGS__)(fm__comma)
118+
#definefm_va_comma_fun(...) \
119+
fm_if(fm_va_01(__VA_ARGS__), fm_comma, fm_empty)
120+
121+
122+
/****************************************/
123+
// Tuples
124+
125+
#definefm_is_tuple(x, ...) fm__is_tuple_(fm__is_tuple_help x, 1, 0)
90126
#definefm__is_tuple_choose(a,b,x,...) x
91127
#definefm__is_tuple_help(...) ,
92128
#definefm__is_tuple_(...) fm__is_tuple_choose(__VA_ARGS__)
93-
#definefm_is_tuple(x, ...) fm__is_tuple_(fm__is_tuple_help x, 1, 0)
94-
95-
#definefm_head(x, ...) x
96-
#definefm_tail(x, ...) __VA_ARGS__
97-
98-
#definefm_apply_1(macro,x, ...) \
99-
macro(x)
100-
#definefm_apply_2(macro,x,y, ...) \
101-
macro(x, y)
102-
#definefm_apply_3(macro,x,y,z, ...) \
103-
macro(x, y, z)
104-
#definefm_apply_tuple_1(macro,x, ...) \
105-
macro x
106-
#definefm_apply_tuple_2(macro,x,y, ...) \
107-
fm__apply_tuple_2(macro, x, fm_expand y)
108-
#definefm__apply_tuple_2(macro,x, ...) \
109-
macro(x, __VA_ARGS__)
110129

111130
#definefm_tuple_expand(x) fm_expand x
112131
#definefm_tuple_tag(x) fm_head x
@@ -117,37 +136,18 @@
117136
#definefm_tuple_2(x) fm__tuple_2 x
118137
#definefm__tuple_2(_0,_1,_2, ...) _2
119138

139+
#definefm_tuple_tag_or_0(x) fm__tuple_tag_or_0_(fm__tuple_tag_or_0_help x, 0)
140+
#definefm__tuple_tag_or_0_(...) fm__tuple_tag_or_0_choose(__VA_ARGS__)
120141
#definefm__tuple_tag_or_0_choose(a,x,...) x
121142
#definefm__tuple_tag_or_0_help(tag, ...) , tag
122-
#definefm__tuple_tag_or_0_(...) fm__tuple_tag_or_0_choose(__VA_ARGS__)
123-
#definefm_tuple_tag_or_0(x) fm__tuple_tag_or_0_(fm__tuple_tag_or_0_help x, 0)
124143

125144
#definefm_dispatch_tag_or_0(prefix,x) \
126145
fm_cat(prefix, fm_tuple_tag_or_0(x))
127146

128-
#definefm_va_012(...) \
129-
fm_if(fm_no_va(__VA_ARGS__), 0, fm__va_12(__VA_ARGS__))
130-
#definefm__va_12(...) \
131-
fm_if(fm_va_single(__VA_ARGS__), 1, 2)
132-
133-
// recursion handle
134-
#definefm_defer(id) id fm_empty()
135-
#definefm_recurs(id) id fm_empty fm_empty() ()
136-
#definefm_recurs2(a,b) fm_cat fm_empty fm_empty() () (a,b)
137-
138-
#if__STRICT_ANSI__
139-
#definefm__is_emptyfirst(x, ...) fm_if(fm_is_tuple(x), 0, fm__is_emptyfirst_impl(x))
140-
#definefm__is_emptyfirst_impl(x,...) fm_tuple_2((\
141-
fm__is_emptyfirst_do1 x (fm__is_emptyfirst_do2), 1, 0))
142-
#definefm__is_emptyfirst_do1(F) F()
143-
#definefm__is_emptyfirst_do2(...) ,
144-
#definefm_is_empty(...) fm_and(fm__is_emptyfirst(__VA_ARGS__), fm_va_single(__VA_ARGS__))
145-
#definefm_isnt_empty(...) fm_nand(fm__is_emptyfirst(__VA_ARGS__), fm_va_single(__VA_ARGS__))
146-
#else
147-
#definefm_is_empty fm_no_va
148-
#definefm_isnt_empty fm_va_01
149-
#endif
147+
/****************************************/
148+
// Iteration
150149

150+
/* recursion engine */
151151
#definefm_eval(...) fm__eval_0(__VA_ARGS__)
152152
#ifdefFU_LONG_EVAL
153153
#definefm__eval_0(...) fm__eval_1(fm__eval_1(fm__eval_1(fm__eval_1(__VA_ARGS__))))
@@ -158,75 +158,96 @@
158158
#definefm__eval_2(...) fm__eval_3(fm__eval_3(__VA_ARGS__))
159159
#definefm__eval_3(...) __VA_ARGS__
160160

161-
#definefm_foreach(macro, ...) \
162-
fm_when(fm_va_01(__VA_ARGS__))( \
163-
fm_apply_1(macro, __VA_ARGS__) \
164-
fm_recurs2(fm_, foreach) (\
165-
macro, fm_tail(__VA_ARGS__) \
166-
) \
167-
)
161+
// recursion handle : delay macro expansion to next recursion iteration
162+
#definefm_recurs(id) id fm_empty fm_empty() ()
163+
#definefm_recurs2(a,b) fm_cat fm_empty fm_empty() () (a,b)
164+
#definefm_defer(id) id fm_empty()
168165

169-
#definefm_foreach_arg(macro,arg, ...) \
170-
fm_when(fm_va_01(__VA_ARGS__))( \
171-
fm_apply_2(macro, arg, __VA_ARGS__) \
172-
fm_recurs2(fm_, foreach_arg) (\
173-
macro, arg, fm_tail(__VA_ARGS__) \
174-
) \
175-
)
166+
#definefm_foreach_join(join,macro, ...) \
167+
fm_foreach_join_(fm_empty, join, macro, __VA_ARGS__)
168+
#definefm_foreach_join_(join1,join2,macro, ...) \
169+
fm_cat(fm_foreach_join_, fm_va_01n(__VA_ARGS__))(join1, join2, macro, __VA_ARGS__)
170+
#definefm_foreach_join_0(join1,join2,macro, ...)
171+
#definefm_foreach_join_1(join1,join2,macro,x) \
172+
join1() macro(x)
173+
#definefm_foreach_join_n(join1,join2,macro,x,y, ...) \
174+
join1() macro(x) \
175+
join2() macro(y) \
176+
fm_recurs2(fm_, foreach_join_) (join2, join2, macro, __VA_ARGS__)
176177

178+
#definefm_foreach(macro, ...) \
179+
fm_foreach_join(fm_empty, macro, __VA_ARGS__)
177180
#definefm_foreach_comma(macro, ...) \
178-
fm_when(fm_va_01(__VA_ARGS__))( \
179-
fm_apply_1(macro, __VA_ARGS__\
180-
)fm_if(fm_va_single(__VA_ARGS__), , fm__comma)\
181-
fm_recurs2(fm_, foreach_comma) (\
182-
macro, fm_tail(__VA_ARGS__) \
183-
) \
184-
)
181+
fm_foreach_join(fm_comma, macro, __VA_ARGS__)
182+
183+
#definefm_foreach_arg_join(join,macro,arg, ...) \
184+
fm_foreach_arg_join_(fm_empty, join, macro, arg, __VA_ARGS__)
185+
#definefm_foreach_arg_join_(join1,join2,macro,arg, ...) \
186+
fm_cat(fm_foreach_arg_join_, fm_va_01n(__VA_ARGS__))(join1, join2, macro, arg, __VA_ARGS__)
187+
#definefm_foreach_arg_join_0(join1,join2,macro, ...)
188+
#definefm_foreach_arg_join_1(join1,join2,macro,arg,x) \
189+
join1() macro(arg, x)
190+
#definefm_foreach_arg_join_n(join1,join2,macro,arg,x,y, ...) \
191+
join1() macro(arg, x) \
192+
join2() macro(arg, y) \
193+
fm_recurs2(fm_, foreach_arg_join_) (join2, join2, macro, arg, __VA_ARGS__)
185194

195+
#definefm_foreach_arg(macro,arg, ...) \
196+
fm_foreach_arg_join(fm_empty, macro, arg, __VA_ARGS__)
197+
#definefm_foreach_arg_comma(macro,arg, ...) \
198+
fm_foreach_arg_join(fm_comma, macro, arg, __VA_ARGS__)
199+
200+
#definefm_foreach_tuple_join(join,macro, ...) \
201+
fm_foreach_tuple_join_(fm_empty, join, macro, __VA_ARGS__)
202+
#definefm_foreach_tuple_join_(join1,join2,macro, ...) \
203+
fm_cat(fm_foreach_tuple_join_, fm_va_01n(__VA_ARGS__))(join1, join2, macro, __VA_ARGS__)
204+
#definefm_foreach_tuple_join_0(join1,join2,macro, ...)
205+
#definefm_foreach_tuple_join_1(join1,join2,macro,x) \
206+
join1() macro x
207+
#definefm_foreach_tuple_join_n(join1,join2,macro,x,y, ...) \
208+
join1() macro x \
209+
join2() macro y \
210+
fm_recurs2(fm_, foreach_tuple_join_) (join2, join2, macro, __VA_ARGS__)
186211

187212
#definefm_foreach_tuple(macro, ...) \
188-
fm_when(fm_va_01(__VA_ARGS__))( \
189-
fm_apply_tuple_1(macro, __VA_ARGS__) \
190-
fm_recurs2(fm_, foreach_tuple) (\
191-
macro, fm_tail(__VA_ARGS__) \
192-
) \
193-
)
194-
195-
#definefm_foreach_tuple_arg(macro,arg, ...) \
196-
fm_when(fm_va_01(__VA_ARGS__))( \
197-
fm_apply_tuple_2(macro, arg, __VA_ARGS__) \
198-
fm_recurs2(fm_, foreach_tuple_arg) (\
199-
macro, arg, fm_tail(__VA_ARGS__) \
200-
) \
201-
)
202-
213+
fm_foreach_tuple_join(fm_empty, macro, __VA_ARGS__)
203214
#definefm_foreach_tuple_comma(macro, ...) \
204-
fm_when(fm_va_01(__VA_ARGS__))( \
205-
fm_apply_tuple_1(macro, __VA_ARGS__\
206-
)fm_if(fm_va_single(__VA_ARGS__), fm_empty(), fm__comma)\
207-
fm_recurs2(fm_, foreach_tuple_comma) (\
208-
macro, fm_tail(__VA_ARGS__) \
209-
) \
210-
)
215+
fm_foreach_tuple_join(fm_comma, macro, __VA_ARGS__)
216+
217+
#definefm_foreach_tuple_arg_join(join,macro,arg, ...) \
218+
fm_foreach_tuple_arg_join_(fm_empty, join, macro, arg, __VA_ARGS__)
219+
#definefm_foreach_tuple_arg_join_(join1,join2,macro,arg, ...) \
220+
fm_cat(fm_foreach_tuple_arg_join_, fm_va_01n(__VA_ARGS__))(join1, join2, macro, arg, __VA_ARGS__)
221+
#definefm_foreach_tuple_arg_join_0(join1,join2,macro, ...)
222+
#definefm_foreach_tuple_arg_join_1(join1,join2,macro,arg,x) \
223+
join1() fm_apply(macro, arg, fm_expand x)
224+
#definefm_foreach_tuple_arg_join_n(join1,join2,macro,arg,x,y, ...) \
225+
join1() fm_apply(macro, arg, fm_expand x) \
226+
join2() fm_apply(macro, arg, fm_expand y) \
227+
fm_recurs2(fm_, foreach_tuple_arg_join_) (join2, join2, macro, arg, __VA_ARGS__)
211228

229+
#definefm_foreach_tuple_arg(macro,arg, ...) \
230+
fm_foreach_tuple_arg_join(fm_empty, macro, arg, __VA_ARGS__)
231+
#definefm_foreach_tuple_arg_comma(macro,arg, ...) \
232+
fm_foreach_tuple_arg_join(fm_comma, macro, arg, __VA_ARGS__)
212233

213234
#definefm_eval_foreach(macro, ...) \
214-
fm_eval(fm_foreach(macro, __VA_ARGS__))
235+
fm_eval(fm_foreach(macro, __VA_ARGS__))
215236

216237
#definefm_eval_foreach_comma(macro, ...) \
217-
fm_eval(fm_foreach_comma(macro, __VA_ARGS__))
238+
fm_eval(fm_foreach_comma(macro, __VA_ARGS__))
218239

219240
#definefm_eval_foreach_arg(macro,arg, ...) \
220-
fm_eval(fm_foreach_arg(macro, arg, __VA_ARGS__))
241+
fm_eval(fm_foreach_arg(macro, arg, __VA_ARGS__))
221242

222243
#definefm_eval_tuples(macro, ...) \
223-
fm_eval(fm_foreach_tuple(macro, __VA_ARGS__))
244+
fm_eval(fm_foreach_tuple(macro, __VA_ARGS__))
224245

225246
#definefm_eval_tuples_arg(macro,arg, ...) \
226-
fm_eval(fm_foreach_tuple_arg(macro, arg, __VA_ARGS__))
247+
fm_eval(fm_foreach_tuple_arg(macro, arg, __VA_ARGS__))
227248

228249
#definefm_eval_tuples_comma(macro, ...) \
229-
fm_eval(fm_foreach_tuple_comma(macro, __VA_ARGS__))
250+
fm_eval(fm_foreach_tuple_comma(macro, __VA_ARGS__))
230251

231252
#definefm__dumb_require_semicolon \
232253
struct __dumb_struct_declaration_for_semicolon

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp