summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEevee (Alex Munroe) <eevee.git@veekun.com>2014-08-29 16:10:00 -0700
committerEevee (Alex Munroe) <eevee.git@veekun.com>2014-08-29 17:07:48 -0700
commitea076cc40dfeb0ac373376c3a912285595e2058e (patch)
tree329573b02ea6369b5c6ad4dce1a1258915da5a6d
parent28671cd9612f26ec24b03eb5048e30ce0060ac26 (diff)
downloadpyscss-ea076cc40dfeb0ac373376c3a912285595e2058e.tar.gz
Remove extraneous Pattern_setup function from speedups.
-rw-r--r--scss/src/scanner.c37
1 files changed, 12 insertions, 25 deletions
diff --git a/scss/src/scanner.c b/scss/src/scanner.c
index 9f35b04..785a9dc 100644
--- a/scss/src/scanner.c
+++ b/scss/src/scanner.c
@@ -89,26 +89,11 @@ Pattern_match(Pattern *regex, char *string, int string_sz, int start_at, Token *
}
static void Pattern_initialize(Pattern *, int);
-static void Pattern_setup(Pattern *, int);
static void Pattern_finalize(void);
static void
Pattern_initialize(Pattern *patterns, int patterns_sz) {
- #ifdef DEBUG
- fprintf(stderr, "%s\n", __PRETTY_FUNCTION__);
- #endif
-
- if (!Pattern_patterns_initialized) {
- if (patterns_sz) {
- Pattern_patterns_initialized = 1;
- Pattern_setup(patterns, patterns_sz);
- }
- }
-}
-
-static void
-Pattern_setup(Pattern *patterns, int patterns_sz) {
int i;
Pattern *regex;
@@ -116,18 +101,20 @@ Pattern_setup(Pattern *patterns, int patterns_sz) {
fprintf(stderr, "%s\n", __PRETTY_FUNCTION__);
#endif
- if (!Pattern_patterns_initialized) {
- Pattern_initialize(patterns, patterns_sz);
- } else {
- for (i = 0; i < patterns_sz; i++) {
- regex = Pattern_regex(patterns[i].tok, patterns[i].expr);
- #ifdef DEBUG
- if (regex) {
- fprintf(stderr, "\tAdded regex pattern %s: %s\n", repr(regex->tok), repr(regex->expr));
- }
- #endif
+ if (Pattern_patterns_initialized || !patterns_sz) {
+ return;
+ }
+
+ for (i = 0; i < patterns_sz; i++) {
+ regex = Pattern_regex(patterns[i].tok, patterns[i].expr);
+ #ifdef DEBUG
+ if (regex) {
+ fprintf(stderr, "\tAdded regex pattern %s: %s\n", repr(regex->tok), repr(regex->expr));
}
+ #endif
}
+
+ Pattern_patterns_initialized = 1;
}
static void