Changeset 391 for python/trunk/Parser/tokenizer.h

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Parser/tokenizer.h (modified) (1 diff)

python/trunk/Parser/tokenizer.h

@@ -9 +9 @@
 /* Tokenizer interface */
 
-#include "token.h"      /* For token types */
+#include "token.h"      /* For token types */
 
-#define MAXINDENT 100   /* Max indentation level */
+#define MAXINDENT 100   /* Max indentation level */
 
 /* Tokenizer state */
 struct tok_state {
-        /* Input state; buf <= cur <= inp <= end */
-        /* NB an entire line is held in the buffer */
-        char *buf;      /* Input buffer, or NULL; malloc'ed if fp != NULL */
-        char *cur;      /* Next character in buffer */
-        char *inp;      /* End of data in buffer */
-        char *end;      /* End of input buffer if buf != NULL */
-        char *start;    /* Start of current token if not NULL */
-        int done;       /* E_OK normally, E_EOF at EOF, otherwise error code */
-        /* NB If done != E_OK, cur must be == inp!!! */
-        FILE *fp;       /* Rest of input; NULL if tokenizing a string */
-        int tabsize;    /* Tab spacing */
-        int indent;     /* Current indentation index */
-        int indstack[MAXINDENT];        /* Stack of indents */
-        int atbol;      /* Nonzero if at begin of new line */
-        int pendin;     /* Pending indents (if > 0) or dedents (if < 0) */
-        char *prompt, *nextprompt;      /* For interactive prompting */
-        int lineno;     /* Current line number */
-        int level;      /* () [] {} Parentheses nesting level */
-                        /* Used to allow free continuations inside them */
-        /* Stuff for checking on different tab sizes */
-        const char *filename;   /* For error messages */
-        int altwarning; /* Issue warning if alternate tabs don't match */
-        int alterror;   /* Issue error if alternate tabs don't match */
-        int alttabsize; /* Alternate tab spacing */
-        int altindstack[MAXINDENT];     /* Stack of alternate indents */
-        /* Stuff for PEP 0263 */
-        int decoding_state;     /* -1:decoding, 0:init, 1:raw */
-        int decoding_erred;     /* whether erred in decoding  */
-        int read_coding_spec;   /* whether 'coding:...' has been read  */
-        char *encoding;
-        int cont_line;          /* whether we are in a continuation line. */
-        const char* line_start; /* pointer to start of current line */
+    /* Input state; buf <= cur <= inp <= end */
+    /* NB an entire line is held in the buffer */
+    char *buf;          /* Input buffer, or NULL; malloc'ed if fp != NULL */
+    char *cur;          /* Next character in buffer */
+    char *inp;          /* End of data in buffer */
+    char *end;          /* End of input buffer if buf != NULL */
+    char *start;        /* Start of current token if not NULL */
+    int done;           /* E_OK normally, E_EOF at EOF, otherwise error code */
+    /* NB If done != E_OK, cur must be == inp!!! */
+    FILE *fp;           /* Rest of input; NULL if tokenizing a string */
+    int tabsize;        /* Tab spacing */
+    int indent;         /* Current indentation index */
+    int indstack[MAXINDENT];            /* Stack of indents */
+    int atbol;          /* Nonzero if at begin of new line */
+    int pendin;         /* Pending indents (if > 0) or dedents (if < 0) */
+    char *prompt, *nextprompt;          /* For interactive prompting */
+    int lineno;         /* Current line number */
+    int level;          /* () [] {} Parentheses nesting level */
+            /* Used to allow free continuations inside them */
+    /* Stuff for checking on different tab sizes */
+    const char *filename;       /* For error messages */
+    int altwarning;     /* Issue warning if alternate tabs don't match */
+    int alterror;       /* Issue error if alternate tabs don't match */
+    int alttabsize;     /* Alternate tab spacing */
+    int altindstack[MAXINDENT];         /* Stack of alternate indents */
+    /* Stuff for PEP 0263 */
+    int decoding_state;         /* -1:decoding, 0:init, 1:raw */
+    int decoding_erred;         /* whether erred in decoding  */
+    int read_coding_spec;       /* whether 'coding:...' has been read  */
+    char *encoding;
+    int cont_line;          /* whether we are in a continuation line. */
+    const char* line_start;     /* pointer to start of current line */
 #ifndef PGEN
-        PyObject *decoding_readline; /* codecs.open(...).readline */
-        PyObject *decoding_buffer;
+    PyObject *decoding_readline; /* codecs.open(...).readline */
+    PyObject *decoding_buffer;
 #endif
-        const char* enc;
-        const char* str;
+    const char* enc;
+    const char* str;
+    const char* input; /* Tokenizer's newline translated copy of the string. */
 };
 
-extern struct tok_state *PyTokenizer_FromString(const char *);
+extern struct tok_state *PyTokenizer_FromString(const char *, int);
 extern struct tok_state *PyTokenizer_FromFile(FILE *, char *, char *);
 extern void PyTokenizer_Free(struct tok_state *);
 extern int PyTokenizer_Get(struct tok_state *, char **, char **);
 #if defined(PGEN) || defined(Py_USING_UNICODE)
-extern char * PyTokenizer_RestoreEncoding(struct tok_state* tok, 
-                                          int len, int *offset);
+extern char * PyTokenizer_RestoreEncoding(struct tok_state* tok,
+                                          int len, int *offset);
 #endif