[svn] r7321: vs-plugin/trunk: Nemerle.Compiler.Utils/Nemerle.Compiler.Utils.nproj Nemerle.Compiler.Utils/N...

[VladD2]

Log:


Author: VladD2
Date: Mon Jan 22 17:39:19 2007
New Revision: 7321

Modified:
   vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Compiler.Utils.nproj
   vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeModel/Checker.n
   vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeModel/SourceGenerator.n
   vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeModel/XmlDocReader.n
   vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/Engine/Engine.Properties.n
   vs-plugin/trunk/Nemerle.VsIntegration/!ToDo/ToDo.txt

Modified: vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Compiler.Utils.nproj
==============================================================================
--- vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Compiler.Utils.nproj	(original)
+++ vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Compiler.Utils.nproj	Mon Jan 22 17:39:19 2007
@@ -6,6 +6,8 @@
   <ItemGroup>
     <Folder Include="Nemerle.Completion2\" />
     <Folder Include="Nemerle.Completion2\CodeModel\" />
+    <Folder Include="Nemerle.Completion2\CompilerConcreteDefinitions\" />
+    <Folder Include="Nemerle.Completion2\CompilerConcreteDefinitions\Factories\" />
     <Folder Include="Nemerle.Completion2\Debug\" />
     <Folder Include="Nemerle.Completion2\Engine\" />
     <Folder Include="Nemerle.Completion2\Tests\" />

Modified: vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeModel/Checker.n
==============================================================================
--- vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeModel/Checker.n	(original)
+++ vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeModel/Checker.n	Mon Jan 22 17:39:19 2007
@@ -68,6 +68,7 @@
       col > 0 && str.Length >= col && str[col - 1] == ch
     }
 
+    //VladD2: À íå ëó÷øå ëè âîñïîëüçîâàòüñÿ ëåêñåðîì? È îøèáîê ìåíüøå, è òî÷íîñòü âûøå.
     FindNext(lineIndex : int, col : int, text : string, eatComments : bool) : int * int 
     {
       def endLine = Math.Max(GetLineCount(), lineIndex + 10);
@@ -172,7 +173,10 @@
         mutable col  = bloc.Column;
 
         def str = GetLine(ploc.EndLine);
-        def idx = str.IndexOf("=>", ploc.EndColumn - 1);
+        //VladD2: Ñëåäóþùàÿ ñòðî÷êà âñå âðåìÿ ïðèâîäèò ê âûëåòó (íåâåðíûé èíäåêñ)
+        // íà ôàéëå Engine-main.n. IT, ðàçáåðèñü, ïëèç. Ïîêà ÷òî ïðîñòî óáðàë
+        // óêàçàíèå ñòàðòîâîãî èíäåêñà.
+        def idx = str.IndexOf("=>"); //, ploc.EndColumn - 1
 
         when (idx >= 0)
         {

Modified: vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeModel/SourceGenerator.n
==============================================================================
--- vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeModel/SourceGenerator.n	(original)
+++ vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeModel/SourceGenerator.n	Mon Jan 22 17:39:19 2007
@@ -180,7 +180,6 @@
 
     private WriteGenericConstraintList(_ : list[StaticTyVar]) : void
     {
-    
     }
 
     private WriteCustomAttributeList(_ : object) : void

Modified: vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeModel/XmlDocReader.n
==============================================================================
--- vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeModel/XmlDocReader.n	(original)
+++ vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeModel/XmlDocReader.n	Mon Jan 22 17:39:19 2007
@@ -109,7 +109,10 @@
           "M:" + name + "(" + args.Map((tv) =>
             {
             | MType.Array(MType.Class(t, _), _) => t.FullName + "[]"
-            | mt is MType => if (mt.TypeInfo == null) mt.SystemType.Name else mt.TypeInfo.FullName
+              //VladD2: çàêîìåíòèðîâàííûé êîä ïðèâîäèò ê àññåðòó. 
+              // ïîäðîáíîñòè ñìîòðè â êîôðåöèè ïî íåìåðëó.
+            | mt is MType => //if (mt.TypeInfo == null) mt.SystemType.Name else mt.TypeInfo.FullName
+                             mt.ToString()
             | _           => ""
             }).ToString(",") + ")"
 

Modified: vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/Engine/Engine.Properties.n
==============================================================================
--- vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/Engine/Engine.Properties.n	(original)
+++ vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/Engine/Engine.Properties.n	Mon Jan 22 17:39:19 2007
@@ -52,7 +52,8 @@
       _topKeywords = StrsToCompletionElems(
         ["using", "class", "struct", "variant", "namespace", "enum", "public", "protected",
          "internal", "private", "abstract", "sealed", "delegate", "#if", "#region", "extern",
-         "interface", "partial", "static", "[Accessor]", "[Record]", "this", "override"],
+         "interface", "partial", "static", "[Accessor]", "[Record]", "this", "override",
+         "modul", "where"],
         GlyphType.Snippet :> int,
         "snippet or top level keyword");
         

Modified: vs-plugin/trunk/Nemerle.VsIntegration/!ToDo/ToDo.txt
==============================================================================
--- vs-plugin/trunk/Nemerle.VsIntegration/!ToDo/ToDo.txt	(original)
+++ vs-plugin/trunk/Nemerle.VsIntegration/!ToDo/ToDo.txt	Mon Jan 22 17:39:19 2007
@@ -34,3 +34,5 @@
 14. Ïðè êîìïëèòå ñïèñêîâ íàäî ðàñïîçíîâàòü ýòî è çàìåíÿòü Nil íà [], à
     Cons íà èìÿ ïàðàìåòðà ñ îòðåçàííûì ñóôèêñîì "s" (åñëè òàêîâîé åñòü).
 15. Ðåàëèçîâàòü êîìïëèò â ïàðìåòðàõ ëàìä è ëîêàëüíûõ ôóíêöèé.
\ No newline at end of file
+16. Õèíò äëÿ ïîëåé èç òèïîâ îáúÿâëåííûõ â äðóãèõ ñáîðêàõ âûâîäèòñÿ áåç óêàçàíèÿ 
+    òèïà ïîëÿ. Âûâîäèòñÿ îí ÷åðåç ToString(). Íàäî áû ýòî äåëî ïîäïðàâèòü.
\ No newline at end of file