From 1b81afcd42b035770161db485e88db0663c81a83 Mon Sep 17 00:00:00 2001
From: paul <paul@idefix.freepascal.org>
Date: Thu, 5 Sep 2013 01:10:04 +0000
Subject: [PATCH] compiler: allow to hide parent function identifier inside
 them (by a nested function with the same name or by a local variable). Fixes
 mantis #0024129.

git-svn-id: trunk@25420 -
---
 .gitattributes          |  1 +
 compiler/pdecsub.pas    |  8 ++++++++
 tests/webtbs/tw24129.pp | 27 +++++++++++++++++++++++++++
 3 files changed, 36 insertions(+)
 create mode 100644 tests/webtbs/tw24129.pp

diff --git a/.gitattributes b/.gitattributes
index ade887f9a7..33892583c6 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -13488,6 +13488,7 @@ tests/webtbs/tw2397.pp svneol=native#text/plain
 tests/webtbs/tw24007.pp svneol=native#text/plain
 tests/webtbs/tw24071.pp svneol=native#text/pascal
 tests/webtbs/tw2409.pp svneol=native#text/plain
+tests/webtbs/tw24129.pp svneol=native#text/pascal
 tests/webtbs/tw24131.pp svneol=native#text/plain
 tests/webtbs/tw24197.pp svneol=native#text/plain
 tests/webtbs/tw2421.pp svneol=native#text/plain
diff --git a/compiler/pdecsub.pas b/compiler/pdecsub.pas
index 08b196074f..b01311e9e4 100644
--- a/compiler/pdecsub.pas
+++ b/compiler/pdecsub.pas
@@ -907,6 +907,14 @@ implementation
                         HideSym(srsym);
                         searchagain:=true;
                       end
+                     else
+                     if (m_delphi in current_settings.modeswitches) and
+                        (srsym.typ=absolutevarsym) and
+                        ([vo_is_funcret,vo_is_result]*tabstractvarsym(srsym).varoptions=[vo_is_funcret]) then
+                       begin
+                         HideSym(srsym);
+                         searchagain:=true;
+                       end
                      else
                       begin
                         {  we use a different error message for tp7 so it looks more compatible }
diff --git a/tests/webtbs/tw24129.pp b/tests/webtbs/tw24129.pp
new file mode 100644
index 0000000000..d8997a3087
--- /dev/null
+++ b/tests/webtbs/tw24129.pp
@@ -0,0 +1,27 @@
+{%norun}
+program tw24129;
+
+{$mode delphi}
+procedure Test;
+
+  function Next: integer;
+    function Next: integer;
+      function Next: integer;
+      var
+        Next: integer;
+      begin
+
+      end;
+    begin
+
+    end;
+  begin
+
+  end;
+
+begin
+
+end;
+
+begin
+end.
\ No newline at end of file