Merge branch 'a12_2_a13'

cesyms/cesyms.d

@@ -2,36 +2,6 @@ module cesyms;
 
 import std.stdio, std.path, std.file, std.array, std.string;
 import std.d.lexer, std.d.ast, std.d.parser;
-static import std.conv;
-
-interface I{}
-
-alias Int32 = int;
-//alias long Int64;
-
-enum E 
-{
-    e1,
-    e2,
-    e3,
-}
-
-enum {opt1,opt2}
-
-class A
-{
-    class AA
-    {
-        class AA1{}
-        class AA2{}
-    }
-    
-    class BB
-    {
-        class BB1{}
-        class BB2{}
-    }
-}
 
 enum SymbolType
 {
@@ -58,18 +28,18 @@ struct Symbol
     
     void serialize(ref Appender!string lfmApp)
     {
-        lfmApp.put("  \r    item\r");
+        lfmApp.put("\ritem\r");
         
-        lfmApp.put(format("    line = %d\r", line));
+        lfmApp.put(format("line = %d\r", line));
-        lfmApp.put(format("    col = %d\r", col));
+        lfmApp.put(format("col = %d\r", col));
-        lfmApp.put(format("    name = '%s'\r", name));
+        lfmApp.put(format("name = '%s'\r", name));
-        lfmApp.put(format("    symType = %s\r", type));
+        lfmApp.put(format("symType = %s\r", type));
          
-        lfmApp.put("    subs = <");
+        lfmApp.put("subs = <");
         if (subs.length) foreach(Symbol * sub; subs)
             sub.serialize(lfmApp);
         lfmApp.put(">\r");
-        lfmApp.put("    end\r");
+        lfmApp.put("end\r");
     }
 }
 
@@ -93,28 +63,25 @@ void main(string[] args)
         slb.visit(decl);
     }
     
-    
+    version(none)
-    // TODO-cfeature: Outputs the symbol tree in a format handlable by a Coedit widget
-    
-    int level = -1;
-    void print(Symbol * s)
     {
-        foreach(i; 0 .. level) write(".");
+        int level = -1;
-        level++;
+        void print(Symbol * s)
-        write(s.name, '\r');
+        {
-        foreach(ss; s.subs)
+            foreach(i; 0 .. level) write(".");
-            print(ss);
+            level++;
+            write(s.name, '\r');
+            foreach(ss; s.subs)
+                print(ss);
             
-        level--;
+            level--;
+        }
+        print(&slb.root);
     }
-    //print(&slb.root);
     
     auto str = slb.serialize;
-    
+    //std.file.write(r"C:\tool.txt",cast(ubyte[])str);
-    //std.file.write(r"C:\too.txt",cast(ubyte[])str);
-    
     write(str);
-    stdout.flush;
 }
 
 class SymbolListBuilder : ASTVisitor
@@ -134,12 +101,11 @@ class SymbolListBuilder : ASTVisitor
         Appender!string lfmApp;
         lfmApp.reserve(count * 64);
         
-        lfmApp.put("object TSymbolList\r  symbols = <");
+        lfmApp.put("object TSymbolList\rsymbols = <");
         foreach(Symbol * sym; root.subs) sym.serialize(lfmApp);
         lfmApp.put(">\rend\r\n");
         
         return lfmApp.data; 
-        
     }
     
     /// returns a new symbol if the declarator is based on a Token named "name".
@@ -161,7 +127,7 @@ class SymbolListBuilder : ASTVisitor
         {
             count++;
             auto result = new Symbol;
-            result.name = adt.name.text.idup;
+            result.name = adt.name.text;
             result.line = adt.name.line;
             result.col  = adt.name.column;             
             parent.subs ~= result;  
@@ -201,7 +167,7 @@ class SymbolListBuilder : ASTVisitor
     
     final override void visit(const EnumDeclaration decl) 
     {
-        // TODO-ctest: try to see if what dmd outputs as , "enum member" is handled.
+        //TODO-ctest: try to see if what dmd outputs as , "enum member" is handled.
         namedVisitorImpl!(EnumDeclaration, SymbolType._class)(decl);
     }
     
@@ -242,7 +208,7 @@ class SymbolListBuilder : ASTVisitor
     final override void visit(const MixinDeclaration decl) 
     {
         // TODO-cfeature: MixinDeclaration, just display the name of the mixed template.  
-        // the template might be implemented in another module so their ùeùbrs cant be displayed.
+        // the template might be implemented in another module so their cant be displayed.
     }
     
     final override void visit(const StructDeclaration decl) 

cetodo/cetodo.d

@@ -225,6 +225,7 @@ void main(string[] args)
 
 // samples for testing the program as a runnable ('Compile and runfile ...') with '<CFF>'
 
+// fixme-p8: èuèuuè``u`èuùè 
 // fixme-p8: fixme also handled
 // TODO-cINVALID_because_no_content:              
 // TODO: set this property as const() to set it read only.

src/ce_common.pas

@@ -213,6 +213,11 @@ type
    *)
   procedure processOutputToStrings(aProcess: TProcess; var aList: TStringList);
 
+  (**
+   * Copy available process output to a stream.
+   *)
+  procedure processOutputToStream(aProcess: TProcess; output: TMemoryStream);
+
   (**
    * Terminates and frees aProcess;
    *)
@@ -810,6 +815,25 @@ begin
   end;
 end;
 
+procedure processOutputToStream(aProcess: TProcess; output: TMemoryStream);
+var
+  sum, cnt: Integer;
+const
+  buffSz = 2048;
+begin
+  if not (poUsePipes in aProcess.Options) then
+    exit;
+  //
+  sum := output.Size;
+  while aProcess.Output.NumBytesAvailable <> 0 do begin
+    output.SetSize(sum + buffSz);
+    cnt := aProcess.Output.Read((output.Memory + sum)^, buffSz);
+    sum += cnt;
+  end;
+  output.SetSize(sum);
+  output.Position := sum;
+end;
+
 procedure killProcess(var aProcess: TAsyncProcess);
 begin
   if aProcess = nil then

src/ce_symlist.pas

@@ -94,6 +94,7 @@ type
     fAutoRefresh: boolean;
     fRefreshOnChange: boolean;
     fRefreshOnFocus: boolean;
+    fToolOutput: TMemoryStream;
     ndAlias, ndClass, ndEnum, ndFunc, ndUni: TTreeNode;
     ndImp, ndIntf, ndMix, ndStruct, ndTmp, ndVar: TTreeNode;
     procedure TreeDblClick(Sender: TObject);
@@ -106,7 +107,8 @@ type
     procedure clearTree;
     //
     procedure callToolProc;
-    procedure symbolListProduced(sender: TObject);
+    procedure toolOutputData(sender: TObject);
+    procedure toolTerminated(sender: TObject);
     //
     procedure optget_AutoRefresh(aWriter: TWriter);
     procedure optset_AutoRefresh(aReader: TReader);
@@ -239,6 +241,7 @@ begin
   inherited;
   // allow empty name if owner is nil
   fSyms := TSymbolList.create(nil);
+  fToolOutput := TMemoryStream.create;
   //
   ndAlias   := Tree.Items[0];
   ndClass   := Tree.Items[1];
@@ -271,6 +274,7 @@ begin
   EntitiesConnector.removeObserver(self);
   //
   killProcess(fToolProc);
+  fToolOutput.free;
   fSyms.Free;
   inherited;
 end;
@@ -517,8 +521,8 @@ begin
   fToolProc.ShowWindow := swoHIDE;
   fToolProc.Options := [poUsePipes];
   fToolProc.Executable := 'cesyms';
-  fToolProc.OnTerminate := @symbolListProduced;
+  fToolProc.OnTerminate := @toolTerminated;
-  fToolProc.OnReadData  := @symbolListProduced;
+  fToolProc.OnReadData  := @toolOutputData;
   fToolProc.CurrentDirectory := ExtractFileDir(Application.ExeName);
 
   // focused source
@@ -531,13 +535,14 @@ begin
   fToolProc.Execute;
 end;
 
-procedure TCESymbolListWidget.symbolListProduced(sender: TObject);
+procedure TCESymbolListWidget.toolOutputData(sender: TObject);
+begin
+  processOutputToStream(TProcess(sender), fToolOutput);
+end;
+
+procedure TCESymbolListWidget.toolTerminated(sender: TObject);
 var
-  cnt, sum: Integer;
-  str: TmemoryStream;
   i: Integer;
-const
-  buffSz = 1024;
 //
 procedure symbolToTreeNode(sym: TSymbol);
 var
@@ -573,23 +578,12 @@ begin
   updateVisibleCat;
   if fDoc = nil then exit;
   //
-  sum := 0;
+  processOutputToStream(TProcess(sender), fToolOutput);
-  str := TMemoryStream.Create;
+  fToolOutput.Position := 0;
-  try
+  fSyms.LoadFromTool(fToolOutput);
-    while fToolProc.Output.NumBytesAvailable <> 0 do begin
-      str.SetSize(sum + buffSz);
-      cnt := fToolProc.Output.Read((str.Memory + sum)^, buffSz);
-      sum += cnt;
-    end;
-    str.SetSize(sum);
-    str.Position := 0;
-    //str.SaveToFile('C:\symlist.txt');
-    fSyms.LoadFromTool(str);
-  finally
-    str.Free;
-  end;
   fToolProc.OnTerminate := nil;
   fToolProc.OnReadData  := nil;
+  fToolOutput.Clear;
   //
   tree.BeginUpdate;
   for i := 0 to fSyms.symbols.Count-1 do

src/ce_todolist.pas

@@ -79,11 +79,12 @@ type
     procedure handleListClick(Sender: TObject);
     procedure mnuAutoRefreshClick(Sender: TObject);
   private
+    fToolOutput: TMemoryStream;
     fAutoRefresh: Boolean;
     fSingleClick: Boolean;
     fProj: TCEProject;
     fDoc: TCESynMemo;
-    fToolProcess: TCheckedAsyncProcess;
+    fToolProc: TCheckedAsyncProcess;
     fTodos: TTodoItems;
     fMsgs: ICEMessagesDisplay;
     fOptions: TCETodoOptions;
@@ -107,7 +108,8 @@ type
     function getContext: TTodoContext;
     procedure killToolProcess;
     procedure callToolProcess;
-    procedure procOutput(sender: TObject);
+    procedure toolTerminated(sender: TObject);
+    procedure toolOutputData(sender: TObject);
     procedure procOutputDbg(sender: TObject);
     procedure clearTodoList;
     procedure fillTodoList;
@@ -193,6 +195,7 @@ var
 begin
   inherited;
   //
+  fToolOutput := TMemoryStream.Create;
   fOptions := TCETodoOptions.Create(self);
   fOptions.autoRefresh := true;
   fOptions.Name := 'todolistOptions';
@@ -230,6 +233,7 @@ destructor TCETodoListWidget.destroy;
 begin
   fOptions.saveToFile(getCoeditDocPath + OptFname);
   killToolProcess;
+  fToolOutput.Free;
   inherited;
 end;
 
@@ -364,11 +368,11 @@ end;
 
 procedure TCETodoListWidget.killToolProcess;
 begin
-  if fToolProcess = nil then exit;
+  if fToolProc = nil then exit;
   //
-  fToolProcess.Terminate(0);
+  fToolProc.Terminate(0);
-  fToolProcess.Free;
+  fToolProc.Free;
-  fToolProcess := nil;
+  fToolProc := nil;
 end;
 
 procedure TCETodoListWidget.callToolProcess;
@@ -382,26 +386,19 @@ begin
   //
   killToolProcess;
   // process parameter
-  fToolProcess := TCheckedAsyncProcess.Create(nil);
+  fToolProc := TCheckedAsyncProcess.Create(nil);
-  fToolProcess.Executable := ToolExeName;
+  fToolProc.Executable := ToolExeName;
-  fToolProcess.Options := [poUsePipes];
+  fToolProc.Options := [poUsePipes];
-  fToolProcess.ShowWindow := swoHIDE;
+  fToolProc.ShowWindow := swoHIDE;
-  fToolProcess.CurrentDirectory := ExtractFileDir(Application.ExeName);
+  fToolProc.CurrentDirectory := ExtractFileDir(Application.ExeName);
-
+  fToolProc.OnTerminate := @toolTerminated;
-  // Something not quite clear:
+  fToolProc.OnReadData := @toolOutputData;
-  // --------------------------
-  // actually the two events can be called, depending
-  // on the amount of data in the output.
-  // many: OnReadData is called.
-  // few: OnTerminate is called.
-  fToolProcess.OnTerminate := @procOutput;
-  fToolProcess.OnReadData := @procOutput;
 
   // files passed to the tool argument
-  if ctxt = tcProject then fToolProcess.Parameters.AddText(symbolExpander.get('<CPFS>'))
+  if ctxt = tcProject then fToolProc.Parameters.AddText(symbolExpander.get('<CPFS>'))
-  else fToolProcess.Parameters.Add(symbolExpander.get('<CFF>'));
+  else fToolProc.Parameters.Add(symbolExpander.get('<CFF>'));
   //
-  fToolProcess.Execute;
+  fToolProc.Execute;
 end;
 
 procedure TCETodoListWidget.procOutputDbg(sender: TObject);
@@ -413,7 +410,7 @@ begin
   getMessageDisplay(fMsgs);
   str := TStringList.Create;
   try
-    processOutputToStrings(fToolProcess, str);
+    processOutputToStrings(fToolProc, str);
     ctxt := getContext;
     for msg in str do case ctxt of
       tcNone:   fMsgs.message(msg, nil, amcMisc, amkAuto);
@@ -425,29 +422,22 @@ begin
   end;
 end;
 
-procedure TCETodoListWidget.procOutput(sender: TObject);
+procedure TCETodoListWidget.toolOutputData(sender: TObject);
-var
-  str: TMemoryStream;
-  cnt: Integer;
-  sum: Integer;
-const
-  buffSz = 1024;
 begin
-  sum := 0;
+  processOutputToStream(fToolProc, fToolOutput);
-  str := TMemoryStream.Create;
+end;
-  try
+
-    while fToolProcess.Output.NumBytesAvailable <> 0 do begin
+procedure TCETodoListWidget.toolTerminated(sender: TObject);
-      str.SetSize(sum + buffSz);
+begin
-      cnt := fToolProcess.Output.Read((str.Memory + sum)^, buffSz);
+  processOutputToStream(fToolProc, fToolOutput);
-      sum += cnt;
+  fToolOutput.Position := 0;
-    end;
+  //TODO-cbugfix: UTF chars in TODO comments bug either in the widget or the tool, symptom: empty todo list, conditions: to determine.
-    str.SetSize(sum);
+  //fToolOutput.SaveToFile('C:\cetodo_widgetside.txt');
-    str.Position := 0;
+  fTodos.loadFromTxtStream(fToolOutput);
-    fTodos.loadFromTxtStream(str);
+  fillTodoList;
-    fillTodoList;
+  fToolProc.OnTerminate := nil;
-  finally
+  fToolProc.OnReadData := nil;
-    str.Free;
+  fToolOutput.Clear;
-  end;
 end;
 
 procedure TCETodoListWidget.clearTodoList;