From 49500d66f51c3462dd75c65cb02f76c64980e6e1 Mon Sep 17 00:00:00 2001
From: Basile Burg <basile.burg@gmx.com>
Date: Sat, 16 May 2015 16:29:18 +0200
Subject: [PATCH] fix, symbol list background tool - error icons were never
 displayed. - error or warnings messages containing a single quote could
 prevent the deserialization in the GUI. - a memory error with the static
 items could prevent the deserialization in the GUI.

---
 cesyms/cesyms.d | 41 ++++++++++++++++++++++++++++++-----------
 1 file changed, 30 insertions(+), 11 deletions(-)

diff --git a/cesyms/cesyms.d b/cesyms/cesyms.d
index c478e4fd..44588bb2 100644
--- a/cesyms/cesyms.d
+++ b/cesyms/cesyms.d
@@ -15,7 +15,6 @@ void main(string[] args)
     auto source = cast(ubyte[]) read(fname, size_t.max);
     auto scache = StringCache(StringCache.defaultBucketCount);
     
-    
     auto ast = parseModule(getTokensForParser(source, config, &scache), fname, null, &(SymbolListBuilder.astError));
 
     // visit each root member
@@ -43,13 +42,31 @@ void main(string[] args)
     } 
     else 
     {
-        auto str = slb.serialize;
-        write(str);
+        write(slb.serialize);
     }
     
     slb.destruct;
 }
 
+// libdparse warnings includes some "'", which in Pascal are string delim
+string patchPasStringLitteral(const ref string p)
+{
+    string result;
+    for (auto i = 0; i < p.length; i++)
+    {    
+        auto curr = p[i];
+        if (curr == 0)
+            break;
+        else if (curr == 13 || curr == 10)
+            result ~= ' ';
+        else if (curr == '\'') 
+            result ~= "'#39'";
+        else  
+            result ~= curr; 
+    }
+    return result;
+}
+
 // Memory utils ---------------------------------------------------------------+
 void * getMem(size_t size) nothrow
 {
@@ -131,7 +148,7 @@ struct Symbol
         if (subs.length) foreach(Symbol * sub; subs)
             sub.serialize(lfmApp);
         lfmApp.put(">\r");
-        lfmApp.put("end\r");
+        lfmApp.put("end");
     }
 }
 //----
@@ -141,7 +158,10 @@ class SymbolListBuilder : ASTVisitor
 {
     Symbol * root;
     Symbol * parent;
-    static Symbol * [] illFormed;
+    
+    // for some reason (?) the .name of a (static Symbol* []) item was lost 
+    static Symbol[] illFormed;
+    
     size_t count;
     
     alias visit = ASTVisitor.visit;
@@ -149,8 +169,6 @@ class SymbolListBuilder : ASTVisitor
     this()
     {
         root = construct!Symbol;
-        if(illFormed.length)
-            root.subs ~= illFormed;
         resetRoot;
     }
     
@@ -164,9 +182,9 @@ class SymbolListBuilder : ASTVisitor
         Symbol * newSym = construct!Symbol;
         newSym.col = col;
         newSym.line = line;
-        newSym.name = msg;
-        isErr ? newSym.type = SymbolType._error : newSym.type = SymbolType._warning; 
-        illFormed ~= newSym;
+        newSym.name = patchPasStringLitteral(msg);
+        newSym.type = isErr ? SymbolType._error : SymbolType._warning; 
+        illFormed ~= * newSym;
     }
     
     final void resetRoot(){parent = root;}
@@ -177,7 +195,8 @@ class SymbolListBuilder : ASTVisitor
         lfmApp.reserve(count * 64);
         
         lfmApp.put("object TSymbolList\rsymbols = <");
-        foreach(Symbol * sym; root.subs) sym.serialize(lfmApp);
+        foreach(sym; illFormed) sym.serialize(lfmApp);
+        foreach(sym; root.subs) sym.serialize(lfmApp);
         lfmApp.put(">\rend\r\n");
         
         return lfmApp.data;