From: Vern Paxson <vern@ee.lbl.gov>
Date: Sat, 17 Dec 1994 18:41:07 +0000 (+0000)
Subject: C++/-P fixes
X-Git-Tag: flex-2-5-5b~148
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8d597b6056b56604364a0b86310d8d8d2afb0720;p=flex

C++/-P fixes
---

diff --git a/main.c b/main.c
index f5eef7d..3c4fa05 100644
--- a/main.c
+++ b/main.c
@@ -274,24 +274,31 @@ void check_options()
 
 	if ( strcmp( prefix, "yy" ) )
 		{
-#define GEN_PREFIX(name) out_str3( "#define yy%s %s%s\n", name, prefix, name );
-		GEN_PREFIX( "FlexLexer" );
-		GEN_PREFIX( "_create_buffer" );
-		GEN_PREFIX( "_delete_buffer" );
-		GEN_PREFIX( "_scan_buffer" );
-		GEN_PREFIX( "_scan_string" );
-		GEN_PREFIX( "_scan_bytes" );
-		GEN_PREFIX( "_flex_debug" );
-		GEN_PREFIX( "_init_buffer" );
-		GEN_PREFIX( "_load_buffer_state" );
-		GEN_PREFIX( "_switch_to_buffer" );
-		GEN_PREFIX( "in" );
-		GEN_PREFIX( "leng" );
-		GEN_PREFIX( "lex" );
-		GEN_PREFIX( "out" );
-		GEN_PREFIX( "restart" );
-		GEN_PREFIX( "text" );
-		GEN_PREFIX( "wrap" );
+#define GEN_PREFIX(name) out_str3( "#define yy%s %s%s\n", name, prefix, name )
+		if ( C_plus_plus )
+			GEN_PREFIX( "FlexLexer" );
+		else
+			{
+			GEN_PREFIX( "_create_buffer" );
+			GEN_PREFIX( "_delete_buffer" );
+			GEN_PREFIX( "_scan_buffer" );
+			GEN_PREFIX( "_scan_string" );
+			GEN_PREFIX( "_scan_bytes" );
+			GEN_PREFIX( "_flex_debug" );
+			GEN_PREFIX( "_init_buffer" );
+			GEN_PREFIX( "_load_buffer_state" );
+			GEN_PREFIX( "_switch_to_buffer" );
+			GEN_PREFIX( "in" );
+			GEN_PREFIX( "leng" );
+			GEN_PREFIX( "lex" );
+			GEN_PREFIX( "out" );
+			GEN_PREFIX( "restart" );
+			GEN_PREFIX( "text" );
+			}
+
+		if ( do_yywrap )
+			GEN_PREFIX( "wrap" );
+
 		outn( "" );
 		}
 
@@ -869,7 +876,10 @@ void readin()
 		outn( "\n#define YY_USES_REJECT" );
 
 	if ( ! do_yywrap )
+		{
 		outn( "\n#define yywrap() 1" );
+		outn( "#define YY_SKIP_YYWRAP" );
+		}
 
 	if ( ddebug )
 		outn( "\n#define FLEX_DEBUG" );