Merge tag 'v2.6.0' into upstream

flex v2.6.0 release

Signed-off-by: Manoj Srivastava <srivasta@debian.org>

# gpg: Signature made Sat 05 Dec 2015 11:42:31 AM PST using RSA key ID 4F8BC9A4
# gpg: requesting key 4F8BC9A4 from hkp server pool.sks-keyservers.net
# gpg: no valid OpenPGP data found.
# gpg: Total number processed: 0
# gpg: keyserver communications error: key not found
# gpg: keyserver communications error: bad public key
# gpg: Can't check signature: public key not found

# Conflicts:
#	Makefile.am
#	NEWS
#	autogen.sh
#	configure.ac
#	doc/Makefile.am
#	doc/flex.texi
#	examples/fastwc/mywc.c
#	lib/Makefile.am
#	lib/malloc.c
#	lib/realloc.c
#	po/POTFILES.in
#	po/ca.po
#	po/da.po
#	po/de.po
#	po/eo.po
#	po/es.po
#	po/fi.po
#	po/fr.po
#	po/ga.po
#	po/hr.po
#	po/ko.po
#	po/nl.po
#	po/pl.po
#	po/pt_BR.po
#	po/ro.po
#	po/ru.po
#	po/sr.po
#	po/sv.po
#	po/tr.po
#	po/vi.po
#	po/zh_CN.po
#	po/zh_TW.po
#	tests/Makefile.am
#	tests/README

1 files changed, 96 insertions, 0 deletions

diff --git a/tests/string_nr.l b/tests/string_nr.l
new file mode 100644
index 0000000..3dd752a
--- /dev/null
+++ b/tests/string_nr.l
@@ -0,0 +1,96 @@
+/*
+ * This file is part of flex.
+ * 
+ * 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.
+ * 
+ * Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE.
+ */
+
+%{
+/* A template scanner file to build "scanner.c". */
+#include <stdio.h>
+#include <stdlib.h>
+#include "config.h"
+
+#define NUMBER 200
+#define WORD   201
+
+%}
+
+%option 8bit prefix="test"
+%option nounput nomain nodefault noyywrap noinput
+%option warn 
+
+
+%%
+
+[[:space:]]+   { }
+[[:digit:]]+   { printf("NUMBER "); fflush(stdout);}
+[[:alpha:]]+   { printf("WORD "); fflush(stdout);}
+.              {
+    fprintf(stderr,"*** Error: Unrecognized character '%c' while scanning.\n",
+         yytext[0]);
+    yyterminate();
+    }
+
+<<EOF>>  { printf("<<EOF>>\n"); yyterminate();}
+
+%%
+
+
+#define INPUT_STRING_1  "1234 foo bar"
+#define INPUT_STRING_2  "1234 foo bar *@&@&###@^$#&#*"
+
+int main(void);
+
+int
+main ()
+{
+    char * buf;
+    int len;
+    YY_BUFFER_STATE state;
+
+
+    /* Scan a good string. */
+    printf("Testing: yy_scan_string(%s): ",INPUT_STRING_1); fflush(stdout);
+    state = yy_scan_string ( INPUT_STRING_1 );
+    yylex();
+    yy_delete_buffer(state);
+
+    /* Scan only the first 12 chars of a string. */
+    printf("Testing: yy_scan_bytes(%s): ",INPUT_STRING_2); fflush(stdout);
+    state = yy_scan_bytes  ( INPUT_STRING_2, 12 );
+    yylex();
+    yy_delete_buffer(state);
+
+    /* Scan directly from a buffer.
+       We make a copy, since the buffer will be modified by flex.*/
+    printf("Testing: yy_scan_buffer(%s): ",INPUT_STRING_1); fflush(stdout);
+    len = strlen(INPUT_STRING_1) + 2;
+    buf = (char*)malloc( len );
+    strcpy( buf, INPUT_STRING_1);
+    buf[ len -2 ]  = 0; /* Flex requires two NUL bytes at end of buffer. */
+    buf[ len -1 ] =0;
+
+    state = yy_scan_buffer( buf, len );
+    yylex();
+    yy_delete_buffer(state);
+    
+    printf("TEST RETURNING OK.\n");
+    return 0;
+}