[prev in list] [next in list] [prev in thread] [next in thread] 

List:       monetdb-checkins
Subject:    MonetDB: default - jaql.l: attempts to stop flex from reading stdin
From:       Fabian Groffen <fabian () cwi ! nl>
Date:       2012-03-29 12:51:51
Message-ID: hg.ff40dca9641d.1333025511.6315528441665844383 () monetdb2 ! cwi-incubator ! nl
[Download RAW message or body]

Changeset: ff40dca9641d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ff40dca9641d
Modified Files:
	monetdb5/extras/jaql/parser/jaql.l
Branch: default
Log Message:

jaql.l: attempts to stop flex from reading stdin

Various settings that should bypass, skip, or avoid using stdin,
unfortunately all not solving the problem (flex just generates code to
default to initialise using stdin).  However, the settings should be
good for the way we use flex, and don't seem to break anything beyond
what's already broken now.


diffs (22 lines):

diff --git a/monetdb5/extras/jaql/parser/jaql.l b/monetdb5/extras/jaql/parser/jaql.l
--- a/monetdb5/extras/jaql/parser/jaql.l
+++ b/monetdb5/extras/jaql/parser/jaql.l
@@ -4,6 +4,10 @@
 %option noyywrap
 %option yylineno
 %option case-insensitive
+%option batch
+%option nostdinit
+%option nodefault
+%option fast
 %option extra-type="struct _jc *"
 
 %{
@@ -17,6 +21,7 @@ extern void jaqlerror(YYLTYPE* locp, jc*
 #define YY_USER_ACTION yylloc->first_line = yylineno;
 
 #define YY_INPUT(buf, res, max_size) readinput(yyextra, buf, &res, max_size)
+#define YY_NO_INPUT
 
 static void readinput(jc *j, char *buf, int *res, size_t max_size) {
 	if (j->buf != NULL && *j->buf != '\0') {
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
[prev in list] [next in list] [prev in thread] [next in thread]