From: helly <helly@642ea486-5414-0410-9d7f-a0204ed87703>
Date: Sat, 25 Feb 2006 12:41:41 +0000 (+0000)
Subject: - Fix a warning (no more need to pass around out stream)
X-Git-Tag: 0.13.6~448
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d5b6ba7babed0bc3dde0fa70dc71a3e78aea27d6;p=re2c

- Fix a warning (no more need to pass around out stream)
---

diff --git a/bootstrap/parser.cc b/bootstrap/parser.cc
index b1c4e004..9ceb1af3 100644
--- a/bootstrap/parser.cc
+++ b/bootstrap/parser.cc
@@ -1621,7 +1621,7 @@ void parse(Scanner& i, std::ostream& o)
 	o << " */\n";
 	o << sourceFileInfo;
 	
-	while(i.echo(o))
+	while(i.echo())
 	{
 		yyparse();
 		if(spec)
diff --git a/bootstrap/scanner.cc b/bootstrap/scanner.cc
index 27fbefb9..9759502b 100644
--- a/bootstrap/scanner.cc
+++ b/bootstrap/scanner.cc
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.10.0.rc1 on Wed Feb  1 00:27:14 2006 */
+/* Generated by re2c 0.10.1.dev on Sat Feb 25 13:38:57 2006 */
 #line 1 "scanner.re"
 /* $Id$ */
 #include <stdlib.h>
@@ -79,12 +79,12 @@ char *Scanner::fill(char *cursor)
 #line 95 "scanner.re"
 
 
-int Scanner::echo(std::ostream &out){
+int Scanner::echo()
+{
     char *cursor = cur;
     bool ignore_eoc = false;
 
-    // Catch EOF
-    if (eof && cursor == eof)
+    if (eof && cursor == eof) // Catch EOF
 	{
     	return 0;
 	}
diff --git a/parser.y b/parser.y
index c9d3109b..8df671bf 100644
--- a/parser.y
+++ b/parser.y
@@ -195,7 +195,7 @@ void parse(Scanner& i, std::ostream& o)
 	o << " */\n";
 	o << sourceFileInfo;
 	
-	while(i.echo(o))
+	while(i.echo())
 	{
 		yyparse();
 		if(spec)
diff --git a/scanner.h b/scanner.h
index ce09f4b9..5644eb7f 100644
--- a/scanner.h
+++ b/scanner.h
@@ -27,7 +27,7 @@ private:
 
 public:
 	Scanner(std::istream&, std::ostream&);
-	int echo(std::ostream&);
+	int echo();
 	int scan();
 	
 	void fatal(const char*) const;
diff --git a/scanner.re b/scanner.re
index bbc93803..aaf376ae 100644
--- a/scanner.re
+++ b/scanner.re
@@ -94,12 +94,12 @@ config  = "re2c" cname+;
 value   = [^\r\n; \t]* | dstring | sstring;
 */
 
-int Scanner::echo(std::ostream &out){
+int Scanner::echo()
+{
     char *cursor = cur;
     bool ignore_eoc = false;
 
-    // Catch EOF
-    if (eof && cursor == eof)
+    if (eof && cursor == eof) // Catch EOF
 	{
     	return 0;
 	}