From 537be24b9380a662f8286636934d288328dd28da Mon Sep 17 00:00:00 2001 From: Jerome St-Louis Date: Fri, 7 Feb 2014 05:20:56 +0700 Subject: [PATCH] documentor: (#1061) Linking to template classes and template parameter classes --- doc/ecere.eCdoc | Bin 60878 -> 61088 bytes documentor/src/Documentor.ec | 63 +++++++++++++++++++++++++++++++++++++++++-- extras/html/htmlParser.ec | 16 +++++++++++ 3 files changed, 77 insertions(+), 2 deletions(-) diff --git a/doc/ecere.eCdoc b/doc/ecere.eCdoc index b49e7bb334422a8ea52d5178fa29043c17cf879d..1bf43ef1e39158d07752f0091cdc082a190e6592 100644 GIT binary patch delta 8969 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 ipow%c^#{Lg(G4p}| delta 9040 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 diff --git a/documentor/src/Documentor.ec b/documentor/src/Documentor.ec index f6b0401..0b6bc70 100644 --- a/documentor/src/Documentor.ec +++ b/documentor/src/Documentor.ec @@ -54,6 +54,57 @@ IDESettingsContainer settingsContainer dataOwner = &settings; }; +void GetTemplateString(Class c, char * templateString) +{ + Module m = c.module.application; + char * n = c.name; + char * lt = strchr(n, '<'); + char * s; + char ch; + char curName[256]; + int len = 0; + + memcpy(templateString, n, lt-n); + templateString[lt-n] = 0; + strcat(templateString, ""); + + for(s = lt; (ch = *s); s++) + { + if(ch == '<' || ch == '>' || ch == ',') + { + if(len) + { + Class pc; + char * d = templateString + strlen(templateString); + curName[len] = 0; + pc = eSystem_FindClass(m, curName); + if(pc) + sprintf(d, "%s", pc, pc.name); + else + strcat(d, curName); + } + if(ch == '<') + strcat(templateString, "<"); + else if(ch == '>') + strcat(templateString, ">"); + else + strcat(templateString, ", "); + len = 0; + } + else if(ch == '=') + { + curName[len++] = ' '; + curName[len++] = ch; + curName[len++] = ' '; + curName[0] = 0; + strcat(templateString, curName); + len = 0; + } + else if(ch != ' ') + curName[len++] = ch; + } +} + // WARNING : This function expects a null terminated string since it recursively concatenate... static void _PrintType(Type type, char * string, bool printName, bool printFunction, bool fullName) { @@ -71,11 +122,19 @@ static void _PrintType(Type type, char * string, bool printName, bool printFunct if(type._class.registered) { char hex[20]; - sprintf(hex, "%p", type._class.registered); + char * s = type._class.registered.name; + sprintf(hex, "%p", type._class.registered.templateClass ? type._class.registered.templateClass : type._class.registered); strcat(string, ""); - strcat(string, type._class.registered.name); + if(strchr(s, '<')) + { + char n[1024]; + GetTemplateString(type._class.registered, n); + strcat(string, n); + } + else + strcat(string, type._class.registered.name); strcat(string, ""); } else diff --git a/extras/html/htmlParser.ec b/extras/html/htmlParser.ec index 19b96bd..7c41f7f 100644 --- a/extras/html/htmlParser.ec +++ b/extras/html/htmlParser.ec @@ -1134,6 +1134,8 @@ class HTMLFile unicode = ' '; else if(!strcmpi(symbol, "copy")) unicode ='©'; + else if(!strcmpi(symbol, "reg")) + unicode = '®'; else if(!strcmpi(symbol, "raquo")) unicode = '»'; else if(!strcmpi(symbol, "eacute")) @@ -1148,6 +1150,20 @@ class HTMLFile unicode = 'â'; else if(!strcmpi(symbol, "ocirc")) unicode = 'ô'; + else if(!strcmpi(symbol, "lt")) + unicode = '<'; + else if(!strcmpi(symbol, "gt")) + unicode = '>'; + else if(!strcmpi(symbol, "amp")) + unicode = '&'; + else if(!strcmpi(symbol, "euro")) + unicode = '€'; + else if(!strcmpi(symbol, "yen")) + unicode = '¥'; + else if(!strcmpi(symbol, "pound")) + unicode = '£'; + else if(!strcmpi(symbol, "cent")) + unicode = '¢'; if(unicode) { int len = UTF32toUTF8Len(&unicode, 1, utf8, 5); -- 1.8.3.1