From 4ae9ac969a6cab3ed84ea7a8061c5c44fd418f86 Mon Sep 17 00:00:00 2001
From: Jonas Maebe <jonas@freepascal.org>
Date: Wed, 27 Dec 2006 14:29:23 +0000
Subject: [PATCH]   * implicitly call procvars in tp/delphi modes for divmodn,
 shlshrn     and notn (mantis 7200)

git-svn-id: trunk@5724 -
---
 .gitattributes         |  1 +
 compiler/nmat.pas      | 14 +++++++++++++-
 tests/webtbs/tw7200.pp | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 tests/webtbs/tw7200.pp

diff --git a/.gitattributes b/.gitattributes
index ad0558c7ff..0a4b3c468b 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -7785,6 +7785,7 @@ tests/webtbs/tw7143.pp -text
 tests/webtbs/tw7161.pp svneol=native#text/plain
 tests/webtbs/tw7173.pp svneol=native#text/plain
 tests/webtbs/tw7195.pp svneol=native#text/plain
+tests/webtbs/tw7200.pp svneol=native#text/plain
 tests/webtbs/tw7227.pp svneol=native#text/plain
 tests/webtbs/tw7276.pp svneol=native#text/plain
 tests/webtbs/tw7281.pp svneol=native#text/plain
diff --git a/compiler/nmat.pas b/compiler/nmat.pas
index 4c7fa0a09c..a09557c7b2 100644
--- a/compiler/nmat.pas
+++ b/compiler/nmat.pas
@@ -94,7 +94,8 @@ implementation
       defutil,
       htypechk,pass_1,
       cgbase,
-      ncon,ncnv,ncal,nadd;
+      ncon,ncnv,ncal,nadd,
+      nutils;
 
 {****************************************************************************
                               TMODDIVNODE
@@ -164,6 +165,10 @@ implementation
          if codegenerror then
            exit;
 
+         { tp procvar support }
+         maybe_call_procvar(left,true);
+         maybe_call_procvar(right,true);
+
          result:=simplify;
          if assigned(result) then
            exit;
@@ -495,6 +500,10 @@ implementation
          if codegenerror then
            exit;
 
+         { tp procvar support }
+         maybe_call_procvar(left,true);
+         maybe_call_procvar(right,true);
+
          result:=simplify;
          if assigned(result) then
            exit;
@@ -853,6 +862,9 @@ implementation
          if codegenerror then
            exit;
 
+         { tp procvar support }
+         maybe_call_procvar(left,true);
+
          resultdef:=left.resultdef;
 
          result:=simplify;
diff --git a/tests/webtbs/tw7200.pp b/tests/webtbs/tw7200.pp
new file mode 100644
index 0000000000..0925bc5900
--- /dev/null
+++ b/tests/webtbs/tw7200.pp
@@ -0,0 +1,32 @@
+{$mode delphi}
+
+var i : integer;
+
+function GetInt : integer;
+begin
+ Result := 10;
+end;
+
+
+ var myfunc : function : integer;
+
+
+begin
+
+ myfunc := GetInt;
+
+ //i := integer(myfunc) div 2; //works
+ //i := myfunc; i := i div 2; //works
+ i := myfunc div 2; //does not work
+ if (i <> 5) then
+   halt(1);
+
+ i := myfunc shr 2;
+ if i <> 2 then
+   halt(2);
+
+ i := not myfunc;
+ if i <> not(integer(10)) then
+   halt(3);
+
+end.