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