mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2026-06-07 04:14:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

close #16646; since now works with bootstrap nim post csources_v1 (#17895)

Browse Source 
* revive #16627 now that csources_v1 was merged

* use dedent in rst.nim, refs https://github.com/nim-lang/Nim/pull/17257#discussion_r589025683

* fix test and improve rendering of a rst warning
This commit is contained in:
Timothee Cour
2021-04-30 09:54:47 -07:00
committed by GitHub
parent 76f93877cd
commit 3192995ac9
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/semtypes.nim
View File

@@ -256,8 +256,8 @@ proc semRangeAux(c: PContext, n: PNode, prev: PType): PType =
else:
result.n.add semConstExpr(c, range[i])
if (result.n[0].kind in {nkFloatLit..nkFloat64Lit} and classify(result.n[0].floatVal) == fcNan) or
(result.n[1].kind in {nkFloatLit..nkFloat64Lit} and classify(result.n[1].floatVal) == fcNan):
if (result.n[0].kind in {nkFloatLit..nkFloat64Lit} and result.n[0].floatVal.isNaN) or
(result.n[1].kind in {nkFloatLit..nkFloat64Lit} and result.n[1].floatVal.isNaN):
localError(c.config, n.info, "NaN is not a valid start or end for a range")
if weakLeValue(result.n[0], result.n[1]) == impNo:

5
lib/packages/docutils/rst.nim
View File

@@ -2250,11 +2250,10 @@ proc parseEnumList(p: var RstParser): PRstNode =
let n = p.line + p.tok[j].line
let msg = "\n" & """
not enough indentation on line $2
(should be at column $3 if it's a continuation of enum. list),
(should be at column $3 if it's a continuation of enum. list),
or no blank line after line $1 (if it should be the next paragraph),
or no escaping \ at the beginning of line $1
(if lines $1..$2 are a normal paragraph, not enum. list)""".
unindent(8)
(if lines $1..$2 are a normal paragraph, not enum. list)""".dedent
let c = p.col + requiredIndent + ColRstOffset
rstMessage(p, mwRstStyle, msg % [$(n-1), $n, $c],
p.tok[j].line, p.tok[j].col)

2
tests/stdlib/trstgen.nim
View File

@@ -849,7 +849,7 @@ Test1
let output8 = input8.toHtml(warnings = warnings8)
check(warnings8[].len == 1)
check("input(6, 1) Warning: RST style: \n" &
" not enough indentation on line 6" in warnings8[0])
"not enough indentation on line 6" in warnings8[0])
doAssert output8 == "Paragraph.<ol class=\"upperalpha simple\">" &
"<li>stringA</li>\n<li>stringB</li>\n</ol>\n<p>C. string1 string2 </p>\n"