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