diff options
| author | German M. Bravo <german.mb@deipi.com> | 2013-08-14 13:18:50 -0500 |
|---|---|---|
| committer | German M. Bravo <german.mb@deipi.com> | 2013-08-16 09:39:30 -0500 |
| commit | e60ec23930a661044cb5029f82f3aa740fbbe874 (patch) | |
| tree | 2fc4146341d9e859e3b2ad5a8e13efd3552f5e64 | |
| parent | 85cae01f116d0177c8f74d17ac1945b845b902c0 (diff) | |
| download | pyscss-e60ec23930a661044cb5029f82f3aa740fbbe874.tar.gz | |
Fixed a few bugs in the scanner
| -rw-r--r-- | scss/src/block_locator.h | 2 | ||||
| -rw-r--r-- | scss/src/scanner.c | 27 | ||||
| -rw-r--r-- | scss/src/scanner.h | 2 |
3 files changed, 24 insertions, 7 deletions
diff --git a/scss/src/block_locator.h b/scss/src/block_locator.h index 2b9b230..c59afbc 100644 --- a/scss/src/block_locator.h +++ b/scss/src/block_locator.h @@ -11,7 +11,7 @@ #ifndef BLOCK_LOCATOR_H #define BLOCK_LOCATOR_H -#define MAX_EXC_STRING 200 +#define MAX_EXC_STRING 4096 typedef struct { int error; diff --git a/scss/src/scanner.c b/scss/src/scanner.c index de0d596..25504a2 100644 --- a/scss/src/scanner.c +++ b/scss/src/scanner.c @@ -163,17 +163,20 @@ _Scanner_scan(Scanner *self, Pattern *restrictions, int restrictions_sz) Restriction *p_restriction; Pattern *regex; int j, k, max, skip; + size_t len; + char *aux; #ifdef DEBUG fprintf(stderr, "%s\n", __PRETTY_FUNCTION__); #endif while (1) { + regex = NULL; best_token.regex = NULL; /* Search the patterns for a match, with earlier tokens in the list having preference */ for (j = 0; j < Pattern_patterns_sz; j++) { - Pattern *regex = &Pattern_patterns[j]; + regex = &Pattern_patterns[j]; #ifdef DEBUG fprintf(stderr, "\tTrying %s: %s at pos %d -> %s\n", repr(regex->tok), repr(regex->expr), self->pos, repr(self->input)); #endif @@ -214,10 +217,21 @@ _Scanner_scan(Scanner *self, Pattern *restrictions, int restrictions_sz) /* If we didn't find anything, raise an error */ if (best_token.regex == NULL) { if (restrictions_sz) { - sprintf(self->exc, "SyntaxError[@ char %d: Trying to find one of the %d restricted tokens!]", self->pos, restrictions_sz); + sprintf(self->exc, "SyntaxError[@ char %d: %s found while trying to find one of the restricted tokens: ", self->pos, (regex == NULL) ? "???" : repr(regex->tok)); + aux = self->exc + strlen(self->exc); + for (k=0; k<restrictions_sz; k++) { + len = strlen(restrictions[k].tok); + if (aux + len > self->exc + sizeof(self->exc) - 10) { + sprintf(aux, (k > 0) ? ", ..." : "..."); + break; + } + sprintf(aux, (k > 0) ? ", %s" : "%s", repr(restrictions[k].tok)); + aux += len + 2; + } + sprintf(aux, "]"); return SCANNER_EXC_RESTRICTED; } - sprintf(self->exc, "SyntaxError[@ char %d: Bad Token!]", self->pos); + sprintf(self->exc, "SyntaxError[@ char %d: Bad token: %s]", self->pos, (regex == NULL) ? "???" : repr(regex->tok)); return SCANNER_EXC_BAD_TOKEN; } /* If we found something that isn't to be ignored, return it */ @@ -283,13 +297,16 @@ Scanner_reset(Scanner *self, char *input, int input_sz) { #endif for (i = 0; i < self->tokens_sz; i++) { - PyMem_Del(self->tokens[i].string); PyMem_Del(self->restrictions[i].patterns); + self->restrictions[i].patterns = NULL; + self->restrictions[i].patterns_sz = 0; } self->tokens_sz = 0; if (input_sz) { - if (self->input) PyMem_Del(self->input); + if (self->input != NULL) { + PyMem_Del(self->input); + } self->input = PyMem_Strndup(input, input_sz); self->input_sz = input_sz; #ifdef DEBUG diff --git a/scss/src/scanner.h b/scss/src/scanner.h index 614736a..df9fb62 100644 --- a/scss/src/scanner.h +++ b/scss/src/scanner.h @@ -17,7 +17,7 @@ #define BLOCK_SIZE_PATTERNS 50 #define BLOCK_SIZE_TOKENS 50 -#define MAX_EXC_STRING 200 +#define MAX_EXC_STRING 4096 #define SCANNER_EXC_BAD_TOKEN (long)-1 #define SCANNER_EXC_RESTRICTED (long)-2 |