From 0c8cfeeeb3bd7e0a43a7e9830173da5854501235 Mon Sep 17 00:00:00 2001 From: Jean Privat Date: Fri, 16 Oct 2015 22:29:35 -0400 Subject: [PATCH] nitlight: use `cname` or `full_name` to avoid module conflicts Signed-off-by: Jean Privat --- src/highlight.nit | 2 +- src/nitlight.nit | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/highlight.nit b/src/highlight.nit index 323434f..2a139ee 100644 --- a/src/highlight.nit +++ b/src/highlight.nit @@ -352,7 +352,7 @@ redef class MModule # The module HTML page fun href: String do - return name + ".html" + return c_name + ".html" end redef fun linkto do return linkto_text(name) diff --git a/src/nitlight.nit b/src/nitlight.nit index 9a7b050..ddb1887 100644 --- a/src/nitlight.nit +++ b/src/nitlight.nit @@ -52,7 +52,7 @@ else if mmodules.length > 1 then end for mm in mmodules do - if dir != null then toolcontext.info("write {dir}/{mm.name}.html", 1) + if dir != null then toolcontext.info("write {dir}/{mm.c_name}.html", 1) var v = new HighlightVisitor var prefix = opt_line_id_prefix.value @@ -94,7 +94,7 @@ for mm in mmodules do end if dir != null then - page.write_to_file("{dir}/{mm.name}.html") + page.write_to_file("{dir}/{mm.c_name}.html") else page.write_to(stdout) end @@ -113,8 +113,8 @@ if dir != null then var n2 = new HTMLTag("a") page.add n n.add n2 - n2.attr("href", "{mm.name}.html") - n2.text(mm.name) + n2.attr("href", "{mm.c_name}.html") + n2.text(mm.full_name) end page.add_raw_html "" page.write_to_file("{dir}/index.html") -- 1.7.9.5