walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[HB] Rename internal vars

This commit is contained in:
Behdad Esfahbod 2009-07-29 18:37:57 -04:00
parent b196e6f274
commit 7cda6fa24c
1 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/hb-ot-layout-gsubgpos-private.h
View File

@ -232,16 +232,16 @@ static inline bool context_lookup (APPLY_ARG_DEF,
const USHORT input[], /* Array of input values--start with second glyph */ const USHORT input[], /* Array of input values--start with second glyph */
unsigned int lookupCount, unsigned int lookupCount,
const LookupRecord lookupRecord[], const LookupRecord lookupRecord[],
ContextLookupContext &context) ContextLookupContext &lookup_context)
{ {
return match_input (APPLY_ARG, return match_input (APPLY_ARG,
inputCount, input, inputCount, input,
context.funcs.match, context.match_data, lookup_context.funcs.match, lookup_context.match_data,
&context_length) && &context_length) &&
apply_lookup (APPLY_ARG, apply_lookup (APPLY_ARG,
inputCount, inputCount,
lookupCount, lookupRecord, lookupCount, lookupRecord,
context.funcs.apply); lookup_context.funcs.apply);
} }
struct Rule struct Rule
@ -249,7 +249,7 @@ struct Rule
friend struct RuleSet; friend struct RuleSet;
private: private:
inline bool apply (APPLY_ARG_DEF, ContextLookupContext &context) const inline bool apply (APPLY_ARG_DEF, ContextLookupContext &lookup_context) const
{ {
const LookupRecord *lookupRecord = (const LookupRecord *) const LookupRecord *lookupRecord = (const LookupRecord *)
((const char *) input + ((const char *) input +
@ -257,7 +257,7 @@ struct Rule
return context_lookup (APPLY_ARG, return context_lookup (APPLY_ARG,
inputCount, input, inputCount, input,
lookupCount, lookupRecord, lookupCount, lookupRecord,
context); lookup_context);
} }
private: private:
@ -274,12 +274,12 @@ ASSERT_SIZE (Rule, 4);
struct RuleSet struct RuleSet
{ {
inline bool apply (APPLY_ARG_DEF, ContextLookupContext &context) const inline bool apply (APPLY_ARG_DEF, ContextLookupContext &lookup_context) const
{ {
unsigned int num_rules = rule.len; unsigned int num_rules = rule.len;
for (unsigned int i = 0; i < num_rules; i++) for (unsigned int i = 0; i < num_rules; i++)
{ {
if ((this+rule[i]).apply (APPLY_ARG, context)) if ((this+rule[i]).apply (APPLY_ARG, lookup_context))
return true; return true;
} }
@ -305,11 +305,11 @@ struct ContextFormat1
return false; return false;
const RuleSet &rule_set = this+ruleSet[index]; const RuleSet &rule_set = this+ruleSet[index];
struct ContextLookupContext context = { struct ContextLookupContext lookup_context = {
{match_glyph, apply_func}, {match_glyph, apply_func},
NULL NULL
}; };
return rule_set.apply (APPLY_ARG, context); return rule_set.apply (APPLY_ARG, lookup_context);
} }
private: private:
@ -341,11 +341,11 @@ struct ContextFormat2
/* LONGTERMTODO: Old code fetches glyph classes at most once and caches /* LONGTERMTODO: Old code fetches glyph classes at most once and caches
* them across subrule lookups. Not sure it's worth it. * them across subrule lookups. Not sure it's worth it.
*/ */
struct ContextLookupContext context = { struct ContextLookupContext lookup_context = {
{match_class, apply_func}, {match_class, apply_func},
(char *) &class_def (char *) &class_def
}; };
return rule_set.apply (APPLY_ARG, context); return rule_set.apply (APPLY_ARG, lookup_context);
} }
private: private:
@ -377,14 +377,14 @@ struct ContextFormat3
const LookupRecord *lookupRecord = (const LookupRecord *) const LookupRecord *lookupRecord = (const LookupRecord *)
((const char *) coverage + ((const char *) coverage +
sizeof (coverage[0]) * glyphCount); sizeof (coverage[0]) * glyphCount);
struct ContextLookupContext context = { struct ContextLookupContext lookup_context = {
{match_coverage, apply_func}, {match_coverage, apply_func},
(char *) this (char *) this
}; };
return context_lookup (APPLY_ARG, return context_lookup (APPLY_ARG,
glyphCount, (const USHORT *) (coverage + 1), glyphCount, (const USHORT *) (coverage + 1),
lookupCount, lookupRecord, lookupCount, lookupRecord,
context); lookup_context);
} }
private: private:
@ -441,7 +441,7 @@ static inline bool chain_context_lookup (APPLY_ARG_DEF,
const USHORT lookahead[], const USHORT lookahead[],
unsigned int lookupCount, unsigned int lookupCount,
const LookupRecord lookupRecord[], const LookupRecord lookupRecord[],
ChainContextLookupContext &context) ChainContextLookupContext &lookup_context)
{ {
/* First guess */ /* First guess */
if (HB_UNLIKELY (buffer->out_pos < backtrackCount || if (HB_UNLIKELY (buffer->out_pos < backtrackCount ||
@ -452,20 +452,20 @@ static inline bool chain_context_lookup (APPLY_ARG_DEF,
unsigned int offset; unsigned int offset;
return match_backtrack (APPLY_ARG, return match_backtrack (APPLY_ARG,
backtrackCount, backtrack, backtrackCount, backtrack,
context.funcs.match, context.match_data[0]) && lookup_context.funcs.match, lookup_context.match_data[0]) &&
match_input (APPLY_ARG, match_input (APPLY_ARG,
inputCount, input, inputCount, input,
context.funcs.match, context.match_data[1], lookup_context.funcs.match, lookup_context.match_data[1],
&offset) && &offset) &&
match_lookahead (APPLY_ARG, match_lookahead (APPLY_ARG,
lookaheadCount, lookahead, lookaheadCount, lookahead,
context.funcs.match, context.match_data[2], lookup_context.funcs.match, lookup_context.match_data[2],
offset) && offset) &&
(context_length = offset, true) && (context_length = offset, true) &&
apply_lookup (APPLY_ARG, apply_lookup (APPLY_ARG,
inputCount, inputCount,
lookupCount, lookupRecord, lookupCount, lookupRecord,
context.funcs.apply); lookup_context.funcs.apply);
} }
struct ChainRule struct ChainRule
@ -473,7 +473,7 @@ struct ChainRule
friend struct ChainRuleSet; friend struct ChainRuleSet;
private: private:
inline bool apply (APPLY_ARG_DEF, ChainContextLookupContext &context) const inline bool apply (APPLY_ARG_DEF, ChainContextLookupContext &lookup_context) const
{ {
const HeadlessArrayOf<USHORT> &input = *(const HeadlessArrayOf<USHORT>*) const HeadlessArrayOf<USHORT> &input = *(const HeadlessArrayOf<USHORT>*)
((const char *) &backtrack + backtrack.get_size ()); ((const char *) &backtrack + backtrack.get_size ());
@ -486,7 +486,7 @@ struct ChainRule
input.len, input.array + 1, input.len, input.array + 1,
lookahead.len, lookahead.array, lookahead.len, lookahead.array,
lookup.len, lookup.array, lookup.len, lookup.array,
context); lookup_context);
return false; return false;
} }
@ -510,12 +510,12 @@ ASSERT_SIZE (ChainRule, 8);
struct ChainRuleSet struct ChainRuleSet
{ {
inline bool apply (APPLY_ARG_DEF, ChainContextLookupContext &context) const inline bool apply (APPLY_ARG_DEF, ChainContextLookupContext &lookup_context) const
{ {
unsigned int num_rules = rule.len; unsigned int num_rules = rule.len;
for (unsigned int i = 0; i < num_rules; i++) for (unsigned int i = 0; i < num_rules; i++)
{ {
if ((this+rule[i]).apply (APPLY_ARG, context)) if ((this+rule[i]).apply (APPLY_ARG, lookup_context))
return true; return true;
} }
@ -541,11 +541,11 @@ struct ChainContextFormat1
return false; return false;
const ChainRuleSet &rule_set = this+ruleSet[index]; const ChainRuleSet &rule_set = this+ruleSet[index];
struct ChainContextLookupContext context = { struct ChainContextLookupContext lookup_context = {
{match_glyph, apply_func}, {match_glyph, apply_func},
{NULL, NULL, NULL} {NULL, NULL, NULL}
}; };
return rule_set.apply (APPLY_ARG, context); return rule_set.apply (APPLY_ARG, lookup_context);
} }
private: private:
USHORT format; /* Format identifier--format = 1 */ USHORT format; /* Format identifier--format = 1 */
@ -578,13 +578,13 @@ struct ChainContextFormat2
/* LONGTERMTODO: Old code fetches glyph classes at most once and caches /* LONGTERMTODO: Old code fetches glyph classes at most once and caches
* them across subrule lookups. Not sure it's worth it. * them across subrule lookups. Not sure it's worth it.
*/ */
struct ChainContextLookupContext context = { struct ChainContextLookupContext lookup_context = {
{match_class, apply_func}, {match_class, apply_func},
{(char *) &backtrack_class_def, {(char *) &backtrack_class_def,
(char *) &input_class_def, (char *) &input_class_def,
(char *) &lookahead_class_def} (char *) &lookahead_class_def}
}; };
return rule_set.apply (APPLY_ARG, context); return rule_set.apply (APPLY_ARG, lookup_context);
} }
private: private:
@ -629,7 +629,7 @@ struct ChainContextFormat3
((const char *) &input + input.get_size ()); ((const char *) &input + input.get_size ());
const ArrayOf<LookupRecord> &lookup = *(const ArrayOf<LookupRecord>*) const ArrayOf<LookupRecord> &lookup = *(const ArrayOf<LookupRecord>*)
((const char *) &lookahead + lookahead.get_size ()); ((const char *) &lookahead + lookahead.get_size ());
struct ChainContextLookupContext context = { struct ChainContextLookupContext lookup_context = {
{match_coverage, apply_func}, {match_coverage, apply_func},
{(char *) this, (char *) this, (char *) this} {(char *) this, (char *) this, (char *) this}
}; };
@ -638,7 +638,7 @@ struct ChainContextFormat3
input.len, (USHORT *) input.array, input.len, (USHORT *) input.array,
lookahead.len, (USHORT *) lookahead.array, lookahead.len, (USHORT *) lookahead.array,
lookup.len, lookup.array, lookup.len, lookup.array,
context); lookup_context);
return false; return false;
} }