diff options
| author | Guido van Rossum <guido@python.org> | 2006-03-15 04:58:47 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2006-03-15 04:58:47 (GMT) |
| commit | 45aecf451a64fb1ebe5e74d0b00965ac8d99dff6 (patch) | |
| tree | a7edcfb45ceafcffde68a3542aeba67089ea81cb /Parser | |
| parent | f3175f6341ae207543a0d2d3be36c457349066e6 (diff) | |
| download | cpython-45aecf451a64fb1ebe5e74d0b00965ac8d99dff6.zip cpython-45aecf451a64fb1ebe5e74d0b00965ac8d99dff6.tar.gz cpython-45aecf451a64fb1ebe5e74d0b00965ac8d99dff6.tar.bz2 | |
Checkpoint. 218 tests are okay; 53 are failing. Done so far:
- all classes are new-style (but ripping out classobject.[ch] isn't done)
- int/int -> float
- all exceptions must derive from BaseException
- absolute import
- 'as' and 'with' are keywords
Diffstat (limited to 'Parser')
| -rw-r--r-- | Parser/parser.c | 2 | ||||
| -rw-r--r-- | Parser/parsetok.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Parser/parser.c b/Parser/parser.c index ada6be2..213410c 100644 --- a/Parser/parser.c +++ b/Parser/parser.c @@ -149,6 +149,7 @@ classify(parser_state *ps, int type, char *str) strcmp(l->lb_str, s) != 0) continue; #ifdef PY_PARSER_REQUIRES_FUTURE_KEYWORD + /* Leaving this in as an example */ if (!(ps->p_flags & CO_FUTURE_WITH_STATEMENT)) { if (s[0] == 'w' && strcmp(s, "with") == 0) break; /* not a keyword yet */ @@ -177,6 +178,7 @@ classify(parser_state *ps, int type, char *str) } #ifdef PY_PARSER_REQUIRES_FUTURE_KEYWORD +/* Leaving this in as an example */ static void future_hack(parser_state *ps) { diff --git a/Parser/parsetok.c b/Parser/parsetok.c index 77a2cac..07590c2 100644 --- a/Parser/parsetok.c +++ b/Parser/parsetok.c @@ -192,7 +192,8 @@ parsetok(struct tok_state *tok, grammar *g, int start, perrdetail *err_ret, col_offset = -1; if ((err_ret->error = - PyParser_AddToken(ps, (int)type, str, tok->lineno, col_offset, + PyParser_AddToken(ps, (int)type, str, + tok->lineno, col_offset, &(err_ret->expected))) != E_OK) { if (err_ret->error != E_DONE) PyObject_FREE(str); |