Make source filters work in evalbytes

[perl5.git] / parser.h

diff --git a/parser.h b/parser.h
index 363e0ee..36b1a43 100644 (file)
--- a/parser.h
+++ b/parser.h
@@ -14,10 +14,10 @@
 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 */
-    I32     savestack_ix;      /* size of savestack at this state */
 #endif
 } yy_stack_frame;
 
@@ -39,7 +39,7 @@ typedef struct yy_parser {
 
     /* lexer state */
 
-    I32                lex_brackets;   /* bracket count */
+    I32                lex_brackets;   /* square and curly bracket count */
     I32                lex_casemods;   /* casemod count */
     char       *lex_brackstack;/* what kind of brackets to pop */
     char       *lex_casestack; /* what kind of case mods in effect */
@@ -61,7 +61,7 @@ typedef struct yy_parser {
     char       multi_close;    /* delimiter of said string */
     char       pending_ident;  /* pending identifier lookup */
     bool       preambled;
-    /* XXX I32 space */
+    I32                lex_allbrackets;/* (), [], {}, ?: bracket count */
     SUBLEXINFO sublex_info;
     SV         *linestr;       /* current chunk of src text */
     char       *bufptr;        
@@ -74,11 +74,10 @@ typedef struct yy_parser {
     line_t     copline;        /* current line number */
     U16                in_my;          /* we're compiling a "my"/"our" declaration */
     U8         lex_state;      /* next token is determined */
-    /* space for a U8 here */
+    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 */
-    U8         error_count;    /* how many compile errors so far, max 10 */
 
 #ifdef PERL_MAD
     SV         *endwhite;
@@ -106,6 +105,49 @@ typedef struct yy_parser {
     COP                *saved_curcop;  /* the previous PL_curcop */
     char       tokenbuf[256];
 
+    bool       in_pod;         /* lexer is within a =pod section */
+    U8         lex_fakeeof;    /* precedence at which to fake EOF */
+    bool       filtered;       /* source filters in evalbytes */
+    U32                lex_flags;
 } yy_parser;
-    
 
+/* flags for lexer API */
+#define LEX_STUFF_UTF8         0x00000001
+#define LEX_KEEP_PREVIOUS      0x00000002
+
+#ifdef PERL_CORE
+# define LEX_START_SAME_FILTER 0x00000001
+# define LEX_IGNORE_UTF8_HINTS 0x00000002
+# define LEX_EVALBYTES         0x00000004
+# define LEX_START_FLAGS \
+       (LEX_START_SAME_FILTER|LEX_IGNORE_UTF8_HINTS|LEX_EVALBYTES)
+#endif
+
+/* flags for parser API */
+#define PARSE_OPTIONAL          0x00000001
+
+/* values for lex_fakeeof */
+enum {
+    LEX_FAKEEOF_NEVER,      /* don't fake EOF */
+    LEX_FAKEEOF_CLOSING,    /* fake EOF at unmatched closing punctuation */
+    LEX_FAKEEOF_NONEXPR,    /* ... and at token that can't be in expression */
+    LEX_FAKEEOF_LOWLOGIC,   /* ... and at low-precedence logic operator */
+    LEX_FAKEEOF_COMMA,      /* ... and at comma */
+    LEX_FAKEEOF_ASSIGN,     /* ... and at assignment operator */
+    LEX_FAKEEOF_IFELSE,     /* ... and at ?: operator */
+    LEX_FAKEEOF_RANGE,      /* ... and at range operator */
+    LEX_FAKEEOF_LOGIC,      /* ... and at logic operator */
+    LEX_FAKEEOF_BITWISE,    /* ... and at bitwise operator */
+    LEX_FAKEEOF_COMPARE,    /* ... and at comparison operator */
+    LEX_FAKEEOF_MAX
+};
+
+/*
+ * Local variables:
+ * c-indentation-style: bsd
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ *
+ * ex: set ts=8 sts=4 sw=4 noet:
+ */