提交 c6035cf8 编写于 作者: B Behdad Esfahbod

Add names to enums

gdb was showing <anonymous enum> instead of useful stuff, so name
all our enums.
上级 d1c9eb45
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
HB_BEGIN_DECLS HB_BEGIN_DECLS
typedef enum { typedef enum _hb_memory_mode_t {
HB_MEMORY_MODE_DUPLICATE, HB_MEMORY_MODE_DUPLICATE,
HB_MEMORY_MODE_READONLY, HB_MEMORY_MODE_READONLY,
HB_MEMORY_MODE_WRITABLE, HB_MEMORY_MODE_WRITABLE,
......
...@@ -99,7 +99,7 @@ hb_tag_t hb_tag_from_string (const char *s, int len); ...@@ -99,7 +99,7 @@ hb_tag_t hb_tag_from_string (const char *s, int len);
/* hb_direction_t */ /* hb_direction_t */
typedef enum { typedef enum _hb_direction_t {
HB_DIRECTION_INVALID = -1, HB_DIRECTION_INVALID = -1,
HB_DIRECTION_LTR = 0, HB_DIRECTION_LTR = 0,
HB_DIRECTION_RTL, HB_DIRECTION_RTL,
...@@ -140,7 +140,7 @@ hb_language_get_default (void); ...@@ -140,7 +140,7 @@ hb_language_get_default (void);
/* hb_unicode_general_category_t */ /* hb_unicode_general_category_t */
typedef enum typedef enum _hb_unicode_general_category_t
{ {
HB_UNICODE_GENERAL_CATEGORY_CONTROL, /* Cc */ HB_UNICODE_GENERAL_CATEGORY_CONTROL, /* Cc */
HB_UNICODE_GENERAL_CATEGORY_FORMAT, /* Cf */ HB_UNICODE_GENERAL_CATEGORY_FORMAT, /* Cf */
...@@ -179,7 +179,7 @@ typedef enum ...@@ -179,7 +179,7 @@ typedef enum
/* http://unicode.org/iso15924/ */ /* http://unicode.org/iso15924/ */
/* http://goo.gl/x9ilM */ /* http://goo.gl/x9ilM */
typedef enum typedef enum _hb_script_t
{ {
/* Unicode-1.1 additions */ /* Unicode-1.1 additions */
HB_SCRIPT_COMMON = HB_TAG ('Z','y','y','y'), HB_SCRIPT_COMMON = HB_TAG ('Z','y','y','y'),
......
...@@ -271,7 +271,7 @@ typedef RecordListOf<Feature> FeatureList; ...@@ -271,7 +271,7 @@ typedef RecordListOf<Feature> FeatureList;
struct LookupFlag : USHORT struct LookupFlag : USHORT
{ {
enum { enum Flags {
RightToLeft = 0x0001u, RightToLeft = 0x0001u,
IgnoreBaseGlyphs = 0x0002u, IgnoreBaseGlyphs = 0x0002u,
IgnoreLigatures = 0x0004u, IgnoreLigatures = 0x0004u,
......
...@@ -327,7 +327,7 @@ struct GDEF ...@@ -327,7 +327,7 @@ struct GDEF
{ {
static const hb_tag_t Tag = HB_OT_TAG_GDEF; static const hb_tag_t Tag = HB_OT_TAG_GDEF;
enum { enum GlyphClasses {
UnclassifiedGlyph = 0, UnclassifiedGlyph = 0,
BaseGlyph = 1, BaseGlyph = 1,
LigatureGlyph = 2, LigatureGlyph = 2,
......
...@@ -46,8 +46,7 @@ typedef Value ValueRecord[VAR]; ...@@ -46,8 +46,7 @@ typedef Value ValueRecord[VAR];
struct ValueFormat : USHORT struct ValueFormat : USHORT
{ {
enum enum Flags {
{
xPlacement = 0x0001, /* Includes horizontal adjustment for placement */ xPlacement = 0x0001, /* Includes horizontal adjustment for placement */
yPlacement = 0x0002, /* Includes vertical adjustment for placement */ yPlacement = 0x0002, /* Includes vertical adjustment for placement */
xAdvance = 0x0004, /* Includes horizontal adjustment for advance */ xAdvance = 0x0004, /* Includes horizontal adjustment for advance */
...@@ -1336,7 +1335,7 @@ struct PosLookupSubTable ...@@ -1336,7 +1335,7 @@ struct PosLookupSubTable
{ {
friend struct PosLookup; friend struct PosLookup;
enum { enum Type {
Single = 1, Single = 1,
Pair = 2, Pair = 2,
Cursive = 3, Cursive = 3,
......
...@@ -678,7 +678,7 @@ struct SubstLookupSubTable ...@@ -678,7 +678,7 @@ struct SubstLookupSubTable
{ {
friend struct SubstLookup; friend struct SubstLookup;
enum { enum Type {
Single = 1, Single = 1,
Multiple = 2, Multiple = 2,
Alternate = 3, Alternate = 3,
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
#define props_cache() var1.u16[1] /* glyph_props cache */ #define props_cache() var1.u16[1] /* glyph_props cache */
/* XXX cleanup */ /* XXX cleanup */
typedef enum { typedef enum _hb_ot_layout_glyph_class_t {
HB_OT_LAYOUT_GLYPH_CLASS_UNCLASSIFIED = 0x0001, HB_OT_LAYOUT_GLYPH_CLASS_UNCLASSIFIED = 0x0001,
HB_OT_LAYOUT_GLYPH_CLASS_BASE_GLYPH = 0x0002, HB_OT_LAYOUT_GLYPH_CLASS_BASE_GLYPH = 0x0002,
HB_OT_LAYOUT_GLYPH_CLASS_LIGATURE = 0x0004, HB_OT_LAYOUT_GLYPH_CLASS_LIGATURE = 0x0004,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册