Guido van Rossum | f70e43a | 1991-02-19 12:39:46 +0000 | [diff] [blame] | 1 | |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 2 | /* Parser-tokenizer link implementation */ |
| 3 | |
Guido van Rossum | 3f5da24 | 1990-12-20 15:06:42 +0000 | [diff] [blame] | 4 | #include "pgenheaders.h" |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 5 | #include "tokenizer.h" |
| 6 | #include "node.h" |
| 7 | #include "grammar.h" |
| 8 | #include "parser.h" |
Guido van Rossum | 3f5da24 | 1990-12-20 15:06:42 +0000 | [diff] [blame] | 9 | #include "parsetok.h" |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 10 | #include "errcode.h" |
Martin v. Löwis | 00f1e3f | 2002-08-04 17:29:52 +0000 | [diff] [blame] | 11 | #include "graminit.h" |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 12 | |
Guido van Rossum | 6135df6 | 1998-04-10 19:35:06 +0000 | [diff] [blame] | 13 | int Py_TabcheckFlag; |
| 14 | |
Guido van Rossum | 3f5da24 | 1990-12-20 15:06:42 +0000 | [diff] [blame] | 15 | |
| 16 | /* Forward */ |
Christian Heimes | 4d6ec85 | 2008-03-26 22:34:47 +0000 | [diff] [blame] | 17 | static node *parsetok(struct tok_state *, grammar *, int, perrdetail *, int *); |
Martin v. Löwis | 95292d6 | 2002-12-11 14:04:59 +0000 | [diff] [blame] | 18 | static void initerr(perrdetail *err_ret, const char* filename); |
Guido van Rossum | 3f5da24 | 1990-12-20 15:06:42 +0000 | [diff] [blame] | 19 | |
| 20 | /* Parse input coming from a string. Return error code, print some errors. */ |
Guido van Rossum | bd0389d | 1994-08-29 12:25:45 +0000 | [diff] [blame] | 21 | node * |
Martin v. Löwis | 95292d6 | 2002-12-11 14:04:59 +0000 | [diff] [blame] | 22 | PyParser_ParseString(const char *s, grammar *g, int start, perrdetail *err_ret) |
Guido van Rossum | 3f5da24 | 1990-12-20 15:06:42 +0000 | [diff] [blame] | 23 | { |
Jeremy Hylton | 3e0055f | 2005-10-20 19:59:25 +0000 | [diff] [blame] | 24 | return PyParser_ParseStringFlagsFilename(s, NULL, g, start, err_ret, 0); |
Tim Peters | fe2127d | 2001-07-16 05:37:24 +0000 | [diff] [blame] | 25 | } |
| 26 | |
| 27 | node * |
Martin v. Löwis | 95292d6 | 2002-12-11 14:04:59 +0000 | [diff] [blame] | 28 | PyParser_ParseStringFlags(const char *s, grammar *g, int start, |
Tim Peters | fe2127d | 2001-07-16 05:37:24 +0000 | [diff] [blame] | 29 | perrdetail *err_ret, int flags) |
| 30 | { |
Thomas Heller | 6b17abf | 2002-07-09 09:23:27 +0000 | [diff] [blame] | 31 | return PyParser_ParseStringFlagsFilename(s, NULL, |
Neal Norwitz | 4ded4b5 | 2004-07-08 01:54:07 +0000 | [diff] [blame] | 32 | g, start, err_ret, flags); |
Thomas Heller | 6b17abf | 2002-07-09 09:23:27 +0000 | [diff] [blame] | 33 | } |
| 34 | |
| 35 | node * |
Martin v. Löwis | 95292d6 | 2002-12-11 14:04:59 +0000 | [diff] [blame] | 36 | PyParser_ParseStringFlagsFilename(const char *s, const char *filename, |
Thomas Heller | 6b17abf | 2002-07-09 09:23:27 +0000 | [diff] [blame] | 37 | grammar *g, int start, |
| 38 | perrdetail *err_ret, int flags) |
| 39 | { |
Christian Heimes | 4d6ec85 | 2008-03-26 22:34:47 +0000 | [diff] [blame] | 40 | int iflags = flags; |
| 41 | return PyParser_ParseStringFlagsFilenameEx(s, filename, g, start, |
| 42 | err_ret, &iflags); |
| 43 | } |
| 44 | |
| 45 | node * |
| 46 | PyParser_ParseStringFlagsFilenameEx(const char *s, const char *filename, |
| 47 | grammar *g, int start, |
| 48 | perrdetail *err_ret, int *flags) |
| 49 | { |
Guido van Rossum | bd0389d | 1994-08-29 12:25:45 +0000 | [diff] [blame] | 50 | struct tok_state *tok; |
| 51 | |
Thomas Heller | 6b17abf | 2002-07-09 09:23:27 +0000 | [diff] [blame] | 52 | initerr(err_ret, filename); |
Guido van Rossum | bd0389d | 1994-08-29 12:25:45 +0000 | [diff] [blame] | 53 | |
Guido van Rossum | 86bea46 | 1997-04-29 21:03:06 +0000 | [diff] [blame] | 54 | if ((tok = PyTokenizer_FromString(s)) == NULL) { |
Neal Norwitz | 40d3781 | 2005-10-02 01:48:49 +0000 | [diff] [blame] | 55 | err_ret->error = PyErr_Occurred() ? E_DECODE : E_NOMEM; |
Guido van Rossum | bd0389d | 1994-08-29 12:25:45 +0000 | [diff] [blame] | 56 | return NULL; |
Guido van Rossum | 3f5da24 | 1990-12-20 15:06:42 +0000 | [diff] [blame] | 57 | } |
Guido van Rossum | bd0389d | 1994-08-29 12:25:45 +0000 | [diff] [blame] | 58 | |
Martin v. Löwis | 00f1e3f | 2002-08-04 17:29:52 +0000 | [diff] [blame] | 59 | tok->filename = filename ? filename : "<string>"; |
Thomas Wouters | 6caa07b | 2006-04-14 11:33:28 +0000 | [diff] [blame] | 60 | if (Py_TabcheckFlag >= 3) |
| 61 | tok->alterror = 0; |
Guido van Rossum | 89ce454 | 1998-12-21 18:32:40 +0000 | [diff] [blame] | 62 | |
Tim Peters | fe2127d | 2001-07-16 05:37:24 +0000 | [diff] [blame] | 63 | return parsetok(tok, g, start, err_ret, flags); |
Guido van Rossum | 3f5da24 | 1990-12-20 15:06:42 +0000 | [diff] [blame] | 64 | } |
| 65 | |
Guido van Rossum | 3f5da24 | 1990-12-20 15:06:42 +0000 | [diff] [blame] | 66 | /* Parse input coming from a file. Return error code, print some errors. */ |
| 67 | |
Guido van Rossum | bd0389d | 1994-08-29 12:25:45 +0000 | [diff] [blame] | 68 | node * |
Martin v. Löwis | 95292d6 | 2002-12-11 14:04:59 +0000 | [diff] [blame] | 69 | PyParser_ParseFile(FILE *fp, const char *filename, grammar *g, int start, |
Thomas Wouters | 23c9e00 | 2000-07-22 19:20:54 +0000 | [diff] [blame] | 70 | char *ps1, char *ps2, perrdetail *err_ret) |
Guido van Rossum | 3f5da24 | 1990-12-20 15:06:42 +0000 | [diff] [blame] | 71 | { |
Martin v. Löwis | 85bcc66 | 2007-09-04 09:18:06 +0000 | [diff] [blame] | 72 | return PyParser_ParseFileFlags(fp, filename, NULL, |
| 73 | g, start, ps1, ps2, err_ret, 0); |
Tim Peters | fe2127d | 2001-07-16 05:37:24 +0000 | [diff] [blame] | 74 | } |
| 75 | |
| 76 | node * |
Christian Heimes | 4d6ec85 | 2008-03-26 22:34:47 +0000 | [diff] [blame] | 77 | PyParser_ParseFileFlags(FILE *fp, const char *filename, const char *enc, |
Martin v. Löwis | 85bcc66 | 2007-09-04 09:18:06 +0000 | [diff] [blame] | 78 | grammar *g, int start, |
Tim Peters | fe2127d | 2001-07-16 05:37:24 +0000 | [diff] [blame] | 79 | char *ps1, char *ps2, perrdetail *err_ret, int flags) |
| 80 | { |
Christian Heimes | 4d6ec85 | 2008-03-26 22:34:47 +0000 | [diff] [blame] | 81 | int iflags = flags; |
| 82 | return PyParser_ParseFileFlagsEx(fp, filename, enc, g, start, ps1, |
| 83 | ps2, err_ret, &iflags); |
| 84 | } |
| 85 | |
| 86 | node * |
| 87 | PyParser_ParseFileFlagsEx(FILE *fp, const char *filename, |
| 88 | const char *enc, grammar *g, int start, |
| 89 | char *ps1, char *ps2, perrdetail *err_ret, int *flags) |
| 90 | { |
Guido van Rossum | bd0389d | 1994-08-29 12:25:45 +0000 | [diff] [blame] | 91 | struct tok_state *tok; |
| 92 | |
Martin v. Löwis | 16eff6f | 2002-01-05 21:40:08 +0000 | [diff] [blame] | 93 | initerr(err_ret, filename); |
Guido van Rossum | bd0389d | 1994-08-29 12:25:45 +0000 | [diff] [blame] | 94 | |
Brett Cannon | fdc1a56 | 2007-09-05 20:35:46 +0000 | [diff] [blame] | 95 | if ((tok = PyTokenizer_FromFile(fp, (char *)enc, ps1, ps2)) == NULL) { |
Guido van Rossum | bd0389d | 1994-08-29 12:25:45 +0000 | [diff] [blame] | 96 | err_ret->error = E_NOMEM; |
| 97 | return NULL; |
Guido van Rossum | 3f5da24 | 1990-12-20 15:06:42 +0000 | [diff] [blame] | 98 | } |
Martin v. Löwis | 00f1e3f | 2002-08-04 17:29:52 +0000 | [diff] [blame] | 99 | tok->filename = filename; |
Thomas Wouters | 6caa07b | 2006-04-14 11:33:28 +0000 | [diff] [blame] | 100 | if (Py_TabcheckFlag >= 3) |
| 101 | tok->alterror = 0; |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 102 | |
Tim Peters | fe2127d | 2001-07-16 05:37:24 +0000 | [diff] [blame] | 103 | return parsetok(tok, g, start, err_ret, flags); |
Guido van Rossum | bd0389d | 1994-08-29 12:25:45 +0000 | [diff] [blame] | 104 | } |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 105 | |
Neal Norwitz | e4993c7 | 2006-03-16 06:01:25 +0000 | [diff] [blame] | 106 | #ifdef PY_PARSER_REQUIRES_FUTURE_KEYWORD |
Thomas Wouters | 34aa7ba | 2006-02-28 19:02:24 +0000 | [diff] [blame] | 107 | static char with_msg[] = |
| 108 | "%s:%d: Warning: 'with' will become a reserved keyword in Python 2.6\n"; |
| 109 | |
| 110 | static char as_msg[] = |
| 111 | "%s:%d: Warning: 'as' will become a reserved keyword in Python 2.6\n"; |
| 112 | |
| 113 | static void |
| 114 | warn(const char *msg, const char *filename, int lineno) |
| 115 | { |
| 116 | if (filename == NULL) |
| 117 | filename = "<string>"; |
| 118 | PySys_WriteStderr(msg, filename, lineno); |
| 119 | } |
Neal Norwitz | fc85c92 | 2006-03-17 05:44:46 +0000 | [diff] [blame] | 120 | #endif |
Guido van Rossum | da62ecc | 2001-07-17 16:53:11 +0000 | [diff] [blame] | 121 | |
Thomas Wouters | 89f507f | 2006-12-13 04:49:30 +0000 | [diff] [blame] | 122 | /* Parse input coming from the given tokenizer structure. |
| 123 | Return error code. */ |
| 124 | |
Guido van Rossum | bd0389d | 1994-08-29 12:25:45 +0000 | [diff] [blame] | 125 | static node * |
Tim Peters | fe2127d | 2001-07-16 05:37:24 +0000 | [diff] [blame] | 126 | parsetok(struct tok_state *tok, grammar *g, int start, perrdetail *err_ret, |
Christian Heimes | 4d6ec85 | 2008-03-26 22:34:47 +0000 | [diff] [blame] | 127 | int *flags) |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 128 | { |
| 129 | parser_state *ps; |
Guido van Rossum | bd0389d | 1994-08-29 12:25:45 +0000 | [diff] [blame] | 130 | node *n; |
Thomas Wouters | 34aa7ba | 2006-02-28 19:02:24 +0000 | [diff] [blame] | 131 | int started = 0, handling_import = 0, handling_with = 0; |
Guido van Rossum | bd0389d | 1994-08-29 12:25:45 +0000 | [diff] [blame] | 132 | |
Guido van Rossum | 86bea46 | 1997-04-29 21:03:06 +0000 | [diff] [blame] | 133 | if ((ps = PyParser_New(g, start)) == NULL) { |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 134 | fprintf(stderr, "no mem for new parser\n"); |
Guido van Rossum | bd0389d | 1994-08-29 12:25:45 +0000 | [diff] [blame] | 135 | err_ret->error = E_NOMEM; |
Neal Norwitz | 56c6561 | 2005-11-15 04:54:23 +0000 | [diff] [blame] | 136 | PyTokenizer_Free(tok); |
Guido van Rossum | bd0389d | 1994-08-29 12:25:45 +0000 | [diff] [blame] | 137 | return NULL; |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 138 | } |
Thomas Wouters | 34aa7ba | 2006-02-28 19:02:24 +0000 | [diff] [blame] | 139 | #ifdef PY_PARSER_REQUIRES_FUTURE_KEYWORD |
Christian Heimes | 4d6ec85 | 2008-03-26 22:34:47 +0000 | [diff] [blame] | 140 | if (*flags & PyPARSE_WITH_IS_KEYWORD) |
Thomas Wouters | 34aa7ba | 2006-02-28 19:02:24 +0000 | [diff] [blame] | 141 | ps->p_flags |= CO_FUTURE_WITH_STATEMENT; |
Neil Schemenauer | c24ea08 | 2002-03-22 23:53:36 +0000 | [diff] [blame] | 142 | #endif |
Guido van Rossum | bd0389d | 1994-08-29 12:25:45 +0000 | [diff] [blame] | 143 | |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 144 | for (;;) { |
| 145 | char *a, *b; |
| 146 | int type; |
Guido van Rossum | 6da3434 | 2000-06-28 22:00:02 +0000 | [diff] [blame] | 147 | size_t len; |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 148 | char *str; |
Martin v. Löwis | 49c5da1 | 2006-03-01 22:49:05 +0000 | [diff] [blame] | 149 | int col_offset; |
Guido van Rossum | bd0389d | 1994-08-29 12:25:45 +0000 | [diff] [blame] | 150 | |
Guido van Rossum | 86bea46 | 1997-04-29 21:03:06 +0000 | [diff] [blame] | 151 | type = PyTokenizer_Get(tok, &a, &b); |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 152 | if (type == ERRORTOKEN) { |
Guido van Rossum | bd0389d | 1994-08-29 12:25:45 +0000 | [diff] [blame] | 153 | err_ret->error = tok->done; |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 154 | break; |
| 155 | } |
Guido van Rossum | d8b1d37 | 1992-03-04 16:40:44 +0000 | [diff] [blame] | 156 | if (type == ENDMARKER && started) { |
| 157 | type = NEWLINE; /* Add an extra newline */ |
Thomas Wouters | 34aa7ba | 2006-02-28 19:02:24 +0000 | [diff] [blame] | 158 | handling_with = handling_import = 0; |
Guido van Rossum | d8b1d37 | 1992-03-04 16:40:44 +0000 | [diff] [blame] | 159 | started = 0; |
Guido van Rossum | 4b499dd3 | 2003-02-13 22:07:59 +0000 | [diff] [blame] | 160 | /* Add the right number of dedent tokens, |
| 161 | except if a certain flag is given -- |
| 162 | codeop.py uses this. */ |
| 163 | if (tok->indent && |
Christian Heimes | 4d6ec85 | 2008-03-26 22:34:47 +0000 | [diff] [blame] | 164 | !(*flags & PyPARSE_DONT_IMPLY_DEDENT)) |
Guido van Rossum | 4b499dd3 | 2003-02-13 22:07:59 +0000 | [diff] [blame] | 165 | { |
| 166 | tok->pendin = -tok->indent; |
| 167 | tok->indent = 0; |
| 168 | } |
Guido van Rossum | d8b1d37 | 1992-03-04 16:40:44 +0000 | [diff] [blame] | 169 | } |
| 170 | else |
| 171 | started = 1; |
Guido van Rossum | bd0389d | 1994-08-29 12:25:45 +0000 | [diff] [blame] | 172 | len = b - a; /* XXX this may compute NULL - NULL */ |
Andrew MacIntyre | 80d4e2a | 2002-08-04 06:28:21 +0000 | [diff] [blame] | 173 | str = (char *) PyObject_MALLOC(len + 1); |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 174 | if (str == NULL) { |
| 175 | fprintf(stderr, "no mem for next token\n"); |
Guido van Rossum | bd0389d | 1994-08-29 12:25:45 +0000 | [diff] [blame] | 176 | err_ret->error = E_NOMEM; |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 177 | break; |
| 178 | } |
Guido van Rossum | bd0389d | 1994-08-29 12:25:45 +0000 | [diff] [blame] | 179 | if (len > 0) |
| 180 | strncpy(str, a, len); |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 181 | str[len] = '\0'; |
Guido van Rossum | da62ecc | 2001-07-17 16:53:11 +0000 | [diff] [blame] | 182 | |
Thomas Wouters | 34aa7ba | 2006-02-28 19:02:24 +0000 | [diff] [blame] | 183 | #ifdef PY_PARSER_REQUIRES_FUTURE_KEYWORD |
| 184 | /* This is only necessary to support the "as" warning, but |
| 185 | we don't want to warn about "as" in import statements. */ |
| 186 | if (type == NAME && |
| 187 | len == 6 && str[0] == 'i' && strcmp(str, "import") == 0) |
| 188 | handling_import = 1; |
| 189 | |
| 190 | /* Warn about with as NAME */ |
| 191 | if (type == NAME && |
| 192 | !(ps->p_flags & CO_FUTURE_WITH_STATEMENT)) { |
| 193 | if (len == 4 && str[0] == 'w' && strcmp(str, "with") == 0) |
| 194 | warn(with_msg, err_ret->filename, tok->lineno); |
| 195 | else if (!(handling_import || handling_with) && |
Thomas Wouters | 8ae1295 | 2006-02-28 22:42:15 +0000 | [diff] [blame] | 196 | len == 2 && str[0] == 'a' && |
| 197 | strcmp(str, "as") == 0) |
Thomas Wouters | 34aa7ba | 2006-02-28 19:02:24 +0000 | [diff] [blame] | 198 | warn(as_msg, err_ret->filename, tok->lineno); |
| 199 | } |
| 200 | else if (type == NAME && |
| 201 | (ps->p_flags & CO_FUTURE_WITH_STATEMENT) && |
| 202 | len == 4 && str[0] == 'w' && strcmp(str, "with") == 0) |
| 203 | handling_with = 1; |
Neil Schemenauer | c24ea08 | 2002-03-22 23:53:36 +0000 | [diff] [blame] | 204 | #endif |
Martin v. Löwis | 49c5da1 | 2006-03-01 22:49:05 +0000 | [diff] [blame] | 205 | if (a >= tok->line_start) |
| 206 | col_offset = a - tok->line_start; |
| 207 | else |
| 208 | col_offset = -1; |
| 209 | |
Guido van Rossum | bd0389d | 1994-08-29 12:25:45 +0000 | [diff] [blame] | 210 | if ((err_ret->error = |
Guido van Rossum | 45aecf4 | 2006-03-15 04:58:47 +0000 | [diff] [blame] | 211 | PyParser_AddToken(ps, (int)type, str, |
| 212 | tok->lineno, col_offset, |
Fred Drake | 85f3639 | 2000-07-11 17:53:00 +0000 | [diff] [blame] | 213 | &(err_ret->expected))) != E_OK) { |
Thomas Wouters | 477c8d5 | 2006-05-27 19:21:47 +0000 | [diff] [blame] | 214 | if (err_ret->error != E_DONE) { |
Andrew MacIntyre | 80d4e2a | 2002-08-04 06:28:21 +0000 | [diff] [blame] | 215 | PyObject_FREE(str); |
Thomas Wouters | 477c8d5 | 2006-05-27 19:21:47 +0000 | [diff] [blame] | 216 | err_ret->token = type; |
| 217 | } |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 218 | break; |
Guido van Rossum | ff0ec52 | 1997-07-27 01:52:50 +0000 | [diff] [blame] | 219 | } |
Guido van Rossum | bd0389d | 1994-08-29 12:25:45 +0000 | [diff] [blame] | 220 | } |
| 221 | |
| 222 | if (err_ret->error == E_DONE) { |
| 223 | n = ps->p_tree; |
| 224 | ps->p_tree = NULL; |
| 225 | } |
| 226 | else |
| 227 | n = NULL; |
Christian Heimes | b1b3efc | 2008-03-26 23:24:27 +0000 | [diff] [blame] | 228 | |
Christian Heimes | 4d6ec85 | 2008-03-26 22:34:47 +0000 | [diff] [blame] | 229 | #ifdef PY_PARSER_REQUIRES_FUTURE_KEYWORD |
| 230 | *flags = ps->p_flags; |
| 231 | #endif |
Guido van Rossum | 86bea46 | 1997-04-29 21:03:06 +0000 | [diff] [blame] | 232 | PyParser_Delete(ps); |
Guido van Rossum | bd0389d | 1994-08-29 12:25:45 +0000 | [diff] [blame] | 233 | |
| 234 | if (n == NULL) { |
| 235 | if (tok->lineno <= 1 && tok->done == E_EOF) |
| 236 | err_ret->error = E_EOF; |
| 237 | err_ret->lineno = tok->lineno; |
Guido van Rossum | bd0389d | 1994-08-29 12:25:45 +0000 | [diff] [blame] | 238 | if (tok->buf != NULL) { |
Martin v. Löwis | a87c445 | 2006-02-15 19:56:18 +0000 | [diff] [blame] | 239 | size_t len; |
Martin v. Löwis | 18e1655 | 2006-02-15 17:27:45 +0000 | [diff] [blame] | 240 | assert(tok->cur - tok->buf < INT_MAX); |
| 241 | err_ret->offset = (int)(tok->cur - tok->buf); |
Martin v. Löwis | a87c445 | 2006-02-15 19:56:18 +0000 | [diff] [blame] | 242 | len = tok->inp - tok->buf; |
Martin v. Löwis | 2593146 | 2008-03-17 20:43:42 +0000 | [diff] [blame] | 243 | err_ret->text = (char *) PyObject_MALLOC(len + 1); |
| 244 | if (err_ret->text != NULL) { |
| 245 | if (len > 0) |
| 246 | strncpy(err_ret->text, tok->buf, len); |
| 247 | err_ret->text[len] = '\0'; |
Guido van Rossum | bd0389d | 1994-08-29 12:25:45 +0000 | [diff] [blame] | 248 | } |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 249 | } |
Martin v. Löwis | 00f1e3f | 2002-08-04 17:29:52 +0000 | [diff] [blame] | 250 | } else if (tok->encoding != NULL) { |
| 251 | node* r = PyNode_New(encoding_decl); |
Thomas Wouters | 00ee7ba | 2006-08-21 19:07:27 +0000 | [diff] [blame] | 252 | if (!r) { |
| 253 | err_ret->error = E_NOMEM; |
| 254 | n = NULL; |
| 255 | goto done; |
| 256 | } |
Martin v. Löwis | 00f1e3f | 2002-08-04 17:29:52 +0000 | [diff] [blame] | 257 | r->n_str = tok->encoding; |
| 258 | r->n_nchildren = 1; |
| 259 | r->n_child = n; |
| 260 | tok->encoding = NULL; |
| 261 | n = r; |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 262 | } |
Guido van Rossum | bd0389d | 1994-08-29 12:25:45 +0000 | [diff] [blame] | 263 | |
Thomas Wouters | 00ee7ba | 2006-08-21 19:07:27 +0000 | [diff] [blame] | 264 | done: |
Guido van Rossum | 86bea46 | 1997-04-29 21:03:06 +0000 | [diff] [blame] | 265 | PyTokenizer_Free(tok); |
Guido van Rossum | bd0389d | 1994-08-29 12:25:45 +0000 | [diff] [blame] | 266 | |
| 267 | return n; |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 268 | } |
Guido van Rossum | 0c156a5 | 2001-10-20 14:27:56 +0000 | [diff] [blame] | 269 | |
| 270 | static void |
Jeremy Hylton | 3e0055f | 2005-10-20 19:59:25 +0000 | [diff] [blame] | 271 | initerr(perrdetail *err_ret, const char *filename) |
Guido van Rossum | 0c156a5 | 2001-10-20 14:27:56 +0000 | [diff] [blame] | 272 | { |
| 273 | err_ret->error = E_OK; |
Martin v. Löwis | 16eff6f | 2002-01-05 21:40:08 +0000 | [diff] [blame] | 274 | err_ret->filename = filename; |
Guido van Rossum | 0c156a5 | 2001-10-20 14:27:56 +0000 | [diff] [blame] | 275 | err_ret->lineno = 0; |
| 276 | err_ret->offset = 0; |
| 277 | err_ret->text = NULL; |
| 278 | err_ret->token = -1; |
| 279 | err_ret->expected = -1; |
| 280 | } |