diff --git a/compiler/jsgen.nim b/compiler/jsgen.nim index 2ae85d5cf..c9daba4d1 100644 --- a/compiler/jsgen.nim +++ b/compiler/jsgen.nim @@ -954,7 +954,9 @@ proc genAddr(p: PProc, n: PNode, r: var TCompRes) = r.address = s.loc.r r.res = toRope("0") else: - internalError(n.info, "genAddr: 4") + # 'var openArray' for instance produces an 'addr' but this is harmless: + gen(p, n.sons[0], r) + #internalError(n.info, "genAddr: 4 " & renderTree(n)) else: internalError(n.info, "genAddr: 2") of nkCheckedFieldExpr: genCheckedFieldAddr(p, n, r) diff --git a/tools/nimweb.nim b/tools/nimweb.nim index ddbba1e3f..6cd840ab6 100644 --- a/tools/nimweb.nim +++ b/tools/nimweb.nim @@ -400,6 +400,7 @@ proc main(c: var TConfigData) = for i in 0..c.tabs.len-1: var file = c.tabs[i].val let rss = if file in ["news", "index"]: extractFilename(rssUrl) else: "" + if '.' in file: continue exec(cmd % [c.nimArgs, file]) var temp = "web" / changeFileExt(file, "temp") var content: string diff --git a/tools/website.tmpl b/tools/website.tmpl index b4dd2631c..88a4dee67 100644 --- a/tools/website.tmpl +++ b/tools/website.tmpl @@ -24,10 +24,16 @@ # var t = c.tabs[i].val #if currentTab == t: $name + #if t.contains('.'): + href="${t}" title = "$c.projectName - $name">$name + #else: + href="${t}.html" title = "$c.projectName - $name">$name + #end if #end for diff --git a/web/nim.ini b/web/nim.ini index 83705e8ce..8145317b9 100644 --- a/web/nim.ini +++ b/web/nim.ini @@ -7,7 +7,7 @@ Authors: "Andreas Rumpf and contributors" [Links] # Underscores are replaced with a space. # Everything after ; is the ID -User_Forum: "http://forum.nim-lang.org;link_forum" +Community: "community.html;link_forum" Aporia_IDE: "https://github.com/nimrod-code/Aporia;link_aporia" Github_Repo: "http://github.com/Araq/Nimrod;link_github" @@ -15,12 +15,14 @@ Github_Repo: "http://github.com/Araq/Nimrod;link_github" [Tabs] # Menu entry: filename home: index -news: news docs: documentation learn: learn download: download -community: community +forum: "http://forum.nim-lang.org" FAQ: question +# these two are not in the list of "tabs", but do exist: +community: community +news: news [Ticker] file: ticker.txt