[HB] Rename LOOKUP_ARGS to APPLY_ARGS
diff --git a/src/hb-ot-layout-gpos-private.h b/src/hb-ot-layout-gpos-private.h
index 834d360..bdf6ff4 100644
--- a/src/hb-ot-layout-gpos-private.h
+++ b/src/hb-ot-layout-gpos-private.h
@@ -211,7 +211,7 @@
friend struct SinglePos;
private:
- inline bool apply (LOOKUP_ARGS_DEF) const {
+ inline bool apply (APPLY_ARG_DEF) const {
/* TODO */
return false;
}
@@ -234,7 +234,7 @@
friend struct SinglePos;
private:
- inline bool apply (LOOKUP_ARGS_DEF) const {
+ inline bool apply (APPLY_ARG_DEF) const {
/* TODO */
return false;
}
@@ -258,10 +258,10 @@
private:
- inline bool apply (LOOKUP_ARGS_DEF) const {
+ inline bool apply (APPLY_ARG_DEF) const {
switch (u.format) {
- case 1: return u.format1->apply (LOOKUP_ARGS);
- case 2: return u.format2->apply (LOOKUP_ARGS);
+ case 1: return u.format1->apply (APPLY_ARG);
+ case 2: return u.format2->apply (APPLY_ARG);
default:return false;
}
}
@@ -297,7 +297,7 @@
friend struct PairPos;
private:
- inline bool apply (LOOKUP_ARGS_DEF) const {
+ inline bool apply (APPLY_ARG_DEF) const {
/* TODO */
return false;
}
@@ -324,7 +324,7 @@
friend struct PairPos;
private:
- inline bool apply (LOOKUP_ARGS_DEF) const {
+ inline bool apply (APPLY_ARG_DEF) const {
/* TODO */
return false;
}
@@ -364,10 +364,10 @@
private:
- inline bool apply (LOOKUP_ARGS_DEF) const {
+ inline bool apply (APPLY_ARG_DEF) const {
switch (u.format) {
- case 1: return u.format1->apply (LOOKUP_ARGS);
- case 2: return u.format2->apply (LOOKUP_ARGS);
+ case 1: return u.format1->apply (APPLY_ARG);
+ case 2: return u.format2->apply (APPLY_ARG);
default:return false;
}
}
@@ -402,7 +402,7 @@
friend struct CursivePos;
private:
- inline bool apply (LOOKUP_ARGS_DEF) const {
+ inline bool apply (APPLY_ARG_DEF) const {
/* TODO */
return false;
}
@@ -424,9 +424,9 @@
private:
- inline bool apply (LOOKUP_ARGS_DEF) const {
+ inline bool apply (APPLY_ARG_DEF) const {
switch (u.format) {
- case 1: return u.format1->apply (LOOKUP_ARGS);
+ case 1: return u.format1->apply (APPLY_ARG);
default:return false;
}
}
@@ -466,7 +466,7 @@
friend struct MarkBasePos;
private:
- inline bool apply (LOOKUP_ARGS_DEF) const {
+ inline bool apply (APPLY_ARG_DEF) const {
/* TODO */
return false;
}
@@ -492,9 +492,9 @@
private:
- inline bool apply (LOOKUP_ARGS_DEF) const {
+ inline bool apply (APPLY_ARG_DEF) const {
switch (u.format) {
- case 1: return u.format1->apply (LOOKUP_ARGS);
+ case 1: return u.format1->apply (APPLY_ARG);
default:return false;
}
}
@@ -551,7 +551,7 @@
friend struct MarkLigPos;
private:
- inline bool apply (LOOKUP_ARGS_DEF) const {
+ inline bool apply (APPLY_ARG_DEF) const {
/* TODO */
return false;
}
@@ -577,9 +577,9 @@
private:
- inline bool apply (LOOKUP_ARGS_DEF) const {
+ inline bool apply (APPLY_ARG_DEF) const {
switch (u.format) {
- case 1: return u.format1->apply (LOOKUP_ARGS);
+ case 1: return u.format1->apply (APPLY_ARG);
default:return false;
}
}
@@ -618,7 +618,7 @@
friend struct MarkMarkPos;
private:
- inline bool apply (LOOKUP_ARGS_DEF) const {
+ inline bool apply (APPLY_ARG_DEF) const {
/* TODO */
return false;
}
@@ -644,9 +644,9 @@
private:
- inline bool apply (LOOKUP_ARGS_DEF) const {
+ inline bool apply (APPLY_ARG_DEF) const {
switch (u.format) {
- case 1: return u.format1->apply (LOOKUP_ARGS);
+ case 1: return u.format1->apply (APPLY_ARG);
default:return false;
}
}
@@ -660,20 +660,20 @@
ASSERT_SIZE (MarkMarkPos, 2);
-static inline bool position_lookup (LOOKUP_ARGS_DEF, unsigned int lookup_index);
+static inline bool position_lookup (APPLY_ARG_DEF, unsigned int lookup_index);
struct ContextPos : Context {
- inline bool apply (LOOKUP_ARGS_DEF) const {
- return Context::apply (LOOKUP_ARGS, position_lookup);
+ inline bool apply (APPLY_ARG_DEF) const {
+ return Context::apply (APPLY_ARG, position_lookup);
}
};
ASSERT_SIZE (ContextPos, 2);
struct ChainContextPos : ChainContext {
- inline bool apply (LOOKUP_ARGS_DEF) const {
- return ChainContext::apply (LOOKUP_ARGS, position_lookup);
+ inline bool apply (APPLY_ARG_DEF) const {
+ return ChainContext::apply (APPLY_ARG, position_lookup);
}
};
ASSERT_SIZE (ChainContextPos, 2);
@@ -686,7 +686,7 @@
private:
inline unsigned int get_type (void) const { return extensionLookupType; }
inline unsigned int get_offset (void) const { return (extensionOffset[0] << 16) + extensionOffset[1]; }
- inline bool apply (LOOKUP_ARGS_DEF) const;
+ inline bool apply (APPLY_ARG_DEF) const;
private:
USHORT format; /* Format identifier. Set to 1. */
@@ -714,9 +714,9 @@
}
}
- inline bool apply (LOOKUP_ARGS_DEF) const {
+ inline bool apply (APPLY_ARG_DEF) const {
switch (u.format) {
- case 1: return u.format1->apply (LOOKUP_ARGS);
+ case 1: return u.format1->apply (APPLY_ARG);
default:return false;
}
}
@@ -751,18 +751,18 @@
friend struct PosLookup;
- inline bool apply (LOOKUP_ARGS_DEF, unsigned int lookup_type) const {
+ inline bool apply (APPLY_ARG_DEF, unsigned int lookup_type) const {
switch (lookup_type) {
- case GPOS_Single: return u.single->apply (LOOKUP_ARGS);
- case GPOS_Pair: return u.pair->apply (LOOKUP_ARGS);
- case GPOS_Cursive: return u.cursive->apply (LOOKUP_ARGS);
- case GPOS_MarkBase: return u.markBase->apply (LOOKUP_ARGS);
- case GPOS_MarkLig: return u.markLig->apply (LOOKUP_ARGS);
- case GPOS_MarkMark: return u.markMark->apply (LOOKUP_ARGS);
- case GPOS_Context: return u.context->apply (LOOKUP_ARGS);
- case GPOS_ChainContext: return u.chainContext->apply (LOOKUP_ARGS);
- case GPOS_Extension: return u.extension->apply (LOOKUP_ARGS);
+ case GPOS_Single: return u.single->apply (APPLY_ARG);
+ case GPOS_Pair: return u.pair->apply (APPLY_ARG);
+ case GPOS_Cursive: return u.cursive->apply (APPLY_ARG);
+ case GPOS_MarkBase: return u.markBase->apply (APPLY_ARG);
+ case GPOS_MarkLig: return u.markLig->apply (APPLY_ARG);
+ case GPOS_MarkMark: return u.markMark->apply (APPLY_ARG);
+ case GPOS_Context: return u.context->apply (APPLY_ARG);
+ case GPOS_ChainContext: return u.chainContext->apply (APPLY_ARG);
+ case GPOS_Extension: return u.extension->apply (APPLY_ARG);
default:return false;
}
}
@@ -817,7 +817,7 @@
unsigned int lookup_flag = get_flag ();
for (unsigned int i = 0; i < get_subtable_count (); i++)
- if (get_subtable (i).apply (LOOKUP_ARGS, lookup_type))
+ if (get_subtable (i).apply (APPLY_ARG, lookup_type))
return true;
return false;
@@ -896,16 +896,16 @@
/* Out-of-class implementation for methods recursing */
-inline bool ExtensionPosFormat1::apply (LOOKUP_ARGS_DEF) const {
+inline bool ExtensionPosFormat1::apply (APPLY_ARG_DEF) const {
unsigned int lookup_type = get_type ();
if (HB_UNLIKELY (lookup_type == GPOS_Extension))
return false;
- return ((PosLookupSubTable&)*(((char *) this) + get_offset ())).apply (LOOKUP_ARGS, lookup_type);
+ return ((PosLookupSubTable&)*(((char *) this) + get_offset ())).apply (APPLY_ARG, lookup_type);
}
-static inline bool position_lookup (LOOKUP_ARGS_DEF, unsigned int lookup_index) {
+static inline bool position_lookup (APPLY_ARG_DEF, unsigned int lookup_index) {
const GPOS &gpos = *(layout->gpos);
const PosLookup &l = gpos.get_lookup (lookup_index);
