summaryrefslogtreecommitdiffstats
path: root/Parser
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2002-08-04 20:10:29 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2002-08-04 20:10:29 (GMT)
commit1ee99d31d980e8a6e9c9d2379900f8bd5f98a9fe (patch)
treeee652ff1072207c52a137cc47820b58f588fbd4c /Parser
parentcd280fb59c6dfc84e0a138039e541ef46df7fb0b (diff)
downloadcpython-1ee99d31d980e8a6e9c9d2379900f8bd5f98a9fe.zip
cpython-1ee99d31d980e8a6e9c9d2379900f8bd5f98a9fe.tar.gz
cpython-1ee99d31d980e8a6e9c9d2379900f8bd5f98a9fe.tar.bz2
Make pgen compile with pydebug. Duplicate normalized names, as it may
be longer than the old string.
Diffstat (limited to 'Parser')
-rw-r--r--Parser/tokenizer.c8
-rw-r--r--Parser/tokenizer.h2
2 files changed, 8 insertions, 2 deletions
diff --git a/Parser/tokenizer.c b/Parser/tokenizer.c
index 0ae093e..53c883f 100644
--- a/Parser/tokenizer.c
+++ b/Parser/tokenizer.c
@@ -128,8 +128,10 @@ tok_new(void)
tok->read_coding_spec = 0;
tok->issued_encoding_warning = 0;
tok->encoding = NULL;
+#ifndef PGEN
tok->decoding_readline = NULL;
tok->decoding_buffer = NULL;
+#endif
return tok;
}
@@ -225,8 +227,8 @@ get_coding_spec(const char *s, int size)
char* r = new_string(begin, t - begin);
char* q = get_normal_name(r);
if (r != q) {
- assert(strlen(r) >= strlen(q));
- strcpy(r, q);
+ PyMem_DEL(r);
+ r = new_string(q, strlen(q));
}
return r;
}
@@ -584,8 +586,10 @@ PyTokenizer_Free(struct tok_state *tok)
{
if (tok->encoding != NULL)
PyMem_DEL(tok->encoding);
+#ifndef PGEN
Py_XDECREF(tok->decoding_readline);
Py_XDECREF(tok->decoding_buffer);
+#endif
if (tok->fp != NULL && tok->buf != NULL)
PyMem_DEL(tok->buf);
PyMem_DEL(tok);
diff --git a/Parser/tokenizer.h b/Parser/tokenizer.h
index 9782666..f3bac74 100644
--- a/Parser/tokenizer.h
+++ b/Parser/tokenizer.h
@@ -45,8 +45,10 @@ struct tok_state {
int read_coding_spec; /* whether 'coding:...' has been read */
int issued_encoding_warning; /* whether non-ASCII warning was issued */
char *encoding;
+#ifndef PGEN
PyObject *decoding_readline; /* codecs.open(...).readline */
PyObject *decoding_buffer;
+#endif
const char* enc;
const char* str;
};