You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mod_python-commits@quetz.apache.org by gr...@apache.org on 2003/05/24 05:55:27 UTC
cvs commit: httpd-python/src/include psp_flex.h mod_python.h psp_parser.h
grisha 2003/05/23 20:55:27
Modified: src Makefile.in mod_python.c psp_interface.c
psp_parser.c psp_parser.l
src/include mod_python.h psp_parser.h
Added: src/include psp_flex.h
Log:
This patch addresses the threading issues with the lexer. This requires flex 2.3.51
which can generate reentrant scanners. Now, instead of using a global variable,
a yyscan_t structure is allocated and passed along to every call into flex.
Sterling Hughes will have a hard time recognizing his code after so much
of my tweaking it :-)
The scanner definition was changed to send as much as possible of HTML in
one triple-quoted string, rather than line-by-line.
The copyright in psp_parser.l is fixed, also added a little blurb explaining
what's going on there.
I had to once again revert from "print" to "req.write" because we can't touch
sys.stdout because it is shared among threads.
The caching function is disabled for now until we make it thread-safe.
A new flex-generated header file psp_flex.h was added.
Finally - just a warning - PSP still needs a lot of work, this is only the
first step of many more coming.
Revision Changes Path
1.30 +3 -2 httpd-python/src/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/httpd-python/src/Makefile.in,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- Makefile.in 9 Apr 2003 14:05:55 -0000 1.29
+++ Makefile.in 24 May 2003 03:55:27 -0000 1.30
@@ -60,7 +60,8 @@
APXS=@APXS@
MKDEP=@MKDEP@
-LEX=flex
+# requires flex 2.5.31 for reentrant support
+LEX=/usr/local/bin/flex
INCLUDES=@INCLUDES@
LIBS=@LIBS@ -ll
LDFLAGS=@LDFLAGS@
@@ -75,7 +76,7 @@
all: @ALL@
psp_parser.c:
- $(LEX) -opsp_parser.c psp_parser.l
+ $(LEX) -R -opsp_parser.c --header-file=include/psp_flex.h psp_parser.l
dso: mod_python.so
@echo dso > .install
1.89 +2 -2 httpd-python/src/mod_python.c
Index: mod_python.c
===================================================================
RCS file: /home/cvs/httpd-python/src/mod_python.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- mod_python.c 9 Apr 2003 14:05:55 -0000 1.88
+++ mod_python.c 24 May 2003 03:55:27 -0000 1.89
@@ -376,7 +376,7 @@
/* release the lock; now other threads can run */
PyEval_ReleaseLock();
#endif
- PSP_PG(files) = PyDict_New();
+/* XXX PSP_PG(files) = PyDict_New(); */
}
return OK;
}
1.2 +59 -47 httpd-python/src/psp_interface.c
Index: psp_interface.c
===================================================================
RCS file: /home/cvs/httpd-python/src/psp_interface.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- psp_interface.c 9 Apr 2003 14:05:55 -0000 1.1
+++ psp_interface.c 24 May 2003 03:55:27 -0000 1.2
@@ -63,54 +63,64 @@
#include "httpd.h"
#include <stdio.h>
-extern FILE *yyin;
-
-static void
+static psp_parser_t*
psp_parser_init(void)
{
- memset(&PSP_PG(ob), 0, sizeof(psp_string));
- memset(&PSP_PG(pycode), 0, sizeof(psp_string));
- memset(&PSP_PG(whitespace), 0, sizeof(psp_string));
- PSP_PG(in_block) = 0;
- PSP_PG(string_char) = 0;
- PSP_PG(is_psp_echo) = 0;
- PSP_PG(is_string_escape) = 0;
+ psp_parser_t *parser;
+
+ parser = (psp_parser_t *) malloc(sizeof(*parser));
+
+ memset(&parser->ob, 0, sizeof(psp_string));
+ memset(&parser->pycode, 0, sizeof(psp_string));
+ memset(&parser->whitespace, 0, sizeof(psp_string));
+ parser->in_block = 0;
+ parser->string_char = 0;
+ parser->is_psp_echo = 0;
+ parser->is_string_escape = 0;
+
+ return parser;
}
static void
-psp_parser_cleanup(void)
+psp_parser_cleanup(psp_parser_t *parser)
{
- if (PSP_PG(ob).allocated) {
- free(PSP_PG(ob).blob);
- }
-
- if (PSP_PG(pycode).allocated) {
- free(PSP_PG(pycode).blob);
- }
+ if (parser->ob.allocated) {
+ free(parser->ob.blob);
+ }
+
+ if (parser->pycode.allocated) {
+ free(parser->pycode.blob);
+ }
+
+ if (parser->whitespace.allocated) {
+ free(parser->whitespace.blob);
+ }
- if (PSP_PG(whitespace).allocated) {
- free(PSP_PG(whitespace).blob);
- }
+ free(parser);
}
static char *
-psp_parser_gen_pycode(char *filename)
-{
- FILE *f;
+psp_parser_gen_pycode(psp_parser_t *parser, char *filename)
+{
+ yyscan_t scanner;
+ FILE *f;
+
+ f = fopen(filename, "rb");
+ if (f == NULL) {
+ return NULL;
+ }
+
+ yylex_init(&scanner);
+ yyset_in(f, scanner);
+ yyset_extra(parser, scanner);
+ yylex(scanner);
+ yylex_destroy(scanner);
- f = fopen(filename, "rb");
- if (f == NULL) {
- return NULL;
- }
- yyin = f;
-
- yylex();
-
- fclose(f);
+ fclose(f);
- psp_string_0(&PSP_PG(pycode));
+ psp_string_0(&parser->pycode);
- return PSP_PG(pycode).blob;
+ return parser->pycode.blob;
}
struct psp_object {
@@ -125,32 +135,34 @@
struct psp_object *cached;
char *code;
struct stat sb;
+ psp_parser_t *parser;
if (stat(filename, &sb) != 0) {
return NULL;
}
- cached = (struct psp_object *) PyDict_GetItemString(PSP_PG(files), filename);
- if (cached != NULL) {
- if (sb.st_mtime == cached->mtime) {
- compiled = cached->image;
- goto psp_ret;
- }
- }
+/* XXX TODO - Make cache work, but in a thread-safe way
+/* cached = (struct psp_object *) PyDict_GetItemString(parser->files, filename); */
+/* if (cached != NULL) { */
+/* if (sb.st_mtime == cached->mtime) { */
+/* compiled = cached->image; */
+/* goto psp_ret; */
+/* } */
+/* } */
- psp_parser_init();
- code = psp_parser_gen_pycode(filename);
+ parser = psp_parser_init();
+ code = psp_parser_gen_pycode(parser, filename);
if (code == NULL) {
return NULL;
}
compiled = Py_CompileString(code, filename, Py_file_input);
- psp_parser_cleanup();
+ psp_parser_cleanup(parser);
cached = (struct psp_object *) malloc(sizeof(struct psp_object));
cached->mtime = sb.st_mtime;
cached->image = compiled;
- PyDict_SetItemString(PSP_PG(files), filename, (PyObject *) cached);
+/* PyDict_SetItemString(parser->files, filename, (PyObject *) cached); */
psp_ret:
return compiled;
}
1.4 +1265 -759 httpd-python/src/psp_parser.c
Index: psp_parser.c
===================================================================
RCS file: /home/cvs/httpd-python/src/psp_parser.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- psp_parser.c 23 Apr 2003 11:01:05 -0000 1.3
+++ psp_parser.c 24 May 2003 03:55:27 -0000 1.4
@@ -1,33 +1,86 @@
#line 2 "psp_parser.c"
-/* A lexical scanner generated by flex */
-/* Scanner skeleton version:
- * $Header$
- */
+#line 4 "psp_parser.c"
+
+#define YY_INT_ALIGNED short int
+
+/* A lexical scanner generated by flex */
#define FLEX_SCANNER
#define YY_FLEX_MAJOR_VERSION 2
#define YY_FLEX_MINOR_VERSION 5
+#define YY_FLEX_SUBMINOR_VERSION 31
+#if YY_FLEX_SUBMINOR_VERSION > 0
+#define FLEX_BETA
+#endif
+/* First, we deal with platform-specific or compiler-specific issues. */
+
+/* begin standard C headers. */
#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <stdlib.h>
+/* end standard C headers. */
-/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
-#ifdef c_plusplus
-#ifndef __cplusplus
-#define __cplusplus
+/* flex integer type definitions */
+
+#ifndef FLEXINT_H
+#define FLEXINT_H
+
+/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
+
+#if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L
+#include <inttypes.h>
+typedef int8_t flex_int8_t;
+typedef uint8_t flex_uint8_t;
+typedef int16_t flex_int16_t;
+typedef uint16_t flex_uint16_t;
+typedef int32_t flex_int32_t;
+typedef uint32_t flex_uint32_t;
+#else
+typedef signed char flex_int8_t;
+typedef short int flex_int16_t;
+typedef int flex_int32_t;
+typedef unsigned char flex_uint8_t;
+typedef unsigned short int flex_uint16_t;
+typedef unsigned int flex_uint32_t;
+#endif /* ! C99 */
+
+/* Limits of integral types. */
+#ifndef INT8_MIN
+#define INT8_MIN (-128)
+#endif
+#ifndef INT16_MIN
+#define INT16_MIN (-32767-1)
+#endif
+#ifndef INT32_MIN
+#define INT32_MIN (-2147483647-1)
#endif
+#ifndef INT8_MAX
+#define INT8_MAX (127)
+#endif
+#ifndef INT16_MAX
+#define INT16_MAX (32767)
+#endif
+#ifndef INT32_MAX
+#define INT32_MAX (2147483647)
+#endif
+#ifndef UINT8_MAX
+#define UINT8_MAX (255U)
+#endif
+#ifndef UINT16_MAX
+#define UINT16_MAX (65535U)
+#endif
+#ifndef UINT32_MAX
+#define UINT32_MAX (4294967295U)
#endif
+#endif /* ! FLEXINT_H */
#ifdef __cplusplus
-#include <stdlib.h>
-#include <unistd.h>
-
-/* Use prototypes in function declarations. */
-#define YY_USE_PROTOS
-
/* The "const" storage-class-modifier is valid. */
#define YY_USE_CONST
@@ -35,34 +88,17 @@
#if __STDC__
-#define YY_USE_PROTOS
#define YY_USE_CONST
#endif /* __STDC__ */
#endif /* ! __cplusplus */
-#ifdef __TURBOC__
- #pragma warn -rch
- #pragma warn -use
-#include <io.h>
-#include <stdlib.h>
-#define YY_USE_CONST
-#define YY_USE_PROTOS
-#endif
-
#ifdef YY_USE_CONST
#define yyconst const
#else
#define yyconst
#endif
-
-#ifdef YY_USE_PROTOS
-#define YY_PROTO(proto) proto
-#else
-#define YY_PROTO(proto) ()
-#endif
-
/* Returned upon end-of-file. */
#define YY_NULL 0
@@ -73,75 +109,90 @@
*/
#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
+/* An opaque pointer. */
+#ifndef YY_TYPEDEF_YY_SCANNER_T
+#define YY_TYPEDEF_YY_SCANNER_T
+typedef void* yyscan_t;
+#endif
+
+/* For convenience, these vars (plus the bison vars far below)
+ are macros in the reentrant scanner. */
+#define yyin yyg->yyin_r
+#define yyout yyg->yyout_r
+#define yyextra yyg->yyextra_r
+#define yyleng yyg->yyleng_r
+#define yytext yyg->yytext_r
+#define yylineno (YY_CURRENT_BUFFER_LVALUE->yy_bs_lineno)
+#define yycolumn (YY_CURRENT_BUFFER_LVALUE->yy_bs_column)
+#define yy_flex_debug yyg->yy_flex_debug_r
+
+int yylex_init (yyscan_t* scanner);
+
/* Enter a start condition. This macro really ought to take a parameter,
* but we do it the disgusting crufty way forced on us by the ()-less
* definition of BEGIN.
*/
-#define BEGIN yy_start = 1 + 2 *
+#define BEGIN yyg->yy_start = 1 + 2 *
/* Translate the current start state into a value that can be later handed
* to BEGIN to return to the state. The YYSTATE alias is for lex
* compatibility.
*/
-#define YY_START ((yy_start - 1) / 2)
+#define YY_START ((yyg->yy_start - 1) / 2)
#define YYSTATE YY_START
/* Action number for EOF rule of a given start state. */
#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
/* Special action meaning "start processing a new file". */
-#define YY_NEW_FILE yyrestart( yyin )
+#define YY_NEW_FILE yyrestart(yyin ,yyscanner )
#define YY_END_OF_BUFFER_CHAR 0
/* Size of default input buffer. */
+#ifndef YY_BUF_SIZE
#define YY_BUF_SIZE 16384
+#endif
+#ifndef YY_TYPEDEF_YY_BUFFER_STATE
+#define YY_TYPEDEF_YY_BUFFER_STATE
typedef struct yy_buffer_state *YY_BUFFER_STATE;
-
-extern int yyleng;
-extern FILE *yyin, *yyout;
+#endif
#define EOB_ACT_CONTINUE_SCAN 0
#define EOB_ACT_END_OF_FILE 1
#define EOB_ACT_LAST_MATCH 2
-/* The funky do-while in the following #define is used to turn the definition
- * int a single C statement (which needs a semi-colon terminator). This
- * avoids problems with code like:
- *
- * if ( condition_holds )
- * yyless( 5 );
- * else
- * do_something_else();
- *
- * Prior to using the do-while the compiler would get upset at the
- * "else" because it interpreted the "if" statement as being all
- * done when it reached the ';' after the yyless() call.
- */
-
-/* Return all but the first 'n' matched characters back to the input stream. */
-
+ #define YY_LESS_LINENO(n)
+
+/* Return all but the first "n" matched characters back to the input stream. */
#define yyless(n) \
do \
{ \
/* Undo effects of setting up yytext. */ \
- *yy_cp = yy_hold_char; \
+ int yyless_macro_arg = (n); \
+ YY_LESS_LINENO(yyless_macro_arg);\
+ *yy_cp = yyg->yy_hold_char; \
YY_RESTORE_YY_MORE_OFFSET \
- yy_c_buf_p = yy_cp = yy_bp + n - YY_MORE_ADJ; \
+ yyg->yy_c_buf_p = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
YY_DO_BEFORE_ACTION; /* set up yytext again */ \
} \
while ( 0 )
-#define unput(c) yyunput( c, yytext_ptr )
+#define unput(c) yyunput( c, yyg->yytext_ptr , yyscanner )
/* The following is because we cannot portably get our hands on size_t
* (without autoconf's help, which isn't available because we want
* flex-generated scanners to compile on their own).
*/
-typedef unsigned int yy_size_t;
+#ifndef YY_TYPEDEF_YY_SIZE_T
+#define YY_TYPEDEF_YY_SIZE_T
+typedef unsigned int yy_size_t;
+#endif
+#ifndef YY_STRUCT_YY_BUFFER_STATE
+#define YY_STRUCT_YY_BUFFER_STATE
struct yy_buffer_state
{
FILE *yy_input_file;
@@ -178,12 +229,16 @@
*/
int yy_at_bol;
+ int yy_bs_lineno; /**< The line count. */
+ int yy_bs_column; /**< The column count. */
+
/* Whether to try to fill the input buffer when we reach the
* end of it.
*/
int yy_fill_buffer;
int yy_buffer_status;
+
#define YY_BUFFER_NEW 0
#define YY_BUFFER_NORMAL 1
/* When an EOF's been seen but there's still some text to process
@@ -197,117 +252,127 @@
* just pointing yyin at a new input file.
*/
#define YY_BUFFER_EOF_PENDING 2
- };
-static YY_BUFFER_STATE yy_current_buffer = 0;
+ };
+#endif /* !YY_STRUCT_YY_BUFFER_STATE */
/* We provide macros for accessing buffer states in case in the
* future we want to put the buffer states in a more general
* "scanner state".
+ *
+ * Returns the top of the stack, or NULL.
*/
-#define YY_CURRENT_BUFFER yy_current_buffer
-
-
-/* yy_hold_char holds the character lost when yytext is formed. */
-static char yy_hold_char;
-
-static int yy_n_chars; /* number of characters read into yy_ch_buf */
-
-
-int yyleng;
-
-/* Points to current character in buffer. */
-static char *yy_c_buf_p = (char *) 0;
-static int yy_init = 1; /* whether we need to initialize */
-static int yy_start = 0; /* start state number */
+#define YY_CURRENT_BUFFER ( yyg->yy_buffer_stack \
+ ? yyg->yy_buffer_stack[yyg->yy_buffer_stack_top] \
+ : NULL)
-/* Flag which is used to allow yywrap()'s to do buffer switches
- * instead of setting up a fresh yyin. A bit of a hack ...
+/* Same as previous macro, but useful when we know that the buffer stack is not
+ * NULL or when we need an lvalue. For internal use only.
*/
-static int yy_did_buffer_switch_on_eof;
+#define YY_CURRENT_BUFFER_LVALUE yyg->yy_buffer_stack[yyg->yy_buffer_stack_top]
-void yyrestart YY_PROTO(( FILE *input_file ));
-
-void yy_switch_to_buffer YY_PROTO(( YY_BUFFER_STATE new_buffer ));
-void yy_load_buffer_state YY_PROTO(( void ));
-YY_BUFFER_STATE yy_create_buffer YY_PROTO(( FILE *file, int size ));
-void yy_delete_buffer YY_PROTO(( YY_BUFFER_STATE b ));
-void yy_init_buffer YY_PROTO(( YY_BUFFER_STATE b, FILE *file ));
-void yy_flush_buffer YY_PROTO(( YY_BUFFER_STATE b ));
-#define YY_FLUSH_BUFFER yy_flush_buffer( yy_current_buffer )
-
-YY_BUFFER_STATE yy_scan_buffer YY_PROTO(( char *base, yy_size_t size ));
-YY_BUFFER_STATE yy_scan_string YY_PROTO(( yyconst char *yy_str ));
-YY_BUFFER_STATE yy_scan_bytes YY_PROTO(( yyconst char *bytes, int len ));
-
-static void *yy_flex_alloc YY_PROTO(( yy_size_t ));
-static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t ));
-static void yy_flex_free YY_PROTO(( void * ));
+void yyrestart (FILE *input_file ,yyscan_t yyscanner );
+void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner );
+YY_BUFFER_STATE yy_create_buffer (FILE *file,int size ,yyscan_t yyscanner );
+void yy_delete_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner );
+void yy_flush_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner );
+void yypush_buffer_state (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner );
+void yypop_buffer_state (yyscan_t yyscanner );
+
+static void yyensure_buffer_stack (yyscan_t yyscanner );
+static void yy_load_buffer_state (yyscan_t yyscanner );
+static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file ,yyscan_t yyscanner );
+
+#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER ,yyscanner)
+
+YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner );
+YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str ,yyscan_t yyscanner );
+YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,int len ,yyscan_t yyscanner );
+
+void *yyalloc (yy_size_t ,yyscan_t yyscanner );
+void *yyrealloc (void *,yy_size_t ,yyscan_t yyscanner );
+void yyfree (void * ,yyscan_t yyscanner );
#define yy_new_buffer yy_create_buffer
#define yy_set_interactive(is_interactive) \
{ \
- if ( ! yy_current_buffer ) \
- yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
- yy_current_buffer->yy_is_interactive = is_interactive; \
+ if ( ! YY_CURRENT_BUFFER ){ \
+ yyensure_buffer_stack (yyscanner); \
+ YY_CURRENT_BUFFER_LVALUE = \
+ yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner); \
+ } \
+ YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
}
#define yy_set_bol(at_bol) \
{ \
- if ( ! yy_current_buffer ) \
- yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
- yy_current_buffer->yy_at_bol = at_bol; \
+ if ( ! YY_CURRENT_BUFFER ){\
+ yyensure_buffer_stack (yyscanner); \
+ YY_CURRENT_BUFFER_LVALUE = \
+ yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner); \
+ } \
+ YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
}
-#define YY_AT_BOL() (yy_current_buffer->yy_at_bol)
+#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
+
+/* Begin user sect3 */
typedef unsigned char YY_CHAR;
-FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
+
typedef int yy_state_type;
-extern char *yytext;
-#define yytext_ptr yytext
-static yy_state_type yy_get_previous_state YY_PROTO(( void ));
-static yy_state_type yy_try_NUL_trans YY_PROTO(( yy_state_type current_state ));
-static int yy_get_next_buffer YY_PROTO(( void ));
-static void yy_fatal_error YY_PROTO(( yyconst char msg[] ));
+#define yytext_ptr yytext_r
+
+static yy_state_type yy_get_previous_state (yyscan_t yyscanner );
+static yy_state_type yy_try_NUL_trans (yy_state_type current_state ,yyscan_t yyscanner);
+static int yy_get_next_buffer (yyscan_t yyscanner );
+static void yy_fatal_error (yyconst char msg[] ,yyscan_t yyscanner );
/* Done after the current pattern has been matched and before the
* corresponding action - sets up yytext.
*/
#define YY_DO_BEFORE_ACTION \
- yytext_ptr = yy_bp; \
- yyleng = (int) (yy_cp - yy_bp); \
- yy_hold_char = *yy_cp; \
+ yyg->yytext_ptr = yy_bp; \
+ yyleng = (size_t) (yy_cp - yy_bp); \
+ yyg->yy_hold_char = *yy_cp; \
*yy_cp = '\0'; \
- yy_c_buf_p = yy_cp;
+ yyg->yy_c_buf_p = yy_cp;
-#define YY_NUM_RULES 12
-#define YY_END_OF_BUFFER 13
-static yyconst short int yy_accept[28] =
+#define YY_NUM_RULES 16
+#define YY_END_OF_BUFFER 17
+/* This struct is not used in this scanner,
+ but its presence is necessary. */
+struct yy_trans_info
+ {
+ flex_int32_t yy_verify;
+ flex_int32_t yy_nxt;
+ };
+static yyconst flex_int16_t yy_accept[39] =
{ 0,
- 0, 9, 0, 0, 0, 0, 13, 11, 10, 10,
- 11, 9, 5, 2, 2, 5, 3, 4, 1, 12,
- 0, 9, 6, 4, 8, 7, 0
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 14,
+ 17, 1, 16, 5, 2, 2, 5, 11, 6, 6,
+ 11, 11, 7, 8, 13, 13, 15, 14, 4, 0,
+ 9, 8, 0, 14, 3, 10, 12, 0
} ;
-static yyconst int yy_ec[256] =
+static yyconst flex_int32_t yy_ec[256] =
{ 0,
1, 1, 1, 1, 1, 1, 1, 1, 2, 3,
1, 1, 4, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 5, 1, 1, 1, 1, 6, 1, 1, 1,
+ 1, 5, 1, 6, 1, 1, 7, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 7,
- 8, 9, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 8,
+ 9, 10, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 10, 1, 11, 1, 1, 1, 1, 1,
+ 1, 1, 11, 1, 12, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
@@ -324,49 +389,52 @@
1, 1, 1, 1, 1
} ;
-static yyconst int yy_meta[12] =
+static yyconst flex_int32_t yy_meta[13] =
{ 0,
- 1, 2, 3, 3, 2, 1, 1, 3, 1, 1,
- 1
+ 1, 2, 1, 1, 2, 1, 1, 1, 1, 1,
+ 1, 1
} ;
-static yyconst short int yy_base[32] =
+static yyconst flex_int16_t yy_base[44] =
{ 0,
- 0, 6, 13, 0, 35, 34, 36, 39, 39, 39,
- 29, 0, 39, 39, 39, 25, 39, 28, 39, 39,
- 4, 0, 39, 0, 39, 39, 39, 24, 27, 0,
- 29
+ 46, 45, 0, 6, 14, 0, 24, 28, 44, 33,
+ 37, 50, 50, 50, 50, 50, 26, 50, 50, 50,
+ 26, 19, 50, 23, 50, 7, 50, 0, 3, 5,
+ 50, 2, 0, 0, 50, 50, 50, 50, 38, 40,
+ 42, 44, 0
} ;
-static yyconst short int yy_def[32] =
+static yyconst flex_int16_t yy_def[44] =
{ 0,
- 28, 28, 27, 3, 29, 29, 27, 27, 27, 27,
- 27, 30, 27, 27, 27, 27, 27, 27, 27, 27,
- 31, 30, 27, 27, 27, 27, 0, 27, 27, 27,
- 27
+ 39, 39, 40, 40, 38, 5, 41, 41, 42, 42,
+ 38, 38, 38, 38, 38, 38, 38, 38, 38, 38,
+ 38, 38, 38, 38, 38, 38, 38, 43, 38, 38,
+ 38, 38, 38, 43, 38, 38, 38, 0, 38, 38,
+ 38, 38, 38
} ;
-static yyconst short int yy_nxt[51] =
+static yyconst flex_int16_t yy_nxt[63] =
{ 0,
- 27, 22, 9, 10, 24, 27, 11, 12, 9, 10,
- 12, 26, 11, 13, 13, 14, 15, 13, 16, 13,
- 13, 13, 17, 18, 8, 8, 8, 19, 19, 19,
- 25, 25, 24, 23, 21, 27, 20, 20, 7, 27,
- 27, 27, 27, 27, 27, 27, 27, 27, 27, 27
+ 38, 34, 15, 16, 38, 37, 32, 17, 15, 16,
+ 36, 35, 33, 17, 18, 18, 19, 20, 18, 21,
+ 22, 18, 18, 18, 23, 24, 13, 32, 31, 26,
+ 13, 30, 29, 26, 28, 13, 38, 28, 12, 12,
+ 14, 14, 25, 25, 27, 27, 13, 13, 13, 11,
+ 38, 38, 38, 38, 38, 38, 38, 38, 38, 38,
+ 38, 38
} ;
-static yyconst short int yy_chk[51] =
+static yyconst flex_int16_t yy_chk[63] =
{ 0,
- 0, 30, 1, 1, 24, 0, 1, 2, 2, 2,
- 2, 21, 2, 3, 3, 3, 3, 3, 3, 3,
- 3, 3, 3, 3, 28, 28, 28, 29, 29, 29,
- 31, 31, 18, 16, 11, 7, 6, 5, 27, 27,
- 27, 27, 27, 27, 27, 27, 27, 27, 27, 27
+ 0, 43, 3, 3, 0, 33, 32, 3, 4, 4,
+ 30, 29, 26, 4, 5, 5, 5, 5, 5, 5,
+ 5, 5, 5, 5, 5, 5, 7, 24, 22, 7,
+ 8, 21, 17, 8, 10, 10, 11, 10, 39, 39,
+ 40, 40, 41, 41, 42, 42, 9, 2, 1, 38,
+ 38, 38, 38, 38, 38, 38, 38, 38, 38, 38,
+ 38, 38
} ;
-static yy_state_type yy_last_accepting_state;
-static char *yy_last_accepting_cpos;
-
/* The intent behind this definition is that it'll catch
* any uses of REJECT which flex missed.
*/
@@ -374,36 +442,95 @@
#define yymore() yymore_used_but_not_detected
#define YY_MORE_ADJ 0
#define YY_RESTORE_YY_MORE_OFFSET
-char *yytext;
#line 1 "psp_parser.l"
-#define INITIAL 0
#line 2 "psp_parser.l"
-/*
- +----------------------------------------------------------------------------+
- | mod_psp - A python server pages preprocessor |
- +----------------------------------------------------------------------------+
- | Copyright (c) 2003 Sterling Hughes <st...@php.net> |
- | Permission is hereby granted, free of charge, to any person obtaining a |
- | copy of this software and associated documentation files (the "Software"), |
- | to deal in the Software without restriction, including without limitation |
- | the rights to use, copy, modify, merge, publish, distribute, sublicense, |
- | and/or sell copies of the Software, and to permit persons to whom the |
- | Software is furnished to do so, subject to the following conditions: |
- | |
- | The above copyright notice and this permission notice shall be included in |
- | all copies or substantial portions of the Software. |
- | |
- | THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
- | IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
- | FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL |
- | THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
- | LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
- | FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
- | DEALINGS IN THE SOFTWARE. |
- +----------------------------------------------------------------------------+
- | Authors: Sterling Hughes <st...@php.net> |
- +----------------------------------------------------------------------------+
-*/
+/* ====================================================================
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ * if any, must include the following acknowledgment:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowledgment may appear in the software itself,
+ * if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Apache" and "Apache Software Foundation" must
+ * not be used to endorse or promote products derived from this
+ * software without prior written permission. For written
+ * permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache",
+ * "mod_python", or "modpython", nor may these terms appear in their
+ * name, without prior written permission of the Apache Software
+ * Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ * $Id$
+ *
+ * This file originally by Sterling Hughes.
+ *
+ */
+
+/*
+ * Briefly we are dealing with five modes here:
+ * 0 (INITIAL) - we print a little header, req.print(""" and
+ * immeditely enter TEXT mode.
+ * TEXT - this is your plain old HTML or whatever is in the file.
+ * We copy everything into ob, if we see eol, we flush ob to
+ * pycode. If we see <% or <%= we enter PYCODE mode.
+ * PYCODE - we are inside Python code. Copy everithing similar
+ * TEXT, but watch out for the following:
+ * { - means "simlated" block. We increment in_block counter.
+ * from here on any python code will be indented in_block
+ * times.
+ * } - decrement in_block
+ * ", ' or """ - enter STRING mode
+ * STRING - Copy stuff over, but watch out for a backslash. A backslash
+ * sets the escape flag, so a closing quote is ignored. The """ case is
+ * a bit more complex.
+ * INDENT - we left Python code after encountering %> and are
+ * now in the indent before the first non-whitespace char, e.g.
+ *
+ * %>
+ * ....<h1>hello</h1>
+ *
+ * The space represented by dots above is in INDENT. If in block,
+ * we output whitespace, else, just pass blanks through.
+ * Then print req.write(""" and enter TEXT mode.
+ */
#include "psp_parser.h"
#include <stdio.h>
@@ -414,11 +541,90 @@
#define CLEAR_WHITESPACE(__wsstring) psp_string_clear((__wsstring));
-#define IN_PYCODE 1
-#define IN_STRING 2
-#line 422 "psp_parser.c"
+
+
+#line 549 "psp_parser.c"
+
+#define INITIAL 0
+#define TEXT 1
+#define PYCODE 2
+#define STRING 3
+#define INDENT 4
+
+/* Special case for "unistd.h", since it is non-ANSI. We include it way
+ * down here because we want the user's section 1 to have been scanned first.
+ * The user has a chance to override it with an option.
+ */
+#include <unistd.h>
+
+#ifndef YY_EXTRA_TYPE
+#define YY_EXTRA_TYPE void *
+#endif
+
+/* Holds the entire state of the reentrant scanner. */
+struct yyguts_t
+ {
+
+ /* User-defined. Not touched by flex. */
+ YY_EXTRA_TYPE yyextra_r;
+
+ /* The rest are the same as the globals declared in the non-reentrant scanner. */
+ FILE *yyin_r, *yyout_r;
+ size_t yy_buffer_stack_top; /**< index of top of stack. */
+ size_t yy_buffer_stack_max; /**< capacity of stack. */
+ YY_BUFFER_STATE * yy_buffer_stack; /**< Stack as an array. */
+ char yy_hold_char;
+ int yy_n_chars;
+ int yyleng_r;
+ char *yy_c_buf_p;
+ int yy_init;
+ int yy_start;
+ int yy_did_buffer_switch_on_eof;
+ int yy_start_stack_ptr;
+ int yy_start_stack_depth;
+ int *yy_start_stack;
+ yy_state_type yy_last_accepting_state;
+ char* yy_last_accepting_cpos;
+
+ int yylineno_r;
+ int yy_flex_debug_r;
+
+ char *yytext_r;
+ int yy_more_flag;
+ int yy_more_len;
+
+ }; /* end struct yyguts_t */
+
+/* Accessor methods to globals.
+ These are made visible to non-reentrant scanners for convenience. */
+
+int yylex_destroy (yyscan_t yyscanner );
+
+int yyget_debug (yyscan_t yyscanner );
+
+void yyset_debug (int debug_flag ,yyscan_t yyscanner );
+
+YY_EXTRA_TYPE yyget_extra (yyscan_t yyscanner );
+
+void yyset_extra (YY_EXTRA_TYPE user_defined ,yyscan_t yyscanner );
+
+FILE *yyget_in (yyscan_t yyscanner );
+
+void yyset_in (FILE * in_str ,yyscan_t yyscanner );
+
+FILE *yyget_out (yyscan_t yyscanner );
+
+void yyset_out (FILE * out_str ,yyscan_t yyscanner );
+
+int yyget_leng (yyscan_t yyscanner );
+
+char *yyget_text (yyscan_t yyscanner );
+
+int yyget_lineno (yyscan_t yyscanner );
+
+void yyset_lineno (int line_number ,yyscan_t yyscanner );
/* Macros after this point can all be overridden by user definitions in
* section 1.
@@ -426,65 +632,30 @@
#ifndef YY_SKIP_YYWRAP
#ifdef __cplusplus
-extern "C" int yywrap YY_PROTO(( void ));
+extern "C" int yywrap (yyscan_t yyscanner );
#else
-extern int yywrap YY_PROTO(( void ));
+extern int yywrap (yyscan_t yyscanner );
#endif
#endif
-#ifndef YY_NO_UNPUT
-static void yyunput YY_PROTO(( int c, char *buf_ptr ));
-#endif
-
+ static void yyunput (int c,char *buf_ptr ,yyscan_t yyscanner);
+
#ifndef yytext_ptr
-static void yy_flex_strncpy YY_PROTO(( char *, yyconst char *, int ));
+static void yy_flex_strncpy (char *,yyconst char *,int ,yyscan_t yyscanner);
#endif
#ifdef YY_NEED_STRLEN
-static int yy_flex_strlen YY_PROTO(( yyconst char * ));
+static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner);
#endif
#ifndef YY_NO_INPUT
-#ifdef __cplusplus
-static int yyinput YY_PROTO(( void ));
-#else
-static int input YY_PROTO(( void ));
-#endif
-#endif
-
-#if YY_STACK_USED
-static int yy_start_stack_ptr = 0;
-static int yy_start_stack_depth = 0;
-static int *yy_start_stack = 0;
-#ifndef YY_NO_PUSH_STATE
-static void yy_push_state YY_PROTO(( int new_state ));
-#endif
-#ifndef YY_NO_POP_STATE
-static void yy_pop_state YY_PROTO(( void ));
-#endif
-#ifndef YY_NO_TOP_STATE
-static int yy_top_state YY_PROTO(( void ));
-#endif
+#ifdef __cplusplus
+static int yyinput (yyscan_t yyscanner );
#else
-#define YY_NO_PUSH_STATE 1
-#define YY_NO_POP_STATE 1
-#define YY_NO_TOP_STATE 1
+static int input (yyscan_t yyscanner );
#endif
-#ifdef YY_MALLOC_DECL
-YY_MALLOC_DECL
-#else
-#if __STDC__
-#ifndef __cplusplus
-#include <stdlib.h>
-#endif
-#else
-/* Just try to get by without declaring the routines. This will fail
- * miserably on non-ANSI systems for which sizeof(size_t) != sizeof(int)
- * or sizeof(void*) != sizeof(int).
- */
-#endif
#endif
/* Amount of stuff to slurp up with each read. */
@@ -493,7 +664,6 @@
#endif
/* Copy whatever the last rule matched to the standard output. */
-
#ifndef ECHO
/* This used to be an fputs(), but since the string might contain NUL's,
* we now use fwrite().
@@ -506,9 +676,10 @@
*/
#ifndef YY_INPUT
#define YY_INPUT(buf,result,max_size) \
- if ( yy_current_buffer->yy_is_interactive ) \
+ if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \
- int c = '*', n; \
+ int c = '*'; \
+ size_t n; \
for ( n = 0; n < max_size && \
(c = getc( yyin )) != EOF && c != '\n'; ++n ) \
buf[n] = (char) c; \
@@ -518,9 +689,22 @@
YY_FATAL_ERROR( "input in flex scanner failed" ); \
result = n; \
} \
- else if ( ((result = fread( buf, 1, max_size, yyin )) == 0) \
- && ferror( yyin ) ) \
- YY_FATAL_ERROR( "input in flex scanner failed" );
+ else \
+ { \
+ errno=0; \
+ while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \
+ { \
+ if( errno != EINTR) \
+ { \
+ YY_FATAL_ERROR( "input in flex scanner failed" ); \
+ break; \
+ } \
+ errno=0; \
+ clearerr(yyin); \
+ } \
+ }\
+\
+
#endif
/* No semi-colon after return; correct usage is to write "yyterminate();" -
@@ -538,15 +722,21 @@
/* Report a fatal error. */
#ifndef YY_FATAL_ERROR
-#define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
+#define YY_FATAL_ERROR(msg) yy_fatal_error( msg , yyscanner)
#endif
+/* end tables serialization structures and prototypes */
+
/* Default declaration of generated scanner - a define so the user can
* easily add parameters.
*/
#ifndef YY_DECL
-#define YY_DECL int yylex YY_PROTO(( void ))
-#endif
+#define YY_DECL_IS_OURS 1
+
+extern int yylex (yyscan_t yyscanner);
+
+#define YY_DECL int yylex (yyscan_t yyscanner)
+#endif /* !YY_DECL */
/* Code executed at the beginning of each rule, after yytext and yyleng
* have been set up.
@@ -562,31 +752,34 @@
#define YY_RULE_SETUP \
if ( yyleng > 0 ) \
- yy_current_buffer->yy_at_bol = \
+ YY_CURRENT_BUFFER_LVALUE->yy_at_bol = \
(yytext[yyleng - 1] == '\n'); \
YY_USER_ACTION
+/** The main scanner function which does all the work.
+ */
YY_DECL
- {
+{
register yy_state_type yy_current_state;
register char *yy_cp, *yy_bp;
register int yy_act;
+ struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-#line 43 "psp_parser.l"
+#line 106 "psp_parser.l"
-#line 579 "psp_parser.c"
+#line 772 "psp_parser.c"
- if ( yy_init )
+ if ( yyg->yy_init )
{
- yy_init = 0;
+ yyg->yy_init = 0;
#ifdef YY_USER_INIT
YY_USER_INIT;
#endif
- if ( ! yy_start )
- yy_start = 1; /* first start state */
+ if ( ! yyg->yy_start )
+ yyg->yy_start = 1; /* first start state */
if ( ! yyin )
yyin = stdin;
@@ -594,26 +787,28 @@
if ( ! yyout )
yyout = stdout;
- if ( ! yy_current_buffer )
- yy_current_buffer =
- yy_create_buffer( yyin, YY_BUF_SIZE );
+ if ( ! YY_CURRENT_BUFFER ) {
+ yyensure_buffer_stack (yyscanner);
+ YY_CURRENT_BUFFER_LVALUE =
+ yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner);
+ }
- yy_load_buffer_state();
+ yy_load_buffer_state(yyscanner );
}
while ( 1 ) /* loops until end-of-file is reached */
{
- yy_cp = yy_c_buf_p;
+ yy_cp = yyg->yy_c_buf_p;
/* Support of yytext. */
- *yy_cp = yy_hold_char;
+ *yy_cp = yyg->yy_hold_char;
/* yy_bp points to the position in yy_ch_buf of the start of
* the current run.
*/
yy_bp = yy_cp;
- yy_current_state = yy_start;
+ yy_current_state = yyg->yy_start;
yy_current_state += YY_AT_BOL();
yy_match:
do
@@ -621,225 +816,300 @@
register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
if ( yy_accept[yy_current_state] )
{
- yy_last_accepting_state = yy_current_state;
- yy_last_accepting_cpos = yy_cp;
+ yyg->yy_last_accepting_state = yy_current_state;
+ yyg->yy_last_accepting_cpos = yy_cp;
}
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{
yy_current_state = (int) yy_def[yy_current_state];
- if ( yy_current_state >= 28 )
+ if ( yy_current_state >= 39 )
yy_c = yy_meta[(unsigned int) yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
++yy_cp;
}
- while ( yy_base[yy_current_state] != 39 );
+ while ( yy_base[yy_current_state] != 50 );
yy_find_action:
yy_act = yy_accept[yy_current_state];
if ( yy_act == 0 )
{ /* have to back up */
- yy_cp = yy_last_accepting_cpos;
- yy_current_state = yy_last_accepting_state;
+ yy_cp = yyg->yy_last_accepting_cpos;
+ yy_current_state = yyg->yy_last_accepting_state;
yy_act = yy_accept[yy_current_state];
}
YY_DO_BEFORE_ACTION;
-
do_action: /* This label is used only to access EOF actions. */
-
switch ( yy_act )
{ /* beginning of action switch */
case 0: /* must back up */
/* undo the effects of YY_DO_BEFORE_ACTION */
- *yy_cp = yy_hold_char;
- yy_cp = yy_last_accepting_cpos;
- yy_current_state = yy_last_accepting_state;
+ *yy_cp = yyg->yy_hold_char;
+ yy_cp = yyg->yy_last_accepting_cpos;
+ yy_current_state = yyg->yy_last_accepting_state;
goto yy_find_action;
case 1:
YY_RULE_SETUP
-#line 45 "psp_parser.l"
+#line 108 "psp_parser.l"
{
- if (yytext[0] == '\\') {
- PSP_PG(is_string_escape) = 1;
- } else {
- if (yytext[0] == PSP_PG(string_char)) {
- if (!PSP_PG(is_string_escape)) {
- BEGIN IN_PYCODE;
- }
- }
- PSP_PG(is_string_escape) = 0;
- }
-
- psp_string_appendc(&PSP_PG(pycode), yytext[0]);
+ psp_string_0(&PSP_PG(ob));
+ psp_string_appendl(&PSP_PG(pycode), STATIC_STR("#\n# This is file is auto-generated by mod_python PSP.\n#\n"));
+ psp_string_appendl(&PSP_PG(pycode), STATIC_STR("\nreq.write(\"\"\""));
+ psp_string_free(&PSP_PG(ob));
+
+ yyless(0);
+
+ BEGIN TEXT;
}
YY_BREAK
case 2:
+/* rule 2 can match eol */
YY_RULE_SETUP
-#line 60 "psp_parser.l"
-{
- psp_string_appendc(&PSP_PG(pycode), '\n');
-}
+#line 119 "psp_parser.l"
+{
+ if (PSP_PG(ob).length) {
+ psp_string_0(&PSP_PG(ob));
+ psp_string_appendl(&PSP_PG(pycode), PSP_PG(ob).blob, PSP_PG(ob).length);
+ psp_string_free(&PSP_PG(ob));
+ }
+
+ psp_string_appendc(&PSP_PG(pycode), yytext[0]);
+}
YY_BREAK
case 3:
YY_RULE_SETUP
-#line 64 "psp_parser.l"
+#line 129 "psp_parser.l"
{
- psp_string_appendc(&PSP_PG(whitespace), '\t');
- psp_string_appendc(&PSP_PG(pycode), '\n');
- PSP_PG(in_block)++;
+ if (PSP_PG(ob).length) {
+ psp_string_0(&PSP_PG(ob));
+ psp_string_appendl(&PSP_PG(pycode), PSP_PG(ob).blob, PSP_PG(ob).length);
+ psp_string_free(&PSP_PG(ob));
+ }
+ psp_string_appendl(&PSP_PG(pycode), STATIC_STR("\"\"\")\n"));
+
+ OUTPUT_WHITESPACE(&PSP_PG(whitespace));
+ psp_string_appendl(&PSP_PG(pycode), STATIC_STR("req.write("));
+ PSP_PG(is_psp_echo) = 1;
+
+ BEGIN PYCODE;
}
YY_BREAK
case 4:
YY_RULE_SETUP
-#line 70 "psp_parser.l"
+#line 144 "psp_parser.l"
{
+ if (PSP_PG(ob).length) {
+ psp_string_0(&PSP_PG(ob));
+ psp_string_appendl(&PSP_PG(pycode), PSP_PG(ob).blob, PSP_PG(ob).length);
+ psp_string_free(&PSP_PG(ob));
+ }
+ psp_string_appendl(&PSP_PG(pycode), STATIC_STR("\"\"\")\n\n"));
CLEAR_WHITESPACE(&PSP_PG(whitespace));
- PSP_PG(in_block)--;
- if (PSP_PG(in_block) < 0) {
- PSP_PG(in_block) = 0;
- }
+
+ BEGIN PYCODE;
}
YY_BREAK
case 5:
YY_RULE_SETUP
-#line 78 "psp_parser.l"
+#line 156 "psp_parser.l"
{
- if (yytext[0] == '"' || yytext[0] == '\'') {
- PSP_PG(string_char) = yytext[0];
- BEGIN IN_STRING;
+ if (yytext[0] == '"') {
+ psp_string_appendl(&PSP_PG(ob), STATIC_STR("\\\""));
+ } else {
+ psp_string_appendc(&PSP_PG(ob), yytext[0]);
}
- psp_string_appendc(&PSP_PG(pycode), yytext[0]);
+}
+ YY_BREAK
+case YY_STATE_EOF(TEXT):
+#line 164 "psp_parser.l"
+{
+ if (PSP_PG(ob).length) {
+ psp_string_0(&PSP_PG(ob));
+ OUTPUT_WHITESPACE(&PSP_PG(whitespace));
+ psp_string_appendl(&PSP_PG(pycode), PSP_PG(ob).blob, PSP_PG(ob).length);
+ psp_string_free(&PSP_PG(ob));
+ }
+ psp_string_appendl(&PSP_PG(pycode), STATIC_STR("\"\"\")\n"));
+ yyterminate();
}
YY_BREAK
case 6:
+/* rule 6 can match eol */
YY_RULE_SETUP
-#line 86 "psp_parser.l"
+#line 175 "psp_parser.l"
{
- if (PSP_PG(is_psp_echo)) {
- psp_string_appendl(&PSP_PG(pycode), STATIC_STR(")\n"));
- PSP_PG(is_psp_echo) = 0;
- } else {
- psp_string_appendc(&PSP_PG(pycode), '\n');
- }
-
- BEGIN 0;
+ psp_string_appendc(&PSP_PG(pycode), '\n');
}
YY_BREAK
case 7:
YY_RULE_SETUP
-#line 97 "psp_parser.l"
+#line 179 "psp_parser.l"
{
- if (PSP_PG(ob).length) {
- psp_string_0(&PSP_PG(ob));
- OUTPUT_WHITESPACE(&PSP_PG(whitespace));
- psp_string_appendl(&PSP_PG(pycode), STATIC_STR("sys.stdout.write(\""));
- psp_string_appendl(&PSP_PG(pycode), PSP_PG(ob).blob, PSP_PG(ob).length);
- psp_string_appendl(&PSP_PG(pycode), STATIC_STR("\")\n"));
- psp_string_free(&PSP_PG(ob));
- }
-
- OUTPUT_WHITESPACE(&PSP_PG(whitespace));
- psp_string_appendl(&PSP_PG(pycode), STATIC_STR("sys.stdout.write("));
- PSP_PG(is_psp_echo) = 1;
-
- BEGIN IN_PYCODE;
+ psp_string_appendc(&PSP_PG(whitespace), '\t');
+ PSP_PG(in_block)++;
}
YY_BREAK
case 8:
YY_RULE_SETUP
-#line 114 "psp_parser.l"
+#line 184 "psp_parser.l"
{
- if (PSP_PG(ob).length) {
- psp_string_0(&PSP_PG(ob));
- OUTPUT_WHITESPACE(&PSP_PG(whitespace));
- psp_string_appendl(&PSP_PG(pycode), STATIC_STR("print \""));
- psp_string_appendl(&PSP_PG(pycode), PSP_PG(ob).blob, PSP_PG(ob).length);
- psp_string_appendl(&PSP_PG(pycode), STATIC_STR("\"\n"));
- psp_string_free(&PSP_PG(ob));
- }
-
CLEAR_WHITESPACE(&PSP_PG(whitespace));
-
- BEGIN IN_PYCODE;
+ PSP_PG(in_block)--;
+ if (PSP_PG(in_block) < 0) {
+ PSP_PG(in_block) = 0;
+ }
}
YY_BREAK
case 9:
YY_RULE_SETUP
-#line 129 "psp_parser.l"
+#line 192 "psp_parser.l"
{
- if (!PSP_PG(in_block)) {
- psp_string_clear(&PSP_PG(whitespace));
- psp_string_appendl(&PSP_PG(whitespace), yytext, yyleng);
- }
+ if (PSP_PG(is_psp_echo)) {
+ psp_string_appendc(&PSP_PG(pycode), ')');
+ PSP_PG(is_psp_echo) = 0;
+ }
+
+ BEGIN INDENT;
}
YY_BREAK
case 10:
YY_RULE_SETUP
-#line 136 "psp_parser.l"
+#line 201 "psp_parser.l"
{
- if (PSP_PG(ob).length) {
- psp_string_0(&PSP_PG(ob));
- OUTPUT_WHITESPACE(&PSP_PG(whitespace));
- psp_string_appendl(&PSP_PG(pycode), STATIC_STR("print \""));
- psp_string_appendl(&PSP_PG(pycode), PSP_PG(ob).blob, PSP_PG(ob).length);
- psp_string_appendl(&PSP_PG(pycode), STATIC_STR("\"\n"));
- psp_string_free(&PSP_PG(ob));
- }
+ PSP_PG(string_char) = '3';
+ psp_string_appendl(&PSP_PG(pycode), yytext, yyleng);
- if (!PSP_PG(in_block)) {
- CLEAR_WHITESPACE(&PSP_PG(whitespace));
- }
+ BEGIN STRING;
}
YY_BREAK
case 11:
YY_RULE_SETUP
-#line 151 "psp_parser.l"
+#line 208 "psp_parser.l"
{
- if (yytext[0] == '"') {
- psp_string_appendl(&PSP_PG(ob), STATIC_STR("\\\""));
- } else {
- psp_string_appendc(&PSP_PG(ob), yytext[0]);
- }
+ if (yytext[0] == '"' || yytext[0] == '\'') {
+ PSP_PG(string_char) = yytext[0];
+ BEGIN STRING;
+ }
+ psp_string_appendc(&PSP_PG(pycode), yytext[0]);
}
YY_BREAK
case 12:
YY_RULE_SETUP
-#line 159 "psp_parser.l"
-ECHO;
+#line 216 "psp_parser.l"
+{
+ if (PSP_PG(string_char) == '3') {
+ if (!PSP_PG(is_string_escape)) {
+ psp_string_appendl(&PSP_PG(pycode), yytext, yyleng);
+ BEGIN PYCODE;
+ }
+ else {
+ psp_string_appendc(&PSP_PG(pycode), '"');
+ yyless(1);
+ }
+ }
+ PSP_PG(is_string_escape) = 0;
+}
YY_BREAK
-#line 815 "psp_parser.c"
-case YY_STATE_EOF(INITIAL):
-case YY_STATE_EOF(IN_PYCODE):
-case YY_STATE_EOF(IN_STRING):
- yyterminate();
-
- case YY_END_OF_BUFFER:
- {
- /* Amount of text matched not including the EOB char. */
- int yy_amount_of_matched_text = (int) (yy_cp - yytext_ptr) - 1;
-
- /* Undo the effects of YY_DO_BEFORE_ACTION. */
- *yy_cp = yy_hold_char;
- YY_RESTORE_YY_MORE_OFFSET
-
- if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_NEW )
- {
- /* We're scanning a new file or input source. It's
- * possible that this happened because the user
- * just pointed yyin at a new source and called
- * yylex(). If so, then we have to assure
- * consistency between yy_current_buffer and our
- * globals. Here is the right place to do so, because
- * this is the first action (other than possibly a
+case 13:
+YY_RULE_SETUP
+#line 230 "psp_parser.l"
+{
+ if (yytext[0] == '\\') {
+ PSP_PG(is_string_escape) = 1;
+ } else {
+ if (yytext[0] == PSP_PG(string_char)) {
+ if (!PSP_PG(is_string_escape)) {
+ BEGIN PYCODE;
+ }
+ }
+ PSP_PG(is_string_escape) = 0;
+ }
+
+ psp_string_appendc(&PSP_PG(pycode), yytext[0]);
+}
+ YY_BREAK
+case 14:
+YY_RULE_SETUP
+#line 245 "psp_parser.l"
+{
+ psp_string_appendc(&PSP_PG(pycode), '\n');
+
+ if (PSP_PG(in_block)) {
+ OUTPUT_WHITESPACE(&PSP_PG(whitespace));
+ }
+ else {
+ CLEAR_WHITESPACE(&PSP_PG(whitespace));
+ psp_string_appendl(&PSP_PG(whitespace), yytext, yyleng);
+ psp_string_appendl(&PSP_PG(pycode), yytext, yyleng);
+ }
+ psp_string_appendl(&PSP_PG(pycode), STATIC_STR("req.write(\"\"\""));
+
+ BEGIN TEXT;
+}
+ YY_BREAK
+case 15:
+YY_RULE_SETUP
+#line 261 "psp_parser.l"
+{
+ psp_string_appendc(&PSP_PG(pycode), '\n');
+
+ if (PSP_PG(in_block)) {
+ OUTPUT_WHITESPACE(&PSP_PG(whitespace));
+ }
+ else {
+ CLEAR_WHITESPACE(&PSP_PG(whitespace));
+ }
+
+ psp_string_appendl(&PSP_PG(pycode), STATIC_STR("req.write(\"\"\""));
+
+ if (yytext[0] == '"') {
+ psp_string_appendl(&PSP_PG(ob), STATIC_STR("\\\""));
+ } else {
+ psp_string_appendc(&PSP_PG(ob), yytext[0]);
+ }
+
+ BEGIN TEXT;
+}
+ YY_BREAK
+case 16:
+YY_RULE_SETUP
+#line 282 "psp_parser.l"
+ECHO;
+ YY_BREAK
+#line 1084 "psp_parser.c"
+case YY_STATE_EOF(INITIAL):
+case YY_STATE_EOF(PYCODE):
+case YY_STATE_EOF(STRING):
+case YY_STATE_EOF(INDENT):
+ yyterminate();
+
+ case YY_END_OF_BUFFER:
+ {
+ /* Amount of text matched not including the EOB char. */
+ int yy_amount_of_matched_text = (int) (yy_cp - yyg->yytext_ptr) - 1;
+
+ /* Undo the effects of YY_DO_BEFORE_ACTION. */
+ *yy_cp = yyg->yy_hold_char;
+ YY_RESTORE_YY_MORE_OFFSET
+
+ if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
+ {
+ /* We're scanning a new file or input source. It's
+ * possible that this happened because the user
+ * just pointed yyin at a new source and called
+ * yylex(). If so, then we have to assure
+ * consistency between YY_CURRENT_BUFFER and our
+ * globals. Here is the right place to do so, because
+ * this is the first action (other than possibly a
* back-up) that will match for the new input source.
*/
- yy_n_chars = yy_current_buffer->yy_n_chars;
- yy_current_buffer->yy_input_file = yyin;
- yy_current_buffer->yy_buffer_status = YY_BUFFER_NORMAL;
+ yyg->yy_n_chars = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+ YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin;
+ YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
}
/* Note that here we test for yy_c_buf_p "<=" to the position
@@ -849,13 +1119,13 @@
* end-of-buffer state). Contrast this with the test
* in input().
*/
- if ( yy_c_buf_p <= &yy_current_buffer->yy_ch_buf[yy_n_chars] )
+ if ( yyg->yy_c_buf_p <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] )
{ /* This was really a NUL. */
yy_state_type yy_next_state;
- yy_c_buf_p = yytext_ptr + yy_amount_of_matched_text;
+ yyg->yy_c_buf_p = yyg->yytext_ptr + yy_amount_of_matched_text;
- yy_current_state = yy_get_previous_state();
+ yy_current_state = yy_get_previous_state( yyscanner );
/* Okay, we're now positioned to make the NUL
* transition. We couldn't have
@@ -866,32 +1136,32 @@
* will run more slowly).
*/
- yy_next_state = yy_try_NUL_trans( yy_current_state );
+ yy_next_state = yy_try_NUL_trans( yy_current_state , yyscanner);
- yy_bp = yytext_ptr + YY_MORE_ADJ;
+ yy_bp = yyg->yytext_ptr + YY_MORE_ADJ;
if ( yy_next_state )
{
/* Consume the NUL. */
- yy_cp = ++yy_c_buf_p;
+ yy_cp = ++yyg->yy_c_buf_p;
yy_current_state = yy_next_state;
goto yy_match;
}
else
{
- yy_cp = yy_c_buf_p;
+ yy_cp = yyg->yy_c_buf_p;
goto yy_find_action;
}
}
- else switch ( yy_get_next_buffer() )
+ else switch ( yy_get_next_buffer( yyscanner ) )
{
case EOB_ACT_END_OF_FILE:
{
- yy_did_buffer_switch_on_eof = 0;
+ yyg->yy_did_buffer_switch_on_eof = 0;
- if ( yywrap() )
+ if ( yywrap(yyscanner ) )
{
/* Note: because we've taken care in
* yy_get_next_buffer() to have set up
@@ -902,7 +1172,7 @@
* YY_NULL, it'll still work - another
* YY_NULL will get returned.
*/
- yy_c_buf_p = yytext_ptr + YY_MORE_ADJ;
+ yyg->yy_c_buf_p = yyg->yytext_ptr + YY_MORE_ADJ;
yy_act = YY_STATE_EOF(YY_START);
goto do_action;
@@ -910,30 +1180,30 @@
else
{
- if ( ! yy_did_buffer_switch_on_eof )
+ if ( ! yyg->yy_did_buffer_switch_on_eof )
YY_NEW_FILE;
}
break;
}
case EOB_ACT_CONTINUE_SCAN:
- yy_c_buf_p =
- yytext_ptr + yy_amount_of_matched_text;
+ yyg->yy_c_buf_p =
+ yyg->yytext_ptr + yy_amount_of_matched_text;
- yy_current_state = yy_get_previous_state();
+ yy_current_state = yy_get_previous_state( yyscanner );
- yy_cp = yy_c_buf_p;
- yy_bp = yytext_ptr + YY_MORE_ADJ;
+ yy_cp = yyg->yy_c_buf_p;
+ yy_bp = yyg->yytext_ptr + YY_MORE_ADJ;
goto yy_match;
case EOB_ACT_LAST_MATCH:
- yy_c_buf_p =
- &yy_current_buffer->yy_ch_buf[yy_n_chars];
+ yyg->yy_c_buf_p =
+ &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars];
- yy_current_state = yy_get_previous_state();
+ yy_current_state = yy_get_previous_state( yyscanner );
- yy_cp = yy_c_buf_p;
- yy_bp = yytext_ptr + YY_MORE_ADJ;
+ yy_cp = yyg->yy_c_buf_p;
+ yy_bp = yyg->yytext_ptr + YY_MORE_ADJ;
goto yy_find_action;
}
break;
@@ -944,8 +1214,7 @@
"fatal flex scanner internal error--no action found" );
} /* end of action switch */
} /* end of scanning one token */
- } /* end of yylex */
-
+} /* end of yylex */
/* yy_get_next_buffer - try to read in a new buffer
*
@@ -954,21 +1223,21 @@
* EOB_ACT_CONTINUE_SCAN - continue scanning from current position
* EOB_ACT_END_OF_FILE - end of file
*/
-
-static int yy_get_next_buffer()
- {
- register char *dest = yy_current_buffer->yy_ch_buf;
- register char *source = yytext_ptr;
+static int yy_get_next_buffer (yyscan_t yyscanner)
+{
+ struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+ register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+ register char *source = yyg->yytext_ptr;
register int number_to_move, i;
int ret_val;
- if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] )
+ if ( yyg->yy_c_buf_p > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] )
YY_FATAL_ERROR(
"fatal flex scanner internal error--end of buffer missed" );
- if ( yy_current_buffer->yy_fill_buffer == 0 )
+ if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
{ /* Don't try to fill the buffer, so this is an EOF. */
- if ( yy_c_buf_p - yytext_ptr - YY_MORE_ADJ == 1 )
+ if ( yyg->yy_c_buf_p - yyg->yytext_ptr - YY_MORE_ADJ == 1 )
{
/* We matched a single character, the EOB, so
* treat this as a final EOF.
@@ -988,34 +1257,30 @@
/* Try to read more data. */
/* First move last chars to start of buffer. */
- number_to_move = (int) (yy_c_buf_p - yytext_ptr) - 1;
+ number_to_move = (int) (yyg->yy_c_buf_p - yyg->yytext_ptr) - 1;
for ( i = 0; i < number_to_move; ++i )
*(dest++) = *(source++);
- if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_EOF_PENDING )
+ if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
/* don't do the read, it's not guaranteed to return an EOF,
* just force an EOF
*/
- yy_current_buffer->yy_n_chars = yy_n_chars = 0;
+ YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars = 0;
else
{
- int num_to_read =
- yy_current_buffer->yy_buf_size - number_to_move - 1;
+ size_t num_to_read =
+ YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
while ( num_to_read <= 0 )
{ /* Not enough room in the buffer - grow it. */
-#ifdef YY_USES_REJECT
- YY_FATAL_ERROR(
-"input buffer overflow, can't enlarge buffer because scanner uses REJECT" );
-#else
/* just a shorter name for the current buffer */
- YY_BUFFER_STATE b = yy_current_buffer;
+ YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
int yy_c_buf_p_offset =
- (int) (yy_c_buf_p - b->yy_ch_buf);
+ (int) (yyg->yy_c_buf_p - b->yy_ch_buf);
if ( b->yy_is_our_buffer )
{
@@ -1028,8 +1293,7 @@
b->yy_ch_buf = (char *)
/* Include room in for 2 EOB chars. */
- yy_flex_realloc( (void *) b->yy_ch_buf,
- b->yy_buf_size + 2 );
+ yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 ,yyscanner );
}
else
/* Can't grow it, we don't own it. */
@@ -1039,35 +1303,35 @@
YY_FATAL_ERROR(
"fatal error - scanner input buffer overflow" );
- yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset];
+ yyg->yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset];
- num_to_read = yy_current_buffer->yy_buf_size -
+ num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
number_to_move - 1;
-#endif
+
}
if ( num_to_read > YY_READ_BUF_SIZE )
num_to_read = YY_READ_BUF_SIZE;
/* Read in more data. */
- YY_INPUT( (&yy_current_buffer->yy_ch_buf[number_to_move]),
- yy_n_chars, num_to_read );
+ YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
+ yyg->yy_n_chars, num_to_read );
- yy_current_buffer->yy_n_chars = yy_n_chars;
+ YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;
}
- if ( yy_n_chars == 0 )
+ if ( yyg->yy_n_chars == 0 )
{
if ( number_to_move == YY_MORE_ADJ )
{
ret_val = EOB_ACT_END_OF_FILE;
- yyrestart( yyin );
+ yyrestart(yyin ,yyscanner);
}
else
{
ret_val = EOB_ACT_LAST_MATCH;
- yy_current_buffer->yy_buffer_status =
+ YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
YY_BUFFER_EOF_PENDING;
}
}
@@ -1075,153 +1339,142 @@
else
ret_val = EOB_ACT_CONTINUE_SCAN;
- yy_n_chars += number_to_move;
- yy_current_buffer->yy_ch_buf[yy_n_chars] = YY_END_OF_BUFFER_CHAR;
- yy_current_buffer->yy_ch_buf[yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR;
+ yyg->yy_n_chars += number_to_move;
+ YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] = YY_END_OF_BUFFER_CHAR;
+ YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR;
- yytext_ptr = &yy_current_buffer->yy_ch_buf[0];
+ yyg->yytext_ptr = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
return ret_val;
- }
-
+}
/* yy_get_previous_state - get the state just before the EOB char was reached */
-static yy_state_type yy_get_previous_state()
- {
+ static yy_state_type yy_get_previous_state (yyscan_t yyscanner)
+{
register yy_state_type yy_current_state;
register char *yy_cp;
+ struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
- yy_current_state = yy_start;
+ yy_current_state = yyg->yy_start;
yy_current_state += YY_AT_BOL();
- for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp )
+ for ( yy_cp = yyg->yytext_ptr + YY_MORE_ADJ; yy_cp < yyg->yy_c_buf_p; ++yy_cp )
{
register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
if ( yy_accept[yy_current_state] )
{
- yy_last_accepting_state = yy_current_state;
- yy_last_accepting_cpos = yy_cp;
+ yyg->yy_last_accepting_state = yy_current_state;
+ yyg->yy_last_accepting_cpos = yy_cp;
}
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{
yy_current_state = (int) yy_def[yy_current_state];
- if ( yy_current_state >= 28 )
+ if ( yy_current_state >= 39 )
yy_c = yy_meta[(unsigned int) yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
}
return yy_current_state;
- }
-
+}
/* yy_try_NUL_trans - try to make a transition on the NUL character
*
* synopsis
* next_state = yy_try_NUL_trans( current_state );
*/
-
-#ifdef YY_USE_PROTOS
-static yy_state_type yy_try_NUL_trans( yy_state_type yy_current_state )
-#else
-static yy_state_type yy_try_NUL_trans( yy_current_state )
-yy_state_type yy_current_state;
-#endif
- {
+ static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state , yyscan_t yyscanner)
+{
register int yy_is_jam;
- register char *yy_cp = yy_c_buf_p;
+ struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+ register char *yy_cp = yyg->yy_c_buf_p;
register YY_CHAR yy_c = 1;
if ( yy_accept[yy_current_state] )
{
- yy_last_accepting_state = yy_current_state;
- yy_last_accepting_cpos = yy_cp;
+ yyg->yy_last_accepting_state = yy_current_state;
+ yyg->yy_last_accepting_cpos = yy_cp;
}
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{
yy_current_state = (int) yy_def[yy_current_state];
- if ( yy_current_state >= 28 )
+ if ( yy_current_state >= 39 )
yy_c = yy_meta[(unsigned int) yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
- yy_is_jam = (yy_current_state == 27);
+ yy_is_jam = (yy_current_state == 38);
return yy_is_jam ? 0 : yy_current_state;
- }
+}
+ static void yyunput (int c, register char * yy_bp , yyscan_t yyscanner)
+{
+ register char *yy_cp;
+ struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-#ifndef YY_NO_UNPUT
-#ifdef YY_USE_PROTOS
-static void yyunput( int c, register char *yy_bp )
-#else
-static void yyunput( c, yy_bp )
-int c;
-register char *yy_bp;
-#endif
- {
- register char *yy_cp = yy_c_buf_p;
+ yy_cp = yyg->yy_c_buf_p;
/* undo effects of setting up yytext */
- *yy_cp = yy_hold_char;
+ *yy_cp = yyg->yy_hold_char;
- if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
+ if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
{ /* need to shift things up to make room */
/* +2 for EOB chars. */
- register int number_to_move = yy_n_chars + 2;
- register char *dest = &yy_current_buffer->yy_ch_buf[
- yy_current_buffer->yy_buf_size + 2];
+ register int number_to_move = yyg->yy_n_chars + 2;
+ register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
+ YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
register char *source =
- &yy_current_buffer->yy_ch_buf[number_to_move];
+ &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
- while ( source > yy_current_buffer->yy_ch_buf )
+ while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
*--dest = *--source;
yy_cp += (int) (dest - source);
yy_bp += (int) (dest - source);
- yy_current_buffer->yy_n_chars =
- yy_n_chars = yy_current_buffer->yy_buf_size;
+ YY_CURRENT_BUFFER_LVALUE->yy_n_chars =
+ yyg->yy_n_chars = YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
- if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
+ if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
YY_FATAL_ERROR( "flex scanner push-back overflow" );
}
*--yy_cp = (char) c;
+ yyg->yytext_ptr = yy_bp;
+ yyg->yy_hold_char = *yy_cp;
+ yyg->yy_c_buf_p = yy_cp;
+}
- yytext_ptr = yy_bp;
- yy_hold_char = *yy_cp;
- yy_c_buf_p = yy_cp;
- }
-#endif /* ifndef YY_NO_UNPUT */
-
-
+#ifndef YY_NO_INPUT
#ifdef __cplusplus
-static int yyinput()
+ static int yyinput (yyscan_t yyscanner)
#else
-static int input()
+ static int input (yyscan_t yyscanner)
#endif
- {
+
+{
int c;
+ struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
- *yy_c_buf_p = yy_hold_char;
+ *yyg->yy_c_buf_p = yyg->yy_hold_char;
- if ( *yy_c_buf_p == YY_END_OF_BUFFER_CHAR )
+ if ( *yyg->yy_c_buf_p == YY_END_OF_BUFFER_CHAR )
{
/* yy_c_buf_p now points to the character we want to return.
* If this occurs *before* the EOB characters, then it's a
* valid NUL; if not, then we've hit the end of the buffer.
*/
- if ( yy_c_buf_p < &yy_current_buffer->yy_ch_buf[yy_n_chars] )
+ if ( yyg->yy_c_buf_p < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] )
/* This was really a NUL. */
- *yy_c_buf_p = '\0';
+ *yyg->yy_c_buf_p = '\0';
else
{ /* need more input */
- int offset = yy_c_buf_p - yytext_ptr;
- ++yy_c_buf_p;
+ int offset = yyg->yy_c_buf_p - yyg->yytext_ptr;
+ ++yyg->yy_c_buf_p;
- switch ( yy_get_next_buffer() )
+ switch ( yy_get_next_buffer( yyscanner ) )
{
case EOB_ACT_LAST_MATCH:
/* This happens because yy_g_n_b()
@@ -1235,110 +1488,116 @@
*/
/* Reset buffer status. */
- yyrestart( yyin );
+ yyrestart(yyin ,yyscanner);
- /* fall through */
+ /*FALLTHROUGH*/
case EOB_ACT_END_OF_FILE:
{
- if ( yywrap() )
+ if ( yywrap(yyscanner ) )
return EOF;
- if ( ! yy_did_buffer_switch_on_eof )
+ if ( ! yyg->yy_did_buffer_switch_on_eof )
YY_NEW_FILE;
#ifdef __cplusplus
- return yyinput();
+ return yyinput(yyscanner);
#else
- return input();
+ return input(yyscanner);
#endif
}
case EOB_ACT_CONTINUE_SCAN:
- yy_c_buf_p = yytext_ptr + offset;
+ yyg->yy_c_buf_p = yyg->yytext_ptr + offset;
break;
}
}
}
- c = *(unsigned char *) yy_c_buf_p; /* cast for 8-bit char's */
- *yy_c_buf_p = '\0'; /* preserve yytext */
- yy_hold_char = *++yy_c_buf_p;
+ c = *(unsigned char *) yyg->yy_c_buf_p; /* cast for 8-bit char's */
+ *yyg->yy_c_buf_p = '\0'; /* preserve yytext */
+ yyg->yy_hold_char = *++yyg->yy_c_buf_p;
- yy_current_buffer->yy_at_bol = (c == '\n');
+ YY_CURRENT_BUFFER_LVALUE->yy_at_bol = (c == '\n');
return c;
- }
-
+}
+#endif /* ifndef YY_NO_INPUT */
-#ifdef YY_USE_PROTOS
-void yyrestart( FILE *input_file )
-#else
-void yyrestart( input_file )
-FILE *input_file;
-#endif
- {
- if ( ! yy_current_buffer )
- yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE );
+/** Immediately switch to a different input stream.
+ * @param input_file A readable stream.
+ * @param yyscanner The scanner object.
+ * @note This function does not reset the start condition to @c INITIAL .
+ */
+ void yyrestart (FILE * input_file , yyscan_t yyscanner)
+{
+ struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
- yy_init_buffer( yy_current_buffer, input_file );
- yy_load_buffer_state();
+ if ( ! YY_CURRENT_BUFFER ){
+ yyensure_buffer_stack (yyscanner);
+ YY_CURRENT_BUFFER_LVALUE =
+ yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner);
}
+ yy_init_buffer(YY_CURRENT_BUFFER,input_file ,yyscanner);
+ yy_load_buffer_state(yyscanner );
+}
-#ifdef YY_USE_PROTOS
-void yy_switch_to_buffer( YY_BUFFER_STATE new_buffer )
-#else
-void yy_switch_to_buffer( new_buffer )
-YY_BUFFER_STATE new_buffer;
-#endif
- {
- if ( yy_current_buffer == new_buffer )
+/** Switch to a different input buffer.
+ * @param new_buffer The new input buffer.
+ * @param yyscanner The scanner object.
+ */
+ void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner)
+{
+ struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+
+ /* TODO. We should be able to replace this entire function body
+ * with
+ * yypop_buffer_state();
+ * yypush_buffer_state(new_buffer);
+ */
+ yyensure_buffer_stack (yyscanner);
+ if ( YY_CURRENT_BUFFER == new_buffer )
return;
- if ( yy_current_buffer )
+ if ( YY_CURRENT_BUFFER )
{
/* Flush out information for old buffer. */
- *yy_c_buf_p = yy_hold_char;
- yy_current_buffer->yy_buf_pos = yy_c_buf_p;
- yy_current_buffer->yy_n_chars = yy_n_chars;
+ *yyg->yy_c_buf_p = yyg->yy_hold_char;
+ YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = yyg->yy_c_buf_p;
+ YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;
}
- yy_current_buffer = new_buffer;
- yy_load_buffer_state();
+ YY_CURRENT_BUFFER_LVALUE = new_buffer;
+ yy_load_buffer_state(yyscanner );
/* We don't actually know whether we did this switch during
* EOF (yywrap()) processing, but the only time this flag
* is looked at is after yywrap() is called, so it's safe
* to go ahead and always set it.
*/
- yy_did_buffer_switch_on_eof = 1;
- }
-
-
-#ifdef YY_USE_PROTOS
-void yy_load_buffer_state( void )
-#else
-void yy_load_buffer_state()
-#endif
- {
- yy_n_chars = yy_current_buffer->yy_n_chars;
- yytext_ptr = yy_c_buf_p = yy_current_buffer->yy_buf_pos;
- yyin = yy_current_buffer->yy_input_file;
- yy_hold_char = *yy_c_buf_p;
- }
+ yyg->yy_did_buffer_switch_on_eof = 1;
+}
+static void yy_load_buffer_state (yyscan_t yyscanner)
+{
+ struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+ yyg->yy_n_chars = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+ yyg->yytext_ptr = yyg->yy_c_buf_p = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
+ yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
+ yyg->yy_hold_char = *yyg->yy_c_buf_p;
+}
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_create_buffer( FILE *file, int size )
-#else
-YY_BUFFER_STATE yy_create_buffer( file, size )
-FILE *file;
-int size;
-#endif
- {
+/** Allocate and initialize an input buffer state.
+ * @param file A readable stream.
+ * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
+ * @param yyscanner The scanner object.
+ * @return the allocated buffer state.
+ */
+ YY_BUFFER_STATE yy_create_buffer (FILE * file, int size , yyscan_t yyscanner)
+{
YY_BUFFER_STATE b;
-
- b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
+
+ b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ,yyscanner );
if ( ! b )
YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
@@ -1347,79 +1606,77 @@
/* yy_ch_buf has to be 2 characters longer than the size given because
* we need to put in 2 end-of-buffer characters.
*/
- b->yy_ch_buf = (char *) yy_flex_alloc( b->yy_buf_size + 2 );
+ b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2 ,yyscanner );
if ( ! b->yy_ch_buf )
YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
b->yy_is_our_buffer = 1;
- yy_init_buffer( b, file );
+ yy_init_buffer(b,file ,yyscanner);
return b;
- }
+}
+/** Destroy the buffer.
+ * @param b a buffer created with yy_create_buffer()
+ * @param yyscanner The scanner object.
+ */
+ void yy_delete_buffer (YY_BUFFER_STATE b , yyscan_t yyscanner)
+{
+ struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-#ifdef YY_USE_PROTOS
-void yy_delete_buffer( YY_BUFFER_STATE b )
-#else
-void yy_delete_buffer( b )
-YY_BUFFER_STATE b;
-#endif
- {
if ( ! b )
return;
- if ( b == yy_current_buffer )
- yy_current_buffer = (YY_BUFFER_STATE) 0;
+ if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
+ YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
if ( b->yy_is_our_buffer )
- yy_flex_free( (void *) b->yy_ch_buf );
-
- yy_flex_free( (void *) b );
- }
+ yyfree((void *) b->yy_ch_buf ,yyscanner );
+ yyfree((void *) b ,yyscanner );
+}
-#ifndef YY_ALWAYS_INTERACTIVE
-#ifndef YY_NEVER_INTERACTIVE
-extern int isatty YY_PROTO(( int ));
-#endif
-#endif
+#ifndef __cplusplus
+extern int isatty (int );
+#endif /* __cplusplus */
+
+/* Initializes or reinitializes a buffer.
+ * This function is sometimes called more than once on the same buffer,
+ * such as during a yyrestart() or at EOF.
+ */
+ static void yy_init_buffer (YY_BUFFER_STATE b, FILE * file , yyscan_t yyscanner)
-#ifdef YY_USE_PROTOS
-void yy_init_buffer( YY_BUFFER_STATE b, FILE *file )
-#else
-void yy_init_buffer( b, file )
-YY_BUFFER_STATE b;
-FILE *file;
-#endif
+{
+ int oerrno = errno;
+ struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-
- {
- yy_flush_buffer( b );
+ yy_flush_buffer(b ,yyscanner);
b->yy_input_file = file;
b->yy_fill_buffer = 1;
-#if YY_ALWAYS_INTERACTIVE
- b->yy_is_interactive = 1;
-#else
-#if YY_NEVER_INTERACTIVE
- b->yy_is_interactive = 0;
-#else
- b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
-#endif
-#endif
- }
-
-
-#ifdef YY_USE_PROTOS
-void yy_flush_buffer( YY_BUFFER_STATE b )
-#else
-void yy_flush_buffer( b )
-YY_BUFFER_STATE b;
-#endif
+ /* If b is the current buffer, then yy_init_buffer was _probably_
+ * called from yyrestart() or through yy_get_next_buffer.
+ * In that case, we don't want to reset the lineno or column.
+ */
+ if (b != YY_CURRENT_BUFFER){
+ b->yy_bs_lineno = 1;
+ b->yy_bs_column = 0;
+ }
+
+ b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
+
+ errno = oerrno;
+}
- {
+/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
+ * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
+ * @param yyscanner The scanner object.
+ */
+ void yy_flush_buffer (YY_BUFFER_STATE b , yyscan_t yyscanner)
+{
+ struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
if ( ! b )
return;
@@ -1437,29 +1694,124 @@
b->yy_at_bol = 1;
b->yy_buffer_status = YY_BUFFER_NEW;
- if ( b == yy_current_buffer )
- yy_load_buffer_state();
+ if ( b == YY_CURRENT_BUFFER )
+ yy_load_buffer_state(yyscanner );
+}
+
+/** Pushes the new state onto the stack. The new state becomes
+ * the current state. This function will allocate the stack
+ * if necessary.
+ * @param new_buffer The new state.
+ * @param yyscanner The scanner object.
+ */
+void yypush_buffer_state (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner)
+{
+ struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+ if (new_buffer == NULL)
+ return;
+
+ yyensure_buffer_stack(yyscanner);
+
+ /* This block is copied from yy_switch_to_buffer. */
+ if ( YY_CURRENT_BUFFER )
+ {
+ /* Flush out information for old buffer. */
+ *yyg->yy_c_buf_p = yyg->yy_hold_char;
+ YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = yyg->yy_c_buf_p;
+ YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;
+ }
+
+ /* Only push if top exists. Otherwise, replace top. */
+ if (YY_CURRENT_BUFFER)
+ yyg->yy_buffer_stack_top++;
+ YY_CURRENT_BUFFER_LVALUE = new_buffer;
+
+ /* copied from yy_switch_to_buffer. */
+ yy_load_buffer_state(yyscanner );
+ yyg->yy_did_buffer_switch_on_eof = 1;
+}
+
+/** Removes and deletes the top of the stack, if present.
+ * The next element becomes the new top.
+ * @param yyscanner The scanner object.
+ */
+void yypop_buffer_state (yyscan_t yyscanner)
+{
+ struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+ if (!YY_CURRENT_BUFFER)
+ return;
+
+ yy_delete_buffer(YY_CURRENT_BUFFER ,yyscanner);
+ YY_CURRENT_BUFFER_LVALUE = NULL;
+ if (yyg->yy_buffer_stack_top > 0)
+ --yyg->yy_buffer_stack_top;
+
+ if (YY_CURRENT_BUFFER) {
+ yy_load_buffer_state(yyscanner );
+ yyg->yy_did_buffer_switch_on_eof = 1;
}
+}
+/* Allocates the stack if it does not exist.
+ * Guarantees space for at least one push.
+ */
+static void yyensure_buffer_stack (yyscan_t yyscanner)
+{
+ int num_to_alloc;
+ struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-#ifndef YY_NO_SCAN_BUFFER
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_scan_buffer( char *base, yy_size_t size )
-#else
-YY_BUFFER_STATE yy_scan_buffer( base, size )
-char *base;
-yy_size_t size;
-#endif
- {
- YY_BUFFER_STATE b;
+ if (!yyg->yy_buffer_stack) {
+
+ /* First allocation is just for 2 elements, since we don't know if this
+ * scanner will even need a stack. We use 2 instead of 1 to avoid an
+ * immediate realloc on the next call.
+ */
+ num_to_alloc = 1;
+ yyg->yy_buffer_stack = (struct yy_buffer_state**)yyalloc
+ (num_to_alloc * sizeof(struct yy_buffer_state*)
+ , yyscanner);
+
+ memset(yyg->yy_buffer_stack, 0, num_to_alloc * sizeof(struct yy_buffer_state*));
+
+ yyg->yy_buffer_stack_max = num_to_alloc;
+ yyg->yy_buffer_stack_top = 0;
+ return;
+ }
+
+ if (yyg->yy_buffer_stack_top >= (yyg->yy_buffer_stack_max) - 1){
+ /* Increase the buffer to prepare for a possible push. */
+ int grow_size = 8 /* arbitrary grow size */;
+
+ num_to_alloc = yyg->yy_buffer_stack_max + grow_size;
+ yyg->yy_buffer_stack = (struct yy_buffer_state**)yyrealloc
+ (yyg->yy_buffer_stack,
+ num_to_alloc * sizeof(struct yy_buffer_state*)
+ , yyscanner);
+
+ /* zero only the new slots.*/
+ memset(yyg->yy_buffer_stack + yyg->yy_buffer_stack_max, 0, grow_size * sizeof(struct yy_buffer_state*));
+ yyg->yy_buffer_stack_max = num_to_alloc;
+ }
+}
+
+/** Setup the input buffer state to scan directly from a user-specified character buffer.
+ * @param base the character buffer
+ * @param size the size in bytes of the character buffer
+ * @param yyscanner The scanner object.
+ * @return the newly allocated buffer state object.
+ */
+YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size , yyscan_t yyscanner)
+{
+ YY_BUFFER_STATE b;
+
if ( size < 2 ||
base[size-2] != YY_END_OF_BUFFER_CHAR ||
base[size-1] != YY_END_OF_BUFFER_CHAR )
/* They forgot to leave room for the EOB's. */
return 0;
- b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
+ b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ,yyscanner );
if ( ! b )
YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
@@ -1473,47 +1825,42 @@
b->yy_fill_buffer = 0;
b->yy_buffer_status = YY_BUFFER_NEW;
- yy_switch_to_buffer( b );
+ yy_switch_to_buffer(b ,yyscanner );
return b;
- }
-#endif
-
-
-#ifndef YY_NO_SCAN_STRING
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_scan_string( yyconst char *yy_str )
-#else
-YY_BUFFER_STATE yy_scan_string( yy_str )
-yyconst char *yy_str;
-#endif
- {
- int len;
- for ( len = 0; yy_str[len]; ++len )
- ;
-
- return yy_scan_bytes( yy_str, len );
- }
-#endif
+}
+/** Setup the input buffer state to scan a string. The next call to yylex() will
+ * scan from a @e copy of @a str.
+ * @param str a NUL-terminated string to scan
+ * @param yyscanner The scanner object.
+ * @return the newly allocated buffer state object.
+ * @note If you want to scan bytes that may contain NUL values, then use
+ * yy_scan_bytes() instead.
+ */
+YY_BUFFER_STATE yy_scan_string (yyconst char * str , yyscan_t yyscanner)
+{
+
+ return yy_scan_bytes(str,strlen(str) ,yyscanner);
+}
-#ifndef YY_NO_SCAN_BYTES
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_scan_bytes( yyconst char *bytes, int len )
-#else
-YY_BUFFER_STATE yy_scan_bytes( bytes, len )
-yyconst char *bytes;
-int len;
-#endif
- {
+/** Setup the input buffer state to scan the given bytes. The next call to yylex() will
+ * scan from a @e copy of @a bytes.
+ * @param bytes the byte buffer to scan
+ * @param len the number of bytes in the buffer pointed to by @a bytes.
+ * @param yyscanner The scanner object.
+ * @return the newly allocated buffer state object.
+ */
+YY_BUFFER_STATE yy_scan_bytes (yyconst char * bytes, int len , yyscan_t yyscanner)
+{
YY_BUFFER_STATE b;
char *buf;
yy_size_t n;
int i;
-
+
/* Get memory for full buffer, including space for trailing EOB's. */
n = len + 2;
- buf = (char *) yy_flex_alloc( n );
+ buf = (char *) yyalloc(n ,yyscanner );
if ( ! buf )
YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
@@ -1522,7 +1869,7 @@
buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR;
- b = yy_scan_buffer( buf, n );
+ b = yy_scan_buffer(buf,n ,yyscanner);
if ( ! b )
YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
@@ -1532,148 +1879,297 @@
b->yy_is_our_buffer = 1;
return b;
- }
+}
+
+#ifndef YY_EXIT_FAILURE
+#define YY_EXIT_FAILURE 2
#endif
+static void yy_fatal_error (yyconst char* msg , yyscan_t yyscanner)
+{
+ (void) fprintf( stderr, "%s\n", msg );
+ exit( YY_EXIT_FAILURE );
+}
-#ifndef YY_NO_PUSH_STATE
-#ifdef YY_USE_PROTOS
-static void yy_push_state( int new_state )
-#else
-static void yy_push_state( new_state )
-int new_state;
-#endif
- {
- if ( yy_start_stack_ptr >= yy_start_stack_depth )
- {
- yy_size_t new_size;
+/* Redefine yyless() so it works in section 3 code. */
- yy_start_stack_depth += YY_START_STACK_INCR;
- new_size = yy_start_stack_depth * sizeof( int );
+#undef yyless
+#define yyless(n) \
+ do \
+ { \
+ /* Undo effects of setting up yytext. */ \
+ int yyless_macro_arg = (n); \
+ YY_LESS_LINENO(yyless_macro_arg);\
+ yytext[yyleng] = yyg->yy_hold_char; \
+ yyg->yy_c_buf_p = yytext + yyless_macro_arg; \
+ yyg->yy_hold_char = *yyg->yy_c_buf_p; \
+ *yyg->yy_c_buf_p = '\0'; \
+ yyleng = yyless_macro_arg; \
+ } \
+ while ( 0 )
- if ( ! yy_start_stack )
- yy_start_stack = (int *) yy_flex_alloc( new_size );
+/* Accessor methods (get/set functions) to struct members. */
- else
- yy_start_stack = (int *) yy_flex_realloc(
- (void *) yy_start_stack, new_size );
+/** Get the user-defined data for this scanner.
+ * @param yyscanner The scanner object.
+ */
+YY_EXTRA_TYPE yyget_extra (yyscan_t yyscanner)
+{
+ struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+ return yyextra;
+}
- if ( ! yy_start_stack )
- YY_FATAL_ERROR(
- "out of memory expanding start-condition stack" );
- }
+/** Get the current line number.
+ * @param yyscanner The scanner object.
+ */
+int yyget_lineno (yyscan_t yyscanner)
+{
+ struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+
+ if (! YY_CURRENT_BUFFER)
+ return 0;
+
+ return yylineno;
+}
- yy_start_stack[yy_start_stack_ptr++] = YY_START;
+/** Get the current column number.
+ * @param yyscanner The scanner object.
+ */
+int yyget_column (yyscan_t yyscanner)
+{
+ struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+
+ if (! YY_CURRENT_BUFFER)
+ return 0;
+
+ return yycolumn;
+}
- BEGIN(new_state);
- }
-#endif
+/** Get the input stream.
+ * @param yyscanner The scanner object.
+ */
+FILE *yyget_in (yyscan_t yyscanner)
+{
+ struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+ return yyin;
+}
+/** Get the output stream.
+ * @param yyscanner The scanner object.
+ */
+FILE *yyget_out (yyscan_t yyscanner)
+{
+ struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+ return yyout;
+}
-#ifndef YY_NO_POP_STATE
-static void yy_pop_state()
- {
- if ( --yy_start_stack_ptr < 0 )
- YY_FATAL_ERROR( "start-condition stack underflow" );
+/** Get the length of the current token.
+ * @param yyscanner The scanner object.
+ */
+int yyget_leng (yyscan_t yyscanner)
+{
+ struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+ return yyleng;
+}
- BEGIN(yy_start_stack[yy_start_stack_ptr]);
- }
-#endif
+/** Get the current token.
+ * @param yyscanner The scanner object.
+ */
+char *yyget_text (yyscan_t yyscanner)
+{
+ struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+ return yytext;
+}
-#ifndef YY_NO_TOP_STATE
-static int yy_top_state()
- {
- return yy_start_stack[yy_start_stack_ptr - 1];
- }
-#endif
+/** Set the user-defined data. This data is never touched by the scanner.
+ * @param user_defined The data to be associated with this scanner.
+ * @param yyscanner The scanner object.
+ */
+void yyset_extra (YY_EXTRA_TYPE user_defined , yyscan_t yyscanner)
+{
+ struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+ yyextra = user_defined ;
+}
-#ifndef YY_EXIT_FAILURE
-#define YY_EXIT_FAILURE 2
-#endif
+/** Set the current line number.
+ * @param line_number
+ * @param yyscanner The scanner object.
+ */
+void yyset_lineno (int line_number , yyscan_t yyscanner)
+{
+ struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-#ifdef YY_USE_PROTOS
-static void yy_fatal_error( yyconst char msg[] )
-#else
-static void yy_fatal_error( msg )
-char msg[];
-#endif
- {
- (void) fprintf( stderr, "%s\n", msg );
- exit( YY_EXIT_FAILURE );
- }
+ /* lineno is only valid if an input buffer exists. */
+ if (! YY_CURRENT_BUFFER )
+ yy_fatal_error( "yyset_lineno called with no buffer" , yyscanner);
+
+ yylineno = line_number;
+}
+/** Set the current column.
+ * @param line_number
+ * @param yyscanner The scanner object.
+ */
+void yyset_column (int column_no , yyscan_t yyscanner)
+{
+ struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+ /* column is only valid if an input buffer exists. */
+ if (! YY_CURRENT_BUFFER )
+ yy_fatal_error( "yyset_column called with no buffer" , yyscanner);
+
+ yycolumn = column_no;
+}
-/* Redefine yyless() so it works in section 3 code. */
+/** Set the input stream. This does not discard the current
+ * input buffer.
+ * @param in_str A readable stream.
+ * @param yyscanner The scanner object.
+ * @see yy_switch_to_buffer
+ */
+void yyset_in (FILE * in_str , yyscan_t yyscanner)
+{
+ struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+ yyin = in_str ;
+}
-#undef yyless
-#define yyless(n) \
- do \
- { \
- /* Undo effects of setting up yytext. */ \
- yytext[yyleng] = yy_hold_char; \
- yy_c_buf_p = yytext + n; \
- yy_hold_char = *yy_c_buf_p; \
- *yy_c_buf_p = '\0'; \
- yyleng = n; \
- } \
- while ( 0 )
+void yyset_out (FILE * out_str , yyscan_t yyscanner)
+{
+ struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+ yyout = out_str ;
+}
+int yyget_debug (yyscan_t yyscanner)
+{
+ struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+ return yy_flex_debug;
+}
+
+void yyset_debug (int bdebug , yyscan_t yyscanner)
+{
+ struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+ yy_flex_debug = bdebug ;
+}
+
+/* Accessor methods for yylval and yylloc */
+
+static int yy_init_globals (yyscan_t yyscanner)
+{
+ struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+ /* Initialization is the same as for the non-reentrant scanner.
+ This function is called once per scanner lifetime. */
+
+ yyg->yy_buffer_stack = 0;
+ yyg->yy_buffer_stack_top = 0;
+ yyg->yy_buffer_stack_max = 0;
+ yyg->yy_c_buf_p = (char *) 0;
+ yyg->yy_init = 1;
+ yyg->yy_start = 0;
+ yyg->yy_start_stack_ptr = 0;
+ yyg->yy_start_stack_depth = 0;
+ yyg->yy_start_stack = (int *) 0;
+
+/* Defined in main.c */
+#ifdef YY_STDINIT
+ yyin = stdin;
+ yyout = stdout;
+#else
+ yyin = (FILE *) 0;
+ yyout = (FILE *) 0;
+#endif
+
+ /* For future reference: Set errno on error, since we are called by
+ * yylex_init()
+ */
+ return 0;
+}
+
+/* User-visible API */
+
+/* yylex_init is special because it creates the scanner itself, so it is
+ * the ONLY reentrant function that doesn't take the scanner as the last argument.
+ * That's why we explicitly handle the declaration, instead of using our macros.
+ */
+
+int yylex_init(yyscan_t* ptr_yy_globals)
+
+{
+ if (ptr_yy_globals == NULL){
+ errno = EINVAL;
+ return 1;
+ }
+
+ *ptr_yy_globals = (yyscan_t) yyalloc ( sizeof( struct yyguts_t ), NULL );
+
+ if (*ptr_yy_globals == NULL){
+ errno = ENOMEM;
+ return 1;
+ }
-/* Internal utility routines. */
+ memset(*ptr_yy_globals,0,sizeof(struct yyguts_t));
+
+ return yy_init_globals ( *ptr_yy_globals );
+}
+
+/* yylex_destroy is for both reentrant and non-reentrant scanners. */
+int yylex_destroy (yyscan_t yyscanner)
+{
+ struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+
+ /* Pop the buffer stack, destroying each element. */
+ while(YY_CURRENT_BUFFER){
+ yy_delete_buffer(YY_CURRENT_BUFFER ,yyscanner );
+ YY_CURRENT_BUFFER_LVALUE = NULL;
+ yypop_buffer_state(yyscanner);
+ }
+
+ /* Destroy the stack itself. */
+ yyfree(yyg->yy_buffer_stack ,yyscanner);
+ yyg->yy_buffer_stack = NULL;
+
+ /* Destroy the start condition stack. */
+ yyfree(yyg->yy_start_stack ,yyscanner );
+ yyg->yy_start_stack = NULL;
+
+ /* Destroy the main struct (reentrant only). */
+ yyfree ( yyscanner , yyscanner );
+ return 0;
+}
+
+/*
+ * Internal utility routines.
+ */
#ifndef yytext_ptr
-#ifdef YY_USE_PROTOS
-static void yy_flex_strncpy( char *s1, yyconst char *s2, int n )
-#else
-static void yy_flex_strncpy( s1, s2, n )
-char *s1;
-yyconst char *s2;
-int n;
-#endif
- {
+static void yy_flex_strncpy (char* s1, yyconst char * s2, int n , yyscan_t yyscanner)
+{
register int i;
+ struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
for ( i = 0; i < n; ++i )
s1[i] = s2[i];
- }
+}
#endif
#ifdef YY_NEED_STRLEN
-#ifdef YY_USE_PROTOS
-static int yy_flex_strlen( yyconst char *s )
-#else
-static int yy_flex_strlen( s )
-yyconst char *s;
-#endif
- {
+static int yy_flex_strlen (yyconst char * s , yyscan_t yyscanner)
+{
register int n;
+ struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
for ( n = 0; s[n]; ++n )
;
return n;
- }
+}
#endif
-
-#ifdef YY_USE_PROTOS
-static void *yy_flex_alloc( yy_size_t size )
-#else
-static void *yy_flex_alloc( size )
-yy_size_t size;
-#endif
- {
+void *yyalloc (yy_size_t size , yyscan_t yyscanner)
+{
return (void *) malloc( size );
- }
+}
-#ifdef YY_USE_PROTOS
-static void *yy_flex_realloc( void *ptr, yy_size_t size )
-#else
-static void *yy_flex_realloc( ptr, size )
-void *ptr;
-yy_size_t size;
-#endif
- {
+void *yyrealloc (void * ptr, yy_size_t size , yyscan_t yyscanner)
+{
/* The cast to (char *) in the following accommodates both
* implementations that use char* generic pointers, and those
* that use void* generic pointers. It works with the latter
@@ -1682,24 +2178,34 @@
* as though doing an assignment.
*/
return (void *) realloc( (char *) ptr, size );
- }
+}
-#ifdef YY_USE_PROTOS
-static void yy_flex_free( void *ptr )
-#else
-static void yy_flex_free( ptr )
-void *ptr;
-#endif
- {
- free( ptr );
- }
+void yyfree (void * ptr , yyscan_t yyscanner)
+{
+ free( (char *) ptr ); /* see yyrealloc() for (char *) cast */
+}
-#if YY_MAIN
-int main()
- {
- yylex();
- return 0;
- }
+#define YYTABLES_NAME "yytables"
+
+#undef YY_NEW_FILE
+#undef YY_FLUSH_BUFFER
+#undef yy_set_bol
+#undef yy_new_buffer
+#undef yy_set_interactive
+#undef yytext_ptr
+#undef YY_DO_BEFORE_ACTION
+
+#ifdef YY_DECL_IS_OURS
+#undef YY_DECL_IS_OURS
+#undef YY_DECL
#endif
-#line 159 "psp_parser.l"
+#line 282 "psp_parser.l"
+
+
+
+/* this is for emacs
+Local Variables:
+mode:C
+End:
+*/
1.4 +233 -104 httpd-python/src/psp_parser.l
Index: psp_parser.l
===================================================================
RCS file: /home/cvs/httpd-python/src/psp_parser.l,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- psp_parser.l 23 Apr 2003 11:01:05 -0000 1.3
+++ psp_parser.l 24 May 2003 03:55:27 -0000 1.4
@@ -1,30 +1,91 @@
%{
-/*
- +----------------------------------------------------------------------------+
- | mod_psp - A python server pages preprocessor |
- +----------------------------------------------------------------------------+
- | Copyright (c) 2003 Sterling Hughes <st...@php.net> |
- | Permission is hereby granted, free of charge, to any person obtaining a |
- | copy of this software and associated documentation files (the "Software"), |
- | to deal in the Software without restriction, including without limitation |
- | the rights to use, copy, modify, merge, publish, distribute, sublicense, |
- | and/or sell copies of the Software, and to permit persons to whom the |
- | Software is furnished to do so, subject to the following conditions: |
- | |
- | The above copyright notice and this permission notice shall be included in |
- | all copies or substantial portions of the Software. |
- | |
- | THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
- | IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
- | FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL |
- | THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
- | LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
- | FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
- | DEALINGS IN THE SOFTWARE. |
- +----------------------------------------------------------------------------+
- | Authors: Sterling Hughes <st...@php.net> |
- +----------------------------------------------------------------------------+
-*/
+/* ====================================================================
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ * if any, must include the following acknowledgment:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowledgment may appear in the software itself,
+ * if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Apache" and "Apache Software Foundation" must
+ * not be used to endorse or promote products derived from this
+ * software without prior written permission. For written
+ * permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache",
+ * "mod_python", or "modpython", nor may these terms appear in their
+ * name, without prior written permission of the Apache Software
+ * Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ * $Id$
+ *
+ * This file originally written by Sterling Hughes.
+ *
+ */
+
+/*
+ * Briefly we are dealing with five modes here:
+ * 0 (INITIAL) - we print a little header, req.print(""" and
+ * immeditely enter TEXT mode.
+ * TEXT - this is your plain old HTML or whatever is in the file.
+ * We copy everything into ob, if we see eol, we flush ob to
+ * pycode. If we see <% or <%= we enter PYCODE mode.
+ * PYCODE - we are inside Python code. Copy everithing similar
+ * TEXT, but watch out for the following:
+ * { - means "simlated" block. We increment in_block counter.
+ * from here on any python code will be indented in_block
+ * times.
+ * } - decrement in_block
+ * ", ' or """ - enter STRING mode
+ * STRING - Copy stuff over, but watch out for a backslash. A backslash
+ * sets the escape flag, so a closing quote is ignored. The """ case is
+ * a bit more complex.
+ * INDENT - we left Python code after encountering %> and are
+ * now in the indent before the first non-whitespace char, e.g.
+ *
+ * %>
+ * ....<h1>hello</h1>
+ *
+ * The space represented by dots above is in INDENT. If in block,
+ * we output whitespace, else, just pass blanks through.
+ * Then print req.write(""" and enter TEXT mode.
+ */
#include "psp_parser.h"
#include <stdio.h>
@@ -37,37 +98,90 @@
%}
-%x IN_PYCODE
-%x IN_STRING
+%x TEXT
+%x PYCODE
+%x STRING
+%x INDENT
%%
-<IN_STRING>. {
- if (yytext[0] == '\\') {
- PSP_PG(is_string_escape) = 1;
+. {
+ psp_string_0(&PSP_PG(ob));
+ psp_string_appendl(&PSP_PG(pycode), STATIC_STR("#\n# This is file is auto-generated by mod_python PSP.\n#\n"));
+ psp_string_appendl(&PSP_PG(pycode), STATIC_STR("\nreq.write(\"\"\""));
+ psp_string_free(&PSP_PG(ob));
+
+ yyless(0);
+
+ BEGIN TEXT;
+}
+
+<TEXT>[\r\n] {
+ if (PSP_PG(ob).length) {
+ psp_string_0(&PSP_PG(ob));
+ psp_string_appendl(&PSP_PG(pycode), PSP_PG(ob).blob, PSP_PG(ob).length);
+ psp_string_free(&PSP_PG(ob));
+ }
+
+ psp_string_appendc(&PSP_PG(pycode), yytext[0]);
+}
+
+<TEXT>"<%=" {
+ if (PSP_PG(ob).length) {
+ psp_string_0(&PSP_PG(ob));
+ psp_string_appendl(&PSP_PG(pycode), PSP_PG(ob).blob, PSP_PG(ob).length);
+ psp_string_free(&PSP_PG(ob));
+ }
+ psp_string_appendl(&PSP_PG(pycode), STATIC_STR("\"\"\")\n"));
+
+ OUTPUT_WHITESPACE(&PSP_PG(whitespace));
+ psp_string_appendl(&PSP_PG(pycode), STATIC_STR("req.write("));
+ PSP_PG(is_psp_echo) = 1;
+
+ BEGIN PYCODE;
+}
+
+<TEXT>"<%" {
+ if (PSP_PG(ob).length) {
+ psp_string_0(&PSP_PG(ob));
+ psp_string_appendl(&PSP_PG(pycode), PSP_PG(ob).blob, PSP_PG(ob).length);
+ psp_string_free(&PSP_PG(ob));
+ }
+ psp_string_appendl(&PSP_PG(pycode), STATIC_STR("\"\"\")\n\n"));
+ CLEAR_WHITESPACE(&PSP_PG(whitespace));
+
+ BEGIN PYCODE;
+}
+
+<TEXT>. {
+ if (yytext[0] == '"') {
+ psp_string_appendl(&PSP_PG(ob), STATIC_STR("\\\""));
} else {
- if (yytext[0] == PSP_PG(string_char)) {
- if (!PSP_PG(is_string_escape)) {
- BEGIN IN_PYCODE;
- }
- }
- PSP_PG(is_string_escape) = 0;
+ psp_string_appendc(&PSP_PG(ob), yytext[0]);
}
-
- psp_string_appendc(&PSP_PG(pycode), yytext[0]);
}
-<IN_PYCODE>[\r\n] {
+<TEXT><<EOF>> {
+ if (PSP_PG(ob).length) {
+ psp_string_0(&PSP_PG(ob));
+ OUTPUT_WHITESPACE(&PSP_PG(whitespace));
+ psp_string_appendl(&PSP_PG(pycode), PSP_PG(ob).blob, PSP_PG(ob).length);
+ psp_string_free(&PSP_PG(ob));
+ }
+ psp_string_appendl(&PSP_PG(pycode), STATIC_STR("\"\"\")\n"));
+ yyterminate();
+}
+
+<PYCODE>[\r\n] {
psp_string_appendc(&PSP_PG(pycode), '\n');
}
-<IN_PYCODE>"{" {
+<PYCODE>"{" {
psp_string_appendc(&PSP_PG(whitespace), '\t');
- psp_string_appendc(&PSP_PG(pycode), '\n');
PSP_PG(in_block)++;
}
-<IN_PYCODE>"}"([ ])* {
+<PYCODE>"}"([ ])* {
CLEAR_WHITESPACE(&PSP_PG(whitespace));
PSP_PG(in_block)--;
if (PSP_PG(in_block) < 0) {
@@ -75,85 +189,100 @@
}
}
-<IN_PYCODE>. {
- if (yytext[0] == '"' || yytext[0] == '\'') {
- PSP_PG(string_char) = yytext[0];
- BEGIN IN_STRING;
- }
- psp_string_appendc(&PSP_PG(pycode), yytext[0]);
-}
-
-<IN_PYCODE>"%>" {
+<PYCODE>"%>" {
if (PSP_PG(is_psp_echo)) {
- psp_string_appendl(&PSP_PG(pycode), STATIC_STR(")\n"));
+ psp_string_appendc(&PSP_PG(pycode), ')');
PSP_PG(is_psp_echo) = 0;
- } else {
- psp_string_appendc(&PSP_PG(pycode), '\n');
- }
+ }
- BEGIN 0;
+ BEGIN INDENT;
}
-"<%=" {
- if (PSP_PG(ob).length) {
- psp_string_0(&PSP_PG(ob));
- OUTPUT_WHITESPACE(&PSP_PG(whitespace));
- psp_string_appendl(&PSP_PG(pycode), STATIC_STR("sys.stdout.write(\""));
- psp_string_appendl(&PSP_PG(pycode), PSP_PG(ob).blob, PSP_PG(ob).length);
- psp_string_appendl(&PSP_PG(pycode), STATIC_STR("\")\n"));
- psp_string_free(&PSP_PG(ob));
- }
-
- OUTPUT_WHITESPACE(&PSP_PG(whitespace));
- psp_string_appendl(&PSP_PG(pycode), STATIC_STR("sys.stdout.write("));
- PSP_PG(is_psp_echo) = 1;
+<PYCODE>"\"\"\"" {
+ PSP_PG(string_char) = '3';
+ psp_string_appendl(&PSP_PG(pycode), yytext, yyleng);
- BEGIN IN_PYCODE;
+ BEGIN STRING;
}
-"<%"([ \t]|[\n\r]) {
- if (PSP_PG(ob).length) {
- psp_string_0(&PSP_PG(ob));
- OUTPUT_WHITESPACE(&PSP_PG(whitespace));
- psp_string_appendl(&PSP_PG(pycode), STATIC_STR("print \""));
- psp_string_appendl(&PSP_PG(pycode), PSP_PG(ob).blob, PSP_PG(ob).length);
- psp_string_appendl(&PSP_PG(pycode), STATIC_STR("\"\n"));
- psp_string_free(&PSP_PG(ob));
- }
-
- CLEAR_WHITESPACE(&PSP_PG(whitespace));
+<PYCODE>. {
+ if (yytext[0] == '"' || yytext[0] == '\'') {
+ PSP_PG(string_char) = yytext[0];
+ BEGIN STRING;
+ }
+ psp_string_appendc(&PSP_PG(pycode), yytext[0]);
+}
- BEGIN IN_PYCODE;
+<STRING>"\"\"\"" {
+ if (PSP_PG(string_char) == '3') {
+ if (!PSP_PG(is_string_escape)) {
+ psp_string_appendl(&PSP_PG(pycode), yytext, yyleng);
+ BEGIN PYCODE;
+ }
+ else {
+ psp_string_appendc(&PSP_PG(pycode), '"');
+ yyless(1);
+ }
+ }
+ PSP_PG(is_string_escape) = 0;
}
-^[\t ]* {
- if (!PSP_PG(in_block)) {
- psp_string_clear(&PSP_PG(whitespace));
- psp_string_appendl(&PSP_PG(whitespace), yytext, yyleng);
+<STRING>. {
+ if (yytext[0] == '\\') {
+ PSP_PG(is_string_escape) = 1;
+ } else {
+ if (yytext[0] == PSP_PG(string_char)) {
+ if (!PSP_PG(is_string_escape)) {
+ BEGIN PYCODE;
+ }
+ }
+ PSP_PG(is_string_escape) = 0;
}
+
+ psp_string_appendc(&PSP_PG(pycode), yytext[0]);
}
-[\r\n] {
- if (PSP_PG(ob).length) {
- psp_string_0(&PSP_PG(ob));
- OUTPUT_WHITESPACE(&PSP_PG(whitespace));
- psp_string_appendl(&PSP_PG(pycode), STATIC_STR("print \""));
- psp_string_appendl(&PSP_PG(pycode), PSP_PG(ob).blob, PSP_PG(ob).length);
- psp_string_appendl(&PSP_PG(pycode), STATIC_STR("\"\n"));
- psp_string_free(&PSP_PG(ob));
- }
+<INDENT>^[\t ]* {
+ psp_string_appendc(&PSP_PG(pycode), '\n');
- if (!PSP_PG(in_block)) {
- CLEAR_WHITESPACE(&PSP_PG(whitespace));
+ if (PSP_PG(in_block)) {
+ OUTPUT_WHITESPACE(&PSP_PG(whitespace));
+ }
+ else {
+ CLEAR_WHITESPACE(&PSP_PG(whitespace));
+ psp_string_appendl(&PSP_PG(whitespace), yytext, yyleng);
+ psp_string_appendl(&PSP_PG(pycode), yytext, yyleng);
}
+ psp_string_appendl(&PSP_PG(pycode), STATIC_STR("req.write(\"\"\""));
+
+ BEGIN TEXT;
}
-. {
- if (yytext[0] == '"') {
- psp_string_appendl(&PSP_PG(ob), STATIC_STR("\\\""));
- } else {
- psp_string_appendc(&PSP_PG(ob), yytext[0]);
- }
+<INDENT>. {
+ psp_string_appendc(&PSP_PG(pycode), '\n');
+
+ if (PSP_PG(in_block)) {
+ OUTPUT_WHITESPACE(&PSP_PG(whitespace));
+ }
+ else {
+ CLEAR_WHITESPACE(&PSP_PG(whitespace));
+ }
+
+ psp_string_appendl(&PSP_PG(pycode), STATIC_STR("req.write(\"\"\""));
+
+ if (yytext[0] == '"') {
+ psp_string_appendl(&PSP_PG(ob), STATIC_STR("\\\""));
+ } else {
+ psp_string_appendc(&PSP_PG(ob), yytext[0]);
+ }
+
+ BEGIN TEXT;
}
%%
+
+/* this is for emacs
+Local Variables:
+mode:C
+End:
+*/
1.29 +2 -1 httpd-python/src/include/mod_python.h
Index: mod_python.h
===================================================================
RCS file: /home/cvs/httpd-python/src/include/mod_python.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- mod_python.h 9 Apr 2003 14:05:56 -0000 1.28
+++ mod_python.h 24 May 2003 03:55:27 -0000 1.29
@@ -121,6 +121,7 @@
#include "connobject.h"
#include "requestobject.h"
#include "filterobject.h"
+#include "psp_flex.h"
/** Things specific to mod_python, as an Apache module **/
1.2 +4 -6 httpd-python/src/include/psp_parser.h
Index: psp_parser.h
===================================================================
RCS file: /home/cvs/httpd-python/src/include/psp_parser.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- psp_parser.h 9 Apr 2003 14:05:56 -0000 1.1
+++ psp_parser.h 24 May 2003 03:55:27 -0000 1.2
@@ -64,10 +64,10 @@
#define STATIC_STR(s) s, sizeof(s)-1
-#define PSP_PG(v) (psp_parser_globals.v)
+#define PSP_PG(v) (((psp_parser_t*)yyget_extra(yyscanner))->v)
typedef struct {
- PyObject *files;
+/* PyObject *files; XXX removed until cache is fixed */
psp_string whitespace;
psp_string ob;
psp_string pycode;
@@ -75,8 +75,6 @@
char string_char;
unsigned is_psp_echo : 1;
unsigned is_string_escape : 1;
-} psp_parser_globals_t;
-
-psp_parser_globals_t psp_parser_globals;
+} psp_parser_t;
#endif /* __PSP_PARSER_H */
1.1 httpd-python/src/include/psp_flex.h
Index: psp_flex.h
===================================================================
#ifndef yyHEADER_H
#define yyHEADER_H 1
#define yyIN_HEADER 1
#line 6 "include/flex.h"
#line 8 "include/flex.h"
#define YY_INT_ALIGNED short int
/* A lexical scanner generated by flex */
#define FLEX_SCANNER
#define YY_FLEX_MAJOR_VERSION 2
#define YY_FLEX_MINOR_VERSION 5
#define YY_FLEX_SUBMINOR_VERSION 31
#if YY_FLEX_SUBMINOR_VERSION > 0
#define FLEX_BETA
#endif
/* First, we deal with platform-specific or compiler-specific issues. */
/* begin standard C headers. */
#include <stdio.h>
#include <string.h>
#include <errno.h>
#include <stdlib.h>
/* end standard C headers. */
/* flex integer type definitions */
#ifndef FLEXINT_H
#define FLEXINT_H
/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
#if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L
#include <inttypes.h>
typedef int8_t flex_int8_t;
typedef uint8_t flex_uint8_t;
typedef int16_t flex_int16_t;
typedef uint16_t flex_uint16_t;
typedef int32_t flex_int32_t;
typedef uint32_t flex_uint32_t;
#else
typedef signed char flex_int8_t;
typedef short int flex_int16_t;
typedef int flex_int32_t;
typedef unsigned char flex_uint8_t;
typedef unsigned short int flex_uint16_t;
typedef unsigned int flex_uint32_t;
#endif /* ! C99 */
/* Limits of integral types. */
#ifndef INT8_MIN
#define INT8_MIN (-128)
#endif
#ifndef INT16_MIN
#define INT16_MIN (-32767-1)
#endif
#ifndef INT32_MIN
#define INT32_MIN (-2147483647-1)
#endif
#ifndef INT8_MAX
#define INT8_MAX (127)
#endif
#ifndef INT16_MAX
#define INT16_MAX (32767)
#endif
#ifndef INT32_MAX
#define INT32_MAX (2147483647)
#endif
#ifndef UINT8_MAX
#define UINT8_MAX (255U)
#endif
#ifndef UINT16_MAX
#define UINT16_MAX (65535U)
#endif
#ifndef UINT32_MAX
#define UINT32_MAX (4294967295U)
#endif
#endif /* ! FLEXINT_H */
#ifdef __cplusplus
/* The "const" storage-class-modifier is valid. */
#define YY_USE_CONST
#else /* ! __cplusplus */
#if __STDC__
#define YY_USE_CONST
#endif /* __STDC__ */
#endif /* ! __cplusplus */
#ifdef YY_USE_CONST
#define yyconst const
#else
#define yyconst
#endif
/* An opaque pointer. */
#ifndef YY_TYPEDEF_YY_SCANNER_T
#define YY_TYPEDEF_YY_SCANNER_T
typedef void* yyscan_t;
#endif
/* For convenience, these vars (plus the bison vars far below)
are macros in the reentrant scanner. */
#define yyin yyg->yyin_r
#define yyout yyg->yyout_r
#define yyextra yyg->yyextra_r
#define yyleng yyg->yyleng_r
#define yytext yyg->yytext_r
#define yylineno (YY_CURRENT_BUFFER_LVALUE->yy_bs_lineno)
#define yycolumn (YY_CURRENT_BUFFER_LVALUE->yy_bs_column)
#define yy_flex_debug yyg->yy_flex_debug_r
int yylex_init (yyscan_t* scanner);
#ifndef YY_TYPEDEF_YY_BUFFER_STATE
#define YY_TYPEDEF_YY_BUFFER_STATE
typedef struct yy_buffer_state *YY_BUFFER_STATE;
#endif
/* The following is because we cannot portably get our hands on size_t
* (without autoconf's help, which isn't available because we want
* flex-generated scanners to compile on their own).
*/
#ifndef YY_TYPEDEF_YY_SIZE_T
#define YY_TYPEDEF_YY_SIZE_T
typedef unsigned int yy_size_t;
#endif
#ifndef YY_STRUCT_YY_BUFFER_STATE
#define YY_STRUCT_YY_BUFFER_STATE
struct yy_buffer_state
{
FILE *yy_input_file;
char *yy_ch_buf; /* input buffer */
char *yy_buf_pos; /* current position in input buffer */
/* Size of input buffer in bytes, not including room for EOB
* characters.
*/
yy_size_t yy_buf_size;
/* Number of characters read into yy_ch_buf, not including EOB
* characters.
*/
int yy_n_chars;
/* Whether we "own" the buffer - i.e., we know we created it,
* and can realloc() it to grow it, and should free() it to
* delete it.
*/
int yy_is_our_buffer;
/* Whether this is an "interactive" input source; if so, and
* if we're using stdio for input, then we want to use getc()
* instead of fread(), to make sure we stop fetching input after
* each newline.
*/
int yy_is_interactive;
/* Whether we're considered to be at the beginning of a line.
* If so, '^' rules will be active on the next match, otherwise
* not.
*/
int yy_at_bol;
int yy_bs_lineno; /**< The line count. */
int yy_bs_column; /**< The column count. */
/* Whether to try to fill the input buffer when we reach the
* end of it.
*/
int yy_fill_buffer;
int yy_buffer_status;
};
#endif /* !YY_STRUCT_YY_BUFFER_STATE */
void yyrestart (FILE *input_file ,yyscan_t yyscanner );
void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner );
YY_BUFFER_STATE yy_create_buffer (FILE *file,int size ,yyscan_t yyscanner );
void yy_delete_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner );
void yy_flush_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner );
void yypush_buffer_state (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner );
void yypop_buffer_state (yyscan_t yyscanner );
YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner );
YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str ,yyscan_t yyscanner );
YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,int len ,yyscan_t yyscanner );
void *yyalloc (yy_size_t ,yyscan_t yyscanner );
void *yyrealloc (void *,yy_size_t ,yyscan_t yyscanner );
void yyfree (void * ,yyscan_t yyscanner );
/* Begin user sect3 */
#define yytext_ptr yytext_r
#ifdef YY_HEADER_EXPORT_START_CONDITIONS
#define INITIAL 0
#define TEXT 1
#define PYCODE 2
#define STRING 3
#define INDENT 4
#endif
/* Special case for "unistd.h", since it is non-ANSI. We include it way
* down here because we want the user's section 1 to have been scanned first.
* The user has a chance to override it with an option.
*/
#include <unistd.h>
#ifndef YY_EXTRA_TYPE
#define YY_EXTRA_TYPE void *
#endif
static int yy_init_globals (yyscan_t yyscanner );
/* Accessor methods to globals.
These are made visible to non-reentrant scanners for convenience. */
int yylex_destroy (yyscan_t yyscanner );
int yyget_debug (yyscan_t yyscanner );
void yyset_debug (int debug_flag ,yyscan_t yyscanner );
YY_EXTRA_TYPE yyget_extra (yyscan_t yyscanner );
void yyset_extra (YY_EXTRA_TYPE user_defined ,yyscan_t yyscanner );
FILE *yyget_in (yyscan_t yyscanner );
void yyset_in (FILE * in_str ,yyscan_t yyscanner );
FILE *yyget_out (yyscan_t yyscanner );
void yyset_out (FILE * out_str ,yyscan_t yyscanner );
int yyget_leng (yyscan_t yyscanner );
char *yyget_text (yyscan_t yyscanner );
int yyget_lineno (yyscan_t yyscanner );
void yyset_lineno (int line_number ,yyscan_t yyscanner );
/* Macros after this point can all be overridden by user definitions in
* section 1.
*/
#ifndef YY_SKIP_YYWRAP
#ifdef __cplusplus
extern "C" int yywrap (yyscan_t yyscanner );
#else
extern int yywrap (yyscan_t yyscanner );
#endif
#endif
#ifndef yytext_ptr
static void yy_flex_strncpy (char *,yyconst char *,int ,yyscan_t yyscanner);
#endif
#ifdef YY_NEED_STRLEN
static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner);
#endif
#ifndef YY_NO_INPUT
#endif
/* Amount of stuff to slurp up with each read. */
#ifndef YY_READ_BUF_SIZE
#define YY_READ_BUF_SIZE 8192
#endif
/* Number of entries by which start-condition stack grows. */
#ifndef YY_START_STACK_INCR
#define YY_START_STACK_INCR 25
#endif
/* Default declaration of generated scanner - a define so the user can
* easily add parameters.
*/
#ifndef YY_DECL
#define YY_DECL_IS_OURS 1
extern int yylex (yyscan_t yyscanner);
#define YY_DECL int yylex (yyscan_t yyscanner)
#endif /* !YY_DECL */
/* yy_get_previous_state - get the state just before the EOB char was reached */
#undef YY_NEW_FILE
#undef YY_FLUSH_BUFFER
#undef yy_set_bol
#undef yy_new_buffer
#undef yy_set_interactive
#undef yytext_ptr
#undef YY_DO_BEFORE_ACTION
#ifdef YY_DECL_IS_OURS
#undef YY_DECL_IS_OURS
#undef YY_DECL
#endif
#line 282 "psp_parser.l"
#line 324 "include/flex.h"
#undef yyIN_HEADER
#endif /* yyHEADER_H */