From: helly <helly@642ea486-5414-0410-9d7f-a0204ed87703>
Date: Sat, 25 Feb 2006 12:57:50 +0000 (+0000)
Subject: - Fix a warning (parameters hide members)
X-Git-Tag: 0.13.6~447
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=608960029b0b1a37fc256a33cd29e54d3e014314;p=re2c

- Fix a warning (parameters hide members)
---

diff --git a/actions.cc b/actions.cc
index c38da901..ef4f296b 100644
--- a/actions.cc
+++ b/actions.cc
@@ -695,23 +695,23 @@ uint Scanner::unescape(SubStr &s) const
 	}
 }
 
-std::string& Scanner::unescape(SubStr & in, std::string & out) const
+std::string& Scanner::unescape(SubStr& str_in, std::string& str_out) const
 {
-	out.clear();
+	str_out.clear();
 
-	while(in.len)
+	while(str_in.len)
 	{
-		uint c = unescape(in);
+		uint c = unescape(str_in);
 		
 		if (c > 0xFF)
 		{
-			fatal(in.ofs(), "Illegal character");
+			fatal(str_in.ofs(), "Illegal character");
 		}
 
-		out += static_cast<char>(c);
+		str_out += static_cast<char>(c);
 	}
 
-	return out;
+	return str_out;
 }
 
 Range * Scanner::getRange(SubStr &s) const
diff --git a/scanner.h b/scanner.h
index 5644eb7f..9f7fb958 100644
--- a/scanner.h
+++ b/scanner.h
@@ -41,7 +41,7 @@ public:
 	uint xlat(uint c) const;
 
 	uint unescape(SubStr &s) const;
-	std::string& unescape(SubStr & in, std::string & out) const;
+	std::string& unescape(SubStr& str_in, std::string& str_out) const;
 
 	Range * getRange(SubStr &s) const;
 	RegExp * matchChar(uint c) const;