Merge branch 'upstream'

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

# Conflicts:
#	INSTALL
#	Makefile.in
#	aclocal.m4
#	build-aux/compile
#	build-aux/config.guess
#	build-aux/config.sub
#	build-aux/depcomp
#	build-aux/install-sh
#	build-aux/mdate-sh
#	build-aux/texinfo.tex
#	configure
#	doc/Makefile.in
#	doc/flex.1
#	doc/flex.info
#	doc/flex.info-1
#	doc/flex.info-2
#	doc/flex.pdf
#	doc/stamp-vti
#	doc/version.texi
#	examples/Makefile.in
#	examples/fastwc/Makefile.in
#	examples/manual/Makefile.in
#	src/config.h.in
#	tests/Makefile.in
#	tests/test-bison-nr/Makefile.am
#	tests/test-bison-yylloc/Makefile.am
#	tests/test-bison-yylval/Makefile.am
#	tools/Makefile.in

1 files changed, 57 insertions, 0 deletions

diff --git a/tests/c_cxx_nr.lll b/tests/c_cxx_nr.lll
new file mode 100644
index 0000000..c9e0fb6
--- /dev/null
+++ b/tests/c_cxx_nr.lll
@@ -0,0 +1,57 @@
+/*
+ * 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". 
+   The scanner is not really important -- we only care if
+   it compiles under a c++ compiler, and runs. */
+#include <stdio.h>
+#include <stdlib.h>
+#include "config.h"
+/*#include "parser.h" */
+
+%}
+
+%option 8bit prefix="test"
+%option nounput nomain noyywrap 
+%option warn
+
+
+%%
+
+.              { }
+
+%%
+
+int main(void);
+
+int
+main ()
+{
+    yyin = stdin;
+    yyout = stdout;
+    yylex();
+    yylex_destroy();
+    printf("TEST RETURNING OK.\n");
+    return 0;
+}