From eae20e77a3888766a142c1f0dfca7575fbac9450 Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Sat, 27 Jun 2009 00:48:16 +0000 Subject: Less pointless inlining svn path=/trunk/libcss/; revision=8033 --- src/parse/language.c | 42 ++++++++++++++--------------- src/parse/parse.c | 74 ++++++++++++++++++++++++++-------------------------- 2 files changed, 58 insertions(+), 58 deletions(-) (limited to 'src/parse') diff --git a/src/parse/language.c b/src/parse/language.c index 7054130..191b779 100644 --- a/src/parse/language.c +++ b/src/parse/language.c @@ -30,62 +30,62 @@ typedef struct context_entry { /* Event handlers */ static css_error language_handle_event(css_parser_event type, const parserutils_vector *tokens, void *pw); -static inline css_error handleStartStylesheet(css_language *c, +static css_error handleStartStylesheet(css_language *c, const parserutils_vector *vector); -static inline css_error handleEndStylesheet(css_language *c, +static css_error handleEndStylesheet(css_language *c, const parserutils_vector *vector); -static inline css_error handleStartRuleset(css_language *c, +static css_error handleStartRuleset(css_language *c, const parserutils_vector *vector); -static inline css_error handleEndRuleset(css_language *c, +static css_error handleEndRuleset(css_language *c, const parserutils_vector *vector); -static inline css_error handleStartAtRule(css_language *c, +static css_error handleStartAtRule(css_language *c, const parserutils_vector *vector); -static inline css_error handleEndAtRule(css_language *c, +static css_error handleEndAtRule(css_language *c, const parserutils_vector *vector); -static inline css_error handleStartBlock(css_language *c, +static css_error handleStartBlock(css_language *c, const parserutils_vector *vector); -static inline css_error handleEndBlock(css_language *c, +static css_error handleEndBlock(css_language *c, const parserutils_vector *vector); -static inline css_error handleBlockContent(css_language *c, +static css_error handleBlockContent(css_language *c, const parserutils_vector *vector); -static inline css_error handleDeclaration(css_language *c, +static css_error handleDeclaration(css_language *c, const parserutils_vector *vector); /* At-rule parsing */ -static inline css_error parseMediaList(css_language *c, +static css_error parseMediaList(css_language *c, const parserutils_vector *vector, int *ctx, uint64_t *media); /* Selector list parsing */ -static inline css_error parseClass(css_language *c, +static css_error parseClass(css_language *c, const parserutils_vector *vector, int *ctx, css_selector_detail *specific); -static inline css_error parseAttrib(css_language *c, +static css_error parseAttrib(css_language *c, const parserutils_vector *vector, int *ctx, css_selector_detail *specific); -static inline css_error parsePseudo(css_language *c, +static css_error parsePseudo(css_language *c, const parserutils_vector *vector, int *ctx, css_selector_detail *specific); -static inline css_error parseSpecific(css_language *c, +static css_error parseSpecific(css_language *c, const parserutils_vector *vector, int *ctx, css_selector **parent); -static inline css_error parseSelectorSpecifics(css_language *c, +static css_error parseSelectorSpecifics(css_language *c, const parserutils_vector *vector, int *ctx, css_selector **parent); -static inline css_error parseSimpleSelector(css_language *c, +static css_error parseSimpleSelector(css_language *c, const parserutils_vector *vector, int *ctx, css_selector **result); -static inline css_error parseCombinator(css_language *c, +static css_error parseCombinator(css_language *c, const parserutils_vector *vector, int *ctx, css_combinator *result); -static inline css_error parseSelector(css_language *c, +static css_error parseSelector(css_language *c, const parserutils_vector *vector, int *ctx, css_selector **result); -static inline css_error parseSelectorList(css_language *c, +static css_error parseSelectorList(css_language *c, const parserutils_vector *vector, css_rule *rule); /* Declaration parsing */ -static inline css_error parseProperty(css_language *c, +static css_error parseProperty(css_language *c, const css_token *property, const parserutils_vector *vector, int *ctx, css_rule *rule); diff --git a/src/parse/parse.c b/src/parse/parse.c index 5e31f44..1e419c9 100644 --- a/src/parse/parse.c +++ b/src/parse/parse.c @@ -120,43 +120,43 @@ static css_error css_parser_create_internal(const char *charset, css_allocator_fn alloc, void *pw, parser_state initial, css_parser **parser); -static inline css_error transition(css_parser *parser, parser_state to, +static css_error transition(css_parser *parser, parser_state to, parser_state subsequent); -static inline css_error transitionNoRet(css_parser *parser, parser_state to); -static inline css_error done(css_parser *parser); -static inline css_error expect(css_parser *parser, css_token_type type); -static inline css_error getToken(css_parser *parser, const css_token **token); -static inline css_error pushBack(css_parser *parser, const css_token *token); -static inline css_error eatWS(css_parser *parser); - -static inline css_error parseStart(css_parser *parser); -static inline css_error parseStylesheet(css_parser *parser); -static inline css_error parseStatement(css_parser *parser); -static inline css_error parseRuleset(css_parser *parser); -static inline css_error parseRulesetEnd(css_parser *parser); -static inline css_error parseAtRule(css_parser *parser); -static inline css_error parseAtRuleEnd(css_parser *parser); -static inline css_error parseBlock(css_parser *parser); -static inline css_error parseBlockContent(css_parser *parser); -static inline css_error parseSelector(css_parser *parser); -static inline css_error parseDeclaration(css_parser *parser); -static inline css_error parseDeclList(css_parser *parser); -static inline css_error parseDeclListEnd(css_parser *parser); -static inline css_error parseProperty(css_parser *parser); -static inline css_error parseValue0(css_parser *parser); -static inline css_error parseValue1(css_parser *parser); -static inline css_error parseValue(css_parser *parser); -static inline css_error parseAny0(css_parser *parser); -static inline css_error parseAny1(css_parser *parser); -static inline css_error parseAny(css_parser *parser); -static inline css_error parseMalformedDeclaration(css_parser *parser); -static inline css_error parseMalformedSelector(css_parser *parser); -static inline css_error parseMalformedAtRule(css_parser *parser); -static inline css_error parseInlineStyle(css_parser *parser); -static inline css_error parseISBody0(css_parser *parser); -static inline css_error parseISBody(css_parser *parser); - -static inline void unref_interned_strings_in_tokens(css_parser *parser); +static css_error transitionNoRet(css_parser *parser, parser_state to); +static css_error done(css_parser *parser); +static css_error expect(css_parser *parser, css_token_type type); +static css_error getToken(css_parser *parser, const css_token **token); +static css_error pushBack(css_parser *parser, const css_token *token); +static css_error eatWS(css_parser *parser); + +static css_error parseStart(css_parser *parser); +static css_error parseStylesheet(css_parser *parser); +static css_error parseStatement(css_parser *parser); +static css_error parseRuleset(css_parser *parser); +static css_error parseRulesetEnd(css_parser *parser); +static css_error parseAtRule(css_parser *parser); +static css_error parseAtRuleEnd(css_parser *parser); +static css_error parseBlock(css_parser *parser); +static css_error parseBlockContent(css_parser *parser); +static css_error parseSelector(css_parser *parser); +static css_error parseDeclaration(css_parser *parser); +static css_error parseDeclList(css_parser *parser); +static css_error parseDeclListEnd(css_parser *parser); +static css_error parseProperty(css_parser *parser); +static css_error parseValue0(css_parser *parser); +static css_error parseValue1(css_parser *parser); +static css_error parseValue(css_parser *parser); +static css_error parseAny0(css_parser *parser); +static css_error parseAny1(css_parser *parser); +static css_error parseAny(css_parser *parser); +static css_error parseMalformedDeclaration(css_parser *parser); +static css_error parseMalformedSelector(css_parser *parser); +static css_error parseMalformedAtRule(css_parser *parser); +static css_error parseInlineStyle(css_parser *parser); +static css_error parseISBody0(css_parser *parser); +static css_error parseISBody(css_parser *parser); + +static void unref_interned_strings_in_tokens(css_parser *parser); /** * Dispatch table for parsing, indexed by major state number @@ -2563,7 +2563,7 @@ css_error parseISBody(css_parser *parser) * * \param parser The parser whose tokens we are cleaning up. */ -static inline void unref_interned_strings_in_tokens(css_parser *parser) +void unref_interned_strings_in_tokens(css_parser *parser) { int32_t ctx = 0; const css_token *tok; -- cgit v1.2.3