X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=parser.h;h=4ef460836cc6a94053a621081d5106be1003745b;hb=83918a83a5dfae8071d366c33fa37b83aabecfc4;hp=a78eafc9c2e4b6a2da1d62edeff13f2e3969e898;hpb=bc641c27709fc92be4f44291a8f5fa3a483662fd;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/parser.h b/parser.h
index a78eafc..4ef4608 100644
--- a/parser.h
+++ b/parser.h
@@ -14,7 +14,8 @@
 typedef struct {
     YYSTYPE val;    /* semantic value */
     short   state;
-    AV	    *comppad; /* value of PL_comppad when this value was created */
+    I32     savestack_ix;	/* size of savestack at this state */
+    CV	    *compcv; /* value of PL_compcv when this value was created */
 #ifdef DEBUGGING
     const char  *name; /* token/rule name for -Dpv */
 #endif
@@ -25,8 +26,8 @@ typedef struct yy_parser {
     /* parser state */
 
     struct yy_parser *old_parser; /* previous value of PL_parser */
-    int		    yychar;	/* The lookahead symbol.  */
     YYSTYPE	    yylval;	/* value of lookahead symbol, set by yylex() */
+    int		    yychar;	/* The lookahead symbol.  */
 
     /* Number of tokens to shift before error messages enabled.  */
     int		    yyerrstatus;
@@ -42,22 +43,41 @@ typedef struct yy_parser {
     I32		lex_casemods;	/* casemod count */
     char	*lex_brackstack;/* what kind of brackets to pop */
     char	*lex_casestack;	/* what kind of case mods in effect */
-    U32		lex_defer;	/* state after determined token */
-    I32		lex_dojoin;	/* doing an array interpolation */
-    int		lex_expect;	/* expect after determined token */
+    U8		lex_defer;	/* state after determined token */
+    bool	lex_dojoin;	/* doing an array interpolation */
+    U8		lex_expect;	/* expect after determined token */
+    U8		expect;		/* how to interpret ambiguous tokens */
     I32		lex_formbrack;	/* bracket count at outer format level */
     OP		*lex_inpat;	/* in pattern $) and $| are special */
-    I32		lex_inwhat;	/* what kind of quoting are we in */
     OP		*lex_op;	/* extra info to pass back on op */
     SV		*lex_repl;	/* runtime replacement from s/// */
+    U16		lex_inwhat;	/* what kind of quoting are we in */
+    OPCODE	last_lop_op;	/* last list operator */
     I32		lex_starts;	/* how many interps done on level */
     SV		*lex_stuff;	/* runtime pattern from m// or s/// */
     I32		multi_start;	/* 1st line of multi-line string */
-    I32		multi_open;	/* delimiter of said string */
-    I32		multi_close;	/* delimiter of said string */
+    I32		multi_end;	/* last line of multi-line string */
+    char	multi_open;	/* delimiter of said string */
+    char	multi_close;	/* delimiter of said string */
     char	pending_ident;	/* pending identifier lookup */
     bool	preambled;
+    /* XXX I32 space */
     SUBLEXINFO	sublex_info;
+    SV		*linestr;	/* current chunk of src text */
+    char	*bufptr;	
+    char	*oldbufptr;	
+    char	*oldoldbufptr;	
+    char	*bufend;	
+    char	*linestart;	/* beginning of most recently read line */
+    char	*last_uni;	/* position of last named-unary op */
+    char	*last_lop;	/* position of last list operator */
+    line_t	copline;	/* current line number */
+    U16		in_my;		/* we're compiling a "my"/"our" declaration */
+    U8		lex_state;	/* next token is determined */
+    U8		error_count;	/* how many compile errors so far, max 10 */
+    HV		*in_my_stash;	/* declared class of this "my" declaration */
+    PerlIO	*rsfp;		/* current source file pointer */
+    AV		*rsfp_filters;	/* holds chain of active source filters */
 
 #ifdef PERL_MAD
     SV		*endwhite;
@@ -72,7 +92,31 @@ typedef struct yy_parser {
     SV		*thisstuff;
     SV		*thistoken;
     SV		*thiswhite;
+
+/* What we know when we're in LEX_KNOWNEXT state. */
+    NEXTTOKE	nexttoke[5];	/* value of next token, if any */
+    I32		curforce;
+#else
+    YYSTYPE	nextval[5];	/* value of next token, if any */
+    I32		nexttype[5];	/* type of next token */
+    I32		nexttoke;
 #endif
+
+    COP		*saved_curcop;	/* the previous PL_curcop */
+    char	tokenbuf[256];
+
 } yy_parser;
-    
 
+/* flags for lexer API */
+#define LEX_STUFF_UTF8		0x00000001
+#define LEX_KEEP_PREVIOUS	0x00000002
+
+/*
+ * Local variables:
+ * c-indentation-style: bsd
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ *
+ * ex: set ts=8 sts=4 sw=4 noet:
+ */