From ca085a35d225bd344d67b38a160a9d3cff64ad1d Mon Sep 17 00:00:00 2001
From: miks1965 <miks@math.sfedu.ru>
Date: Wed, 9 May 2018 12:12:34 +0300
Subject: [PATCH] try bug fix 815

---
 Configuration/GlobalAssemblyInfo.cs         |   2 +-
 Configuration/Version.defs                  |   4 ++--
 Localization/DefaultLang.resources          | Bin 82840 -> 82950 bytes
 ReleaseGenerators/PascalABCNET_version.nsh  |   2 +-
 TestSuite/CompilationSamples/PABCSystem.pas |   4 ++--
 TestSuite/IndexOfInListAndMyList.pas        |  14 ++++++++++++++
 TreeConverter/NetWrappers/NetHelper.cs      |   4 ++--
 bin/Lib/PABCSystem.pas                      |   4 ++--
 8 files changed, 24 insertions(+), 10 deletions(-)
 create mode 100644 TestSuite/IndexOfInListAndMyList.pas

diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs
index a97b28a4e..67a949a59 100644
--- a/Configuration/GlobalAssemblyInfo.cs
+++ b/Configuration/GlobalAssemblyInfo.cs
@@ -15,7 +15,7 @@ internal static class RevisionClass
 	public const string Major = "3";
 	public const string Minor = "3";
 	public const string Build = "5";
-	public const string Revision = "1663";
+	public const string Revision = "1664";
 
         public const string MainVersion = Major + "." + Minor;
 	public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision;
diff --git a/Configuration/Version.defs b/Configuration/Version.defs
index 4ba5e671e..58f5af9f0 100644
--- a/Configuration/Version.defs
+++ b/Configuration/Version.defs
@@ -1,4 +1,4 @@
-%COREVERSION%=5
-%REVISION%=1663
 %MINOR%=3
+%REVISION%=1664
+%COREVERSION%=5
 %MAJOR%=3
diff --git a/Localization/DefaultLang.resources b/Localization/DefaultLang.resources
index d1e751d119e4536387b6be40038979030fd2e1f6..c1a9fc895617b3cb0c8f7a51eba9ddff7a6c5f72 100644
GIT binary patch
delta 133
zcmbQy&f3<&I^hA6lJmw#$(=dQK90e`@s1%OL7q;bA+GU${vq*>K0f~8t}gMOe(@0L
zfFM^FS2s_;5Kn)<VB51#pS*kj`QxV-Z{8`qd;j6-lc%r$fBK{F;M0c}4?lnUt?=sg
kgO48{C_GYl`uLp!NdDdX7at$Ieeq&)KfB!K#4hul05FkB;{X5v

delta 20
ccmZqcV4cy<I^hA+7N?Dmk~=qV?h4)s0AckC8vp<R

diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh
index 563a4c349..540205357 100644
--- a/ReleaseGenerators/PascalABCNET_version.nsh
+++ b/ReleaseGenerators/PascalABCNET_version.nsh
@@ -1 +1 @@
-!define VERSION '3.3.5.1663'
+!define VERSION '3.3.5.1664'
diff --git a/TestSuite/CompilationSamples/PABCSystem.pas b/TestSuite/CompilationSamples/PABCSystem.pas
index 8f645b8ad..95d30e648 100644
--- a/TestSuite/CompilationSamples/PABCSystem.pas
+++ b/TestSuite/CompilationSamples/PABCSystem.pas
@@ -3677,9 +3677,9 @@ procedure BigInteger.operator*=(var p: BigInteger; q: BigInteger) := p := p * q;
 
 procedure BigInteger.operator-=(var p: BigInteger; q: BigInteger) := p := p - q;
 
-function BigInteger.operator div(p,q: BigInteger) := BigInteger.Divide(p,q);
+//function BigInteger.operator div(p,q: BigInteger) := BigInteger.Divide(p,q);
 
-function BigInteger.operator mod(p,q: BigInteger) := BigInteger.Remainder(p,q);
+//function BigInteger.operator mod(p,q: BigInteger) := BigInteger.Remainder(p,q);
 
 function BigInteger.operator-(p: BigInteger) := BigInteger.Negate(p);
 
diff --git a/TestSuite/IndexOfInListAndMyList.pas b/TestSuite/IndexOfInListAndMyList.pas
new file mode 100644
index 000000000..8ef545765
--- /dev/null
+++ b/TestSuite/IndexOfInListAndMyList.pas
@@ -0,0 +1,14 @@
+// Закрывает баг #815
+
+type
+  MyList<T> = class(List<T>)
+  public
+    function IndexOf: integer; 
+    begin Print(666); end;
+  end;
+
+begin
+  var l := new MyList<integer>;
+  l.Add(1);
+  Assert(l.IndexOf(l[0])=0);
+end.
\ No newline at end of file
diff --git a/TreeConverter/NetWrappers/NetHelper.cs b/TreeConverter/NetWrappers/NetHelper.cs
index 88ce40007..f877436b6 100644
--- a/TreeConverter/NetWrappers/NetHelper.cs
+++ b/TreeConverter/NetWrappers/NetHelper.cs
@@ -1480,8 +1480,8 @@ namespace PascalABCCompiler.NetHelper
                     {
                         case MemberTypes.Method:
                             temp = new SymbolInfo(compiled_function_node.get_compiled_method(mi as MethodInfo));
-                            // SSM 2018.05.05
-                            //temp.symbol_kind = symbol_kind.sk_overload_function;
+                            // SSM 2018.05.05 исправляет bug #815
+                            temp.symbol_kind = symbol_kind.sk_overload_function;
                             break;
                         case MemberTypes.Constructor:
                             temp = new SymbolInfo(compiled_constructor_node.get_compiled_constructor(mi as ConstructorInfo));
diff --git a/bin/Lib/PABCSystem.pas b/bin/Lib/PABCSystem.pas
index 8f645b8ad..95d30e648 100644
--- a/bin/Lib/PABCSystem.pas
+++ b/bin/Lib/PABCSystem.pas
@@ -3677,9 +3677,9 @@ procedure BigInteger.operator*=(var p: BigInteger; q: BigInteger) := p := p * q;
 
 procedure BigInteger.operator-=(var p: BigInteger; q: BigInteger) := p := p - q;
 
-function BigInteger.operator div(p,q: BigInteger) := BigInteger.Divide(p,q);
+//function BigInteger.operator div(p,q: BigInteger) := BigInteger.Divide(p,q);
 
-function BigInteger.operator mod(p,q: BigInteger) := BigInteger.Remainder(p,q);
+//function BigInteger.operator mod(p,q: BigInteger) := BigInteger.Remainder(p,q);
 
 function BigInteger.operator-(p: BigInteger) := BigInteger.Negate(p);