[Git][freetype/freetype][master] [autofit] Split `afwrtsys.h`.

[Werner Lemberg (@wl)]

Werner Lemberg pushed to branch master at FreeType / FreeType

Commits:

• 5bcaf51b
  by Ben Wagner at 2021-07-24T07:29:17+02:00

  [autofit] Split `afwrtsys.h`.
  
  The header file `afwrtsys.h` has two distinct functions: to include the
  required writing system headers and also to generate code for each writing
  system.  At each current use site only one or the other is used, with
  various macro trickery selecting one or the other.  Split this header into
  `afws-decl.h` for the required writing system declarations and `afws-iter.h`
  for iterating over the writing systems to generate code.
  
  The motivation for this change is that the Visual C++ compiler treats the
  standard include guard idiom like `#pragma once` 'if no non-comment code or
  preprocessor directive comes before or after the standard form of the
  idiom'.  It appears to check this after macro expansion, so if
  `WRITING_SYSTEM` expands to empty the bottom of `afwrtsys.h` is empty and
  looks like the standard include guard idiom which is treated like `#pragma
  once`, so subsequent inclusion of `afwrtsys.h` is elided.
  
  Fixes #1075.
  
  * src/autofit/afglobal.c (af_writing_system_classes), src/autofit/aftypes.h
  (AF_WritingSystem), src/autofit/rules.mk (AUTOF_DRV_H): Updated.
  
  * src/autofit/afwrtsys.h: Split into...
  * src/autofit/afws-decl.h, src/autofit/afws-iter.h: New files.
  

5 changed files:

• src/autofit/afglobal.c
• src/autofit/aftypes.h
• src/autofit/afwrtsys.h → src/autofit/afws-decl.h
• + src/autofit/afws-iter.h
• src/autofit/rules.mk

Changes:

src/autofit/afglobal.c

---

...	...	@@ -19,6 +19,7 @@
19	19	#include "afglobal.h"
20	20	#include "afranges.h"
21	21	#include "afshaper.h"
	22	+#include "afws-decl.h"
22	23	#include <freetype/internal/ftdebug.h>
23	24
24	25
...	...	@@ -32,11 +33,6 @@
32	33	#define FT_COMPONENT afglobal
33	34
34	35
35		- /* get writing system specific header files */
36		-#undef WRITING_SYSTEM
37		-#define WRITING_SYSTEM( ws, WS ) /* empty */
38		-#include "afwrtsys.h"
39		-
40	36	#include "aferrors.h"
41	37
42	38
...	...	@@ -74,7 +70,7 @@
74	70	af_writing_system_classes[] =
75	71	{
76	72
77		-#include "afwrtsys.h"
	73	+#include "afws-iter.h"
78	74
79	75	NULL /* do not remove */
80	76	};

src/autofit/aftypes.h

---

...	...	@@ -198,7 +198,6 @@ extern void* _af_debug_hints;
198	198	* outline according to the results of the glyph analyzer.
199	199	*/
200	200
201		-#define AFWRTSYS_H_ /* don't load header files */
202	201	#undef WRITING_SYSTEM
203	202	#define WRITING_SYSTEM( ws, WS ) \
204	203	AF_WRITING_SYSTEM_ ## WS,
...	...	@@ -207,14 +206,12 @@ extern void* _af_debug_hints;
207	206	typedef enum AF_WritingSystem_
208	207	{
209	208
210		-#include "afwrtsys.h"
	209	+#include "afws-iter.h"
211	210
212	211	AF_WRITING_SYSTEM_MAX /* do not remove */
213	212
214	213	} AF_WritingSystem;
215	214
216		-#undef AFWRTSYS_H_
217		-
218	215
219	216	typedef struct AF_WritingSystemClassRec_
220	217	{

src/autofit/afwrtsys.h → src/autofit/afws-decl.h

---

1	1	/****************************************************************************
2	2	*
3		- * afwrtsys.h
	3	+ * afws-decl.h
4	4	*
5		- * Auto-fitter writing systems (specification only).
	5	+ * Auto-fitter writing system declarations (specification only).
6	6	*
7	7	* Copyright (C) 2013-2021 by
8	8	* David Turner, Robert Wilhelm, and Werner Lemberg.
...	...	@@ -16,8 +16,8 @@
16	16	*/
17	17
18	18
19		-#ifndef AFWRTSYS_H_
20		-#define AFWRTSYS_H_
	19	+#ifndef AFWS_DECL_H_
	20	+#define AFWS_DECL_H_
21	21
22	22	/* Since preprocessor directives can't create other preprocessor */
23	23	/* directives, we have to include the header files manually. */
...	...	@@ -27,19 +27,7 @@
27	27	#include "afcjk.h"
28	28	#include "afindic.h"
29	29
30		-#endif /* AFWRTSYS_H_ */
	30	+#endif /* AFWS_DECL_H_ */
31	31
32	32
33		- /* The following part can be included multiple times. */
34		- /* Define `WRITING_SYSTEM' as needed. */
35		-
36		-
37		- /* Add new writing systems here. The arguments are the writing system */
38		- /* name in lowercase and uppercase, respectively. */
39		-
40		- WRITING_SYSTEM( dummy, DUMMY )
41		- WRITING_SYSTEM( latin, LATIN )
42		- WRITING_SYSTEM( cjk, CJK )
43		- WRITING_SYSTEM( indic, INDIC )
44		-
45	33	/* END */

src/autofit/afws-iter.h

---

	1	+/****************************************************************************
	2	+ *
	3	+ * afws-iter.h
	4	+ *
	5	+ * Auto-fitter writing systems iterator (specification only).
	6	+ *
	7	+ * Copyright (C) 2013-2021 by
	8	+ * David Turner, Robert Wilhelm, and Werner Lemberg.
	9	+ *
	10	+ * This file is part of the FreeType project, and may only be used,
	11	+ * modified, and distributed under the terms of the FreeType project
	12	+ * license, LICENSE.TXT. By continuing to use, modify, or distribute
	13	+ * this file you indicate that you have read the license and
	14	+ * understand and accept it fully.
	15	+ *
	16	+ */
	17	+
	18	+ /* This header may be included multiple times. */
	19	+ /* Define `WRITING_SYSTEM' as needed. */
	20	+
	21	+
	22	+ /* Add new writing systems here. The arguments are the writing system */
	23	+ /* name in lowercase and uppercase, respectively. */
	24	+
	25	+ WRITING_SYSTEM( dummy, DUMMY )
	26	+ WRITING_SYSTEM( latin, LATIN )
	27	+ WRITING_SYSTEM( cjk, CJK )
	28	+ WRITING_SYSTEM( indic, INDIC )
	29	+
	30	+
	31	+/* END */

src/autofit/rules.mk

---

...	...	@@ -42,13 +42,14 @@ AUTOF_DRV_SRC := $(AUTOF_DIR)/afblue.c \
42	42
43	43	# AUTOF driver headers
44	44	#
45		-AUTOF_DRV_H := $(AUTOF_DRV_SRC:%c=%h) \
46		- $(AUTOF_DIR)/afcover.h \
47		- $(AUTOF_DIR)/aferrors.h \
48		- $(AUTOF_DIR)/afscript.h \
49		- $(AUTOF_DIR)/afstyles.h \
50		- $(AUTOF_DIR)/aftypes.h \
51		- $(AUTOF_DIR)/afwrtsys.h
	45	+AUTOF_DRV_H := $(AUTOF_DRV_SRC:%c=%h) \
	46	+ $(AUTOF_DIR)/afcover.h \
	47	+ $(AUTOF_DIR)/aferrors.h \
	48	+ $(AUTOF_DIR)/afscript.h \
	49	+ $(AUTOF_DIR)/afstyles.h \
	50	+ $(AUTOF_DIR)/aftypes.h \
	51	+ $(AUTOF_DIR)/afws-decl.h \
	52	+ $(AUTOF_DIR)/afws-iter.h
52	53
53	54
54	55	# AUTOF driver object(s)

—
View it on GitLab.
You're receiving this email because of your account on gitlab.freedesktop.org. If you'd like to receive fewer emails, you can adjust your notification settings.