Причёсываю PABCSystem.pas

codingteam · Feb 23, 2016 · 7908a03 · 7908a03
1 parent 94c0db5
commit 7908a03
Show file tree

Hide file tree

Showing 9 changed files with 934 additions and 366 deletions.
diff --git 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 = "1";
 	public const string Build = "0";
-	public const string Revision = "1173";
+	public const string Revision = "1174";
 
         public const string MainVersion = Major + "." + Minor;
 	public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision;

diff --git a/Configuration/Version.defs b/Configuration/Version.defs
@@ -1,4 +1,4 @@
-%COREVERSION%=0
-%REVISION%=1173
 %MINOR%=1
+%REVISION%=1174
+%COREVERSION%=0
 %MAJOR%=3
diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh
@@ -1 +1 @@
-!define VERSION '3.1.0.1173'
+!define VERSION '3.1.0.1174'
diff --git a/TestSuite/foreachvar1.pas b/TestSuite/foreachvar1.pas
@@ -1,10 +1,3 @@
-{begin
-  var s := [1,2,3];
-  foreach var x in s do
-  begin
-    var y := x + x;
-  end;
-end.}
 type
   TPair = auto class
     Key: string;

diff --git a/TestSuite/foreachvar3.pas b/TestSuite/foreachvar3.pas
@@ -0,0 +1,13 @@
+procedure p<T>(s: set of T; f: T->T);
+begin
+  foreach var x in s do
+  begin
+    var y := f(x);
+    Print(y);
+  end;
+end;
+
+begin
+  var s := [1,2,3,7,2,4];
+  p(s,x->x);
+end.
diff --git a/TreeConverter/TreeConversion/syntax_tree_visitor.cs b/TreeConverter/TreeConversion/syntax_tree_visitor.cs
@@ -16287,12 +16287,11 @@ public bool FindIEnumerableElementType(SyntaxTree.foreach_stmt _foreach_stmt, ty
                     }
                 }
 
-                foreach (SemanticTree.ITypeNode itn in tn.ImplementingInterfaces)
+                foreach (SemanticTree.ITypeNode itn in tn.ImplementingInterfaces) // если не нашли - ищем интерфейс IEnumerable и возвращаем object в качестве elem_type
                 {
-                    //if (itn == ctn)
                     if (itn is compiled_type_node)
                     {
-                        var itnc = (itn as compiled_type_node).compiled_type;
+                        /*var itnc = (itn as compiled_type_node).compiled_type;
                         if (itnc.IsGenericType)
                         {
                             var my = itnc.GetGenericTypeDefinition();// = typeof(System.Collections.Generic.IEnumerable<>)
@@ -16303,7 +16302,8 @@ public bool FindIEnumerableElementType(SyntaxTree.foreach_stmt _foreach_stmt, ty
                                 return true;
                             }
                         }
-                        else if (itn == ctn)
+                        else */
+                        if (itn == ctn)
                         {
                             elem_type = SystemLibrary.SystemLibrary.object_type;
                             return true;

diff --git a/bin/Lib/PABCRtl.dll b/bin/Lib/PABCRtl.dll
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		!define VERSION '3.1.0.1173'
		!define VERSION '3.1.0.1174'