Patch #802188: better parser error message for non-EOL following line cont.

loewis · loewis · commit 4bf108d74f2e · 2005-03-03T11:45:45.000Z
diff --git a/Include/errcode.h b/Include/errcode.h
@@ -28,6 +28,7 @@ extern "C" {
 #define E_DECODE	22	/* Error in decoding into Unicode */
 #define E_EOFS		23	/* EOF in triple-quoted string */
 #define E_EOLS		24	/* EOL in single-quoted string */
+#define E_LINECONT	25	/* Unexpected characters after a line continuation */
 
 #ifdef __cplusplus
 }
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -10,6 +10,9 @@ What's New in Python 2.5 alpha 1?
 Core and builtins
 -----------------
 
+- Patch #802188: Report characters after line continuation character 
+  ('\') with a specific error message.
+
 - Bug #723201: Raise a TypeError for passing bad objects to 'L' format.
 
 - Bug #1124295: the __name__ attribute of file objects was
diff --git a/Parser/tokenizer.c b/Parser/tokenizer.c
@@ -1413,7 +1413,7 @@ tok_get(register struct tok_state *tok, char **p_start, char **p_end)
 	if (c == '\\') {
 		c = tok_nextc(tok);
 		if (c != '\n') {
-			tok->done = E_TOKEN;
+			tok->done = E_LINECONT;
 			tok->cur = tok->inp;
 			return ERRORTOKEN;
 		}
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
@@ -1484,6 +1484,9 @@ err_input(perrdetail *err)
 			msg = "unknown decode error";
 		break;
 	}
+	case E_LINECONT:
+		msg = "unexpected character after line continuation character";
+		break;
 	default:
 		fprintf(stderr, "error=%d\n", err->error);
 		msg = "unknown parsing error";

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ extern "C" {`
`28`	`28`	`#define E_DECODE 22 /* Error in decoding into Unicode */`
`29`	`29`	`#define E_EOFS 23 /* EOF in triple-quoted string */`
`30`	`30`	`#define E_EOLS 24 /* EOL in single-quoted string */`
	`31`	`+#define E_LINECONT 25 /* Unexpected characters after a line continuation */`
`31`	`32`
`32`	`33`	`#ifdef __cplusplus`
`33`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1413,7 +1413,7 @@ tok_get(register struct tok_state tok, char p_start, char *p_end)`
`1413`	`1413`	`if (c == '\\') {`
`1414`	`1414`	`c = tok_nextc(tok);`
`1415`	`1415`	`if (c != '\n') {`
`1416`		`- tok->done = E_TOKEN;`
	`1416`	`+ tok->done = E_LINECONT;`
`1417`	`1417`	`tok->cur = tok->inp;`
`1418`	`1418`	`return ERRORTOKEN;`
`1419`	`1419`	`}`