Repository: lucy-clownfish Updated Branches: refs/heads/markdown_v2 d481bd6e1 -> 8776f81f9
Misc fixes to CFCCHtml.c Project: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/repo Commit: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/commit/c584c769 Tree: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/tree/c584c769 Diff: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/diff/c584c769 Branch: refs/heads/markdown_v2 Commit: c584c76935a09c22a1ebac33631084e91f89fae0 Parents: d481bd6 Author: Nick Wellnhofer <[email protected]> Authored: Mon Dec 8 15:42:50 2014 +0100 Committer: Nick Wellnhofer <[email protected]> Committed: Mon Dec 8 16:17:58 2014 +0100 ---------------------------------------------------------------------- compiler/src/CFCCHtml.c | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/c584c769/compiler/src/CFCCHtml.c ---------------------------------------------------------------------- diff --git a/compiler/src/CFCCHtml.c b/compiler/src/CFCCHtml.c index 149968c..3de712b 100644 --- a/compiler/src/CFCCHtml.c +++ b/compiler/src/CFCCHtml.c @@ -513,9 +513,8 @@ S_html_create_functions(CFCClass *klass) { static char* S_html_create_methods(CFCClass *klass) { - CFCMethod **fresh_methods = CFCClass_fresh_methods(klass); - char *methods_html = CFCUtil_strdup(""); - char *result; + char *methods_html = CFCUtil_strdup(""); + char *result; for (CFCClass *ancestor = klass; ancestor; @@ -527,18 +526,18 @@ S_html_create_methods(CFCClass *klass) { break; } - char *novel_html = S_html_create_fresh_methods(klass, ancestor); - if (novel_html[0] != '\0') { + char *fresh_html = S_html_create_fresh_methods(klass, ancestor); + if (fresh_html[0] != '\0') { if (ancestor == klass) { - methods_html = CFCUtil_cat(methods_html, novel_html, NULL); + methods_html = CFCUtil_cat(methods_html, fresh_html, NULL); } else { methods_html = CFCUtil_cat(methods_html, "<h3>Methods inherited from ", - class_name, "</h3>\n", novel_html, NULL); + class_name, "</h3>\n", fresh_html, NULL); } } - FREEMEM(novel_html); + FREEMEM(fresh_html); } if (methods_html[0] == '\0') { @@ -589,12 +588,9 @@ S_html_create_fresh_methods(CFCClass *klass, CFCClass *ancestor) { CFCParcel *parcel = CFCSymbol_get_parcel((CFCSymbol*)method); const char *prefix = CFCParcel_get_PREFIX(parcel); char *short_sym = CFCMethod_short_method_sym(method, klass); - const char *attrs = NULL; - char *method_html = S_html_create_func(klass, (CFCFunction*)method, prefix, short_sym); result = CFCUtil_cat(result, method_html, NULL); - FREEMEM(method_html); FREEMEM(short_sym); } @@ -698,11 +694,11 @@ S_html_create_param_list(CFCClass *klass, CFCFunction *func) { char *result = CFCUtil_strdup("("); for (int i = 0; variables[i]; ++i) { - CFCVariable *variable = variables[i]; - const char *name = CFCVariable_micro_sym(variable); + CFCVariable *variable = variables[i]; + CFCType *type = CFCVariable_get_type(variable); + const char *name = CFCVariable_micro_sym(variable); char *type_html; - int decremented = false; if (is_method && i == 0) { const char *prefix = CFCClass_get_prefix(klass); const char *struct_sym = CFCClass_get_struct_sym(klass); @@ -710,9 +706,7 @@ S_html_create_param_list(CFCClass *klass, CFCFunction *func) { type_html = CFCUtil_sprintf(pattern, prefix, struct_sym); } else { - CFCType *type = CFCVariable_get_type(variable); type_html = S_type_to_html(klass, type); - decremented = CFCType_decremented(type); } result = CFCUtil_cat(result, "\n ", type_html, " <strong>", name, @@ -721,7 +715,7 @@ S_html_create_param_list(CFCClass *klass, CFCFunction *func) { if (variables[i+1]) { result = CFCUtil_cat(result, ",", NULL); } - if (decremented) { + if (CFCType_decremented(type)) { result = CFCUtil_cat(result, " <span class=\"comment\">// decremented</span>", NULL); }
