Build flex 2.5.11.

This commit is contained in:
Andrius Štikonas 2021-01-28 18:53:44 +00:00
parent 707328a15c
commit de9548dbff
11 changed files with 882 additions and 2 deletions

View file

@ -0,0 +1,24 @@
diff --git flexdef.h flexdef.h
index 3eb710a..94ef024 100644
--- flexdef.h
+++ flexdef.h
@@ -421,7 +421,7 @@ extern int yymore_really_used, reject_really_used;
*/
extern int datapos, dataline, linenum, out_linenum;
-extern FILE *skelfile, *yyin, *backing_up_file;
+extern FILE *skelfile, *backing_up_file;
extern const char *skel[];
extern int skel_ind;
extern char *infilename, *outfilename, *headerfilename;
@@ -432,6 +432,10 @@ extern char **input_files;
extern int num_input_files;
extern char *program_name;
+#ifndef yyin_defined
+extern FILE* yyin;
+#endif
+
extern char *action_array;
extern int action_size;
extern int defs1_offset, prolog_offset, action_offset, action_index;

View file

@ -0,0 +1,36 @@
diff --git scan.l scan.l
index 18d0de8..c251a5e 100644
--- scan.l
+++ scan.l
@@ -32,6 +32,7 @@
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
+#define yyin_defined
#include "flexdef.h"
#include "parse.h"
@@ -334,8 +335,8 @@ LEXOPT [aceknopr]
<SECT2PROLOG>{
- ^"%{".* ++bracelevel; yyless( 2 ); /* eat only %{ */
- ^"%}".* --bracelevel; yyless( 2 ); /* eat only %} */
+ ^"%{".* ++bracelevel; yyless( 2 );
+ ^"%}".* --bracelevel; yyless( 2 );
^{WS}.* ACTION_ECHO; /* indented code in prolog */
@@ -480,11 +481,11 @@ LEXOPT [aceknopr]
}
}
+ "{"{NAME}"}"[[:space:]]? {
/* Check for :space: at the end of the rule so we don't
* wrap the expanded regex in '(' ')' -- breaking trailing
* context.
*/
- "{"{NAME}"}"[[:space:]]? {
register Char *nmdefptr;
int end_is_ws, end_ch;