From bcbe317d177e9a22856e8dd6c0ad1e20436b913a Mon Sep 17 00:00:00 2001
From: Neelesh Chandola <neelesh.chandola@outlook.com>
Date: Sun, 30 Dec 2018 23:04:41 +0530
Subject: Before showing deprecated warning, check whether enum field was
marked deprecated or the whole enum type (#10135)
---
compiler/suggest.nim | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'compiler')
diff --git a/compiler/suggest.nim b/compiler/suggest.nim
index f149327ac..d3ce46172 100644
--- a/compiler/suggest.nim
+++ b/compiler/suggest.nim
@@ -464,7 +464,7 @@ proc extractPragma(s: PSym): PNode =
proc warnAboutDeprecated(conf: ConfigRef; info: TLineInfo; s: PSym) =
let pragmaNode = if s.kind == skEnumField: extractPragma(s.owner) else: extractPragma(s)
let name =
- if s.kind == skEnumField: "enum '" & s.owner.name.s & "' which contains field '" & s.name.s & "'"
+ if s.kind == skEnumField and sfDeprecated notin s.flags: "enum '" & s.owner.name.s & "' which contains field '" & s.name.s & "'"
else: s.name.s
if pragmaNode != nil:
for it in pragmaNode:
@@ -490,7 +490,7 @@ proc markUsed(conf: ConfigRef; info: TLineInfo; s: PSym; usageSym: var PSym) =
if s.kind == skEnumField and s.owner != nil:
incl(s.owner.flags, sfUsed)
if sfDeprecated in s.owner.flags:
- incl(s.flags, sfDeprecated)
+ warnAboutDeprecated(conf, info, s)
if {sfDeprecated, sfError} * s.flags != {}:
if sfDeprecated in s.flags: warnAboutDeprecated(conf, info, s)
if sfError in s.flags: userError(conf, info, s)
--
cgit 1.4.1-2-gfad0
From e87910197a209d02cf69bba3aacd9766723aeb37 Mon Sep 17 00:00:00 2001
From: deech <aditya.siram@gmail.com>
Date: Mon, 31 Dec 2018 07:41:24 -0600
Subject: Check there are no side effects before optimizing away compile time
expressions. (#9934)
---
compiler/semexprs.nim | 20 ++++++++++-------
compiler/semstmts.nim | 2 ++
tests/vm/tcompiletimesideeffects.nim | 42 ++++++++++++++++++++++++++++++++++++
3 files changed, 56 insertions(+), 8 deletions(-)
create mode 100644 tests/vm/tcompiletimesideeffects.nim
(limited to 'compiler')
diff --git a/compiler/semexprs.nim b/compiler/semexprs.nim
index ddec457a1..45e259b65 100644
--- a/compiler/semexprs.nim
+++ b/compiler/semexprs.nim
@@ -710,16 +710,20 @@ proc evalAtCompileTime(c: PContext, n: PNode): PNode =
let a = getConstExpr(c.module, n.sons[i], c.graph)
if a == nil: return n
call.add(a)
+
#echo "NOW evaluating at compile time: ", call.renderTree
- if sfCompileTime in callee.flags:
- result = evalStaticExpr(c.module, c.graph, call, c.p.owner)
- if result.isNil:
- localError(c.config, n.info, errCannotInterpretNodeX % renderTree(call))
- else: result = fixupTypeAfterEval(c, result, n)
+ if c.inStaticContext == 0 or sfNoSideEffect in callee.flags:
+ if sfCompileTime in callee.flags:
+ result = evalStaticExpr(c.module, c.graph, call, c.p.owner)
+ if result.isNil:
+ localError(c.config, n.info, errCannotInterpretNodeX % renderTree(call))
+ else: result = fixupTypeAfterEval(c, result, n)
+ else:
+ result = evalConstExpr(c.module, c.graph, call)
+ if result.isNil: result = n
+ else: result = fixupTypeAfterEval(c, result, n)
else:
- result = evalConstExpr(c.module, c.graph, call)
- if result.isNil: result = n
- else: result = fixupTypeAfterEval(c, result, n)
+ result = n
#if result != n:
# echo "SUCCESS evaluated at compile time: ", call.renderTree
diff --git a/compiler/semstmts.nim b/compiler/semstmts.nim
index 04991193c..f60e2556d 100644
--- a/compiler/semstmts.nim
+++ b/compiler/semstmts.nim
@@ -548,6 +548,7 @@ proc semVarOrLet(c: PContext, n: PNode, symkind: TSymKind): PNode =
proc semConst(c: PContext, n: PNode): PNode =
result = copyNode(n)
+ inc c.inStaticContext
for i in countup(0, sonsLen(n) - 1):
var a = n.sons[i]
if c.config.cmd == cmdIdeTools: suggestStmt(c, a)
@@ -607,6 +608,7 @@ proc semConst(c: PContext, n: PNode): PNode =
v.ast = def[j]
b.sons[j] = newSymNode(v)
addSon(result,b)
+ dec c.inStaticContext
include semfields
diff --git a/tests/vm/tcompiletimesideeffects.nim b/tests/vm/tcompiletimesideeffects.nim
new file mode 100644
index 000000000..4cd57b3bd
--- /dev/null
+++ b/tests/vm/tcompiletimesideeffects.nim
@@ -0,0 +1,42 @@
+discard """
+ output:
+'''
+@[0, 1, 2]
+@[3, 4, 5]
+@[0, 1, 2]
+3
+4
+'''
+"""
+
+template runNTimes(n: int, f : untyped) : untyped =
+ var accum: seq[type(f)]
+ for i in 0..n-1:
+ accum.add(f)
+ accum
+
+var state {.compileTime.} : int = 0
+proc fill(): int {.compileTime.} =
+ result = state
+ inc state
+
+# invoke fill() at compile time as a compile time expression
+const C1 = runNTimes(3, fill())
+echo C1
+
+# invoke fill() at compile time as a set of compile time statements
+const C2 =
+ block:
+ runNTimes(3, fill())
+echo C2
+
+# invoke fill() at compile time after a compile time reset of state
+const C3 =
+ block:
+ state = 0
+ runNTimes(3, fill())
+echo C3
+
+# evaluate fill() at compile time and use the results at runtime
+echo fill()
+echo fill()
--
cgit 1.4.1-2-gfad0
From ab72d68ec80300ebd0629c5174a78c73f28fc729 Mon Sep 17 00:00:00 2001
From: Timothee Cour <timothee.cour2@gmail.com>
Date: Mon, 31 Dec 2018 06:42:01 -0800
Subject: fix off by 1 error in `col` shown by toFileLineCol (#10138)
* fix off by 1 error in `col` shown by toFileLineCol
* fix test failures
---
compiler/msgs.nim | 2 +-
tests/discard/tneedsdiscard.nim | 2 +-
tests/method/tmapper.nim | 2 +-
tests/modules/tmismatchedvisibility.nim | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
(limited to 'compiler')
diff --git a/compiler/msgs.nim b/compiler/msgs.nim
index 7e6b67cbe..18c196085 100644
--- a/compiler/msgs.nim
+++ b/compiler/msgs.nim
@@ -208,7 +208,7 @@ proc toFileLine*(conf: ConfigRef; info: TLineInfo): string {.inline.} =
result = toFilename(conf, info) & ":" & $info.line
proc toFileLineCol*(conf: ConfigRef; info: TLineInfo): string {.inline.} =
- result = toFilename(conf, info) & "(" & $info.line & ", " & $info.col & ")"
+ result = toFilename(conf, info) & "(" & $info.line & ", " & $(info.col+1) & ")"
proc `$`*(conf: ConfigRef; info: TLineInfo): string = toFileLineCol(conf, info)
diff --git a/tests/discard/tneedsdiscard.nim b/tests/discard/tneedsdiscard.nim
index 7d2997b3f..d9483947f 100644
--- a/tests/discard/tneedsdiscard.nim
+++ b/tests/discard/tneedsdiscard.nim
@@ -1,5 +1,5 @@
discard """
- errormsg: '''expression 'open(f, "arg.txt", fmRead, -1)' is of type 'bool' and has to be discarded; start of expression here: tneedsdiscard.nim(7, 2)'''
+ errormsg: '''expression 'open(f, "arg.txt", fmRead, -1)' is of type 'bool' and has to be discarded; start of expression here: tneedsdiscard.nim(7, 3)'''
line: 10
"""
diff --git a/tests/method/tmapper.nim b/tests/method/tmapper.nim
index a5d03f700..9162d0eec 100644
--- a/tests/method/tmapper.nim
+++ b/tests/method/tmapper.nim
@@ -1,5 +1,5 @@
discard """
- errormsg: "invalid declaration order; cannot attach 'step' to method defined here: tmapper.nim(22, 7)"
+ errormsg: "invalid declaration order; cannot attach 'step' to method defined here: tmapper.nim(22, 8)"
line: 25
"""
diff --git a/tests/modules/tmismatchedvisibility.nim b/tests/modules/tmismatchedvisibility.nim
index 4bf244807..fd582b571 100644
--- a/tests/modules/tmismatchedvisibility.nim
+++ b/tests/modules/tmismatchedvisibility.nim
@@ -1,5 +1,5 @@
discard """
- errormsg: "public implementation 'tmismatchedvisibility.foo(a: int)[declared in tmismatchedvisibility.nim(6, 5)]' has non-public forward declaration in "
+ errormsg: "public implementation 'tmismatchedvisibility.foo(a: int)[declared in tmismatchedvisibility.nim(6, 6)]' has non-public forward declaration in "
line: 8
"""
--
cgit 1.4.1-2-gfad0
From 7c90e22ddd354692d259c5620578f194757c20e1 Mon Sep 17 00:00:00 2001
From: cooldome <cdome@bk.ru>
Date: Mon, 31 Dec 2018 21:57:09 +0000
Subject: fixes #10148 (#10149)
* fixes #10148
* fix a typo
---
compiler/cgen.nim | 31 ++++++++++++++++++-------------
tests/cpp/t10148.nim | 29 +++++++++++++++++++++++++++++
2 files changed, 47 insertions(+), 13 deletions(-)
create mode 100644 tests/cpp/t10148.nim
(limited to 'compiler')
diff --git a/compiler/cgen.nim b/compiler/cgen.nim
index 3d76be254..e4f16f4ed 100644
--- a/compiler/cgen.nim
+++ b/compiler/cgen.nim
@@ -1103,9 +1103,8 @@ proc genMainProc(m: BModule) =
"}$N$N" &
"void PreMain(void) {$N" &
"\tvoid (*volatile inner)(void);$N" &
- "$1" &
"\tinner = PreMainInner;$N" &
- "$4$5" &
+ "$1" &
"\t(*inner)();$N" &
"}$N$N"
@@ -1222,12 +1221,7 @@ proc genMainProc(m: BModule) =
else: ropecg(m, "\t#initStackBottomWith((void *)&inner);$N")
inc(m.labels)
appcg(m, m.s[cfsProcs], PreMainBody, [
- m.g.mainDatInit, m.g.breakpoints, m.g.otherModsInit,
- if emulatedThreadVars(m.config) and m.config.target.targetOS != osStandalone:
- ropecg(m, "\t#initThreadVarsEmulation();$N")
- else:
- "".rope,
- initStackBottomCall])
+ m.g.mainDatInit, m.g.breakpoints, m.g.otherModsInit])
appcg(m, m.s[cfsProcs], nimMain,
[m.g.mainModInit, initStackBottomCall, rope(m.labels)])
@@ -1256,21 +1250,32 @@ proc getInitName(m: PSym): Rope =
proc getDatInitName(m: PSym): Rope = getSomeInitName(m, "DatInit000")
+
proc registerModuleToMain(g: BModuleList; m: BModule) =
+ if m.s[cfsDatInitProc].len > 0:
+ let datInit = m.module.getDatInitName
+ addf(g.mainModProcs, "N_LIB_PRIVATE N_NIMCALL(void, $1)(void);$N", [datInit])
+ addf(g.mainDatInit, "\t$1();$N", [datInit])
+
+ # Initialization of TLS and GC should be done in between
+ # systemDatInit and systemInit calls if any
+ if sfSystemModule in m.module.flags:
+ if emulatedThreadVars(m.config) and m.config.target.targetOS != osStandalone:
+ add(g.mainDatInit, ropecg(m, "\t#initThreadVarsEmulation();$N"))
+ if m.config.target.targetOS != osStandalone and m.config.selectedGC != gcNone:
+ add(g.mainDatInit, ropecg(m, "\t#initStackBottomWith((void *)&inner);$N"))
+
if m.s[cfsInitProc].len > 0:
let init = m.module.getInitName
addf(g.mainModProcs, "N_LIB_PRIVATE N_NIMCALL(void, $1)(void);$N", [init])
let initCall = "\t$1();$N" % [init]
if sfMainModule in m.module.flags:
add(g.mainModInit, initCall)
+ elif sfSystemModule in m.module.flags:
+ add(g.mainDatInit, initCall) # systemInit must called right after systemDatInit if any
else:
add(g.otherModsInit, initCall)
- if m.s[cfsDatInitProc].len > 0:
- let datInit = m.module.getDatInitName
- addf(g.mainModProcs, "N_LIB_PRIVATE N_NIMCALL(void, $1)(void);$N", [datInit])
- addf(g.mainDatInit, "\t$1();$N", [datInit])
-
proc genDatInitCode(m: BModule) =
## this function is called in cgenWriteModules after all modules are closed,
## it means raising dependency on the symbols is too late as it will not propogate
diff --git a/tests/cpp/t10148.nim b/tests/cpp/t10148.nim
new file mode 100644
index 000000000..e8dd3098f
--- /dev/null
+++ b/tests/cpp/t10148.nim
@@ -0,0 +1,29 @@
+discard """
+ output: '''Expected successful exit'''
+ joinable: false
+"""
+
+import os
+
+proc another_proc: string =
+ ## trigger many GC allocations
+ var x = @[""]
+ for i in 0..100:
+ x.add $i
+ result = "not_existent_path"
+
+proc findlib2: string =
+ let path = getEnv("MYLIB2_DOES_NOT_EXIST_PATH")
+ let another_path = another_proc()
+ GC_fullCollect()
+
+ if path.len > 0 and dirExists(path):
+ path / "alib_does_not_matter.dll"
+ elif fileExists(another_path):
+ another_path
+ else:
+ quit("Expected successful exit", 0)
+
+proc imported_func*(a: cint): cstring {.importc, dynlib: findlib2().}
+
+echo imported_func(0)
--
cgit 1.4.1-2-gfad0
From 9faad7591e37fa074544206d1de17e59f56bd576 Mon Sep 17 00:00:00 2001
From: Neelesh Chandola <neelesh.chandola@outlook.com>
Date: Tue, 1 Jan 2019 18:20:48 +0530
Subject: Deprecate gc v2 (#10151)
* Deprecate gc v2
* warnDeprecated now has custom messages
---
compiler/commands.nim | 4 ++--
compiler/importer.nim | 4 ++--
compiler/lineinfos.nim | 2 +-
compiler/lookups.nim | 2 +-
compiler/modulepaths.nim | 2 +-
compiler/parser.nim | 4 ++--
compiler/pragmas.nim | 12 ++++++------
compiler/semexprs.nim | 2 +-
compiler/semstmts.nim | 2 +-
compiler/semtypes.nim | 2 +-
compiler/suggest.nim | 4 ++--
doc/advopt.txt | 2 +-
12 files changed, 21 insertions(+), 21 deletions(-)
(limited to 'compiler')
diff --git a/compiler/commands.nim b/compiler/commands.nim
index 5893791cc..8b73884e8 100644
--- a/compiler/commands.nim
+++ b/compiler/commands.nim
@@ -224,7 +224,7 @@ proc testCompileOptionArg*(conf: ConfigRef; switch, arg: string, info: TLineInfo
case arg.normalize
of "boehm": result = conf.selectedGC == gcBoehm
of "refc": result = conf.selectedGC == gcRefc
- of "v2": result = conf.selectedGC == gcV2
+ of "v2": result = false
of "markandsweep": result = conf.selectedGC == gcMarkAndSweep
of "generational": result = false
of "destructors": result = conf.selectedGC == gcDestructors
@@ -442,7 +442,7 @@ proc processSwitch*(switch, arg: string, pass: TCmdLinePass, info: TLineInfo;
of "refc":
conf.selectedGC = gcRefc
of "v2":
- conf.selectedGC = gcV2
+ message(conf, info, warnDeprecated, "--gc:v2 is deprecated; using default gc")
of "markandsweep":
conf.selectedGC = gcMarkAndSweep
defineSymbol(conf.symbols, "gcmarkandsweep")
diff --git a/compiler/importer.nim b/compiler/importer.nim
index 118d26d80..eef0c9bb9 100644
--- a/compiler/importer.nim
+++ b/compiler/importer.nim
@@ -162,9 +162,9 @@ proc myImportModule(c: PContext, n: PNode; importStmtResult: PNode): PSym =
localError(c.config, n.info, "A module cannot import itself")
if sfDeprecated in result.flags:
if result.constraint != nil:
- message(c.config, n.info, warnDeprecated, result.constraint.strVal & "; " & result.name.s)
+ message(c.config, n.info, warnDeprecated, result.constraint.strVal & "; " & result.name.s & " is deprecated")
else:
- message(c.config, n.info, warnDeprecated, result.name.s)
+ message(c.config, n.info, warnDeprecated, result.name.s & " is deprecated")
suggestSym(c.config, n.info, result, c.graph.usageSym, false)
importStmtResult.add newSymNode(result, n.info)
#newStrNode(toFullPath(c.config, f), n.info)
diff --git a/compiler/lineinfos.nim b/compiler/lineinfos.nim
index b1ecf779e..21ce44406 100644
--- a/compiler/lineinfos.nim
+++ b/compiler/lineinfos.nim
@@ -65,7 +65,7 @@ const
warnOctalEscape: "octal escape sequences do not exist; leading zero is ignored",
warnXIsNeverRead: "'$1' is never read",
warnXmightNotBeenInit: "'$1' might not have been initialized",
- warnDeprecated: "$1 is deprecated",
+ warnDeprecated: "$1",
warnConfigDeprecated: "config file '$1' is deprecated",
warnSmallLshouldNotBeUsed: "'l' should not be used as an identifier; may look like '1' (one)",
warnUnknownMagic: "unknown magic '$1' might crash the compiler",
diff --git a/compiler/lookups.nim b/compiler/lookups.nim
index 11a741505..d4959db12 100644
--- a/compiler/lookups.nim
+++ b/compiler/lookups.nim
@@ -89,7 +89,7 @@ proc skipAlias*(s: PSym; n: PNode; conf: ConfigRef): PSym =
prettybase.replaceDeprecated(conf, n.info, s, result)
else:
message(conf, n.info, warnDeprecated, "use " & result.name.s & " instead; " &
- s.name.s)
+ s.name.s & " is deprecated")
proc localSearchInScope*(c: PContext, s: PIdent): PSym =
result = strTableGet(c.currentScope.symbols, s)
diff --git a/compiler/modulepaths.nim b/compiler/modulepaths.nim
index f0718c4eb..9e27a2d7d 100644
--- a/compiler/modulepaths.nim
+++ b/compiler/modulepaths.nim
@@ -147,7 +147,7 @@ proc getModuleName*(conf: ConfigRef; n: PNode): string =
# hacky way to implement 'x / y /../ z':
result = renderTree(n, {renderNoComments}).replace(" ")
of nkDotExpr:
- localError(conf, n.info, warnDeprecated, "using '.' instead of '/' in import paths")
+ localError(conf, n.info, warnDeprecated, "using '.' instead of '/' in import paths is deprecated")
result = renderTree(n, {renderNoComments}).replace(".", "/")
of nkImportAs:
result = getModuleName(conf, n.sons[0])
diff --git a/compiler/parser.nim b/compiler/parser.nim
index 163ad6455..afc49c0d3 100644
--- a/compiler/parser.nim
+++ b/compiler/parser.nim
@@ -1916,7 +1916,7 @@ proc parseObject(p: var TParser): PNode =
getTok(p)
if p.tok.tokType == tkCurlyDotLe and p.validInd:
# Deprecated since v0.20.0
- parMessage(p, warnDeprecated, "type pragmas follow the type name; this form of writing pragmas")
+ parMessage(p, warnDeprecated, "type pragmas follow the type name; this form of writing pragmas is deprecated")
addSon(result, parsePragma(p))
else:
addSon(result, p.emptyNode)
@@ -2008,7 +2008,7 @@ proc parseTypeDef(p: var TParser): PNode =
if p.tok.tokType == tkBracketLe and p.validInd:
if not noPragmaYet:
# Deprecated since v0.20.0
- parMessage(p, warnDeprecated, "pragma before generic parameter list")
+ parMessage(p, warnDeprecated, "pragma before generic parameter list is deprecated")
genericParam = parseGenericParamList(p)
else:
genericParam = p.emptyNode
diff --git a/compiler/pragmas.nim b/compiler/pragmas.nim
index 58f64f7b0..39b58d0b1 100644
--- a/compiler/pragmas.nim
+++ b/compiler/pragmas.nim
@@ -242,7 +242,7 @@ proc pragmaNoForward(c: PContext, n: PNode; flag=sfNoForward) =
# deprecated as of 0.18.1
message(c.config, n.info, warnDeprecated,
"use {.experimental: \"codeReordering.\".} instead; " &
- (if flag == sfNoForward: "{.noForward.}" else: "{.reorder.}"))
+ (if flag == sfNoForward: "{.noForward.}" else: "{.reorder.}") & " is deprecated")
proc processCallConv(c: PContext, n: PNode) =
if n.kind in nkPragmaCallKinds and n.len == 2 and n.sons[1].kind == nkIdent:
@@ -447,14 +447,14 @@ proc processPop(c: PContext, n: PNode) =
proc processDefine(c: PContext, n: PNode) =
if (n.kind in nkPragmaCallKinds and n.len == 2) and (n[1].kind == nkIdent):
defineSymbol(c.config.symbols, n[1].ident.s)
- message(c.config, n.info, warnDeprecated, "define")
+ message(c.config, n.info, warnDeprecated, "define is deprecated")
else:
invalidPragma(c, n)
proc processUndef(c: PContext, n: PNode) =
if (n.kind in nkPragmaCallKinds and n.len == 2) and (n[1].kind == nkIdent):
undefSymbol(c.config.symbols, n[1].ident.s)
- message(c.config, n.info, warnDeprecated, "undef")
+ message(c.config, n.info, warnDeprecated, "undef is deprecated")
else:
invalidPragma(c, n)
@@ -784,7 +784,7 @@ proc singlePragma(c: PContext, sym: PSym, n: PNode, i: var int,
if sym.kind in {skTemplate, skMacro}:
incl(sym.flags, sfImmediate)
incl(sym.flags, sfAllUntyped)
- message(c.config, n.info, warnDeprecated, "use 'untyped' parameters instead; immediate")
+ message(c.config, n.info, warnDeprecated, "use 'untyped' parameters instead; immediate is deprecated")
else: invalidPragma(c, it)
of wDirty:
if sym.kind == skTemplate: incl(sym.flags, sfDirty)
@@ -1098,10 +1098,10 @@ proc singlePragma(c: PContext, sym: PSym, n: PNode, i: var int,
of wThis:
if it.kind in nkPragmaCallKinds and it.len == 2:
c.selfName = considerQuotedIdent(c, it[1])
- message(c.config, n.info, warnDeprecated, "the '.this' pragma")
+ message(c.config, n.info, warnDeprecated, "the '.this' pragma is deprecated")
elif it.kind == nkIdent or it.len == 1:
c.selfName = getIdent(c.cache, "self")
- message(c.config, n.info, warnDeprecated, "the '.this' pragma")
+ message(c.config, n.info, warnDeprecated, "the '.this' pragma is deprecated")
else:
localError(c.config, it.info, "'this' pragma is allowed to have zero or one arguments")
of wNoRewrite:
diff --git a/compiler/semexprs.nim b/compiler/semexprs.nim
index 45e259b65..19d008557 100644
--- a/compiler/semexprs.nim
+++ b/compiler/semexprs.nim
@@ -2434,7 +2434,7 @@ proc semExpr(c: PContext, n: PNode, flags: TExprFlags = {}): PNode =
result.kind = nkCall
result = semExpr(c, result, flags)
of nkBind:
- message(c.config, n.info, warnDeprecated, "bind")
+ message(c.config, n.info, warnDeprecated, "bind is deprecated")
result = semExpr(c, n.sons[0], flags)
of nkTypeOfExpr, nkTupleTy, nkTupleClassTy, nkRefTy..nkEnumTy, nkStaticTy:
if c.matchedConcept != nil and n.len == 1:
diff --git a/compiler/semstmts.nim b/compiler/semstmts.nim
index f60e2556d..59eb23162 100644
--- a/compiler/semstmts.nim
+++ b/compiler/semstmts.nim
@@ -1582,7 +1582,7 @@ proc semMethodPrototype(c: PContext; s: PSym; n: PNode) =
foundObj = true
x.methods.add((col,s))
if not foundObj:
- message(c.config, n.info, warnDeprecated, "generic method not attachable to object type")
+ message(c.config, n.info, warnDeprecated, "generic method not attachable to object type is deprecated")
else:
# why check for the body? bug #2400 has none. Checking for sfForward makes
# no sense either.
diff --git a/compiler/semtypes.nim b/compiler/semtypes.nim
index 200b247ca..d1ea54eca 100644
--- a/compiler/semtypes.nim
+++ b/compiler/semtypes.nim
@@ -210,7 +210,7 @@ proc semAnyRef(c: PContext; n: PNode; kind: TTypeKind; prev: PType): PType =
tyError, tyObject}:
message c.config, n[i].info, errGenerated, "region needs to be an object type"
else:
- message(c.config, n.info, warnDeprecated, "region for pointer types")
+ message(c.config, n.info, warnDeprecated, "region for pointer types is deprecated")
addSonSkipIntLit(result, region)
addSonSkipIntLit(result, t)
if tfPartial in result.flags:
diff --git a/compiler/suggest.nim b/compiler/suggest.nim
index d3ce46172..144b86224 100644
--- a/compiler/suggest.nim
+++ b/compiler/suggest.nim
@@ -470,9 +470,9 @@ proc warnAboutDeprecated(conf: ConfigRef; info: TLineInfo; s: PSym) =
for it in pragmaNode:
if whichPragma(it) == wDeprecated and it.safeLen == 2 and
it[1].kind in {nkStrLit..nkTripleStrLit}:
- message(conf, info, warnDeprecated, it[1].strVal & "; " & name)
+ message(conf, info, warnDeprecated, it[1].strVal & "; " & name & " is deprecated")
return
- message(conf, info, warnDeprecated, name)
+ message(conf, info, warnDeprecated, name & " is deprecated")
proc userError(conf: ConfigRef; info: TLineInfo; s: PSym) =
let pragmaNode = extractPragma(s)
diff --git a/doc/advopt.txt b/doc/advopt.txt
index 7445068c1..75260baad 100644
--- a/doc/advopt.txt
+++ b/doc/advopt.txt
@@ -82,7 +82,7 @@ Advanced options:
--skipUserCfg do not read the user's configuration file
--skipParentCfg do not read the parent dirs' configuration files
--skipProjCfg do not read the project's configuration file
- --gc:refc|v2|markAndSweep|boehm|go|none|regions
+ --gc:refc|markAndSweep|boehm|go|none|regions
select the GC to use; default is 'refc'
--index:on|off turn index file generation on|off
--putenv:key=value set an environment variable
--
cgit 1.4.1-2-gfad0
From 6ed9676af5ae17fa15551a00f1ad5f3be109233f Mon Sep 17 00:00:00 2001
From: Neelesh Chandola <neelesh.chandola@outlook.com>
Date: Tue, 1 Jan 2019 23:19:44 +0530
Subject: Show field not initialized warning only when `notnil` used (#10155)
---
compiler/semtypes.nim | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'compiler')
diff --git a/compiler/semtypes.nim b/compiler/semtypes.nim
index d1ea54eca..f4936a71a 100644
--- a/compiler/semtypes.nim
+++ b/compiler/semtypes.nim
@@ -141,7 +141,7 @@ proc semEnum(c: PContext, n: PNode, prev: PType): PType =
if isPure and (let conflict = strTableInclReportConflict(symbols, e); conflict != nil):
wrongRedefinition(c, e.info, e.name.s, conflict.info)
inc(counter)
- if not hasNull: incl(result.flags, tfNeedsInit)
+ if tfNotNil in e.typ.flags and not hasNull: incl(result.flags, tfNeedsInit)
proc semSet(c: PContext, n: PNode, prev: PType): PType =
result = newOrPrevType(tySet, prev, c)
--
cgit 1.4.1-2-gfad0
From a1e268e3dccdde4df9b11a0ee87971e1143fbb43 Mon Sep 17 00:00:00 2001
From: Timothee Cour <timothee.cour2@gmail.com>
Date: Wed, 2 Jan 2019 01:26:40 -0800
Subject: [cleanup] remove dead code compiler.options.mergeConfigs (#10165)
---
compiler/options.nim | 78 ----------------------------------------------------
1 file changed, 78 deletions(-)
(limited to 'compiler')
diff --git a/compiler/options.nim b/compiler/options.nim
index 49d2f7404..448741ddb 100644
--- a/compiler/options.nim
+++ b/compiler/options.nim
@@ -253,84 +253,6 @@ template depConfigFields*(fn) {.dirty.} =
fn(globalOptions)
fn(selectedGC)
-proc mergeConfigs*(dest, src: ConfigRef; mergeSymbols: bool) =
- template merge[T: enum](a, b: T) =
- a = b
- template merge[T](a, b: set[T]) =
- a = a + b
- template merge(a, b: int) =
- inc a, b
- template merge[T](a, b: seq[T]) =
- for bb in b: a.add b
- template merge(a, b: string) =
- a = b
- template merge[T: AbsoluteFile|AbsoluteDir](a, b: T) =
- if a.isEmpty and not b.isEmpty: a = b
-
- template merge[T](a, b: HashSet[T]) =
- for bb in b: a.incl b
- template merge(a, b: StringTableRef) =
- for k, v in b: a[k] = v
- template merge[T: object](a, b: T) =
- a = b
-
- template m(field) =
- merge(dest.field, src.field)
-
- m target
- m options
- m globalOptions
- m cmd
- m selectedGC
- dest.verbosity = src.verbosity
- m numberOfProcessors
- m evalExpr
- m symbolFiles
- m cppDefines
- m headerFile
- m features
- m arguments
- m ideCmd
- m cCompiler
- m enableNotes
- m disableNotes
- m foreignPackageNotes
- m notes
- m errorCounter
- m hintCounter
- m warnCounter
- m errorMax
- m configVars
- if mergeSymbols:
- m symbols
- m projectName
- m projectPath
- m projectFull
- m searchPaths
- m lazyPaths
- m outFile
- m prefixDir
- m libpath
- m nimcacheDir
- m dllOverrides
- m moduleOverrides
- m command
- m commandArgs
- m implicitImports
- m implicitIncludes
- m docSeeSrcUrl
- m cIncludes
- m cLibs
- m cLinkedLibs
- m externalToLink
- m linkOptionsCmd
- m compileOptionsCmd
- m linkOptions
- m compileOptions
- m ccompilerpath
- m toCompile
- m cppCustomNamespace
-
const oldExperimentalFeatures* = {implicitDeref, dotOperators, callOperator, parallel}
const
--
cgit 1.4.1-2-gfad0
From 7c5ae008874e7bb76214bca96267bcb400a723d1 Mon Sep 17 00:00:00 2001
From: Neelesh Chandola <neelesh.chandola@outlook.com>
Date: Thu, 3 Jan 2019 00:31:06 +0530
Subject: exportc is now not allowed for type aliases (#9979)
---
compiler/semstmts.nim | 2 ++
tests/pragmas/t5149.nim | 12 ++++++++++++
2 files changed, 14 insertions(+)
create mode 100644 tests/pragmas/t5149.nim
(limited to 'compiler')
diff --git a/compiler/semstmts.nim b/compiler/semstmts.nim
index 59eb23162..39f200ba8 100644
--- a/compiler/semstmts.nim
+++ b/compiler/semstmts.nim
@@ -1101,6 +1101,8 @@ proc typeSectionRightSidePass(c: PContext, n: PNode) =
#debug s.typ
s.ast = a
popOwner(c)
+ if sfExportc in s.flags and s.typ.kind == tyAlias:
+ localError(c.config, name.info, "{.exportc.} not allowed for type aliases")
let aa = a.sons[2]
if aa.kind in {nkRefTy, nkPtrTy} and aa.len == 1 and
aa.sons[0].kind == nkObjectTy:
diff --git a/tests/pragmas/t5149.nim b/tests/pragmas/t5149.nim
new file mode 100644
index 000000000..2d242a8d5
--- /dev/null
+++ b/tests/pragmas/t5149.nim
@@ -0,0 +1,12 @@
+discard """
+ errormsg: "{.exportc.} not allowed for type aliases"
+ line: 9
+"""
+
+type
+ X* = object
+ a: int
+ Y* {.exportc.} = X
+
+proc impl*(x: X) =
+ echo "it works"
--
cgit 1.4.1-2-gfad0
From 086229459aa72f06d31a4f920653a82a74cfc6b0 Mon Sep 17 00:00:00 2001
From: Araq <rumpf_a@web.de>
Date: Fri, 4 Jan 2019 09:52:01 +0100
Subject: runnableExamples: compile and test them as a single file; fixes #9300
---
compiler/docgen.nim | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
(limited to 'compiler')
diff --git a/compiler/docgen.nim b/compiler/docgen.nim
index 67f4108e1..0fe19c5bc 100644
--- a/compiler/docgen.nim
+++ b/compiler/docgen.nim
@@ -40,6 +40,7 @@ type
# already. See bug #3655
destFile*: AbsoluteFile
thisDir*: AbsoluteDir
+ examples: string
PDoc* = ref TDocumentor ## Alias to type less.
@@ -378,6 +379,13 @@ proc testExample(d: PDoc; ex: PNode) =
"_examples" & $d.exampleCounter & ".nim"))
#let nimcache = outp.changeFileExt"" & "_nimcache"
renderModule(ex, d.filename, outp.string, conf = d.conf)
+ d.examples.add "import r\"" & outp.string & "\"\n"
+
+proc runAllExamples(d: PDoc) =
+ let outputDir = d.conf.getNimcacheDir / RelativeDir"runnableExamples"
+ let outp = outputDir / RelativeFile(extractFilename(d.filename.changeFileExt"" &
+ "_examples.nim"))
+ writeFile(outp, d.examples)
let backend = if isDefined(d.conf, "js"): "js"
elif isDefined(d.conf, "cpp"): "cpp"
elif isDefined(d.conf, "objc"): "objc"
@@ -400,11 +408,9 @@ proc extractImports(n: PNode; result: PNode) =
for i in 0..<n.safeLen: extractImports(n[i], result)
proc prepareExamples(d: PDoc; n: PNode) =
-
var docComment = newTree(nkCommentStmt)
let loc = d.conf.toFileLineCol(n.info)
docComment.comment = "autogenerated by docgen from " & loc
-
var runnableExamples = newTree(nkStmtList,
docComment,
newTree(nkImportStmt, newStrNode(nkStrLit, d.filename)))
@@ -935,6 +941,7 @@ proc generateIndex*(d: PDoc) =
writeIndexFile(d[], dest.string)
proc writeOutput*(d: PDoc, useWarning = false) =
+ runAllExamples(d)
var content = genOutFile(d)
if optStdout in d.conf.globalOptions:
writeRope(stdout, content)
@@ -947,6 +954,7 @@ proc writeOutput*(d: PDoc, useWarning = false) =
outfile.string)
proc writeOutputJson*(d: PDoc, useWarning = false) =
+ runAllExamples(d)
var modDesc: string
for desc in d.modDesc:
modDesc &= desc
--
cgit 1.4.1-2-gfad0
From 5101b6befd55a7e32694a09a23dc818cb63dcbb6 Mon Sep 17 00:00:00 2001
From: Araq <rumpf_a@web.de>
Date: Fri, 4 Jan 2019 13:39:47 +0100
Subject: fixes #10188
---
compiler/docgen.nim | 1 +
1 file changed, 1 insertion(+)
(limited to 'compiler')
diff --git a/compiler/docgen.nim b/compiler/docgen.nim
index 0fe19c5bc..1af9c06b8 100644
--- a/compiler/docgen.nim
+++ b/compiler/docgen.nim
@@ -382,6 +382,7 @@ proc testExample(d: PDoc; ex: PNode) =
d.examples.add "import r\"" & outp.string & "\"\n"
proc runAllExamples(d: PDoc) =
+ if d.examples.len == 0: return
let outputDir = d.conf.getNimcacheDir / RelativeDir"runnableExamples"
let outp = outputDir / RelativeFile(extractFilename(d.filename.changeFileExt"" &
"_examples.nim"))
--
cgit 1.4.1-2-gfad0
From e9a192c36fb62331db0bbd308433e56fc771c352 Mon Sep 17 00:00:00 2001
From: Neelesh Chandola <neelesh.chandola@outlook.com>
Date: Fri, 4 Jan 2019 19:41:48 +0530
Subject: expandFilename on windows is now consistent with other platforms
(#10154)
---
compiler/options.nim | 11 +------
lib/pure/os.nim | 90 ++++++++++++++++++++++++++++------------------------
2 files changed, 49 insertions(+), 52 deletions(-)
(limited to 'compiler')
diff --git a/compiler/options.nim b/compiler/options.nim
index 448741ddb..3730d16f8 100644
--- a/compiler/options.nim
+++ b/compiler/options.nim
@@ -482,16 +482,7 @@ proc setDefaultLibpath*(conf: ConfigRef) =
conf.libpath = AbsoluteDir parentNimLibPath
proc canonicalizePath*(conf: ConfigRef; path: AbsoluteFile): AbsoluteFile =
- # on Windows, 'expandFilename' calls getFullPathName which doesn't do
- # case corrections, so we have to use this convoluted way of retrieving
- # the true filename (see tests/modules and Nimble uses 'import Uri' instead
- # of 'import uri'):
- when defined(windows):
- result = AbsoluteFile path.string.expandFilename
- for x in walkFiles(result.string):
- return AbsoluteFile x
- else:
- result = AbsoluteFile path.string.expandFilename
+ result = AbsoluteFile path.string.expandFilename
proc shortenDir*(conf: ConfigRef; dir: string): string {.
deprecated: "use 'relativeTo' instead".} =
diff --git a/lib/pure/os.nim b/lib/pure/os.nim
index b6cef191b..ab87101c2 100644
--- a/lib/pure/os.nim
+++ b/lib/pure/os.nim
@@ -945,48 +945,6 @@ when not weirdTarget:
raise newException(ValueError, "The specified root is not absolute: " & root)
joinPath(root, path)
-proc expandFilename*(filename: string): string {.rtl, extern: "nos$1",
- tags: [ReadDirEffect], noNimScript.} =
- ## Returns the full (`absolute`:idx:) path of an existing file `filename`,
- ## raises OSError in case of an error. Follows symlinks.
- when defined(windows):
- var bufsize = MAX_PATH.int32
- when useWinUnicode:
- var unused: WideCString = nil
- var res = newWideCString("", bufsize)
- while true:
- var L = getFullPathNameW(newWideCString(filename), bufsize, res, unused)
- if L == 0'i32:
- raiseOSError(osLastError())
- elif L > bufsize:
- res = newWideCString("", L)
- bufsize = L
- else:
- result = res$L
- break
- else:
- var unused: cstring = nil
- result = newString(bufsize)
- while true:
- var L = getFullPathNameA(filename, bufsize, result, unused)
- if L == 0'i32:
- raiseOSError(osLastError())
- elif L > bufsize:
- result = newString(L)
- bufsize = L
- else:
- setLen(result, L)
- break
- else:
- # according to Posix we don't need to allocate space for result pathname.
- # But we need to free return value with free(3).
- var r = realpath(filename, nil)
- if r.isNil:
- raiseOSError(osLastError())
- else:
- result = $r
- c_free(cast[pointer](r))
-
proc normalizePath*(path: var string) {.rtl, extern: "nos$1", tags: [], noNimScript.} =
## Normalize a path.
##
@@ -1425,6 +1383,54 @@ iterator walkDirs*(pattern: string): string {.tags: [ReadDirEffect], noNimScript
## notation is supported.
walkCommon(pattern, isDir)
+proc expandFilename*(filename: string): string {.rtl, extern: "nos$1",
+ tags: [ReadDirEffect], noNimScript.} =
+ ## Returns the full (`absolute`:idx:) path of an existing file `filename`,
+ ## raises OSError in case of an error. Follows symlinks.
+ when defined(windows):
+ var bufsize = MAX_PATH.int32
+ when useWinUnicode:
+ var unused: WideCString = nil
+ var res = newWideCString("", bufsize)
+ while true:
+ var L = getFullPathNameW(newWideCString(filename), bufsize, res, unused)
+ if L == 0'i32:
+ raiseOSError(osLastError())
+ elif L > bufsize:
+ res = newWideCString("", L)
+ bufsize = L
+ else:
+ result = res$L
+ break
+ else:
+ var unused: cstring = nil
+ result = newString(bufsize)
+ while true:
+ var L = getFullPathNameA(filename, bufsize, result, unused)
+ if L == 0'i32:
+ raiseOSError(osLastError())
+ elif L > bufsize:
+ result = newString(L)
+ bufsize = L
+ else:
+ setLen(result, L)
+ break
+ # getFullPathName doesn't do case corrections, so we have to use this convoluted
+ # way of retrieving the true filename
+ for x in walkFiles(result.string):
+ result = x
+ if not existsFile(result) and not existsDir(result):
+ raise newException(OSError, "file does not exist")
+ else:
+ # according to Posix we don't need to allocate space for result pathname.
+ # But we need to free return value with free(3).
+ var r = realpath(filename, nil)
+ if r.isNil:
+ raiseOSError(osLastError())
+ else:
+ result = $r
+ c_free(cast[pointer](r))
+
type
PathComponent* = enum ## Enumeration specifying a path component.
pcFile, ## path refers to a file
--
cgit 1.4.1-2-gfad0
From e77dd683eb9b6b2b9c2638f4145f8857fece12cb Mon Sep 17 00:00:00 2001
From: Neelesh Chandola <neelesh.chandola@outlook.com>
Date: Mon, 7 Jan 2019 05:21:17 +0530
Subject: Fix defer not not-working at top level (#10191)
---
compiler/sem.nim | 2 --
compiler/semexprs.nim | 2 ++
tests/async/tasyncfilewrite.nim | 3 +--
tests/exception/tdefer1.nim | 10 +---------
4 files changed, 4 insertions(+), 13 deletions(-)
(limited to 'compiler')
diff --git a/compiler/sem.nim b/compiler/sem.nim
index 8332af346..3763c9b84 100644
--- a/compiler/sem.nim
+++ b/compiler/sem.nim
@@ -556,8 +556,6 @@ proc isEmptyTree(n: PNode): bool =
else: result = false
proc semStmtAndGenerateGenerics(c: PContext, n: PNode): PNode =
- if n.kind == nkDefer:
- localError(c.config, n.info, "defer statement not supported at top level")
if c.topStmts == 0 and not isImportSystemStmt(c.graph, n):
if sfSystemModule notin c.module.flags and not isEmptyTree(n):
c.importTable.addSym c.graph.systemModule # import the "System" identifier
diff --git a/compiler/semexprs.nim b/compiler/semexprs.nim
index 19d008557..7a124c769 100644
--- a/compiler/semexprs.nim
+++ b/compiler/semexprs.nim
@@ -2624,6 +2624,8 @@ proc semExpr(c: PContext, n: PNode, flags: TExprFlags = {}): PNode =
of nkStaticStmt:
result = semStaticStmt(c, n)
of nkDefer:
+ if c.currentScope == c.topLevelScope:
+ localError(c.config, n.info, "defer statement not supported at top level")
n.sons[0] = semExpr(c, n.sons[0])
if not n.sons[0].typ.isEmptyType and not implicitlyDiscardable(n.sons[0]):
localError(c.config, n.info, "'defer' takes a 'void' expression")
diff --git a/tests/async/tasyncfilewrite.nim b/tests/async/tasyncfilewrite.nim
index 373b93301..3baf2bbc6 100644
--- a/tests/async/tasyncfilewrite.nim
+++ b/tests/async/tasyncfilewrite.nim
@@ -9,7 +9,6 @@ import os, asyncfile, asyncdispatch
const F = "test_async.txt"
removeFile(F)
-defer: removeFile(F)
let f = openAsync(F, fmWrite)
var futs = newSeq[Future[void]]()
for i in 1..3:
@@ -17,4 +16,4 @@ for i in 1..3:
waitFor(all(futs))
f.close()
echo readFile(F)
-
+removeFile(F)
diff --git a/tests/exception/tdefer1.nim b/tests/exception/tdefer1.nim
index b84ba7681..db46bad27 100644
--- a/tests/exception/tdefer1.nim
+++ b/tests/exception/tdefer1.nim
@@ -1,6 +1,5 @@
discard """
output: '''hi
-hi
1
hi
2
@@ -10,13 +9,6 @@ A'''
# bug #1742
-template test(): untyped =
- let a = 0
- defer: echo "hi"
- a
-
-let i = test()
-
import strutils
let x = try: parseInt("133a")
except: -1
@@ -31,7 +23,7 @@ template atFuncEnd =
template testB(): untyped =
let a = 0
- defer: echo "hi" # Delete this line to make it work
+ defer: echo "hi"
a
proc main =
--
cgit 1.4.1-2-gfad0
From 5345c5b1302e7beca5eb88ed510570e8e4431413 Mon Sep 17 00:00:00 2001
From: Miran <narimiran@disroot.org>
Date: Mon, 7 Jan 2019 10:37:49 +0100
Subject: remove deprecated modules (#10215)
* removed from `compiler`:
* lists (deprecated 2 years ago)
* removed from `lib` (all deprecated 3 years ago):
* ssl
* matchers
* httpserver
* removed from `lib/deprecated`:
* unsigned
* actors (and three accompanying tests)
* parseurl
* moved to `lib/deprecated`:
* securehash (the reason for not directly removing - it was deprecated (only) one year ago)
---
compiler/lists.nim | 28 --
doc/lib.rst | 14 +-
lib/deprecated/core/unsigned.nim | 18 -
lib/deprecated/pure/actors.nim | 239 ---------
lib/deprecated/pure/actors.nim.cfg | 3 -
lib/deprecated/pure/parseurl.nim | 112 -----
lib/deprecated/pure/rawsockets.nim | 14 -
lib/deprecated/pure/securehash.nim | 6 +
lib/impure/ssl.nim | 99 ----
lib/pure/httpserver.nim | 535 ---------------------
lib/pure/matchers.nim | 68 ---
lib/pure/securehash.nim | 6 -
.../keineschweine/enet_server/enet_server.nim | 2 +-
.../manyloc/keineschweine/server/old_dirserver.nim | 2 +-
.../manyloc/keineschweine/server/old_sg_server.nim | 2 +-
tests/threads/tactors.nim | 13 -
tests/threads/tactors2.nim | 25 -
tests/threads/trecursive_actor.nim | 20 -
tests/tuples/tuple_with_nil.nim | 1 -
tools/kochdocs.nim | 4 -
20 files changed, 11 insertions(+), 1200 deletions(-)
delete mode 100644 compiler/lists.nim
delete mode 100644 lib/deprecated/core/unsigned.nim
delete mode 100644 lib/deprecated/pure/actors.nim
delete mode 100644 lib/deprecated/pure/actors.nim.cfg
delete mode 100644 lib/deprecated/pure/parseurl.nim
delete mode 100644 lib/deprecated/pure/rawsockets.nim
create mode 100644 lib/deprecated/pure/securehash.nim
delete mode 100644 lib/impure/ssl.nim
delete mode 100644 lib/pure/httpserver.nim
delete mode 100644 lib/pure/matchers.nim
delete mode 100644 lib/pure/securehash.nim
delete mode 100644 tests/threads/tactors.nim
delete mode 100644 tests/threads/tactors2.nim
delete mode 100644 tests/threads/trecursive_actor.nim
(limited to 'compiler')
diff --git a/compiler/lists.nim b/compiler/lists.nim
deleted file mode 100644
index bfd052204..000000000
--- a/compiler/lists.nim
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-#
-# The Nim Compiler
-# (c) Copyright 2012 Andreas Rumpf
-#
-# See the file "copying.txt", included in this
-# distribution, for details about the copyright.
-#
-
-# This module is deprecated, don't use it.
-# TODO Remove this
-
-import os
-
-static:
- echo "WARNING: imported deprecated module compiler/lists.nim, use seq ore lists from the standard library"
-
-proc appendStr*(list: var seq[string]; data: string) {.deprecated.} =
- # just use system.add
- list.add(data)
-
-proc includeStr(list: var seq[string]; data: string): bool {.deprecated.} =
- if list.contains(data):
- result = true
- else:
- result = false
- list.add data
-
diff --git a/doc/lib.rst b/doc/lib.rst
index 89e3cca40..a16bf2677 100644
--- a/doc/lib.rst
+++ b/doc/lib.rst
@@ -141,9 +141,6 @@ String handling
Ropes can represent very long strings efficiently; especially concatenation
is done in O(1) instead of O(n).
-* `matchers <matchers.html>`_
- This module contains various string matchers for email addresses, etc.
-
* `subexes <subexes.html>`_
This module implements advanced string substitution operations.
@@ -275,8 +272,8 @@ Internet Protocols and Support
module.
* `net <net.html>`_
- This module implements a high-level sockets API. It will replace the
- ``sockets`` module in the future.
+ This module implements a high-level sockets API. It replaces the
+ ``sockets`` module.
* `nativesockets <nativesockets.html>`_
This module implements a low-level sockets API.
@@ -456,13 +453,6 @@ Database support
for other databases too.
-Other
------
-
-* `ssl <ssl.html>`_
- This module provides an easy to use sockets-style
- Nim interface to the OpenSSL library.
-
Wrappers
========
diff --git a/lib/deprecated/core/unsigned.nim b/lib/deprecated/core/unsigned.nim
deleted file mode 100644
index 93a29e1c9..000000000
--- a/lib/deprecated/core/unsigned.nim
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-#
-# Nim's Runtime Library
-# (c) Copyright 2012 Andreas Rumpf
-#
-# See the file "copying.txt", included in this
-# distribution, for details about the copyright.
-#
-
-## **Warning:** Since version 0.11.4 this module is deprecated.
-##
-## This module implemented basic arithmetic operators for unsigned integers.
-## These operators are now available in the ``system`` module directly.
-
-{.deprecated.}
-
-export `shr`, `shl`, `and`, `or`, `xor`, `==`, `+`, `-`, `*`, `div`, `mod`,
- `<=`, `<`
diff --git a/lib/deprecated/pure/actors.nim b/lib/deprecated/pure/actors.nim
deleted file mode 100644
index 77c67a3e4..000000000
--- a/lib/deprecated/pure/actors.nim
+++ /dev/null
@@ -1,239 +0,0 @@
-#
-#
-# Nim's Runtime Library
-# (c) Copyright 2012 Andreas Rumpf
-#
-# See the file "copying.txt", included in this
-# distribution, for details about the copyright.
-#
-
-## `Actor`:idx: support for Nim. An actor is implemented as a thread with
-## a channel as its inbox. This module requires the ``--threads:on``
-## command line switch.
-##
-## Example:
-##
-## .. code-block:: nim
-##
-## var
-## a: ActorPool[int, void]
-## createActorPool(a)
-## for i in 0 ..< 300:
-## a.spawn(i, proc (x: int) {.thread.} = echo x)
-## a.join()
-##
-## **Note**: This whole module is deprecated. Use `threadpool` and ``spawn``
-## instead.
-
-{.deprecated.}
-
-from os import sleep
-
-type
- Task*[In, Out] = object{.pure, final.} ## a task
- when Out isnot void:
- receiver*: ptr Channel[Out] ## the receiver channel of the response
- action*: proc (x: In): Out {.thread.} ## action to execute;
- ## sometimes useful
- shutDown*: bool ## set to tell an actor to shut-down
- data*: In ## the data to process
-
- Actor[In, Out] = object{.pure, final.}
- i: Channel[Task[In, Out]]
- t: Thread[ptr Actor[In, Out]]
-
- PActor*[In, Out] = ptr Actor[In, Out] ## an actor
-
-proc spawn*[In, Out](action: proc(
- self: PActor[In, Out]){.thread.}): PActor[In, Out] =
- ## creates an actor; that is a thread with an inbox. The caller MUST call
- ## ``join`` because that also frees the actor's associated resources.
- result = cast[PActor[In, Out]](allocShared0(sizeof(result[])))
- open(result.i)
- createThread(result.t, action, result)
-
-proc inbox*[In, Out](self: PActor[In, Out]): ptr Channel[In] =
- ## gets a pointer to the associated inbox of the actor `self`.
- result = addr(self.i)
-
-proc running*[In, Out](a: PActor[In, Out]): bool =
- ## returns true if the actor `a` is running.
- result = running(a.t)
-
-proc ready*[In, Out](a: PActor[In, Out]): bool =
- ## returns true if the actor `a` is ready to process new messages.
- result = ready(a.i)
-
-proc join*[In, Out](a: PActor[In, Out]) =
- ## joins an actor.
- joinThread(a.t)
- close(a.i)
- deallocShared(a)
-
-proc recv*[In, Out](a: PActor[In, Out]): Task[In, Out] =
- ## receives a task from `a`'s inbox.
- result = recv(a.i)
-
-proc send*[In, Out, X, Y](receiver: PActor[In, Out], msg: In,
- sender: PActor[X, Y]) =
- ## sends a message to `a`'s inbox.
- var t: Task[In, Out]
- t.receiver = addr(sender.i)
- shallowCopy(t.data, msg)
- send(receiver.i, t)
-
-proc send*[In, Out](receiver: PActor[In, Out], msg: In,
- sender: ptr Channel[Out] = nil) =
- ## sends a message to `receiver`'s inbox.
- var t: Task[In, Out]
- t.receiver = sender
- shallowCopy(t.data, msg)
- send(receiver.i, t)
-
-proc sendShutdown*[In, Out](receiver: PActor[In, Out]) =
- ## send a shutdown message to `receiver`.
- var t: Task[In, Out]
- t.shutdown = true
- send(receiver.i, t)
-
-proc reply*[In, Out](t: Task[In, Out], m: Out) =
- ## sends a message to io's output message box.
- when Out is void:
- {.error: "you cannot reply to a void outbox".}
- assert t.receiver != nil
- send(t.receiver[], m)
-
-
-# ----------------- actor pools ----------------------------------------------
-
-type
- ActorPool*[In, Out] = object{.pure, final.} ## an actor pool
- actors: seq[PActor[In, Out]]
- when Out isnot void:
- outputs: Channel[Out]
-
-proc `^`*[T](f: ptr Channel[T]): T =
- ## alias for 'recv'.
- result = recv(f[])
-
-proc poolWorker[In, Out](self: PActor[In, Out]) {.thread.} =
- while true:
- var m = self.recv
- if m.shutDown: break
- when Out is void:
- m.action(m.data)
- else:
- send(m.receiver[], m.action(m.data))
- #self.reply()
-
-proc createActorPool*[In, Out](a: var ActorPool[In, Out], poolSize = 4) =
- ## creates an actor pool.
- newSeq(a.actors, poolSize)
- when Out isnot void:
- open(a.outputs)
- for i in 0 ..< a.actors.len:
- a.actors[i] = spawn(poolWorker[In, Out])
-
-proc sync*[In, Out](a: var ActorPool[In, Out], polling=50) =
- ## waits for every actor of `a` to finish with its work. Currently this is
- ## implemented as polling every `polling` ms and has a slight chance
- ## of failing since we check for every actor to be in `ready` state and not
- ## for messages still in ether. This will change in a later
- ## version, however.
- var allReadyCount = 0
- while true:
- var wait = false
- for i in 0..high(a.actors):
- if not a.actors[i].i.ready:
- wait = true
- allReadyCount = 0
- break
- if not wait:
- # it's possible that some actor sent a message to some other actor but
- # both appeared to be non-working as the message takes some time to
- # arrive. We assume that this won't take longer than `polling` and
- # simply attempt a second time and declare victory then. ;-)
- inc allReadyCount
- if allReadyCount > 1: break
- sleep(polling)
-
-proc terminate*[In, Out](a: var ActorPool[In, Out]) =
- ## terminates each actor in the actor pool `a` and frees the
- ## resources attached to `a`.
- var t: Task[In, Out]
- t.shutdown = true
- for i in 0..<a.actors.len: send(a.actors[i].i, t)
- for i in 0..<a.actors.len: join(a.actors[i])
- when Out isnot void:
- close(a.outputs)
- a.actors = @[]
-
-proc join*[In, Out](a: var ActorPool[In, Out]) =
- ## short-cut for `sync` and then `terminate`.
- sync(a)
- terminate(a)
-
-template setupTask =
- t.action = action
- shallowCopy(t.data, input)
-
-template schedule =
- # extremely simple scheduler: We always try the first thread first, so that
- # it remains 'hot' ;-). Round-robin hurts for keeping threads hot.
- for i in 0..high(p.actors):
- if p.actors[i].i.ready:
- p.actors[i].i.send(t)
- return
- # no thread ready :-( --> send message to the thread which has the least
- # messages pending:
- var minIdx = -1
- var minVal = high(int)
- for i in 0..high(p.actors):
- var curr = p.actors[i].i.peek
- if curr == 0:
- # ok, is ready now:
- p.actors[i].i.send(t)
- return
- if curr < minVal and curr >= 0:
- minVal = curr
- minIdx = i
- if minIdx >= 0:
- p.actors[minIdx].i.send(t)
- else:
- raise newException(DeadThreadError, "cannot send message; thread died")
-
-proc spawn*[In, Out](p: var ActorPool[In, Out], input: In,
- action: proc (input: In): Out {.thread.}
- ): ptr Channel[Out] =
- ## uses the actor pool to run ``action(input)`` concurrently.
- ## `spawn` is guaranteed to not block.
- var t: Task[In, Out]
- setupTask()
- result = addr(p.outputs)
- t.receiver = result
- schedule()
-
-proc spawn*[In](p: var ActorPool[In, void], input: In,
- action: proc (input: In) {.thread.}) =
- ## uses the actor pool to run ``action(input)`` concurrently.
- ## `spawn` is guaranteed to not block.
- var t: Task[In, void]
- setupTask()
- schedule()
-
-when not defined(testing) and isMainModule:
- var
- a: ActorPool[int, void]
- createActorPool(a)
- for i in 0 ..< 300:
- a.spawn(i, proc (x: int) {.thread.} = echo x)
-
- when false:
- proc treeDepth(n: PNode): int {.thread.} =
- var x = a.spawn(treeDepth, n.le)
- var y = a.spawn(treeDepth, n.ri)
- result = max(^x, ^y) + 1
-
- a.join()
-
-
diff --git a/lib/deprecated/pure/actors.nim.cfg b/lib/deprecated/pure/actors.nim.cfg
deleted file mode 100644
index c6bb9c545..000000000
--- a/lib/deprecated/pure/actors.nim.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-# to shut up the tester:
---threads:on
-
diff --git a/lib/deprecated/pure/parseurl.nim b/lib/deprecated/pure/parseurl.nim
deleted file mode 100644
index b19f6dc85..000000000
--- a/lib/deprecated/pure/parseurl.nim
+++ /dev/null
@@ -1,112 +0,0 @@
-#
-#
-# Nim's Runtime Library
-# (c) Copyright 2015 Dominik Picheta
-#
-# See the file "copying.txt", included in this
-# distribution, for details about the copyright.
-#
-
-## **Warnings:** This module is deprecated since version 0.10.2.
-## Use the `uri <uri.html>`_ module instead.
-##
-## Parses & constructs URLs.
-
-{.deprecated.}
-
-import strutils
-
-type
- Url* = tuple[ ## represents a *Uniform Resource Locator* (URL)
- ## any optional component is "" if it does not exist
- scheme, username, password,
- hostname, port, path, query, anchor: string]
-
-proc parseUrl*(url: string): Url {.deprecated.} =
- var i = 0
-
- var scheme, username, password: string = ""
- var hostname, port, path, query, anchor: string = ""
-
- var temp = ""
-
- if url[i] != '/': # url isn't a relative path
- while true:
- # Scheme
- if url[i] == ':':
- if url[i+1] == '/' and url[i+2] == '/':
- scheme = temp
- temp.setLen(0)
- inc(i, 3) # Skip the //
- # Authority(username, password)
- if url[i] == '@':
- username = temp
- let colon = username.find(':')
- if colon >= 0:
- password = username.substr(colon+1)
- username = username.substr(0, colon-1)
- temp.setLen(0)
- inc(i) #Skip the @
- # hostname(subdomain, domain, port)
- if url[i] == '/' or url[i] == '\0':
- hostname = temp
- let colon = hostname.find(':')
- if colon >= 0:
- port = hostname.substr(colon+1)
- hostname = hostname.substr(0, colon-1)
-
- temp.setLen(0)
- break
-
- temp.add(url[i])
- inc(i)
-
- if url[i] == '/': inc(i) # Skip the '/'
- # Path
- while true:
- if url[i] == '?':
- path = temp
- temp.setLen(0)
- if url[i] == '#':
- if temp[0] == '?':
- query = temp
- else:
- path = temp
- temp.setLen(0)
-
- if url[i] == '\0':
- if temp[0] == '?':
- query = temp
- elif temp[0] == '#':
- anchor = temp
- else:
- path = temp
- break
-
- temp.add(url[i])
- inc(i)
-
- return (scheme, username, password, hostname, port, path, query, anchor)
-
-proc `$`*(u: Url): string {.deprecated.} =
- ## turns the URL `u` into its string representation.
- result = ""
- if u.scheme.len > 0:
- result.add(u.scheme)
- result.add("://")
- if u.username.len > 0:
- result.add(u.username)
- if u.password.len > 0:
- result.add(":")
- result.add(u.password)
- result.add("@")
- result.add(u.hostname)
- if u.port.len > 0:
- result.add(":")
- result.add(u.port)
- if u.path.len > 0:
- result.add("/")
- result.add(u.path)
- result.add(u.query)
- result.add(u.anchor)
-
diff --git a/lib/deprecated/pure/rawsockets.nim b/lib/deprecated/pure/rawsockets.nim
deleted file mode 100644
index 876334f9e..000000000
--- a/lib/deprecated/pure/rawsockets.nim
+++ /dev/null
@@ -1,14 +0,0 @@
-import nativesockets
-export nativesockets
-
-{.warning: "rawsockets module is deprecated, use nativesockets instead".}
-
-template newRawSocket*(domain, sockType, protocol: cint): untyped =
- {.warning: "newRawSocket is deprecated, use newNativeSocket instead".}
- newNativeSocket(domain, sockType, protocol)
-
-template newRawSocket*(domain: Domain = AF_INET,
- sockType: SockType = SOCK_STREAM,
- protocol: Protocol = IPPROTO_TCP): untyped =
- {.warning: "newRawSocket is deprecated, use newNativeSocket instead".}
- newNativeSocket(domain, sockType, protocol)
diff --git a/lib/deprecated/pure/securehash.nim b/lib/deprecated/pure/securehash.nim
new file mode 100644
index 000000000..c6cde599a
--- /dev/null
+++ b/lib/deprecated/pure/securehash.nim
@@ -0,0 +1,6 @@
+
+
+## This module is a deprecated alias for the ``sha1`` module.
+{.deprecated.}
+
+include "../std/sha1"
diff --git a/lib/impure/ssl.nim b/lib/impure/ssl.nim
deleted file mode 100644
index 0bcb3f217..000000000
--- a/lib/impure/ssl.nim
+++ /dev/null
@@ -1,99 +0,0 @@
-#
-#
-# Nim's Runtime Library
-# (c) Copyright 2012 Dominik Picheta
-#
-# See the file "copying.txt", included in this
-# distribution, for details about the copyright.
-#
-
-## This module provides an easy to use sockets-style
-## nim interface to the OpenSSL library.
-##
-## **Warning:** This module is deprecated, use the SSL procedures defined in
-## the ``net`` module instead.
-
-{.deprecated.}
-
-import openssl, strutils, os
-
-type
- SecureSocket* = object
- ssl: SslPtr
- bio: BIO
-
-proc connect*(sock: var SecureSocket, address: string,
- port: int): int =
- ## Connects to the specified `address` on the specified `port`.
- ## Returns the result of the certificate validation.
- SslLoadErrorStrings()
- ERR_load_BIO_strings()
-
- if SSL_library_init() != 1:
- raiseOSError(osLastError())
-
- var ctx = SSL_CTX_new(SSLv23_client_method())
- if ctx == nil:
- ERR_print_errors_fp(stderr)
- raiseOSError(osLastError())
-
- #if SSL_CTX_load_verify_locations(ctx,
- # "/tmp/openssl-0.9.8e/certs/vsign1.pem", NIL) == 0:
- # echo("Failed load verify locations")
- # ERR_print_errors_fp(stderr)
-
- sock.bio = BIO_new_ssl_connect(ctx)
- if BIO_get_ssl(sock.bio, addr(sock.ssl)) == 0:
- raiseOSError(osLastError())
-
- if BIO_set_conn_hostname(sock.bio, address & ":" & $port) != 1:
- raiseOSError(osLastError())
-
- if BIO_do_connect(sock.bio) <= 0:
- ERR_print_errors_fp(stderr)
- raiseOSError(osLastError())
-
- result = SSL_get_verify_result(sock.ssl)
-
-proc recvLine*(sock: SecureSocket, line: var TaintedString): bool =
- ## Acts in a similar fashion to the `recvLine` in the sockets module.
- ## Returns false when no data is available to be read.
- ## `Line` must be initialized and not nil!
- setLen(line.string, 0)
- while true:
- var c: array[0..0, char]
- var n = BIO_read(sock.bio, addr c, c.len.cint)
- if n <= 0: return false
- if c[0] == '\r':
- n = BIO_read(sock.bio, addr c, c.len.cint)
- if n > 0 and c[0] == '\L':
- return true
- elif n <= 0:
- return false
- elif c[0] == '\L': return true
- add(line.string, c[0])
-
-
-proc send*(sock: SecureSocket, data: string) =
- ## Writes `data` to the socket.
- if BIO_write(sock.bio, data, data.len.cint) <= 0:
- raiseOSError(osLastError())
-
-proc close*(sock: SecureSocket) =
- ## Closes the socket
- if BIO_free(sock.bio) <= 0:
- ERR_print_errors_fp(stderr)
- raiseOSError(osLastError())
-
-when not defined(testing) and isMainModule:
- var s: SecureSocket
- echo connect(s, "smtp.gmail.com", 465)
-
- #var buffer: array[0..255, char]
- #echo BIO_read(bio, buffer, buffer.len)
- var buffer: string = ""
-
- echo s.recvLine(buffer)
- echo buffer
- echo buffer.len
-
diff --git a/lib/pure/httpserver.nim b/lib/pure/httpserver.nim
deleted file mode 100644
index a81e8c0a8..000000000
--- a/lib/pure/httpserver.nim
+++ /dev/null
@@ -1,535 +0,0 @@
-#
-#
-# Nim's Runtime Library
-# (c) Copyright 2012 Andreas Rumpf, Dominik Picheta
-#
-# See the file "copying.txt", included in this
-# distribution, for details about the copyright.
-#
-
-## This module implements a simple HTTP-Server.
-##
-## **Warning**: This module will soon be deprecated in favour of
-## the ``asyncdispatch`` module, you should use it instead.
-##
-## Example:
-##
-## .. code-block:: nim
-## import strutils, sockets, httpserver
-##
-## var counter = 0
-## proc handleRequest(client: Socket, path, query: string): bool {.procvar.} =
-## inc(counter)
-## client.send("Hello for the $#th time." % $counter & wwwNL)
-## return false # do not stop processing
-##
-## run(handleRequest, Port(80))
-##
-
-import parseutils, strutils, os, osproc, strtabs, streams, sockets, asyncio
-
-const
- wwwNL* = "\r\L"
- ServerSig = "Server: httpserver.nim/1.0.0" & wwwNL
-
-# --------------- output messages --------------------------------------------
-
-proc sendTextContentType(client: Socket) =
- send(client, "Content-type: text/html" & wwwNL)
- send(client, wwwNL)
-
-proc sendStatus(client: Socket, status: string) =
- send(client, "HTTP/1.1 " & status & wwwNL)
-
-proc badRequest(client: Socket) =
- # Inform the client that a request it has made has a problem.
- send(client, "HTTP/1.1 400 Bad Request" & wwwNL)
- sendTextContentType(client)
- send(client, "<p>Your browser sent a bad request, " &
- "such as a POST without a Content-Length.</p>" & wwwNL)
-
-when false:
- proc cannotExec(client: Socket) =
- send(client, "HTTP/1.1 500 Internal Server Error" & wwwNL)
- sendTextContentType(client)
- send(client, "<P>Error prohibited CGI execution." & wwwNL)
-
-proc headers(client: Socket, filename: string) =
- # XXX could use filename to determine file type
- send(client, "HTTP/1.1 200 OK" & wwwNL)
- send(client, ServerSig)
- sendTextContentType(client)
-
-proc notFound(client: Socket) =
- send(client, "HTTP/1.1 404 NOT FOUND" & wwwNL)
- send(client, ServerSig)
- sendTextContentType(client)
- send(client, "<html><title>Not Found</title>" & wwwNL)
- send(client, "<body><p>The server could not fulfill" & wwwNL)
- send(client, "your request because the resource specified" & wwwNL)
- send(client, "is unavailable or nonexistent.</p>" & wwwNL)
- send(client, "</body></html>" & wwwNL)
-
-proc unimplemented(client: Socket) =
- send(client, "HTTP/1.1 501 Method Not Implemented" & wwwNL)
- send(client, ServerSig)
- sendTextContentType(client)
- send(client, "<html><head><title>Method Not Implemented" &
- "</title></head>" &
- "<body><p>HTTP request method not supported.</p>" &
- "</body></HTML>" & wwwNL)
-
-# ----------------- file serving ---------------------------------------------
-
-when false:
- proc discardHeaders(client: Socket) = skip(client)
-
-proc serveFile*(client: Socket, filename: string) =
- ## serves a file to the client.
- var f: File
- if open(f, filename):
- headers(client, filename)
- const bufSize = 8000 # != 8K might be good for memory manager
- var buf = alloc(bufsize)
- while true:
- var bytesread = readBuffer(f, buf, bufsize)
- if bytesread > 0:
- var byteswritten = send(client, buf, bytesread)
- if bytesread != bytesWritten:
- dealloc(buf)
- close(f)
- raiseOSError(osLastError())
- if bytesread != bufSize: break
- dealloc(buf)
- close(f)
- else:
- notFound(client)
-
-# ------------------ CGI execution -------------------------------------------
-when false:
- # TODO: Fix this, or get rid of it.
- type
- RequestMethod = enum reqGet, reqPost
-
- proc executeCgi(client: Socket, path, query: string, meth: RequestMethod) =
- var env = newStringTable(modeCaseInsensitive)
- var contentLength = -1
- case meth
- of reqGet:
- discardHeaders(client)
-
- env["REQUEST_METHOD"] = "GET"
- env["QUERY_STRING"] = query
- of reqPost:
- var buf = TaintedString""
- var dataAvail = false
- while dataAvail:
- dataAvail = recvLine(client, buf) # TODO: This is incorrect.
- var L = toLowerAscii(buf.string)
- if L.startsWith("content-length:"):
- var i = len("content-length:")
- while L[i] in Whitespace: inc(i)
- contentLength = parseInt(substr(L, i))
-
- if contentLength < 0:
- badRequest(client)
- return
-
- env["REQUEST_METHOD"] = "POST"
- env["CONTENT_LENGTH"] = $contentLength
-
- send(client, "HTTP/1.0 200 OK" & wwwNL)
-
- var process = startProcess(command=path, env=env)
- if meth == reqPost:
- # get from client and post to CGI program:
- var buf = alloc(contentLength)
- if recv(client, buf, contentLength) != contentLength:
- dealloc(buf)
- raiseOSError()
- var inp = process.inputStream
- inp.writeData(buf, contentLength)
- dealloc(buf)
-
- var outp = process.outputStream
- var line = newStringOfCap(120).TaintedString
- while true:
- if outp.readLine(line):
- send(client, line.string)
- send(client, wwwNL)
- elif not running(process): break
-
- # --------------- Server Setup -----------------------------------------------
-
- proc acceptRequest(client: Socket) =
- var cgi = false
- var query = ""
- var buf = TaintedString""
- discard recvLine(client, buf)
- var path = ""
- var data = buf.string.split()
- var meth = reqGet
-
- var q = find(data[1], '?')
-
- # extract path
- if q >= 0:
- # strip "?..." from path, this may be found in both POST and GET
- path = "." & data[1].substr(0, q-1)
- else:
- path = "." & data[1]
- # path starts with "/", by adding "." in front of it we serve files from cwd
-
- if cmpIgnoreCase(data[0], "GET") == 0:
- if q >= 0:
- cgi = true
- query = data[1].substr(q+1)
- elif cmpIgnoreCase(data[0], "POST") == 0:
- cgi = true
- meth = reqPost
- else:
- unimplemented(client)
-
- if path[path.len-1] == '/' or existsDir(path):
- path = path / "index.html"
-
- if not existsFile(path):
- discardHeaders(client)
- notFound(client)
- else:
- when defined(Windows):
- var ext = splitFile(path).ext.toLowerAscii
- if ext == ".exe" or ext == ".cgi":
- # XXX: extract interpreter information here?
- cgi = true
- else:
- if {fpUserExec, fpGroupExec, fpOthersExec} * path.getFilePermissions != {}:
- cgi = true
- if not cgi:
- serveFile(client, path)
- else:
- executeCgi(client, path, query, meth)
-
-type
- Server* = object of RootObj ## contains the current server state
- socket: Socket
- port: Port
- client*: Socket ## the socket to write the file data to
- reqMethod*: string ## Request method. GET or POST.
- path*, query*: string ## path and query the client requested
- headers*: StringTableRef ## headers with which the client made the request
- body*: string ## only set with POST requests
- ip*: string ## ip address of the requesting client
-
- PAsyncHTTPServer* = ref AsyncHTTPServer
- AsyncHTTPServer = object of Server
- asyncSocket: AsyncSocket
-
-proc open*(s: var Server, port = Port(80), reuseAddr = false) =
- ## creates a new server at port `port`. If ``port == 0`` a free port is
- ## acquired that can be accessed later by the ``port`` proc.
- s.socket = socket(AF_INET)
- if s.socket == invalidSocket: raiseOSError(osLastError())
- if reuseAddr:
- s.socket.setSockOpt(OptReuseAddr, true)
- bindAddr(s.socket, port)
- listen(s.socket)
-
- if port == Port(0):
- s.port = getSockName(s.socket)
- else:
- s.port = port
- s.client = invalidSocket
- s.reqMethod = ""
- s.body = ""
- s.path = ""
- s.query = ""
- s.headers = {:}.newStringTable()
-
-proc port*(s: var Server): Port =
- ## get the port number the server has acquired.
- result = s.port
-
-proc next*(s: var Server) =
- ## proceed to the first/next request.
- var client: Socket
- new(client)
- var ip: string
- acceptAddr(s.socket, client, ip)
- s.client = client
- s.ip = ip
- s.headers = newStringTable(modeCaseInsensitive)
- #headers(s.client, "")
- var data = ""
- s.client.readLine(data)
- if data == "":
- # Socket disconnected
- s.client.close()
- next(s)
- return
- var header = ""
- while true:
- s.client.readLine(header)
- if header == "\c\L": break
- if header != "":
- var i = 0
- var key = ""
- var value = ""
- i = header.parseUntil(key, ':')
- inc(i) # skip :
- i += header.skipWhiteSpace(i)
- i += header.parseUntil(value, {'\c', '\L'}, i)
- s.headers[key] = value
- else:
- s.client.close()
- next(s)
- return
-
- var i = skipWhitespace(data)
- if skipIgnoreCase(data, "GET") > 0:
- s.reqMethod = "GET"
- inc(i, 3)
- elif skipIgnoreCase(data, "POST") > 0:
- s.reqMethod = "POST"
- inc(i, 4)
- else:
- unimplemented(s.client)
- s.client.close()
- next(s)
- return
-
- if s.reqMethod == "POST":
- # Check for Expect header
- if s.headers.hasKey("Expect"):
- if s.headers["Expect"].toLowerAscii == "100-continue":
- s.client.sendStatus("100 Continue")
- else:
- s.client.sendStatus("417 Expectation Failed")
-
- # Read the body
- # - Check for Content-length header
- if s.headers.hasKey("Content-Length"):
- var contentLength = 0
- if parseInt(s.headers["Content-Length"], contentLength) == 0:
- badRequest(s.client)
- s.client.close()
- next(s)
- return
- else:
- var totalRead = 0
- var totalBody = ""
- while totalRead < contentLength:
- var chunkSize = 8000
- if (contentLength - totalRead) < 8000:
- chunkSize = (contentLength - totalRead)
- var bodyData = newString(chunkSize)
- var octetsRead = s.client.recv(cstring(bodyData), chunkSize)
- if octetsRead <= 0:
- s.client.close()
- next(s)
- return
- totalRead += octetsRead
- totalBody.add(bodyData)
- if totalBody.len != contentLength:
- s.client.close()
- next(s)
- return
-
- s.body = totalBody
- else:
- badRequest(s.client)
- s.client.close()
- next(s)
- return
-
- var L = skipWhitespace(data, i)
- inc(i, L)
- # XXX we ignore "HTTP/1.1" etc. for now here
- var query = 0
- var last = i
- while last < data.len and data[last] notin Whitespace:
- if data[last] == '?' and query == 0: query = last
- inc(last)
- if query > 0:
- s.query = data.substr(query+1, last-1)
- s.path = data.substr(i, query-1)
- else:
- s.query = ""
- s.path = data.substr(i, last-1)
-
-proc close*(s: Server) =
- ## closes the server (and the socket the server uses).
- close(s.socket)
-
-proc run*(handleRequest: proc (client: Socket,
- path, query: string): bool {.closure.},
- port = Port(80)) =
- ## encapsulates the server object and main loop
- var s: Server
- open(s, port, reuseAddr = true)
- #echo("httpserver running on port ", s.port)
- while true:
- next(s)
- if handleRequest(s.client, s.path, s.query): break
- close(s.client)
- close(s)
-
-# -- AsyncIO begin
-
-proc nextAsync(s: PAsyncHTTPServer) =
- ## proceed to the first/next request.
- var client: Socket
- new(client)
- var ip: string
- acceptAddr(getSocket(s.asyncSocket), client, ip)
- s.client = client
- s.ip = ip
- s.headers = newStringTable(modeCaseInsensitive)
- #headers(s.client, "")
- var data = ""
- s.client.readLine(data)
- if data == "":
- # Socket disconnected
- s.client.close()
- return
- var header = ""
- while true:
- s.client.readLine(header) # TODO: Very inefficient here. Prone to DOS.
- if header == "\c\L": break
- if header != "":
- var i = 0
- var key = ""
- var value = ""
- i = header.parseUntil(key, ':')
- inc(i) # skip :
- if i < header.len:
- i += header.skipWhiteSpace(i)
- i += header.parseUntil(value, {'\c', '\L'}, i)
- s.headers[key] = value
- else:
- s.client.close()
- return
-
- var i = skipWhitespace(data)
- if skipIgnoreCase(data, "GET") > 0:
- s.reqMethod = "GET"
- inc(i, 3)
- elif skipIgnoreCase(data, "POST") > 0:
- s.reqMethod = "POST"
- inc(i, 4)
- else:
- unimplemented(s.client)
- s.client.close()
- return
-
- if s.reqMethod == "POST":
- # Check for Expect header
- if s.headers.hasKey("Expect"):
- if s.headers["Expect"].toLowerAscii == "100-continue":
- s.client.sendStatus("100 Continue")
- else:
- s.client.sendStatus("417 Expectation Failed")
-
- # Read the body
- # - Check for Content-length header
- if s.headers.hasKey("Content-Length"):
- var contentLength = 0
- if parseInt(s.headers["Content-Length"], contentLength) == 0:
- badRequest(s.client)
- s.client.close()
- return
- else:
- var totalRead = 0
- var totalBody = ""
- while totalRead < contentLength:
- var chunkSize = 8000
- if (contentLength - totalRead) < 8000:
- chunkSize = (contentLength - totalRead)
- var bodyData = newString(chunkSize)
- var octetsRead = s.client.recv(cstring(bodyData), chunkSize)
- if octetsRead <= 0:
- s.client.close()
- return
- totalRead += octetsRead
- totalBody.add(bodyData)
- if totalBody.len != contentLength:
- s.client.close()
- return
-
- s.body = totalBody
- else:
- badRequest(s.client)
- s.client.close()
- return
-
- var L = skipWhitespace(data, i)
- inc(i, L)
- # XXX we ignore "HTTP/1.1" etc. for now here
- var query = 0
- var last = i
- while last < data.len and data[last] notin Whitespace:
- if data[last] == '?' and query == 0: query = last
- inc(last)
- if query > 0:
- s.query = data.substr(query+1, last-1)
- s.path = data.substr(i, query-1)
- else:
- s.query = ""
- s.path = data.substr(i, last-1)
-
-proc asyncHTTPServer*(handleRequest: proc (server: PAsyncHTTPServer, client: Socket,
- path, query: string): bool {.closure, gcsafe.},
- port = Port(80), address = "",
- reuseAddr = false): PAsyncHTTPServer =
- ## Creates an Asynchronous HTTP server at ``port``.
- var capturedRet: PAsyncHTTPServer
- new(capturedRet)
- capturedRet.asyncSocket = asyncSocket()
- capturedRet.asyncSocket.handleAccept =
- proc (s: AsyncSocket) =
- nextAsync(capturedRet)
- let quit = handleRequest(capturedRet, capturedRet.client, capturedRet.path,
- capturedRet.query)
- if quit: capturedRet.asyncSocket.close()
- if reuseAddr:
- capturedRet.asyncSocket.setSockOpt(OptReuseAddr, true)
-
- capturedRet.asyncSocket.bindAddr(port, address)
- capturedRet.asyncSocket.listen()
- if port == Port(0):
- capturedRet.port = getSockName(capturedRet.asyncSocket)
- else:
- capturedRet.port = port
-
- capturedRet.client = invalidSocket
- capturedRet.reqMethod = ""
- capturedRet.body = ""
- capturedRet.path = ""
- capturedRet.query = ""
- capturedRet.headers = {:}.newStringTable()
- result = capturedRet
-
-proc register*(d: Dispatcher, s: PAsyncHTTPServer) =
- ## Registers a ``PAsyncHTTPServer`` with a ``Dispatcher``.
- d.register(s.asyncSocket)
-
-proc close*(h: PAsyncHTTPServer) =
- ## Closes the ``PAsyncHTTPServer``.
- h.asyncSocket.close()
-
-when not defined(testing) and isMainModule:
- var counter = 0
-
- var s: Server
- open(s, Port(0))
- echo("httpserver running on port ", s.port)
- while true:
- next(s)
-
- inc(counter)
- s.client.send("Hello, Andreas, for the $#th time. $# ? $#" % [
- $counter, s.path, s.query] & wwwNL)
-
- close(s.client)
- close(s)
-
diff --git a/lib/pure/matchers.nim b/lib/pure/matchers.nim
deleted file mode 100644
index 97223ed01..000000000
--- a/lib/pure/matchers.nim
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-#
-# Nim's Runtime Library
-# (c) Copyright 2015 Andreas Rumpf
-#
-# See the file "copying.txt", included in this
-# distribution, for details about the copyright.
-#
-
-## This module contains various string matchers for email addresses, etc.
-##
-## **Warning:** This module is deprecated since version 0.14.0.
-{.deprecated.}
-
-{.deadCodeElim: on.} # dce option deprecated
-
-{.push debugger:off .} # the user does not want to trace a part
- # of the standard library!
-
-include "system/inclrtl"
-
-import parseutils, strutils
-
-proc validEmailAddress*(s: string): bool {.noSideEffect,
- rtl, extern: "nsuValidEmailAddress".} =
- ## returns true if `s` seems to be a valid e-mail address.
- ## The checking also uses a domain list.
- const
- chars = Letters + Digits + {'!','#','$','%','&',
- '\'','*','+','/','=','?','^','_','`','{','}','|','~','-','.'}
- var i = 0
- if i >= s.len or s[i] notin chars or s[i] == '.': return false
- while i < s.len and s[i] in chars:
- if i+1 < s.len and s[i] == '.' and s[i+1] == '.': return false
- inc(i)
- if i >= s.len or s[i] != '@': return false
- var j = len(s)-1
- if j >= 0 and s[j] notin Letters: return false
- while j >= i and s[j] in Letters: dec(j)
- inc(i) # skip '@'
- while i < s.len and s[i] in {'0'..'9', 'a'..'z', '-', '.'}: inc(i)
- if i != s.len: return false
-
- var x = substr(s, j+1)
- if len(x) == 2 and x[0] in Letters and x[1] in Letters: return true
- case toLowerAscii(x)
- of "com", "org", "net", "gov", "mil", "biz", "info", "mobi", "name",
- "aero", "jobs", "museum": return true
- else: return false
-
-proc parseInt*(s: string, value: var int, validRange: HSlice[int, int]) {.
- noSideEffect, rtl, extern: "nmatchParseInt".} =
- ## parses `s` into an integer in the range `validRange`. If successful,
- ## `value` is modified to contain the result. Otherwise no exception is
- ## raised and `value` is not touched; this way a reasonable default value
- ## won't be overwritten.
- var x = value
- try:
- discard parseutils.parseInt(s, x, 0)
- except OverflowError:
- discard
- if x in validRange: value = x
-
-when isMainModule:
- doAssert "wuseldusel@codehome.com".validEmailAddress
-
-{.pop.}
-
diff --git a/lib/pure/securehash.nim b/lib/pure/securehash.nim
deleted file mode 100644
index c6cde599a..000000000
--- a/lib/pure/securehash.nim
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-## This module is a deprecated alias for the ``sha1`` module.
-{.deprecated.}
-
-include "../std/sha1"
diff --git a/tests/manyloc/keineschweine/enet_server/enet_server.nim b/tests/manyloc/keineschweine/enet_server/enet_server.nim
index 3bb259386..336e57755 100644
--- a/tests/manyloc/keineschweine/enet_server/enet_server.nim
+++ b/tests/manyloc/keineschweine/enet_server/enet_server.nim
@@ -103,7 +103,7 @@ handlers[HZoneJoinReq] = proc(client: PClient; buffer: PBuffer) =
when true:
- import parseopt, matchers, os, json
+ import parseopt, os, json
if enetInit() != 0:
diff --git a/tests/manyloc/keineschweine/server/old_dirserver.nim b/tests/manyloc/keineschweine/server/old_dirserver.nim
index cfb0b0377..390b738aa 100644
--- a/tests/manyloc/keineschweine/server/old_dirserver.nim
+++ b/tests/manyloc/keineschweine/server/old_dirserver.nim
@@ -157,7 +157,7 @@ proc poll*(timeout: int = 250) =
c.outputBuf.flush()
when true:
- import parseopt, matchers, strutils
+ import parseopt, strutils
var cfgFile = "dirserver_settings.json"
for kind, key, val in getOpt():
case kind
diff --git a/tests/manyloc/keineschweine/server/old_sg_server.nim b/tests/manyloc/keineschweine/server/old_sg_server.nim
index d046df9dd..473880e2b 100644
--- a/tests/manyloc/keineschweine/server/old_sg_server.nim
+++ b/tests/manyloc/keineschweine/server/old_sg_server.nim
@@ -142,7 +142,7 @@ proc poll*(timeout: int = 250) =
c.outputBuf.flush()
when true:
- import parseopt, matchers, strutils
+ import parseopt, strutils
var zoneCfgFile = "./server_settings.json"
for kind, key, val in getOpt():
case kind
diff --git a/tests/threads/tactors.nim b/tests/threads/tactors.nim
deleted file mode 100644
index ea052b9bd..000000000
--- a/tests/threads/tactors.nim
+++ /dev/null
@@ -1,13 +0,0 @@
-discard """
- outputsub: "150"
-"""
-
-import actors
-
-var
- pool: ActorPool[int, void]
-createActorPool(pool)
-for i in 0 ..< 300:
- pool.spawn(i, proc (x: int) {.thread.} = echo x)
-pool.join()
-
diff --git a/tests/threads/tactors2.nim b/tests/threads/tactors2.nim
deleted file mode 100644
index e8afe203c..000000000
--- a/tests/threads/tactors2.nim
+++ /dev/null
@@ -1,25 +0,0 @@
-discard """
- output: "1"
-"""
-
-import actors
-
-type
- some_type {.pure, final.} = object
- bla: int
-
-proc thread_proc(input: some_type): some_type {.thread.} =
- result.bla = 1
-
-proc main() =
- var actorPool: ActorPool[some_type, some_type]
- createActorPool(actorPool, 1)
-
- var some_data: some_type
-
- var inchannel = spawn(actorPool, some_data, thread_proc)
- var recv_data = ^inchannel
- close(inchannel[])
- echo recv_data.bla
-
-main()
diff --git a/tests/threads/trecursive_actor.nim b/tests/threads/trecursive_actor.nim
deleted file mode 100644
index d7072aa53..000000000
--- a/tests/threads/trecursive_actor.nim
+++ /dev/null
@@ -1,20 +0,0 @@
-discard """
- disabled: yes
- outputsub: "0"
-"""
-
-import actors
-
-var
- a: TActorPool[int, void]
-createActorPool(a)
-
-proc task(i: int) {.thread.} =
- echo i
- if i != 0: a.spawn (i-1, task)
-
-# count from 9 till 0 and check 0 is somewhere in the output
-a.spawn(9, task)
-a.join()
-
-
diff --git a/tests/tuples/tuple_with_nil.nim b/tests/tuples/tuple_with_nil.nim
index e09c53407..1b210b2bf 100644
--- a/tests/tuples/tuple_with_nil.nim
+++ b/tests/tuples/tuple_with_nil.nim
@@ -4,7 +4,6 @@ import parseutils
import unicode
import math
import fenv
-#import unsigned
import pegs
import streams
diff --git a/tools/kochdocs.nim b/tools/kochdocs.nim
index 658b9ead7..6741fcf5d 100644
--- a/tools/kochdocs.nim
+++ b/tools/kochdocs.nim
@@ -126,7 +126,6 @@ lib/js/asyncjs.nim
lib/pure/os.nim
lib/pure/strutils.nim
lib/pure/math.nim
-lib/pure/matchers.nim
lib/std/editdistance.nim
lib/std/wordwrap.nim
lib/experimental/diff.nim
@@ -161,10 +160,8 @@ lib/impure/db_mysql.nim
lib/impure/db_sqlite.nim
lib/impure/db_odbc.nim
lib/pure/db_common.nim
-lib/pure/httpserver.nim
lib/pure/httpclient.nim
lib/pure/smtp.nim
-lib/impure/ssl.nim
lib/pure/ropes.nim
lib/pure/unidecode/unidecode.nim
lib/pure/xmlparser.nim
@@ -218,7 +215,6 @@ lib/pure/selectors.nim
lib/pure/sugar.nim
lib/pure/collections/chains.nim
lib/pure/asyncfile.nim
-lib/deprecated/pure/ftpclient.nim
lib/pure/asyncftpclient.nim
lib/pure/lenientops.nim
lib/pure/md5.nim
--
cgit 1.4.1-2-gfad0
From 87f8ec5b92d5647ab4b1875262e845d51dd82763 Mon Sep 17 00:00:00 2001
From: zah <zahary@gmail.com>
Date: Mon, 7 Jan 2019 13:10:54 +0200
Subject: Fix #10073 (#10218)
---
compiler/semexprs.nim | 9 ++++++++-
tests/statictypes/tstatictypes.nim | 16 ++++++++++++++++
2 files changed, 24 insertions(+), 1 deletion(-)
(limited to 'compiler')
diff --git a/compiler/semexprs.nim b/compiler/semexprs.nim
index 7a124c769..f03af3db9 100644
--- a/compiler/semexprs.nim
+++ b/compiler/semexprs.nim
@@ -1043,7 +1043,8 @@ proc semSym(c: PContext, n: PNode, sym: PSym, flags: TExprFlags): PNode =
of skConst:
markUsed(c.config, n.info, s, c.graph.usageSym)
onUse(n.info, s)
- case skipTypes(s.typ, abstractInst-{tyTypeDesc}).kind
+ let typ = skipTypes(s.typ, abstractInst-{tyTypeDesc})
+ case typ.kind
of tyNil, tyChar, tyInt..tyInt64, tyFloat..tyFloat128,
tyTuple, tySet, tyUInt..tyUInt64:
if s.magic == mNone: result = inlineConst(c, n, s)
@@ -1061,6 +1062,12 @@ proc semSym(c: PContext, n: PNode, sym: PSym, flags: TExprFlags): PNode =
# deal with two different ``[]``.
if s.ast.len == 0: result = inlineConst(c, n, s)
else: result = newSymNode(s, n.info)
+ of tyStatic:
+ if typ.n != nil:
+ result = typ.n
+ result.typ = typ.base
+ else:
+ result = newSymNode(s, n.info)
else:
result = newSymNode(s, n.info)
of skMacro:
diff --git a/tests/statictypes/tstatictypes.nim b/tests/statictypes/tstatictypes.nim
index 2a3b7332d..9888165cc 100644
--- a/tests/statictypes/tstatictypes.nim
+++ b/tests/statictypes/tstatictypes.nim
@@ -116,3 +116,19 @@ block:
Tensor[B: static[Backend]; T] = object
BackProp[B: static[Backend],T] = proc (gradient: Tensor[B,T]): Tensor[B,T]
+
+# https://github.com/nim-lang/Nim/issues/10073
+block:
+ proc foo[N: static int](x: var int,
+ y: int,
+ z: static int,
+ arr: array[N, int]): auto =
+ var t1 = (a: x, b: y, c: z, d: N)
+ var t2 = (x, y, z, N)
+ doAssert t1 == t2
+ result = t1
+
+ var y = 20
+ var x = foo(y, 10, 15, [1, 2, 3])
+ doAssert x == (20, 10, 15, 3)
+
--
cgit 1.4.1-2-gfad0
From 044cef152f6006927a905d69dc527cada8206b0f Mon Sep 17 00:00:00 2001
From: jcosborn <jcosborn@users.noreply.github.com>
Date: Mon, 7 Jan 2019 05:36:06 -0600
Subject: add custom pragma support for var and let symbols (#9582)
* add custom pragma support for var and let symbols
* updated changelog for custom pragmas on var and let symbols
* add oldast switch for backwards compatibility
---
changelog.md | 10 ++++++----
compiler/ast.nim | 7 +++++++
compiler/commands.nim | 2 ++
compiler/guards.nim | 8 ++++----
compiler/options.nim | 3 ++-
compiler/semstmts.nim | 23 +++++++++++++++++++----
doc/advopt.txt | 1 +
lib/core/macros.nim | 8 +++++++-
tests/pragmas/tcustom_pragma.nim | 35 +++++++++++++++++++++++++++++------
9 files changed, 77 insertions(+), 20 deletions(-)
(limited to 'compiler')
diff --git a/changelog.md b/changelog.md
index b3ccc1b2e..05f65516d 100644
--- a/changelog.md
+++ b/changelog.md
@@ -23,7 +23,8 @@
- The undocumented ``#? strongSpaces`` parsing mode has been removed.
- The `not` operator is now always a unary operator, this means that code like
``assert not isFalse(3)`` compiles.
-
+- `getImpl` on a `var` or `let` symbol will now return the full `IdentDefs`
+ tree from the symbol declaration instead of just the initializer portion.
#### Breaking changes in the standard library
@@ -133,8 +134,9 @@ proc enumToString*(enums: openArray[enum]): string =
the `gcsafe` pragma block.
- added os.getCurrentProcessId()
- User defined pragmas are now allowed in the pragma blocks
-- Pragma blocks are now longer eliminated from the typed AST tree to preserve
+- Pragma blocks are no longer eliminated from the typed AST tree to preserve
pragmas for further analysis by macros
+- Custom pragmas are now supported for `var` and `let` symbols.
### Language changes
@@ -143,10 +145,10 @@ proc enumToString*(enums: openArray[enum]): string =
it's more recognizable and allows tools like github to recognize it as Nim,
see [#9647](https://github.com/nim-lang/Nim/issues/9647).
The previous extension will continue to work.
-- Pragma syntax is now consistent. Previous syntax where type pragmas did not
+- Pragma syntax is now consistent. Previous syntax where type pragmas did not
follow the type name is now deprecated. Also pragma before generic parameter
list is deprecated to be consistent with how pragmas are used with a proc. See
- [#8514](https://github.com/nim-lang/Nim/issues/8514) and
+ [#8514](https://github.com/nim-lang/Nim/issues/8514) and
[#1872](https://github.com/nim-lang/Nim/issues/1872) for further details.
diff --git a/compiler/ast.nim b/compiler/ast.nim
index 5f5f296cb..24891d6d3 100644
--- a/compiler/ast.nim
+++ b/compiler/ast.nim
@@ -1087,6 +1087,13 @@ proc newSym*(symKind: TSymKind, name: PIdent, owner: PSym,
when debugIds:
registerId(result)
+proc astdef*(s: PSym): PNode =
+ # get only the definition (initializer) portion of the ast
+ if s.ast != nil and s.ast.kind == nkIdentDefs:
+ s.ast[2]
+ else:
+ s.ast
+
proc isMetaType*(t: PType): bool =
return t.kind in tyMetaTypes or
(t.kind == tyStatic and t.n == nil) or
diff --git a/compiler/commands.nim b/compiler/commands.nim
index 8b73884e8..47687046f 100644
--- a/compiler/commands.nim
+++ b/compiler/commands.nim
@@ -291,6 +291,7 @@ proc testCompileOption*(conf: ConfigRef; switch: string, info: TLineInfo): bool
of "patterns": result = contains(conf.options, optPatterns)
of "excessivestacktrace": result = contains(conf.globalOptions, optExcessiveStackTrace)
of "nilseqs": result = contains(conf.options, optNilSeqs)
+ of "oldast": result = contains(conf.options, optOldAst)
else: invalidCmdLineOption(conf, passCmd1, switch, info)
proc processPath(conf: ConfigRef; path: string, info: TLineInfo,
@@ -508,6 +509,7 @@ proc processSwitch*(switch, arg: string, pass: TCmdLinePass, info: TLineInfo;
localError(conf, info, errOnOrOffExpectedButXFound % arg)
of "laxstrings": processOnOffSwitch(conf, {optLaxStrings}, arg, pass, info)
of "nilseqs": processOnOffSwitch(conf, {optNilSeqs}, arg, pass, info)
+ of "oldast": processOnOffSwitch(conf, {optOldAst}, arg, pass, info)
of "checks", "x": processOnOffSwitch(conf, ChecksOptions, arg, pass, info)
of "floatchecks":
processOnOffSwitch(conf, {optNaNCheck, optInfCheck}, arg, pass, info)
diff --git a/compiler/guards.nim b/compiler/guards.nim
index a01c023e4..46e18d3bf 100644
--- a/compiler/guards.nim
+++ b/compiler/guards.nim
@@ -257,9 +257,9 @@ proc canon*(n: PNode; o: Operators): PNode =
for i in 0 ..< n.len:
result.sons[i] = canon(n.sons[i], o)
elif n.kind == nkSym and n.sym.kind == skLet and
- n.sym.ast.getMagic in (someEq + someAdd + someMul + someMin +
+ n.sym.astdef.getMagic in (someEq + someAdd + someMul + someMin +
someMax + someHigh + {mUnaryLt} + someSub + someLen + someDiv):
- result = n.sym.ast.copyTree
+ result = n.sym.astdef.copyTree
else:
result = n
case result.getMagic
@@ -395,8 +395,8 @@ proc usefulFact(n: PNode; o: Operators): PNode =
# if a:
# ...
# We make can easily replace 'a' by '2 < x' here:
- if n.sym.ast != nil:
- result = usefulFact(n.sym.ast, o)
+ if n.sym.astdef != nil:
+ result = usefulFact(n.sym.astdef, o)
elif n.kind == nkStmtListExpr:
result = usefulFact(n.lastSon, o)
diff --git a/compiler/options.nim b/compiler/options.nim
index 3730d16f8..ea159ee1d 100644
--- a/compiler/options.nim
+++ b/compiler/options.nim
@@ -40,7 +40,8 @@ type # please make sure we have under 32 options
optMemTracker,
optHotCodeReloading,
optLaxStrings,
- optNilSeqs
+ optNilSeqs,
+ optOldAst
TOptions* = set[TOption]
TGlobalOption* = enum # **keep binary compatible**
diff --git a/compiler/semstmts.nim b/compiler/semstmts.nim
index 39f200ba8..12283e042 100644
--- a/compiler/semstmts.nim
+++ b/compiler/semstmts.nim
@@ -330,9 +330,9 @@ proc semIdentDef(c: PContext, n: PNode, kind: TSymKind): PSym =
proc checkNilable(c: PContext; v: PSym) =
if {sfGlobal, sfImportC} * v.flags == {sfGlobal} and
{tfNotNil, tfNeedsInit} * v.typ.flags != {}:
- if v.ast.isNil:
+ if v.astdef.isNil:
message(c.config, v.info, warnProveInit, v.name.s)
- elif tfNotNil in v.typ.flags and tfNotNil notin v.ast.typ.flags:
+ elif tfNotNil in v.typ.flags and tfNotNil notin v.astdef.typ.flags:
message(c.config, v.info, warnProveInit, v.name.s)
include semasgn
@@ -518,8 +518,6 @@ proc semVarOrLet(c: PContext, n: PNode, symkind: TSymKind): PNode =
message(c.config, a.info, warnShadowIdent, v.name.s)
if a.kind != nkVarTuple:
if def.kind != nkEmpty:
- # this is needed for the evaluation pass and for the guard checking:
- v.ast = def
if sfThread in v.flags: localError(c.config, def.info, errThreadvarCannotInit)
setVarType(c, v, typ)
b = newNodeI(nkIdentDefs, a.info)
@@ -531,6 +529,23 @@ proc semVarOrLet(c: PContext, n: PNode, symkind: TSymKind): PNode =
addSon(b, a.sons[length-2])
addSon(b, copyTree(def))
addToVarSection(c, result, n, b)
+ if optOldAst in c.config.options:
+ if def.kind != nkEmpty:
+ v.ast = def
+ else:
+ # this is needed for the evaluation pass, guard checking
+ # and custom pragmas:
+ var ast = newNodeI(nkIdentDefs, a.info)
+ if a[j].kind == nkPragmaExpr:
+ var p = newNodeI(nkPragmaExpr, a.info)
+ p.add newSymNode(v)
+ p.add a[j][1].copyTree
+ ast.add p
+ else:
+ ast.add newSymNode(v)
+ ast.add a.sons[length-2].copyTree
+ ast.add def
+ v.ast = ast
else:
if def.kind in {nkPar, nkTupleConstr}: v.ast = def[j]
# bug #7663, for 'nim check' this can be a non-tuple:
diff --git a/doc/advopt.txt b/doc/advopt.txt
index 5ddd064ef..2e91deed9 100644
--- a/doc/advopt.txt
+++ b/doc/advopt.txt
@@ -76,6 +76,7 @@ Advanced options:
strings is allowed; only for backwards compatibility
--nilseqs:on|off allow 'nil' for strings/seqs for
backwards compatibility
+ --oldast:on|off use old AST for backwards compatibility
--skipCfg do not read the general configuration file
--skipUserCfg do not read the user's configuration file
--skipParentCfg do not read the parent dirs' configuration files
diff --git a/lib/core/macros.nim b/lib/core/macros.nim
index 291858bed..64334161e 100644
--- a/lib/core/macros.nim
+++ b/lib/core/macros.nim
@@ -1402,8 +1402,14 @@ proc customPragmaNode(n: NimNode): NimNode =
let impl = n.getImpl()
if impl.kind in RoutineNodes:
return impl.pragma
+ elif impl.kind == nnkIdentDefs and impl[0].kind == nnkPragmaExpr:
+ return impl[0][1]
else:
- return typ.getImpl()[0][1]
+ let timpl = typ.getImpl()
+ if timpl.len>0 and timpl[0].len>1:
+ return timpl[0][1]
+ else:
+ return timpl
if n.kind in {nnkDotExpr, nnkCheckedFieldExpr}:
let name = $(if n.kind == nnkCheckedFieldExpr: n[0][1] else: n[1])
diff --git a/tests/pragmas/tcustom_pragma.nim b/tests/pragmas/tcustom_pragma.nim
index 0bc4d2f18..fefcc0b5f 100644
--- a/tests/pragmas/tcustom_pragma.nim
+++ b/tests/pragmas/tcustom_pragma.nim
@@ -175,24 +175,47 @@ var foo: Something
foo.cardinal = north
doAssert foo.b.hasCustomPragma(thingy) == true
-
-proc myproc(s: string): int =
+proc myproc(s: string): int =
{.thingy.}:
s.len
doAssert myproc("123") == 3
let xx = compiles:
- proc myproc_bad(s: string): int =
+ proc myproc_bad(s: string): int =
{.not_exist.}:
s.len
doAssert: xx == false
-
-macro checkSym(s: typed{nkSym}): untyped =
+macro checkSym(s: typed{nkSym}): untyped =
let body = s.getImpl.body
doAssert body[1].kind == nnkPragmaBlock
doAssert body[1][0].kind == nnkPragma
doAssert body[1][0][0] == bindSym"thingy"
-checkSym(myproc)
\ No newline at end of file
+checkSym(myproc)
+
+# var and let pragmas
+block:
+ template myAttr() {.pragma.}
+ template myAttr2(x: int) {.pragma.}
+ template myAttr3(x: string) {.pragma.}
+
+ let a {.myAttr,myAttr2(2),myAttr3:"test".}: int = 0
+ let b {.myAttr,myAttr2(2),myAttr3:"test".} = 0
+ var x {.myAttr,myAttr2(2),myAttr3:"test".}: int = 0
+ var y {.myAttr,myAttr2(2),myAttr3:"test".}: int
+ var z {.myAttr,myAttr2(2),myAttr3:"test".} = 0
+
+ template check(s: untyped) =
+ doAssert s.hasCustomPragma(myAttr)
+ doAssert s.hasCustomPragma(myAttr2)
+ doAssert s.getCustomPragmaVal(myAttr2) == 2
+ doAssert s.hasCustomPragma(myAttr3)
+ doAssert s.getCustomPragmaVal(myAttr3) == "test"
+
+ check(a)
+ check(b)
+ check(x)
+ check(y)
+ check(z)
--
cgit 1.4.1-2-gfad0
From 387831d657bcbd130b7e739e4d58f7ccc29adae9 Mon Sep 17 00:00:00 2001
From: Neelesh Chandola <neelesh.chandola@outlook.com>
Date: Mon, 7 Jan 2019 20:32:47 +0530
Subject: Show error when trying to export individual enum field (#10109)
---
compiler/semexprs.nim | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
(limited to 'compiler')
diff --git a/compiler/semexprs.nim b/compiler/semexprs.nim
index f03af3db9..8852cb653 100644
--- a/compiler/semexprs.nim
+++ b/compiler/semexprs.nim
@@ -2335,7 +2335,6 @@ proc semExportExcept(c: PContext, n: PNode): PNode =
proc semExport(c: PContext, n: PNode): PNode =
result = newNodeI(nkExportStmt, n.info)
-
for i in 0..<n.len:
let a = n.sons[i]
var o: TOverloadIter
@@ -2354,6 +2353,9 @@ proc semExport(c: PContext, n: PNode): PNode =
it = nextIter(ti, s.tab)
else:
while s != nil:
+ if s.kind == skEnumField:
+ localError(c.config, a.info, errGenerated, "cannot export: " & renderTree(a) &
+ "; enum field cannot be exported individually")
if s.kind in ExportableSymKinds+{skModule}:
result.add(newSymNode(s, a.info))
strTableAdd(c.module.tab, s)
--
cgit 1.4.1-2-gfad0
From abad758a7eff72e9f97224c400e1b48d09ecd97a Mon Sep 17 00:00:00 2001
From: Arne Döring <arne.doering@gmx.net>
Date: Mon, 7 Jan 2019 18:09:57 +0100
Subject: Fix for sizeof bitsize combination (#10227)
* fix #10082
* added test
---
compiler/sizealignoffsetimpl.nim | 11 ++++++++---
tests/misc/tsizeof.nim | 12 ++++++++++++
2 files changed, 20 insertions(+), 3 deletions(-)
(limited to 'compiler')
diff --git a/compiler/sizealignoffsetimpl.nim b/compiler/sizealignoffsetimpl.nim
index ea4730f57..fb256b895 100644
--- a/compiler/sizealignoffsetimpl.nim
+++ b/compiler/sizealignoffsetimpl.nim
@@ -154,12 +154,17 @@ proc computePackedObjectOffsetsFoldFunction(conf: ConfigRef; n: PNode, initialOf
if result == szIllegalRecursion:
break
of nkSym:
+ var size = szUnknownSize
if n.sym.bitsize == 0:
computeSizeAlign(conf, n.sym.typ)
- n.sym.offset = initialOffset.int
- result = n.sym.offset + n.sym.typ.size
- else:
+ size = n.sym.typ.size.int
+
+ if initialOffset == szUnknownSize or size == szUnknownSize:
+ n.sym.offset = szUnknownSize
result = szUnknownSize
+ else:
+ n.sym.offset = int(initialOffset)
+ result = initialOffset + n.sym.typ.size
else:
result = szUnknownSize
diff --git a/tests/misc/tsizeof.nim b/tests/misc/tsizeof.nim
index 4422e900e..25c566171 100644
--- a/tests/misc/tsizeof.nim
+++ b/tests/misc/tsizeof.nim
@@ -402,6 +402,18 @@ type
assert sizeof(C) == 3
+
+type
+ MixedBitsize = object {.packed.}
+ a: uint32
+ b {.bitsize: 8.}: uint8
+ c {.bitsize: 1.}: uint8
+ d {.bitsize: 7.}: uint8
+ e {.bitsize: 16.}: uint16
+ f: uint32
+
+doAssert sizeof(MixedBitsize) == 12
+
if failed:
quit("FAIL")
else:
--
cgit 1.4.1-2-gfad0
From 427435a814248b8b5778aa0d78f128a3f60978cd Mon Sep 17 00:00:00 2001
From: Clyybber <darkmine956@gmail.com>
Date: Tue, 8 Jan 2019 10:13:39 +0100
Subject: Don't use deprecated pragma syntax (#10187)
* Don't use deprecated pragma syntax
* Remove pure pragma, since it's a noop now
---
compiler/types.nim | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'compiler')
diff --git a/compiler/types.nim b/compiler/types.nim
index b163ca4e9..63a87f14e 100644
--- a/compiler/types.nim
+++ b/compiler/types.nim
@@ -756,7 +756,7 @@ type
TTypeCmpFlags* = set[TTypeCmpFlag]
- TSameTypeClosure = object {.pure.}
+ TSameTypeClosure = object
cmp: TDistinctCompare
recCheck: int
flags: TTypeCmpFlags
--
cgit 1.4.1-2-gfad0
From fb26b95f815b5426e0a8aad98ca0ff018ef1f4db Mon Sep 17 00:00:00 2001
From: Neelesh Chandola <neelesh.chandola@outlook.com>
Date: Wed, 9 Jan 2019 00:14:47 +0530
Subject: {.deprecated: msg.} now works for vars and lets (#10234)
---
compiler/pragmas.nim | 2 +-
compiler/suggest.nim | 8 ++++++--
tests/deprecated/tannot.nim | 9 +++++++++
tests/deprecated/tnoannot.nim | 7 -------
4 files changed, 16 insertions(+), 10 deletions(-)
create mode 100644 tests/deprecated/tannot.nim
delete mode 100644 tests/deprecated/tnoannot.nim
(limited to 'compiler')
diff --git a/compiler/pragmas.nim b/compiler/pragmas.nim
index 39b58d0b1..bb5707cd5 100644
--- a/compiler/pragmas.nim
+++ b/compiler/pragmas.nim
@@ -881,7 +881,7 @@ proc singlePragma(c: PContext, sym: PSym, n: PNode, i: var int,
of wExplain:
sym.flags.incl sfExplain
of wDeprecated:
- if sym != nil and sym.kind in routineKinds + {skType}:
+ if sym != nil and sym.kind in routineKinds + {skType, skVar, skLet}:
if it.kind in nkPragmaCallKinds: discard getStrLitNode(c, it)
incl(sym.flags, sfDeprecated)
elif sym != nil and sym.kind != skModule:
diff --git a/compiler/suggest.nim b/compiler/suggest.nim
index 144b86224..f3f960136 100644
--- a/compiler/suggest.nim
+++ b/compiler/suggest.nim
@@ -456,13 +456,17 @@ proc suggestSym*(conf: ConfigRef; info: TLineInfo; s: PSym; usageSym: var PSym;
proc extractPragma(s: PSym): PNode =
if s.kind in routineKinds:
result = s.ast[pragmasPos]
- elif s.kind in {skType}:
+ elif s.kind in {skType, skVar, skLet}:
# s.ast = nkTypedef / nkPragmaExpr / [nkSym, nkPragma]
result = s.ast[0][1]
doAssert result == nil or result.kind == nkPragma
proc warnAboutDeprecated(conf: ConfigRef; info: TLineInfo; s: PSym) =
- let pragmaNode = if s.kind == skEnumField: extractPragma(s.owner) else: extractPragma(s)
+ var pragmaNode: PNode
+ if optOldAst in conf.options and s.kind in {skVar, skLet}:
+ pragmaNode = nil
+ else:
+ pragmaNode = if s.kind == skEnumField: extractPragma(s.owner) else: extractPragma(s)
let name =
if s.kind == skEnumField and sfDeprecated notin s.flags: "enum '" & s.owner.name.s & "' which contains field '" & s.name.s & "'"
else: s.name.s
diff --git a/tests/deprecated/tannot.nim b/tests/deprecated/tannot.nim
new file mode 100644
index 000000000..d14f6cc23
--- /dev/null
+++ b/tests/deprecated/tannot.nim
@@ -0,0 +1,9 @@
+discard """
+ nimout: '''tannot.nim(9, 1) Warning: efgh; foo1 is deprecated [Deprecated]
+tannot.nim(9, 8) Warning: abcd; foo is deprecated [Deprecated]
+'''
+"""
+
+let foo* {.deprecated: "abcd".} = 42
+var foo1* {.deprecated: "efgh".} = 42
+foo1 = foo
diff --git a/tests/deprecated/tnoannot.nim b/tests/deprecated/tnoannot.nim
deleted file mode 100644
index ac168952e..000000000
--- a/tests/deprecated/tnoannot.nim
+++ /dev/null
@@ -1,7 +0,0 @@
-discard """
- errormsg: "annotation to deprecated not supported here"
- line: 7
-"""
-
-var foo* {.deprecated.} = 42
-var foo1* {.deprecated: "no".} = 42
--
cgit 1.4.1-2-gfad0
From bf3a308e86e7c5999855546962aed564218a8121 Mon Sep 17 00:00:00 2001
From: Timothee Cour <timothee.cour2@gmail.com>
Date: Tue, 8 Jan 2019 15:58:47 -0800
Subject: [error messages, stacktraces] fix #8794 #9270 #9767 #9768 (#9766)
* fixes #8794 : `Error: undeclared field: 'foo'` should show type (+ where type is defined) (hard to guess in generic code)
* fixes #9270: `--listFullPaths` not honored by `declared in foo.nim` messages
* fixes #9767: VM stacktrace doesn't honor --excessiveStackTrace:on
* fixes #9768: VM stacktrace misses column info, can lead to ambiguous or harder to read stacktraces
* refactors some col+1 code to col + ColOffset (self documents code)
* make getProcHeader show declared info location also for types and all routine kinds (including macros,templates) instead of just (rather arbitrarily) for iterator,proc,func,method
* --listFullPaths now is honored in more places
* fix typo system/except.nim => lib/system/excpt.nim
* remove substr(foo, 0) hack in compiler/vm.nim which seems old and not applicable anymore
---
compiler/lookups.nim | 2 +-
compiler/msgs.nim | 24 +++++++++++++++---------
compiler/options.nim | 2 +-
compiler/semcall.nim | 15 ++++++++++++++-
compiler/types.nim | 31 +++++++++++++++++--------------
compiler/vm.nim | 15 ++++++++++-----
tests/errmsgs/m8794.nim | 2 ++
tests/errmsgs/t8794.nim | 39 +++++++++++++++++++++++++++++++++++++++
tests/errmsgs/t9768.nim | 30 ++++++++++++++++++++++++++++++
9 files changed, 129 insertions(+), 31 deletions(-)
create mode 100644 tests/errmsgs/m8794.nim
create mode 100644 tests/errmsgs/t8794.nim
create mode 100644 tests/errmsgs/t9768.nim
(limited to 'compiler')
diff --git a/compiler/lookups.nim b/compiler/lookups.nim
index d4959db12..269447486 100644
--- a/compiler/lookups.nim
+++ b/compiler/lookups.nim
@@ -150,7 +150,7 @@ type
proc getSymRepr*(conf: ConfigRef; s: PSym): string =
case s.kind
- of skProc, skFunc, skMethod, skConverter, skIterator:
+ of routineKinds, skType:
result = getProcHeader(conf, s)
else:
result = s.name.s
diff --git a/compiler/msgs.nim b/compiler/msgs.nim
index 18c196085..0dd5820b4 100644
--- a/compiler/msgs.nim
+++ b/compiler/msgs.nim
@@ -135,6 +135,10 @@ const
WarningColor = fgYellow
HintTitle = "Hint: "
HintColor = fgGreen
+ # NOTE: currently line info line numbers start with 1,
+ # but column numbers start with 0, however most editors expect
+ # first column to be 1, so we need to +1 here
+ ColOffset* = 1
proc getInfoContextLen*(conf: ConfigRef): int = return conf.m.msgContext.len
proc setInfoContextLen*(conf: ConfigRef; L: int) = setLen(conf.m.msgContext, L)
@@ -155,7 +159,10 @@ template toFilename*(conf: ConfigRef; fileIdx: FileIndex): string =
if fileIdx.int32 < 0 or conf == nil:
"???"
else:
- conf.m.fileInfos[fileIdx.int32].projPath.string
+ if optListFullPaths in conf.globalOptions:
+ conf.m.fileInfos[fileIdx.int32].fullPath.string
+ else:
+ conf.m.fileInfos[fileIdx.int32].projPath.string
proc toFullPath*(conf: ConfigRef; fileIdx: FileIndex): string =
if fileIdx.int32 < 0 or conf == nil: result = "???"
@@ -192,10 +199,10 @@ proc toMsgFilename*(conf: ConfigRef; info: TLineInfo): string =
result = "???"
return
let absPath = conf.m.fileInfos[info.fileIndex.int32].fullPath.string
- let relPath = conf.m.fileInfos[info.fileIndex.int32].projPath.string
if optListFullPaths in conf.globalOptions:
result = absPath
else:
+ let relPath = conf.m.fileInfos[info.fileIndex.int32].projPath.string
result = if absPath.len < relPath.len: absPath else: relPath
proc toLinenumber*(info: TLineInfo): int {.inline.} =
@@ -208,7 +215,9 @@ proc toFileLine*(conf: ConfigRef; info: TLineInfo): string {.inline.} =
result = toFilename(conf, info) & ":" & $info.line
proc toFileLineCol*(conf: ConfigRef; info: TLineInfo): string {.inline.} =
- result = toFilename(conf, info) & "(" & $info.line & ", " & $(info.col+1) & ")"
+ # consider calling `helpers.lineInfoToString` instead
+ result = toFilename(conf, info) & "(" & $info.line & ", " &
+ $(info.col + ColOffset) & ")"
proc `$`*(conf: ConfigRef; info: TLineInfo): string = toFileLineCol(conf, info)
@@ -359,7 +368,7 @@ proc writeContext(conf: ConfigRef; lastinfo: TLineInfo) =
styledMsgWriteln(styleBright,
PosFormat % [toMsgFilename(conf, context.info),
coordToStr(context.info.line.int),
- coordToStr(context.info.col+1)],
+ coordToStr(context.info.col+ColOffset)],
resetStyle,
message)
info = context.info
@@ -446,7 +455,7 @@ proc formatMsg*(conf: ConfigRef; info: TLineInfo, msg: TMsgKind, arg: string): s
of hintMin..hintMax: HintTitle
else: ErrorTitle
result = PosFormat % [toMsgFilename(conf, info), coordToStr(info.line.int),
- coordToStr(info.col+1)] &
+ coordToStr(info.col+ColOffset)] &
title &
getMessageStr(msg, arg)
@@ -483,11 +492,8 @@ proc liMessage(conf: ConfigRef; info: TLineInfo, msg: TMsgKind, arg: string,
color = HintColor
if msg != hintUserRaw: kind = HintsToStr[ord(msg) - ord(hintMin)]
inc(conf.hintCounter)
- # NOTE: currently line info line numbers start with 1,
- # but column numbers start with 0, however most editors expect
- # first column to be 1, so we need to +1 here
let x = PosFormat % [toMsgFilename(conf, info), coordToStr(info.line.int),
- coordToStr(info.col+1)]
+ coordToStr(info.col+ColOffset)]
let s = getMessageStr(msg, arg)
if not ignoreMsg:
diff --git a/compiler/options.nim b/compiler/options.nim
index ea159ee1d..d39b0a268 100644
--- a/compiler/options.nim
+++ b/compiler/options.nim
@@ -78,7 +78,7 @@ type # please make sure we have under 32 options
optShowAllMismatches # show all overloading resolution candidates
optWholeProject # for 'doc2': output any dependency
optMixedMode # true if some module triggered C++ codegen
- optListFullPaths
+ optListFullPaths # use full paths in toMsgFilename, toFilename
optNoNimblePath
optDynlibOverrideAll
diff --git a/compiler/semcall.nim b/compiler/semcall.nim
index 7e0ea5490..7991640ea 100644
--- a/compiler/semcall.nim
+++ b/compiler/semcall.nim
@@ -287,7 +287,20 @@ proc getMsgDiagnostic(c: PContext, flags: TExprFlags, n, f: PNode): string =
let ident = considerQuotedIdent(c, f, n).s
if nfDotField in n.flags and nfExplicitCall notin n.flags:
- result = errUndeclaredField % ident & result
+ let sym = n.sons[1].typ.sym
+ var typeHint = ""
+ if sym == nil:
+ #[
+ Perhaps we're in a `compiles(foo.bar)` expression, or
+ in a concept, eg:
+ ExplainedConcept {.explain.} = concept o
+ o.foo is int
+ We coudl use: `(c.config $ n.sons[1].info)` to get more context.
+ ]#
+ discard
+ else:
+ typeHint = " for type " & getProcHeader(c.config, sym)
+ result = errUndeclaredField % ident & typeHint & " " & result
else:
if result.len == 0: result = errUndeclaredRoutine % ident
else: result = errBadRoutine % [ident, result]
diff --git a/compiler/types.nim b/compiler/types.nim
index 63a87f14e..5b8b9e602 100644
--- a/compiler/types.nim
+++ b/compiler/types.nim
@@ -107,20 +107,23 @@ proc isFloatLit*(t: PType): bool {.inline.} =
result = t.kind == tyFloat and t.n != nil and t.n.kind == nkFloatLit
proc getProcHeader*(conf: ConfigRef; sym: PSym; prefer: TPreferedDesc = preferName): string =
- result = sym.owner.name.s & '.' & sym.name.s & '('
- var n = sym.typ.n
- for i in countup(1, sonsLen(n) - 1):
- let p = n.sons[i]
- if p.kind == nkSym:
- add(result, p.sym.name.s)
- add(result, ": ")
- add(result, typeToString(p.sym.typ, prefer))
- if i != sonsLen(n)-1: add(result, ", ")
- else:
- result.add renderTree(p)
- add(result, ')')
- if n.sons[0].typ != nil:
- result.add(": " & typeToString(n.sons[0].typ, prefer))
+ assert sym != nil
+ result = sym.owner.name.s & '.' & sym.name.s
+ if sym.kind in routineKinds:
+ result.add '('
+ var n = sym.typ.n
+ for i in countup(1, sonsLen(n) - 1):
+ let p = n.sons[i]
+ if p.kind == nkSym:
+ add(result, p.sym.name.s)
+ add(result, ": ")
+ add(result, typeToString(p.sym.typ, prefer))
+ if i != sonsLen(n)-1: add(result, ", ")
+ else:
+ result.add renderTree(p)
+ add(result, ')')
+ if n.sons[0].typ != nil:
+ result.add(": " & typeToString(n.sons[0].typ, prefer))
result.add "[declared in "
result.add(conf$sym.info)
result.add "]"
diff --git a/compiler/vm.nim b/compiler/vm.nim
index c8784c3e7..e2586e615 100644
--- a/compiler/vm.nim
+++ b/compiler/vm.nim
@@ -65,15 +65,20 @@ proc stackTraceAux(c: PCtx; x: PStackFrame; pc: int; recursionLimit=100) =
return
stackTraceAux(c, x.next, x.comesFrom, recursionLimit-1)
var info = c.debug[pc]
- # we now use the same format as in system/except.nim
- var s = substr(toFilename(c.config, info), 0)
- # this 'substr' prevents a strange corruption. XXX This needs to be
- # investigated eventually but first attempts to fix it broke everything
- # see the araq-wip-fixed-writebarrier branch.
+ # we now use a format similar to the one in lib/system/excpt.nim
+ var s = ""
+ # todo: factor with quotedFilename
+ if optExcessiveStackTrace in c.config.globalOptions:
+ s = toFullPath(c.config, info)
+ else:
+ s = toFilename(c.config, info)
var line = toLinenumber(info)
+ var col = toColumn(info)
if line > 0:
add(s, '(')
add(s, $line)
+ add(s, ", ")
+ add(s, $(col + ColOffset))
add(s, ')')
if x.prc != nil:
for k in 1..max(1, 25-s.len): add(s, ' ')
diff --git a/tests/errmsgs/m8794.nim b/tests/errmsgs/m8794.nim
new file mode 100644
index 000000000..12e61cf54
--- /dev/null
+++ b/tests/errmsgs/m8794.nim
@@ -0,0 +1,2 @@
+type Foo3* = object
+ a1: int
diff --git a/tests/errmsgs/t8794.nim b/tests/errmsgs/t8794.nim
new file mode 100644
index 000000000..7f16a42fe
--- /dev/null
+++ b/tests/errmsgs/t8794.nim
@@ -0,0 +1,39 @@
+discard """
+ cmd: "nim check $options $file"
+ errormsg: ""
+ nimout: '''
+t8794.nim(39, 27) Error: undeclared field: 'a3' for type m8794.Foo3[declared in m8794.nim(1, 6)]
+'''
+"""
+
+
+
+
+
+
+
+
+
+
+
+
+## line 20
+
+## issue #8794
+
+import m8794
+
+when false: # pending https://github.com/nim-lang/Nim/pull/10091 add this
+ type Foo = object
+ a1: int
+
+ discard Foo().a2
+
+type Foo3b = Foo3
+var x2: Foo3b
+
+proc getFun[T](): T =
+ var a: T
+ a
+
+discard getFun[type(x2)]().a3
diff --git a/tests/errmsgs/t9768.nim b/tests/errmsgs/t9768.nim
new file mode 100644
index 000000000..18588c87c
--- /dev/null
+++ b/tests/errmsgs/t9768.nim
@@ -0,0 +1,30 @@
+discard """
+ errmsg: "unhandled exception:"
+ file: "system.nim"
+ nimout: '''
+stack trace: (most recent call last)
+t9768.nim(28, 33) main
+t9768.nim(23, 11) foo1
+'''
+"""
+
+
+
+
+
+
+
+
+
+
+## line 20
+
+proc foo1(a: int): auto =
+ doAssert a < 4
+ result = a * 2
+
+proc main()=
+ static:
+ if foo1(1) > 0: discard foo1(foo1(2))
+
+main()
--
cgit 1.4.1-2-gfad0
From fc7fcca9df305c02489bad4b969621cf9d8cb4f5 Mon Sep 17 00:00:00 2001
From: Timothee Cour <timothee.cour2@gmail.com>
Date: Tue, 8 Jan 2019 17:07:46 -0800
Subject: fix leftover comment from #9766
---
compiler/semcall.nim | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
(limited to 'compiler')
diff --git a/compiler/semcall.nim b/compiler/semcall.nim
index 7991640ea..3723d3fc1 100644
--- a/compiler/semcall.nim
+++ b/compiler/semcall.nim
@@ -290,13 +290,11 @@ proc getMsgDiagnostic(c: PContext, flags: TExprFlags, n, f: PNode): string =
let sym = n.sons[1].typ.sym
var typeHint = ""
if sym == nil:
- #[
- Perhaps we're in a `compiles(foo.bar)` expression, or
- in a concept, eg:
- ExplainedConcept {.explain.} = concept o
- o.foo is int
- We coudl use: `(c.config $ n.sons[1].info)` to get more context.
- ]#
+ # Perhaps we're in a `compiles(foo.bar)` expression, or
+ # in a concept, eg:
+ # ExplainedConcept {.explain.} = concept x
+ # x.foo is int
+ # We coudl use: `(c.config $ n.sons[1].info)` to get more context.
discard
else:
typeHint = " for type " & getProcHeader(c.config, sym)
--
cgit 1.4.1-2-gfad0
From 23c1ee982e2d3795001879a4527581f33875cd33 Mon Sep 17 00:00:00 2001
From: Timothee Cour <timothee.cour2@gmail.com>
Date: Wed, 9 Jan 2019 00:46:44 -0800
Subject: add `alignTable`, `parseTableCells` to align/format a tab(etc)
delimited table (#10182)
* add compiler/unittest_light.nim for easy diffing: assertEquals and mismatch
* fixup
* add alignTable, parseTableCells
---
compiler/asciitables.nim | 83 ++++++++++++++++++++++++++++
compiler/unittest_light.nim | 37 +++++++++++++
tests/compiler/nim.cfg | 7 +++
tests/compiler/tasciitables.nim | 109 +++++++++++++++++++++++++++++++++++++
tests/compiler/tunittest_light.nim | 55 +++++++++++++++++++
5 files changed, 291 insertions(+)
create mode 100644 compiler/asciitables.nim
create mode 100644 compiler/unittest_light.nim
create mode 100644 tests/compiler/nim.cfg
create mode 100644 tests/compiler/tasciitables.nim
create mode 100644 tests/compiler/tunittest_light.nim
(limited to 'compiler')
diff --git a/compiler/asciitables.nim b/compiler/asciitables.nim
new file mode 100644
index 000000000..c25d54bde
--- /dev/null
+++ b/compiler/asciitables.nim
@@ -0,0 +1,83 @@
+#[
+move to std/asciitables.nim once stable, or to a nimble paackage
+once compiler can depend on nimble
+]#
+
+type Cell* = object
+ text*: string
+ width*, row*, col*, ncols*, nrows*: int
+
+iterator parseTableCells*(s: string, delim = '\t'): Cell =
+ ## iterates over all cells in a `delim`-delimited `s`, after a 1st
+ ## pass that computes number of rows, columns, and width of each column.
+ var widths: seq[int]
+ var cell: Cell
+ template update() =
+ if widths.len<=cell.col:
+ widths.setLen cell.col+1
+ widths[cell.col] = cell.width
+ else:
+ widths[cell.col] = max(widths[cell.col], cell.width)
+ cell.width = 0
+
+ for a in s:
+ case a
+ of '\n':
+ update()
+ cell.col = 0
+ cell.row.inc
+ elif a == delim:
+ update()
+ cell.col.inc
+ else:
+ # todo: consider multi-width chars when porting to non-ascii implementation
+ cell.width.inc
+ if s.len > 0 and s[^1] != '\n':
+ update()
+
+ cell.ncols = widths.len
+ cell.nrows = cell.row + 1
+ cell.row = 0
+ cell.col = 0
+ cell.width = 0
+
+ template update2() =
+ cell.width = widths[cell.col]
+ yield cell
+ cell.text = ""
+ cell.width = 0
+ cell.col.inc
+
+ template finishRow() =
+ for col in cell.col..<cell.ncols:
+ cell.col = col
+ update2()
+ cell.col = 0
+
+ for a in s:
+ case a
+ of '\n':
+ finishRow()
+ cell.row.inc
+ elif a == delim:
+ update2()
+ else:
+ cell.width.inc
+ cell.text.add a
+
+ if s.len > 0 and s[^1] != '\n':
+ finishRow()
+
+proc alignTable*(s: string, delim = '\t', fill = ' ', sep = " "): string =
+ ## formats a `delim`-delimited `s` representing a table; each cell is aligned
+ ## to a width that's computed for each column; consecutive columns are
+ ## delimted by `sep`, and alignment space is filled using `fill`.
+ ## More customized formatting can be done by calling `parseTableCells` directly.
+ for cell in parseTableCells(s, delim):
+ result.add cell.text
+ for i in cell.text.len..<cell.width:
+ result.add fill
+ if cell.col < cell.ncols-1:
+ result.add sep
+ if cell.col == cell.ncols-1 and cell.row < cell.nrows - 1:
+ result.add '\n'
diff --git a/compiler/unittest_light.nim b/compiler/unittest_light.nim
new file mode 100644
index 000000000..bcba6f7c7
--- /dev/null
+++ b/compiler/unittest_light.nim
@@ -0,0 +1,37 @@
+# note: consider merging tests/assert/testhelper.nim here.
+
+proc mismatch*[T](lhs: T, rhs: T): string =
+ ## Simplified version of `unittest.require` that satisfies a common use case,
+ ## while avoiding pulling too many dependencies. On failure, diagnostic
+ ## information is provided that in particular makes it easy to spot
+ ## whitespace mismatches and where the mismatch is.
+ proc replaceInvisible(s: string): string =
+ for a in s:
+ case a
+ of '\n': result.add "\\n\n"
+ else: result.add a
+
+ proc quoted(s: string): string = result.addQuoted s
+
+ result.add "\n"
+ result.add "lhs:{\n" & replaceInvisible(
+ $lhs) & "}\nrhs:{\n" & replaceInvisible($rhs) & "}\n"
+ when compiles(lhs.len):
+ if lhs.len != rhs.len:
+ result.add "lhs.len: " & $lhs.len & " rhs.len: " & $rhs.len & "\n"
+ when compiles(lhs[0]):
+ var i = 0
+ while i < lhs.len and i < rhs.len:
+ if lhs[i] != rhs[i]: break
+ i.inc
+ result.add "first mismatch index: " & $i & "\n"
+ if i < lhs.len and i < rhs.len:
+ result.add "lhs[i]: {" & quoted($lhs[i]) & "} rhs[i]: {" & quoted(
+ $rhs[i]) & "}"
+ result.add "lhs[0..<i]:{\n" & replaceInvisible($lhs[
+ 0..<i]) & "}\nrhs[0..<i]:{\n" & replaceInvisible($rhs[0..<i]) & "}"
+
+proc assertEquals*[T](lhs: T, rhs: T) =
+ when false: # can be useful for debugging to see all that's fed to this.
+ echo "----" & $lhs
+ doAssert lhs==rhs, mismatch(lhs, rhs)
diff --git a/tests/compiler/nim.cfg b/tests/compiler/nim.cfg
new file mode 100644
index 000000000..6f49473aa
--- /dev/null
+++ b/tests/compiler/nim.cfg
@@ -0,0 +1,7 @@
+# note: consider moving tests/compilerapi/ to tests/compiler/ since
+# that's more predictable.
+
+# note: without this, tests may succeed locally but fail on CI (it can succeed
+# locally even when compiling via `./bin/nim` because `$HOME/.nimble` is being
+# used).
+--path:"../../" # so we can `import compiler/foo` in this dir
diff --git a/tests/compiler/tasciitables.nim b/tests/compiler/tasciitables.nim
new file mode 100644
index 000000000..0a5ee0f05
--- /dev/null
+++ b/tests/compiler/tasciitables.nim
@@ -0,0 +1,109 @@
+import compiler/unittest_light
+import compiler/asciitables
+
+import strformat
+
+proc alignTableCustom(s: string, delim = '\t', sep = ","): string =
+ for cell in parseTableCells(s, delim):
+ result.add fmt"({cell.row},{cell.col}): "
+ for i in cell.text.len..<cell.width:
+ result.add " "
+ result.add cell.text
+ if cell.col < cell.ncols-1:
+ result.add sep
+ if cell.col == cell.ncols-1 and cell.row < cell.nrows - 1:
+ result.add '\n'
+
+proc testAlignTable() =
+ block: # test with variable width columns
+ var ret = ""
+ ret.add "12\t143\tbcdef\n"
+ ret.add "2\t14394852020\tbcdef\n"
+ ret.add "45342\t1\tbf\n"
+ ret.add "45342\t1\tbsadfasdfasfdasdff\n"
+ ret.add "453232323232342\t1\tbsadfasdfasfdasdff\n"
+ ret.add "45342\t1\tbf\n"
+ ret.add "45342\t1\tb afasf a ff\n"
+ ret.add "4\t1\tbf\n"
+
+ assertEquals alignTable(ret),
+ """
+12 143 bcdef
+2 14394852020 bcdef
+45342 1 bf
+45342 1 bsadfasdfasfdasdff
+453232323232342 1 bsadfasdfasfdasdff
+45342 1 bf
+45342 1 b afasf a ff
+4 1 bf
+"""
+
+ assertEquals alignTable(ret, fill = '.', sep = ","),
+ """
+12.............,143........,bcdef.............
+2..............,14394852020,bcdef.............
+45342..........,1..........,bf................
+45342..........,1..........,bsadfasdfasfdasdff
+453232323232342,1..........,bsadfasdfasfdasdff
+45342..........,1..........,bf................
+45342..........,1..........,b afasf a ff......
+4..............,1..........,bf................
+"""
+
+ assertEquals alignTableCustom(ret, sep = " "),
+ """
+(0,0): 12 (0,1): 143 (0,2): bcdef
+(1,0): 2 (1,1): 14394852020 (1,2): bcdef
+(2,0): 45342 (2,1): 1 (2,2): bf
+(3,0): 45342 (3,1): 1 (3,2): bsadfasdfasfdasdff
+(4,0): 453232323232342 (4,1): 1 (4,2): bsadfasdfasfdasdff
+(5,0): 45342 (5,1): 1 (5,2): bf
+(6,0): 45342 (6,1): 1 (6,2): b afasf a ff
+(7,0): 4 (7,1): 1 (7,2): bf
+"""
+
+ block: # test with 1 column
+ var ret = "12\nasdfa\nadf"
+ assertEquals alignTable(ret), """
+12
+asdfa
+adf """
+
+ block: # test with empty input
+ var ret = ""
+ assertEquals alignTable(ret), ""
+
+ block: # test with 1 row
+ var ret = "abc\tdef"
+ assertEquals alignTable(ret), """
+abc def"""
+
+ block: # test with 1 row ending in \t
+ var ret = "abc\tdef\t"
+ assertEquals alignTable(ret), """
+abc def """
+
+ block: # test with 1 row starting with \t
+ var ret = "\tabc\tdef\t"
+ assertEquals alignTable(ret), """
+ abc def """
+
+
+ block: # test with variable number of cols per row
+ var ret = """
+a1,a2,a3
+
+b1
+c1,c2
+,d1
+"""
+ assertEquals alignTableCustom(ret, delim = ',', sep = ","),
+ """
+(0,0): a1,(0,1): a2,(0,2): a3
+(1,0): ,(1,1): ,(1,2):
+(2,0): b1,(2,1): ,(2,2):
+(3,0): c1,(3,1): c2,(3,2):
+(4,0): ,(4,1): d1,(4,2):
+"""
+
+testAlignTable()
diff --git a/tests/compiler/tunittest_light.nim b/tests/compiler/tunittest_light.nim
new file mode 100644
index 000000000..d20293d5b
--- /dev/null
+++ b/tests/compiler/tunittest_light.nim
@@ -0,0 +1,55 @@
+import compiler/unittest_light
+
+proc testAssertEquals() =
+ assertEquals("foo", "foo")
+ doAssertRaises(AssertionError):
+ assertEquals("foo", "foo ")
+
+proc testMismatch() =
+ assertEquals(1+1, 2*1)
+
+ let a = """
+ some test with space at the end of lines
+
+ can be hard to spot differences when diffing in a terminal
+ without this helper function
+
+"""
+
+ let b = """
+ some test with space at the end of lines
+
+ can be hard to spot differences when diffing in a terminal
+ without this helper function
+
+"""
+
+ doAssert mismatch(a, b) == """
+
+lhs:{
+ some test with space at the end of lines \n
+\n
+ can be hard to spot differences when diffing in a terminal \n
+ without this helper function\n
+\n
+}
+rhs:{
+ some test with space at the end of lines \n
+\n
+ can be hard to spot differences when diffing in a terminal \n
+ without this helper function\n
+\n
+}
+lhs.len: 144 rhs.len: 143
+first mismatch index: 110
+lhs[i]: {" "} rhs[i]: {"\n"}lhs[0..<i]:{
+ some test with space at the end of lines \n
+\n
+ can be hard to spot differences when diffing in a terminal }
+rhs[0..<i]:{
+ some test with space at the end of lines \n
+\n
+ can be hard to spot differences when diffing in a terminal }"""
+
+testMismatch()
+testAssertEquals()
--
cgit 1.4.1-2-gfad0
From 44b4e289d656475df5f0123de86ccc89e366edcb Mon Sep 17 00:00:00 2001
From: cooldome <cdome@bk.ru>
Date: Thu, 10 Jan 2019 08:25:35 +0000
Subject: destructors: lift type bound operations for case and distinct objects
(#10238)
---
compiler/semasgn.nim | 46 +++++++++++++++++++++++---
tests/destructor/tdestructor.nim | 71 ++++++++++++++++++++++++++++------------
2 files changed, 91 insertions(+), 26 deletions(-)
(limited to 'compiler')
diff --git a/compiler/semasgn.nim b/compiler/semasgn.nim
index 5d676dc76..c1ecaf8a2 100644
--- a/compiler/semasgn.nim
+++ b/compiler/semasgn.nim
@@ -49,6 +49,14 @@ proc liftBodyObj(c: var TLiftCtx; n, body, x, y: PNode) =
liftBodyAux(c, f.typ, body, x.dotField(f), y.dotField(f))
of nkNilLit: discard
of nkRecCase:
+ if c.kind in {attachedSink, attachedAsgn, attachedDeepCopy}:
+ ## the value needs to be destroyed before we assign the selector
+ ## or the value is lost
+ let prevKind = c.kind
+ c.kind = attachedDestructor
+ liftBodyObj(c, n, body, x, y)
+ c.kind = prevKind
+
# copy the selector:
liftBodyObj(c, n[0], body, x, y)
# we need to generate a case statement:
@@ -66,7 +74,6 @@ proc liftBodyObj(c: var TLiftCtx; n, body, x, y: PNode) =
liftBodyObj(c, n[i].lastSon, branch.sons[L-1], x, y)
caseStmt.add(branch)
body.add(caseStmt)
- localError(c.c.config, c.info, "cannot lift assignment operator to 'case' object")
of nkRecList:
for t in items(n): liftBodyObj(c, t, body, x, y)
else:
@@ -235,11 +242,12 @@ proc liftBodyAux(c: var TLiftCtx; t: PType; body, x, y: PNode) =
discard considerOverloadedOp(c, t, body, x, y)
else:
defaultOp(c, t, body, x, y)
- of tyObject, tyDistinct:
+ of tyObject:
+ if not considerOverloadedOp(c, t, body, x, y):
+ liftBodyObj(c, t.n, body, x, y)
+ of tyDistinct:
if not considerOverloadedOp(c, t, body, x, y):
- if t.sons[0] != nil:
- liftBodyAux(c, t.sons[0].skipTypes(skipPtrs), body, x, y)
- if t.kind == tyObject: liftBodyObj(c, t.n, body, x, y)
+ liftBodyAux(c, t.sons[0].skipTypes(skipPtrs), body, x, y)
of tyTuple:
liftBodyTup(c, t, body, x, y)
of tyProc:
@@ -279,8 +287,36 @@ proc addParam(procType: PType; param: PSym) =
addSon(procType.n, newSymNode(param))
rawAddSon(procType, param.typ)
+proc liftBodyDistinctType(c: PContext; typ: PType; kind: TTypeAttachedOp; info: TLineInfo): PSym =
+ assert typ.kind == tyDistinct
+ let baseType = typ[0]
+ case kind
+ of attachedAsgn:
+ if baseType.assignment == nil:
+ discard liftBody(c, baseType, kind, info)
+ typ.assignment = baseType.assignment
+ result = typ.assignment
+ of attachedSink:
+ if baseType.sink == nil:
+ discard liftBody(c, baseType, kind, info)
+ typ.sink = baseType.sink
+ result = typ.sink
+ of attachedDeepCopy:
+ if baseType.deepCopy == nil:
+ discard liftBody(c, baseType, kind, info)
+ typ.deepCopy = baseType.deepCopy
+ result = typ.deepCopy
+ of attachedDestructor:
+ if baseType.destructor == nil:
+ discard liftBody(c, baseType, kind, info)
+ typ.destructor = baseType.destructor
+ result = typ.destructor
+
proc liftBody(c: PContext; typ: PType; kind: TTypeAttachedOp;
info: TLineInfo): PSym =
+ if typ.kind == tyDistinct:
+ return liftBodyDistinctType(c, typ, kind, info)
+
var a: TLiftCtx
a.info = info
a.c = c
diff --git a/tests/destructor/tdestructor.nim b/tests/destructor/tdestructor.nim
index c9f1caf2d..09dce19ab 100644
--- a/tests/destructor/tdestructor.nim
+++ b/tests/destructor/tdestructor.nim
@@ -7,21 +7,28 @@ mygeneric1 constructed
mygeneric1 destroyed
----
mygeneric2 constructed
-mygeneric2 destroyed
myobj destroyed
+mygeneric2 destroyed
----
mygeneric3 constructed
mygeneric1 destroyed
----
-mygeneric1 destroyed
-----
+mydistinctObj constructed
myobj destroyed
+mygeneric2 destroyed
+------------------
----
----
myobj destroyed
+mygeneric1 destroyed
+myobj destroyed
+myobj destroyed
+myobj destroyed
+---
+myobj destroyed
+myobj destroyed
+myobj destroyed
'''
- cmd: '''nim c --newruntime $file'''
- disabled: "true"
"""
type
@@ -29,6 +36,11 @@ type
x, y: int
p: pointer
+proc `=destroy`(o: var TMyObj) =
+ if o.p != nil: dealloc o.p
+ echo "myobj destroyed"
+
+type
TMyGeneric1[T] = object
x: T
@@ -36,37 +48,40 @@ type
x: A
y: B
+proc `=destroy`(o: var TMyGeneric1[int]) =
+ echo "mygeneric1 destroyed"
+
+proc `=destroy`[A, B](o: var TMyGeneric2[A, B]) =
+ echo "mygeneric2 destroyed"
+
+type
TMyGeneric3[A, B, C] = object
x: A
y: B
z: C
- TObjKind = enum A, B, C, D
+ TDistinctObjX = distinct TMyGeneric3[TMyObj, TMyGeneric2[int, int], int]
+ TDistinctObj = TDistinctObjX
+
+ TObjKind = enum Z, A, B, C, D
TCaseObj = object
+ z: TMyGeneric3[TMyObj, float, int]
case kind: TObjKind
+ of Z: discard
of A:
x: TMyGeneric1[int]
of B, C:
y: TMyObj
else:
case innerKind: TObjKind
+ of Z: discard
of A, B, C:
p: TMyGeneric3[int, float, string]
of D:
q: TMyGeneric3[TMyObj, int, int]
r: string
-proc `=destroy`(o: var TMyObj) =
- if o.p != nil: dealloc o.p
- echo "myobj destroyed"
-
-proc `=destroy`(o: var TMyGeneric1[int]) =
- echo "mygeneric1 destroyed"
-
-proc `=destroy`[A, B](o: var TMyGeneric2[A, B]) =
- echo "mygeneric2 destroyed"
-
proc open: TMyObj =
# allow for superfluous ()
result = (TMyObj(x: 1, y: 2, p: alloc(3)))
@@ -95,6 +110,12 @@ proc mygeneric3 =
echo "mygeneric3 constructed"
+proc mydistinctObj =
+ var x = TMyGeneric3[TMyObj, TMyGeneric2[int, int], int](
+ x: open(), y: TMyGeneric2[int, int](x: 5, y: 15), z: 20)
+
+ echo "mydistinctObj constructed"
+
echo "----"
myobj()
@@ -107,9 +128,11 @@ mygeneric2[int](10)
echo "----"
mygeneric3()
+echo "----"
+mydistinctObj()
+
proc caseobj =
block:
- echo "----"
var o1 = TCaseObj(kind: A, x: TMyGeneric1[int](x: 10))
block:
@@ -121,10 +144,16 @@ proc caseobj =
var o3 = TCaseObj(kind: D, innerKind: B, r: "test",
p: TMyGeneric3[int, float, string](x: 10, y: 1.0, z: "test"))
- block:
- echo "----"
- var o4 = TCaseObj(kind: D, innerKind: D, r: "test",
- q: TMyGeneric3[TMyObj, int, int](x: open(), y: 1, z: 0))
+echo "------------------"
caseobj()
+proc caseobj_test_sink: TCaseObj =
+ # check that lifted sink can destroy case val correctly
+ result = TCaseObj(kind: D, innerKind: D, r: "test",
+ q: TMyGeneric3[TMyObj, int, int](x: open(), y: 1, z: 0))
+ result = TCaseObj(kind: B, y: open())
+
+
+echo "---"
+discard caseobj_test_sink()
\ No newline at end of file
--
cgit 1.4.1-2-gfad0
From f55c8d4d5430b9bf35a5a1ca8e8fe678c52a963b Mon Sep 17 00:00:00 2001
From: Arne Döring <arne.doering@gmx.net>
Date: Thu, 10 Jan 2019 09:27:01 +0100
Subject: fixes #10251 (#10255)
---
compiler/lookups.nim | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'compiler')
diff --git a/compiler/lookups.nim b/compiler/lookups.nim
index 269447486..8bc263485 100644
--- a/compiler/lookups.nim
+++ b/compiler/lookups.nim
@@ -190,7 +190,7 @@ proc addDecl*(c: PContext, sym: PSym, info: TLineInfo) =
wrongRedefinition(c, info, sym.name.s, conflict.info)
proc addDecl*(c: PContext, sym: PSym) =
- let conflict = c.currentScope.addUniqueSym(sym)
+ let conflict = strTableInclReportConflict(c.currentScope.symbols, sym, true)
if conflict != nil:
wrongRedefinition(c, sym.info, sym.name.s, conflict.info)
--
cgit 1.4.1-2-gfad0
From d998cb58dd9a29cb7b739ee4daa6a0528810790d Mon Sep 17 00:00:00 2001
From: Neelesh Chandola <neelesh.chandola@outlook.com>
Date: Thu, 10 Jan 2019 17:19:35 +0530
Subject: void object fields are now ignored by codegen and fields/fieldPairs
iterator (#10144)
* Codegen now ignores object fields of type void
* Fix `$` bug for objects/tuples where it does not add a comma
* fields/fieldPairs iterators now ignore void types
* Use `isEmptyType` instead of checking for `tyVoid` directly
---
compiler/ccgtypes.nim | 2 ++
compiler/jsgen.nim | 2 ++
compiler/semfields.nim | 3 +++
lib/system.nim | 1 +
tests/objects/t3734.nim | 17 +++++++++++++++++
5 files changed, 25 insertions(+)
create mode 100644 tests/objects/t3734.nim
(limited to 'compiler')
diff --git a/compiler/ccgtypes.nim b/compiler/ccgtypes.nim
index 243aa87de..23e16cb93 100644
--- a/compiler/ccgtypes.nim
+++ b/compiler/ccgtypes.nim
@@ -1041,6 +1041,8 @@ proc genObjectFields(m: BModule, typ, origType: PType, n: PNode, expr: Rope;
else: internalError(m.config, n.info, "genObjectFields(nkRecCase)")
of nkSym:
var field = n.sym
+ # Do not produce code for void types
+ if isEmptyType(field.typ): return
if field.bitsize == 0:
if field.loc.r == nil: fillObjectFields(m, typ)
if field.loc.t == nil:
diff --git a/compiler/jsgen.nim b/compiler/jsgen.nim
index 83d205bc2..2f5e202e0 100644
--- a/compiler/jsgen.nim
+++ b/compiler/jsgen.nim
@@ -1502,6 +1502,8 @@ proc createRecordVarAux(p: PProc, rec: PNode, excludedFieldIDs: IntSet, output:
for i in countup(1, sonsLen(rec) - 1):
createRecordVarAux(p, lastSon(rec.sons[i]), excludedFieldIDs, output)
of nkSym:
+ # Do not produce code for void types
+ if isEmptyType(rec.sym.typ): return
if rec.sym.id notin excludedFieldIDs:
if output.len > 0: output.add(", ")
output.addf("$#: ", [mangleName(p.module, rec.sym)])
diff --git a/compiler/semfields.nim b/compiler/semfields.nim
index 07321f477..d65d962cb 100644
--- a/compiler/semfields.nim
+++ b/compiler/semfields.nim
@@ -19,6 +19,9 @@ type
c: PContext
proc instFieldLoopBody(c: TFieldInstCtx, n: PNode, forLoop: PNode): PNode =
+ if c.field != nil and isEmptyType(c.field.typ):
+ result = newNode(nkEmpty)
+ return
case n.kind
of nkEmpty..pred(nkIdent), succ(nkSym)..nkNilLit: result = n
of nkIdent, nkSym:
diff --git a/lib/system.nim b/lib/system.nim
index dff195402..b8ff85f49 100644
--- a/lib/system.nim
+++ b/lib/system.nim
@@ -2700,6 +2700,7 @@ proc `$`*[T: tuple|object](x: T): string =
firstElement = false
else:
result.add("...")
+ firstElement = false
when not isNamed:
if count == 1:
result.add(",") # $(1,) should print as the semantically legal (1,)
diff --git a/tests/objects/t3734.nim b/tests/objects/t3734.nim
new file mode 100644
index 000000000..cebef6081
--- /dev/null
+++ b/tests/objects/t3734.nim
@@ -0,0 +1,17 @@
+discard """
+output: "i0"
+"""
+
+type
+ Application = object
+ config: void
+ i: int
+ f: void
+
+proc printFields(rec: Application) =
+ for k, v in fieldPairs(rec):
+ echo k, v
+
+var app: Application
+
+printFields(app)
--
cgit 1.4.1-2-gfad0
From d1b7aa28e7b5b847a44eda11ff7aadbe3bb0b49a Mon Sep 17 00:00:00 2001
From: Andreas Rumpf <rumpf_a@web.de>
Date: Fri, 11 Jan 2019 15:55:16 +0100
Subject: fixes #10240 (#10269)
* kochdocs.nim: code cleanup
* fixes #10420
---
compiler/scriptconfig.nim | 6 ++++--
tools/kochdocs.nim | 6 +-----
2 files changed, 5 insertions(+), 7 deletions(-)
(limited to 'compiler')
diff --git a/compiler/scriptconfig.nim b/compiler/scriptconfig.nim
index bfff86479..e3a9478d1 100644
--- a/compiler/scriptconfig.nim
+++ b/compiler/scriptconfig.nim
@@ -63,8 +63,10 @@ proc setupVM*(module: PSym; cache: IdentCache; scriptName: string;
os.removeFile getString(a, 0)
cbos createDir:
os.createDir getString(a, 0)
- cbos getOsError:
- setResult(a, errorMsg)
+
+ result.registerCallback "stdlib.system.getOsError",
+ proc (a: VmArgs) = setResult(a, errorMsg)
+
cbos setCurrentDir:
os.setCurrentDir getString(a, 0)
cbos getCurrentDir:
diff --git a/tools/kochdocs.nim b/tools/kochdocs.nim
index 3d146188f..68662bab2 100644
--- a/tools/kochdocs.nim
+++ b/tools/kochdocs.nim
@@ -56,12 +56,8 @@ proc nimexec*(cmd: string) =
exec findNim() & " " & cmd
proc nimCompile*(input: string, outputDir = "bin", mode = "c", options = "") =
- # TODO: simplify pending https://github.com/nim-lang/Nim/issues/9513
- var cmd = findNim() & " " & mode
let output = outputDir / input.splitFile.name.exe
- cmd.add " -o:" & output
- cmd.add " " & options
- cmd.add " " & input
+ let cmd = findNim() & " " & mode & " -o:" & output & " " & options & " " & input
exec cmd
const
--
cgit 1.4.1-2-gfad0
From 5397c5d31d58f14ad39e8009882a87ceda6253aa Mon Sep 17 00:00:00 2001
From: Andreas Rumpf <rumpf_a@web.de>
Date: Fri, 11 Jan 2019 16:34:22 +0100
Subject: fixes #10216 (#10270)
---
compiler/pragmas.nim | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
(limited to 'compiler')
diff --git a/compiler/pragmas.nim b/compiler/pragmas.nim
index bb5707cd5..b1a88ace7 100644
--- a/compiler/pragmas.nim
+++ b/compiler/pragmas.nim
@@ -64,10 +64,10 @@ const
varPragmas* = {wImportc, wExportc, wVolatile, wRegister, wThreadVar, wNodecl,
wMagic, wHeader, wDeprecated, wCompilerProc, wCore, wDynlib, wExtern,
wImportCpp, wImportObjC, wError, wNoInit, wCompileTime, wGlobal,
- wGensym, wInject, wCodegenDecl, wGuard, wGoto, wExportNims, wUsed, wRaises}
+ wGensym, wInject, wCodegenDecl, wGuard, wGoto, wExportNims, wUsed}
constPragmas* = {wImportc, wExportc, wHeader, wDeprecated, wMagic, wNodecl,
wExtern, wImportCpp, wImportObjC, wError, wGensym, wInject, wExportNims,
- wIntDefine, wStrDefine, wUsed, wCompilerProc, wCore, wRaises}
+ wIntDefine, wStrDefine, wUsed, wCompilerProc, wCore}
letPragmas* = varPragmas
procTypePragmas* = {FirstCallConv..LastCallConv, wVarargs, wNosideeffect,
wThread, wRaises, wLocks, wTags, wGcSafe}
@@ -1119,13 +1119,16 @@ proc singlePragma(c: PContext, sym: PSym, n: PNode, i: var int,
else: sym.flags.incl sfUsed
of wLiftLocals: discard
else: invalidPragma(c, it)
- elif sym == nil or (sym != nil and sym.kind in {skVar, skLet, skParam,
- skField, skProc, skFunc, skConverter, skMethod, skType}):
- n.sons[i] = semCustomPragma(c, it)
- elif sym != nil:
- illegalCustomPragma(c, it, sym)
+ elif comesFromPush and whichKeyword(ident) in {wTags, wRaises}:
+ discard "ignore the .push pragma; it doesn't apply"
else:
- invalidPragma(c, it)
+ if sym == nil or (sym != nil and sym.kind in {skVar, skLet, skParam,
+ skField, skProc, skFunc, skConverter, skMethod, skType}):
+ n.sons[i] = semCustomPragma(c, it)
+ elif sym != nil:
+ illegalCustomPragma(c, it, sym)
+ else:
+ invalidPragma(c, it)
proc mergePragmas(n, pragmas: PNode) =
if n[pragmasPos].kind == nkEmpty:
--
cgit 1.4.1-2-gfad0
From b0979c8b1c3b43c285fc06ba492b20607e264560 Mon Sep 17 00:00:00 2001
From: Neelesh Chandola <neelesh.chandola@outlook.com>
Date: Fri, 11 Jan 2019 23:46:03 +0530
Subject: Cleanup comesFromPush logic (#10278)
---
compiler/pragmas.nim | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
(limited to 'compiler')
diff --git a/compiler/pragmas.nim b/compiler/pragmas.nim
index b1a88ace7..4adf6032b 100644
--- a/compiler/pragmas.nim
+++ b/compiler/pragmas.nim
@@ -1054,14 +1054,7 @@ proc singlePragma(c: PContext, sym: PSym, n: PNode, i: var int,
noVal(c, it)
if sym == nil: invalidPragma(c, it)
of wLine: pragmaLine(c, it)
- of wRaises, wTags:
- if not sym.isNil and sym.kind in {skVar, skLet, skConst}:
- if comesFromPush:
- return
- else:
- invalidPragma(c, it)
- else:
- pragmaRaisesOrTags(c, it)
+ of wRaises, wTags: pragmaRaisesOrTags(c, it)
of wLocks:
if sym == nil: pragmaLockStmt(c, it)
elif sym.typ == nil: invalidPragma(c, it)
--
cgit 1.4.1-2-gfad0
From 5ef5dc86c523c760b83050b6192f00b6a0816bce Mon Sep 17 00:00:00 2001
From: Araq <rumpf_a@web.de>
Date: Fri, 11 Jan 2019 14:20:34 +0100
Subject: docgen: support markdown link syntax; enable markdown extensions
---
compiler/docgen.nim | 4 ++--
lib/packages/docutils/rst.nim | 28 ++++++++++++++++++++++++++++
lib/packages/docutils/rstast.nim | 3 +++
nimdoc/tester.nim | 2 +-
nimdoc/testproject/expected/testproject.html | 2 +-
nimdoc/testproject/subdir/subdir_b/utils.nim | 2 ++
6 files changed, 37 insertions(+), 4 deletions(-)
(limited to 'compiler')
diff --git a/compiler/docgen.nim b/compiler/docgen.nim
index 1af9c06b8..33cd98f38 100644
--- a/compiler/docgen.nim
+++ b/compiler/docgen.nim
@@ -119,7 +119,7 @@ proc newDocumentor*(filename: AbsoluteFile; cache: IdentCache; conf: ConfigRef,
result.conf = conf
result.cache = cache
initRstGenerator(result[], (if conf.cmd != cmdRst2tex: outHtml else: outLatex),
- conf.configVars, filename.string, {roSupportRawDirective},
+ conf.configVars, filename.string, {roSupportRawDirective, roSupportMarkdown},
docgenFindFile, compilerMsgHandler)
if conf.configVars.hasKey("doc.googleAnalytics"):
@@ -991,7 +991,7 @@ proc commandRstAux(cache: IdentCache, conf: ConfigRef;
d.isPureRst = true
var rst = parseRst(readFile(filen.string), filen.string, 0, 1, d.hasToc,
- {roSupportRawDirective}, conf)
+ {roSupportRawDirective, roSupportMarkdown}, conf)
var modDesc = newStringOfCap(30_000)
renderRstToOut(d[], rst, modDesc)
d.modDesc = rope(modDesc)
diff --git a/lib/packages/docutils/rst.nim b/lib/packages/docutils/rst.nim
index 161509afe..6a03e6bc1 100644
--- a/lib/packages/docutils/rst.nim
+++ b/lib/packages/docutils/rst.nim
@@ -780,6 +780,31 @@ proc parseMarkdownCodeblock(p: var RstParser): PRstNode =
add(result, nil)
add(result, lb)
+proc parseMarkdownLink(p: var RstParser; father: PRstNode): bool =
+ result = true
+ var desc, link = ""
+ var i = p.idx
+
+ template parse(endToken, dest) =
+ inc i # skip begin token
+ while true:
+ if p.tok[i].kind in {tkEof, tkIndent}: return false
+ if p.tok[i].symbol == endToken: break
+ dest.add p.tok[i].symbol
+ inc i
+ inc i # skip end token
+
+ parse("]", desc)
+ if p.tok[i].symbol != "(": return false
+ parse(")", link)
+ let child = newRstNode(rnHyperlink)
+ child.add desc
+ child.add link
+ # only commit if we detected no syntax error:
+ father.add child
+ p.idx = i
+ result = true
+
proc parseInline(p: var RstParser, father: PRstNode) =
case p.tok[p.idx].kind
of tkPunct:
@@ -811,6 +836,9 @@ proc parseInline(p: var RstParser, father: PRstNode) =
var n = newRstNode(rnSubstitutionReferences)
parseUntil(p, n, "|", false)
add(father, n)
+ elif roSupportMarkdown in p.s.options and p.tok[p.idx].symbol == "[" and
+ parseMarkdownLink(p, father):
+ discard "parseMarkdownLink already processed it"
else:
if roSupportSmilies in p.s.options:
let n = parseSmiley(p)
diff --git a/lib/packages/docutils/rstast.nim b/lib/packages/docutils/rstast.nim
index 4a77b4f34..fee824b09 100644
--- a/lib/packages/docutils/rstast.nim
+++ b/lib/packages/docutils/rstast.nim
@@ -89,6 +89,9 @@ proc lastSon*(n: PRstNode): PRstNode =
proc add*(father, son: PRstNode) =
add(father.sons, son)
+proc add*(father: PRstNode; s: string) =
+ add(father.sons, newRstNode(rnLeaf, s))
+
proc addIfNotNil*(father, son: PRstNode) =
if son != nil: add(father, son)
diff --git a/nimdoc/tester.nim b/nimdoc/tester.nim
index e0afe6b94..db2095128 100644
--- a/nimdoc/tester.nim
+++ b/nimdoc/tester.nim
@@ -28,5 +28,5 @@ proc test(dir: string; fixup = false) =
echo "SUCCESS: files identical: ", produced
removeDir(dir / "htmldocs")
-test("nimdoc/testproject", false)
+test("nimdoc/testproject", defined(fixup))
if failures > 0: quit($failures & " failures occurred.")
diff --git a/nimdoc/testproject/expected/testproject.html b/nimdoc/testproject/expected/testproject.html
index 2e23a64d5..dd1541a56 100644
--- a/nimdoc/testproject/expected/testproject.html
+++ b/nimdoc/testproject/expected/testproject.html
@@ -1369,7 +1369,7 @@ The enum B.
<a id="someFunc,"></a>
<dt><pre><span class="Keyword">func</span> <span class="Identifier">someFunc</span><span class="Other">(</span><span class="Other">)</span> <span><span class="Other">{</span><span class="Other pragmadots">...</span><span class="Other">}</span></span><span class="pragmawrap"><span class="Other">{.</span><span class="pragma"><span class="Identifier">raises</span><span class="Other">:</span> <span class="Other">[</span><span class="Other">]</span><span class="Other">,</span> <span class="Identifier">tags</span><span class="Other">:</span> <span class="Other">[</span><span class="Other">]</span></span><span class="Other">.}</span></span></pre></dt>
<dd>
-My someFunc.
+My someFunc. Stuff in <tt class="docutils literal"><span class="pre">quotes</span></tt> here. <a class="reference external" href="https://nim-lang.org">Some link</a>
</dd>
diff --git a/nimdoc/testproject/subdir/subdir_b/utils.nim b/nimdoc/testproject/subdir/subdir_b/utils.nim
index e2ec80dc2..7b529a617 100644
--- a/nimdoc/testproject/subdir/subdir_b/utils.nim
+++ b/nimdoc/testproject/subdir/subdir_b/utils.nim
@@ -23,4 +23,6 @@ template bEnum*(): untyped =
func someFunc*() =
## My someFunc.
+ ## Stuff in `quotes` here.
+ ## [Some link](https://nim-lang.org)
discard
--
cgit 1.4.1-2-gfad0
From f5cc2e2de567b36d33778ddf263b7a440f1d3b11 Mon Sep 17 00:00:00 2001
From: rec <44084068+recloser@users.noreply.github.com>
Date: Sat, 12 Jan 2019 19:49:31 +0100
Subject: Fixes 10202 (#10283)
* Add a test case for #10202
* Fix asgn for object tyVars; fixes #10202
* Check the variant kind before accessing the sym field
---
compiler/jsgen.nim | 4 ++--
tests/js/t9410.nim | 37 +++++++++++++++++++++++++++----------
2 files changed, 29 insertions(+), 12 deletions(-)
(limited to 'compiler')
diff --git a/compiler/jsgen.nim b/compiler/jsgen.nim
index 2f5e202e0..8625f2fe1 100644
--- a/compiler/jsgen.nim
+++ b/compiler/jsgen.nim
@@ -925,7 +925,7 @@ const
proc needsNoCopy(p: PProc; y: PNode): bool =
return y.kind in nodeKindsNeedNoCopy or
- ((mapType(y.typ) != etyBaseIndex or y.sym.kind == skParam) and
+ ((mapType(y.typ) != etyBaseIndex or (y.kind == nkSym and y.sym.kind == skParam)) and
(skipTypes(y.typ, abstractInst).kind in
{tyRef, tyPtr, tyLent, tyVar, tyCString, tyProc} + IntegralTypes))
@@ -950,7 +950,7 @@ proc genAsgnAux(p: PProc, x, y: PNode, noCopyNeeded: bool) =
lineF(p, "$1 = nimCopy(null, $2, $3);$n",
[a.rdLoc, b.res, genTypeInfo(p, y.typ)])
of etyObject:
- if (needsNoCopy(p, y) and needsNoCopy(p, x)) or noCopyNeeded:
+ if x.typ.kind == tyVar or (needsNoCopy(p, y) and needsNoCopy(p, x)) or noCopyNeeded:
lineF(p, "$1 = $2;$n", [a.rdLoc, b.rdLoc])
else:
useMagic(p, "nimCopy")
diff --git a/tests/js/t9410.nim b/tests/js/t9410.nim
index 9aca6d45b..78c329a24 100644
--- a/tests/js/t9410.nim
+++ b/tests/js/t9410.nim
@@ -1,13 +1,3 @@
-template doAssert(exp: untyped) =
- when defined(echot9410):
- let r = exp
- echo $(instantiationInfo().line) & ":\n " & astToStr(exp) & "\n was " & repr(r)
- when not defined(noassertt9410):
- system.doAssert r
- else:
- when not defined(noassertt9410):
- system.doAssert exp
-
template tests =
block:
var i = 0
@@ -428,6 +418,33 @@ template tests =
let xptr2 = cast[type(xptr)](p2)
doAssert xptr == xptr2
+
+ block: # var types
+ block t10202:
+ type Point = object
+ x: float
+ y: float
+
+ var points: seq[Point]
+
+ points.add(Point(x:1, y:2))
+
+ for i, p in points.mpairs:
+ p.x += 1
+
+ doAssert points[0].x == 2
+
+ block:
+ var ints = @[1, 2, 3]
+ for i, val in mpairs ints:
+ val *= 10
+ doAssert ints == @[10, 20, 30]
+
+ block:
+ var seqOfSeqs = @[@[1, 2], @[3, 4]]
+ for i, val in mpairs seqOfSeqs:
+ val[0] *= 10
+ doAssert seqOfSeqs == @[@[10, 2], @[30, 4]]
when false:
block: # openarray
--
cgit 1.4.1-2-gfad0
From 40115cd6458457d071600526aa1037eaffe99f79 Mon Sep 17 00:00:00 2001
From: Araq <rumpf_a@web.de>
Date: Sun, 13 Jan 2019 13:30:01 +0100
Subject: improve error messages quality for '.push: raises []'
---
compiler/pragmas.nim | 7 +++++++
1 file changed, 7 insertions(+)
(limited to 'compiler')
diff --git a/compiler/pragmas.nim b/compiler/pragmas.nim
index 4adf6032b..3967fa22d 100644
--- a/compiler/pragmas.nim
+++ b/compiler/pragmas.nim
@@ -1123,7 +1123,14 @@ proc singlePragma(c: PContext, sym: PSym, n: PNode, i: var int,
else:
invalidPragma(c, it)
+proc overwriteLineInfo(n: PNode; info: TLineInfo) =
+ n.info = info
+ for i in 0..<safeLen(n):
+ overwriteLineInfo(n[i], info)
+
proc mergePragmas(n, pragmas: PNode) =
+ var pragmas = copyTree(pragmas)
+ overwriteLineInfo pragmas, n.info
if n[pragmasPos].kind == nkEmpty:
n[pragmasPos] = pragmas
else:
--
cgit 1.4.1-2-gfad0
From 0c10fc67eb259ede0de4501cee5fe81463064294 Mon Sep 17 00:00:00 2001
From: Araq <rumpf_a@web.de>
Date: Sun, 13 Jan 2019 14:05:09 +0100
Subject: fixes #10104
---
compiler/vm.nim | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
(limited to 'compiler')
diff --git a/compiler/vm.nim b/compiler/vm.nim
index e2586e615..c001981f8 100644
--- a/compiler/vm.nim
+++ b/compiler/vm.nim
@@ -85,7 +85,7 @@ proc stackTraceAux(c: PCtx; x: PStackFrame; pc: int; recursionLimit=100) =
add(s, x.prc.name.s)
msgWriteln(c.config, s)
-proc stackTrace(c: PCtx, tos: PStackFrame, pc: int,
+proc stackTraceImpl(c: PCtx, tos: PStackFrame, pc: int,
msg: string, lineInfo: TLineInfo) =
msgWriteln(c.config, "stack trace: (most recent call last)")
stackTraceAux(c, tos, pc)
@@ -93,8 +93,14 @@ proc stackTrace(c: PCtx, tos: PStackFrame, pc: int,
if c.mode == emRepl: globalError(c.config, lineInfo, msg)
else: localError(c.config, lineInfo, msg)
-proc stackTrace(c: PCtx, tos: PStackFrame, pc: int, msg: string) =
- stackTrace(c, tos, pc, msg, c.debug[pc])
+template stackTrace(c: PCtx, tos: PStackFrame, pc: int,
+ msg: string, lineInfo: TLineInfo) =
+ stackTraceImpl(c, tos, pc, msg, lineInfo)
+ return
+
+template stackTrace(c: PCtx, tos: PStackFrame, pc: int, msg: string) =
+ stackTraceImpl(c, tos, pc, msg, c.debug[pc])
+ return
proc bailOut(c: PCtx; tos: PStackFrame) =
stackTrace(c, tos, c.exceptionInstr, "unhandled exception: " &
@@ -955,13 +961,13 @@ proc rawExecute(c: PCtx, start: int, tos: PStackFrame): TFullReg =
decodeBC(rkInt)
let a = regs[rb].node
let b = regs[rc].node
- if a.kind == nkSym and a.sym.kind in skProcKinds and
+ if a.kind == nkSym and a.sym.kind in skProcKinds and
b.kind == nkSym and b.sym.kind in skProcKinds:
regs[ra].intVal =
if sfFromGeneric in a.sym.flags and a.sym.owner == b.sym: 1
else: 0
- else:
- stackTrace(c, tos, pc, "node is not a proc symbol")
+ else:
+ stackTrace(c, tos, pc, "node is not a proc symbol")
of opcEcho:
let rb = instr.regB
if rb == 1:
--
cgit 1.4.1-2-gfad0
From ab99bdfc408e56a2e8a1a3ada21effe983433851 Mon Sep 17 00:00:00 2001
From: Araq <rumpf_a@web.de>
Date: Sun, 13 Jan 2019 14:56:50 +0100
Subject: fixes #10136
---
compiler/semexprs.nim | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'compiler')
diff --git a/compiler/semexprs.nim b/compiler/semexprs.nim
index 8852cb653..657df36dd 100644
--- a/compiler/semexprs.nim
+++ b/compiler/semexprs.nim
@@ -403,8 +403,8 @@ proc semIs(c: PContext, n: PNode, flags: TExprFlags): PNode =
n[1] = makeTypeSymNode(c, lhsType, n[1].info)
lhsType = n[1].typ
else:
- internalAssert c.config, lhsType.base.kind != tyNone
- if c.inGenericContext > 0 and lhsType.base.containsGenericType:
+ if lhsType.base.kind == tyNone or
+ (c.inGenericContext > 0 and lhsType.base.containsGenericType):
# BUGFIX: don't evaluate this too early: ``T is void``
return
--
cgit 1.4.1-2-gfad0
From aa7ad8897895acaee9e2999652050d5bc52921a7 Mon Sep 17 00:00:00 2001
From: Araq <rumpf_a@web.de>
Date: Sun, 13 Jan 2019 15:52:50 +0100
Subject: fixes #10075 [backport]
---
compiler/sigmatch.nim | 3 +--
tests/macros/tvarargsuntyped.nim | 31 ++++++++++++++++++++++++++++++-
2 files changed, 31 insertions(+), 3 deletions(-)
(limited to 'compiler')
diff --git a/compiler/sigmatch.nim b/compiler/sigmatch.nim
index 0915f303b..9aae254f3 100644
--- a/compiler/sigmatch.nim
+++ b/compiler/sigmatch.nim
@@ -2267,8 +2267,7 @@ proc matchesAux(c: PContext, n, nOrig: PNode,
if n.sons[a].kind == nkHiddenStdConv:
doAssert n.sons[a].sons[0].kind == nkEmpty and
- n.sons[a].sons[1].kind == nkArgList and
- n.sons[a].sons[1].len == 0
+ n.sons[a].sons[1].kind in {nkBracket, nkArgList}
# Steal the container and pass it along
setSon(m.call, formal.position + 1, n.sons[a].sons[1])
else:
diff --git a/tests/macros/tvarargsuntyped.nim b/tests/macros/tvarargsuntyped.nim
index 657ed47d6..f0fcff662 100644
--- a/tests/macros/tvarargsuntyped.nim
+++ b/tests/macros/tvarargsuntyped.nim
@@ -3,7 +3,9 @@ discard """
(left: 2, r: 7, x: 8, height: 4, s: test, width: 3, y: 9, top: 1, g: 7, b: 8)
(left: 2, r: 7, x: 8, height: 4, s: text, width: 3, y: 9, top: 1, g: 7, b: 8)
(left: 2, r: 7, x: 8, height: 4, s: text, width: 3, y: 9, top: 4, g: 7, b: 8)
-(left: 2, r: 7, x: 8, height: 4, s: test, width: 3, y: 9, top: 1, g: 7, b: 8)'''
+(left: 2, r: 7, x: 8, height: 4, s: test, width: 3, y: 9, top: 1, g: 7, b: 8)
+10
+hello 18.0'''
"""
import macros
@@ -78,3 +80,30 @@ let width: cint = 3
let height: cint = 4
bar(rect(top, left, width, height), "test", point(8, 9), color(7,7,8))
+
+
+# bug #10075
+
+import macros
+
+proc convert_hidden_stdconv(args: NimNode): NimNode =
+ var n = args
+ while n.len == 1 and n[0].kind == nnkHiddenStdConv:
+ n = n[0][1]
+ return n
+
+macro t2(s: int, v: varargs[untyped]): untyped =
+ let v = convert_hidden_stdconv(v)
+ echo v.treeRepr
+ let (v1, v2) = (v[0], v[1])
+ quote do:
+ echo `v1`, " ", `v2`
+
+template t1(s: int, v: varargs[typed]) =
+ #static:
+ # dumpTree v
+ echo s
+ t2(s, v)
+
+when isMainModule:
+ t1(10, "hello", 18.0)
--
cgit 1.4.1-2-gfad0
From c707267212a8e5cd5056296acf6502d58c9e5de9 Mon Sep 17 00:00:00 2001
From: genotrance <dev@genotrance.com>
Date: Mon, 14 Jan 2019 02:26:10 -0600
Subject: Add stdin read support to nimscrit #3983 (#10292)
---
compiler/scriptconfig.nim | 15 ++++++++++++---
lib/system/nimscript.nim | 29 ++++++++++++++++++++++++++---
2 files changed, 38 insertions(+), 6 deletions(-)
(limited to 'compiler')
diff --git a/compiler/scriptconfig.nim b/compiler/scriptconfig.nim
index e3a9478d1..db60dafcc 100644
--- a/compiler/scriptconfig.nim
+++ b/compiler/scriptconfig.nim
@@ -42,15 +42,18 @@ proc setupVM*(module: PSym; cache: IdentCache; scriptName: string;
proc (a: VmArgs) =
body
- template cbos(name, body) {.dirty.} =
+ template cbexc(name, exc, body) {.dirty.} =
result.registerCallback "stdlib.system." & astToStr(name),
proc (a: VmArgs) =
errorMsg = ""
try:
body
- except OSError:
+ except exc:
errorMsg = getCurrentExceptionMsg()
+ template cbos(name, body) {.dirty.} =
+ cbexc(name, OSError, body)
+
# Idea: Treat link to file as a file, but ignore link to directory to prevent
# endless recursions out of the box.
cbos listFiles:
@@ -64,7 +67,7 @@ proc setupVM*(module: PSym; cache: IdentCache; scriptName: string;
cbos createDir:
os.createDir getString(a, 0)
- result.registerCallback "stdlib.system.getOsError",
+ result.registerCallback "stdlib.system.getError",
proc (a: VmArgs) = setResult(a, errorMsg)
cbos setCurrentDir:
@@ -157,6 +160,12 @@ proc setupVM*(module: PSym; cache: IdentCache; scriptName: string;
setResult(a, os.getAppFilename())
cbconf cppDefine:
options.cppDefine(conf, a.getString(0))
+ cbexc stdinReadLine, EOFError:
+ setResult(a, "")
+ setResult(a, stdin.readLine())
+ cbexc stdinReadAll, EOFError:
+ setResult(a, "")
+ setResult(a, stdin.readAll())
proc runNimScript*(cache: IdentCache; scriptName: AbsoluteFile;
freshDefines=true; conf: ConfigRef) =
diff --git a/lib/system/nimscript.nim b/lib/system/nimscript.nim
index ae97e88fa..e879fda83 100644
--- a/lib/system/nimscript.nim
+++ b/lib/system/nimscript.nim
@@ -46,7 +46,7 @@ proc copyDir(src, dest: string) {.
tags: [ReadIOEffect, WriteIOEffect], raises: [OSError].} = builtin
proc createDir(dir: string) {.tags: [WriteIOEffect], raises: [OSError].} =
builtin
-proc getOsError: string = builtin
+proc getError: string = builtin
proc setCurrentDir(dir: string) = builtin
proc getCurrentDir*(): string =
## Retrieves the current working directory.
@@ -178,9 +178,12 @@ var
mode*: ScriptMode ## Set this to influence how mkDir, rmDir, rmFile etc.
## behave
+template checkError(exc: untyped): untyped =
+ let err = getError()
+ if err.len > 0: raise newException(exc, err)
+
template checkOsError =
- let err = getOsError()
- if err.len > 0: raise newException(OSError, err)
+ checkError(OSError)
template log(msg: string, body: untyped) =
if mode in {ScriptMode.Verbose, ScriptMode.Whatif}:
@@ -332,6 +335,26 @@ proc cppDefine*(define: string) =
## needs to be mangled.
builtin
+proc stdinReadLine(): TaintedString {.
+ tags: [ReadIOEffect], raises: [IOError].} =
+ builtin
+
+proc stdinReadAll(): TaintedString {.
+ tags: [ReadIOEffect], raises: [IOError].} =
+ builtin
+
+proc readLineFromStdin*(): TaintedString {.raises: [IOError].} =
+ ## Reads a line of data from stdin - blocks until \n or EOF which happens when stdin is closed
+ log "readLineFromStdin":
+ result = stdinReadLine()
+ checkError(EOFError)
+
+proc readAllFromStdin*(): TaintedString {.raises: [IOError].} =
+ ## Reads all data from stdin - blocks until EOF which happens when stdin is closed
+ log "readAllFromStdin":
+ result = stdinReadAll()
+ checkError(EOFError)
+
when not defined(nimble):
template `==?`(a, b: string): bool = cmpIgnoreStyle(a, b) == 0
template task*(name: untyped; description: string; body: untyped): untyped =
--
cgit 1.4.1-2-gfad0
From 825e08b04603a3839ba6d0b915aedfb08418b7d3 Mon Sep 17 00:00:00 2001
From: Araq <rumpf_a@web.de>
Date: Mon, 14 Jan 2019 12:15:29 +0100
Subject: fixes #7524
---
compiler/parampatterns.nim | 15 +++++++--------
compiler/semtypes.nim | 7 ++++++-
tests/trmacros/trmacros_various2.nim | 10 ++++++++++
3 files changed, 23 insertions(+), 9 deletions(-)
(limited to 'compiler')
diff --git a/compiler/parampatterns.nim b/compiler/parampatterns.nim
index bbaf7a069..db79e3eb9 100644
--- a/compiler/parampatterns.nim
+++ b/compiler/parampatterns.nim
@@ -115,20 +115,19 @@ proc compileConstraints(p: PNode, result: var TPatternCode; conf: ConfigRef) =
else:
patternError(p, conf)
-proc semNodeKindConstraints*(p: PNode; conf: ConfigRef): PNode =
+proc semNodeKindConstraints*(n: PNode; conf: ConfigRef; start: Natural): PNode =
## does semantic checking for a node kind pattern and compiles it into an
## efficient internal format.
- assert p.kind == nkCurlyExpr
- result = newNodeI(nkStrLit, p.info)
+ result = newNodeI(nkStrLit, n.info)
result.strVal = newStringOfCap(10)
result.strVal.add(chr(aqNone.ord))
- if p.len >= 2:
- for i in 1..<p.len:
- compileConstraints(p.sons[i], result.strVal, conf)
+ if n.len >= 2:
+ for i in start..<n.len:
+ compileConstraints(n[i], result.strVal, conf)
if result.strVal.len > MaxStackSize-1:
- internalError(conf, p.info, "parameter pattern too complex")
+ internalError(conf, n.info, "parameter pattern too complex")
else:
- patternError(p, conf)
+ patternError(n, conf)
result.strVal.add(ppEof)
type
diff --git a/compiler/semtypes.nim b/compiler/semtypes.nim
index f4936a71a..7056eab5f 100644
--- a/compiler/semtypes.nim
+++ b/compiler/semtypes.nim
@@ -1028,7 +1028,12 @@ proc liftParamType(c: PContext, procKind: TSymKind, genericParams: PNode,
proc semParamType(c: PContext, n: PNode, constraint: var PNode): PType =
if n.kind == nkCurlyExpr:
result = semTypeNode(c, n.sons[0], nil)
- constraint = semNodeKindConstraints(n, c.config)
+ constraint = semNodeKindConstraints(n, c.config, 1)
+ elif n.kind == nkCall and
+ n[0].kind in {nkIdent, nkSym, nkOpenSymChoice, nkClosedSymChoice} and
+ considerQuotedIdent(c, n[0]).s == "{}":
+ result = semTypeNode(c, n[1], nil)
+ constraint = semNodeKindConstraints(n, c.config, 2)
else:
result = semTypeNode(c, n, nil)
diff --git a/tests/trmacros/trmacros_various2.nim b/tests/trmacros/trmacros_various2.nim
index d500c49de..c1367cb1b 100644
--- a/tests/trmacros/trmacros_various2.nim
+++ b/tests/trmacros/trmacros_various2.nim
@@ -77,3 +77,13 @@ block tstar:
# check that it's been optimized properly:
doAssert calls == 1
+
+# bug #7524
+template in_to_out(typIn, typOut: typedesc) =
+ proc to_out(x: typIn{lit}): typOut = result = ord(x)
+
+# Generating the proc via template doesn't work
+in_to_out(char, int)
+
+# This works
+proc to_out2(x: char{lit}): int = result = ord(x)
--
cgit 1.4.1-2-gfad0
From d69a7842fa0836ca18b8057a33bca81a771a9e5a Mon Sep 17 00:00:00 2001
From: Araq <rumpf_a@web.de>
Date: Mon, 14 Jan 2019 12:36:34 +0100
Subject: fixes #7878
---
compiler/ccgexprs.nim | 2 +-
tests/stdlib/trepr.nim | 11 ++++++++++-
2 files changed, 11 insertions(+), 2 deletions(-)
(limited to 'compiler')
diff --git a/compiler/ccgexprs.nim b/compiler/ccgexprs.nim
index d00371dd8..ed6255004 100644
--- a/compiler/ccgexprs.nim
+++ b/compiler/ccgexprs.nim
@@ -1501,7 +1501,7 @@ proc genRepr(p: BProc, e: PNode, d: var TLoc) =
addrLoc(p.config, a), genTypeInfo(p.module, t, e.info)]), a.storage)
of tyOpenArray, tyVarargs:
var b: TLoc
- case a.t.kind
+ case skipTypes(a.t, abstractVarRange).kind
of tyOpenArray, tyVarargs:
putIntoDest(p, b, e, "$1, $1Len_0" % [rdLoc(a)], a.storage)
of tyString, tySequence:
diff --git a/tests/stdlib/trepr.nim b/tests/stdlib/trepr.nim
index 33cb581ef..c1941bd38 100644
--- a/tests/stdlib/trepr.nim
+++ b/tests/stdlib/trepr.nim
@@ -1,5 +1,6 @@
discard """
- output: "{a, b}{'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z'}"
+ output: '''{a, b}{'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z'}
+[1, 2, 3, 4, 5, 6]'''
"""
type
@@ -25,3 +26,11 @@ when false:
# "a", "b", "c", "d", "e"
#]
#echo(repr(testseq))
+
+# bug #7878
+proc test(variable: var openarray[int]) =
+ echo repr(variable)
+
+var arr = [1, 2, 3, 4, 5, 6]
+
+test(arr)
--
cgit 1.4.1-2-gfad0
From e17321aa2429c6bed97bef28a149fd21166b90a2 Mon Sep 17 00:00:00 2001
From: Timothee Cour <timothee.cour2@gmail.com>
Date: Sat, 12 Jan 2019 15:51:44 -0800
Subject: improve formatting in assertEquals
---
compiler/unittest_light.nim | 15 ++++++++-------
tests/compiler/tunittest_light.nim | 22 +++++++++++-----------
2 files changed, 19 insertions(+), 18 deletions(-)
(limited to 'compiler')
diff --git a/compiler/unittest_light.nim b/compiler/unittest_light.nim
index bcba6f7c7..d9842b399 100644
--- a/compiler/unittest_light.nim
+++ b/compiler/unittest_light.nim
@@ -14,8 +14,8 @@ proc mismatch*[T](lhs: T, rhs: T): string =
proc quoted(s: string): string = result.addQuoted s
result.add "\n"
- result.add "lhs:{\n" & replaceInvisible(
- $lhs) & "}\nrhs:{\n" & replaceInvisible($rhs) & "}\n"
+ result.add "lhs:{" & replaceInvisible(
+ $lhs) & "}\nrhs:{" & replaceInvisible($rhs) & "}\n"
when compiles(lhs.len):
if lhs.len != rhs.len:
result.add "lhs.len: " & $lhs.len & " rhs.len: " & $rhs.len & "\n"
@@ -26,12 +26,13 @@ proc mismatch*[T](lhs: T, rhs: T): string =
i.inc
result.add "first mismatch index: " & $i & "\n"
if i < lhs.len and i < rhs.len:
- result.add "lhs[i]: {" & quoted($lhs[i]) & "} rhs[i]: {" & quoted(
- $rhs[i]) & "}"
- result.add "lhs[0..<i]:{\n" & replaceInvisible($lhs[
- 0..<i]) & "}\nrhs[0..<i]:{\n" & replaceInvisible($rhs[0..<i]) & "}"
+ result.add "lhs[i]: {" & quoted($lhs[i]) & "}\nrhs[i]: {" & quoted(
+ $rhs[i]) & "}\n"
+ result.add "lhs[0..<i]:{" & replaceInvisible($lhs[
+ 0..<i]) & "}"
proc assertEquals*[T](lhs: T, rhs: T) =
when false: # can be useful for debugging to see all that's fed to this.
echo "----" & $lhs
- doAssert lhs==rhs, mismatch(lhs, rhs)
+ if lhs!=rhs:
+ doAssert false, mismatch(lhs, rhs)
diff --git a/tests/compiler/tunittest_light.nim b/tests/compiler/tunittest_light.nim
index d20293d5b..422474002 100644
--- a/tests/compiler/tunittest_light.nim
+++ b/tests/compiler/tunittest_light.nim
@@ -24,17 +24,16 @@ proc testMismatch() =
"""
- doAssert mismatch(a, b) == """
+ let output = mismatch(a, b)
+ let expected = """
-lhs:{
- some test with space at the end of lines \n
+lhs:{ some test with space at the end of lines \n
\n
can be hard to spot differences when diffing in a terminal \n
without this helper function\n
\n
}
-rhs:{
- some test with space at the end of lines \n
+rhs:{ some test with space at the end of lines \n
\n
can be hard to spot differences when diffing in a terminal \n
without this helper function\n
@@ -42,14 +41,15 @@ rhs:{
}
lhs.len: 144 rhs.len: 143
first mismatch index: 110
-lhs[i]: {" "} rhs[i]: {"\n"}lhs[0..<i]:{
- some test with space at the end of lines \n
-\n
- can be hard to spot differences when diffing in a terminal }
-rhs[0..<i]:{
- some test with space at the end of lines \n
+lhs[i]: {" "}
+rhs[i]: {"\n"}
+lhs[0..<i]:{ some test with space at the end of lines \n
\n
can be hard to spot differences when diffing in a terminal }"""
+ if output != expected:
+ echo output
+ doAssert false
+
testMismatch()
testAssertEquals()
--
cgit 1.4.1-2-gfad0
From 0a8762eb7b4b3c00cb78a40430f51080913a9ee6 Mon Sep 17 00:00:00 2001
From: Timothee Cour <timothee.cour2@gmail.com>
Date: Sat, 12 Jan 2019 15:26:22 -0800
Subject: fix #9842 #9951: `nim -r` and parseopt.cmdLineRest are now correct
---
compiler/lineinfos.nim | 2 +-
lib/pure/parseopt.nim | 24 +--------
tests/misc/tparseopt.nim | 136 ++++++++++++++++++++++++++++++++---------------
3 files changed, 94 insertions(+), 68 deletions(-)
(limited to 'compiler')
diff --git a/compiler/lineinfos.nim b/compiler/lineinfos.nim
index 21ce44406..165d75821 100644
--- a/compiler/lineinfos.nim
+++ b/compiler/lineinfos.nim
@@ -171,7 +171,7 @@ proc computeNotesVerbosity(): array[0..3, TNoteKinds] =
warnGcUnsafe, hintPath, hintDependency, hintCodeBegin, hintCodeEnd,
hintSource, hintGlobalVar, hintGCStats}
result[0] = result[1] - {hintSuccessX, hintSuccess, hintConf,
- hintProcessing, hintPattern, hintExecuting, hintLinking}
+ hintProcessing, hintPattern, hintExecuting, hintLinking, hintCC}
const
NotesVerbosity* = computeNotesVerbosity()
diff --git a/lib/pure/parseopt.nim b/lib/pure/parseopt.nim
index eba915604..06f32f032 100644
--- a/lib/pure/parseopt.nim
+++ b/lib/pure/parseopt.nim
@@ -73,24 +73,6 @@ proc parseWord(s: string, i: int, w: var string,
inc(result)
when declared(os.paramCount):
- proc quote(s: string): string =
- if find(s, {' ', '\t'}) >= 0 and s.len > 0 and s[0] != '"':
- if s[0] == '-':
- result = newStringOfCap(s.len)
- var i = parseWord(s, 0, result, {' ', '\t', ':', '='})
- if i < s.len and s[i] in {':','='}:
- result.add s[i]
- inc i
- result.add '"'
- while i < s.len:
- result.add s[i]
- inc i
- result.add '"'
- else:
- result = '"' & s & '"'
- else:
- result = s
-
# we cannot provide this for NimRtl creation on Posix, because we can't
# access the command line arguments then!
@@ -228,11 +210,7 @@ proc next*(p: var OptParser) {.rtl, extern: "npo$1".} =
when declared(os.paramCount):
proc cmdLineRest*(p: OptParser): TaintedString {.rtl, extern: "npo$1".} =
## retrieves the rest of the command line that has not been parsed yet.
- var res = ""
- for i in p.idx..<p.cmds.len:
- if i > p.idx: res.add ' '
- res.add quote(p.cmds[i])
- result = res.TaintedString
+ result = p.cmds[p.idx .. ^1].quoteShellCommand.TaintedString
proc remainingArgs*(p: OptParser): seq[TaintedString] {.rtl, extern: "npo$1".} =
## retrieves the rest of the command line that has not been parsed yet.
diff --git a/tests/misc/tparseopt.nim b/tests/misc/tparseopt.nim
index cbed5d476..39c17869c 100644
--- a/tests/misc/tparseopt.nim
+++ b/tests/misc/tparseopt.nim
@@ -30,54 +30,102 @@ kind: cmdLongOption key:val -- debug:3
kind: cmdShortOption key:val -- l:4
kind: cmdShortOption key:val -- r:2'''
"""
-from parseopt import nil
-from parseopt2 import nil
+when defined(testament_tparseopt):
+ import os
+ proc main() =
+ let args = commandLineParams()
+ echo args
+ for i, ai in args:
+ echo "arg ", i, " ai.len:", ai.len, " :{", ai, "}"
+ main()
+else:
+ from parseopt import nil
+ from parseopt2 import nil
-block:
- echo "parseopt"
- for kind, key, val in parseopt.getopt():
- echo "kind: ", kind, "\tkey:val -- ", key, ":", val
+ block:
+ echo "parseopt"
+ for kind, key, val in parseopt.getopt():
+ echo "kind: ", kind, "\tkey:val -- ", key, ":", val
- # pass custom cmdline arguments
- echo "first round"
- var argv = "--left --debug:3 -l=4 -r:2"
- var p = parseopt.initOptParser(argv)
- for kind, key, val in parseopt.getopt(p):
- echo "kind: ", kind, "\tkey:val -- ", key, ":", val
- break
- # reset getopt iterator and check arguments are returned correctly.
- echo "second round"
- for kind, key, val in parseopt.getopt(p):
- echo "kind: ", kind, "\tkey:val -- ", key, ":", val
+ # pass custom cmdline arguments
+ echo "first round"
+ var argv = "--left --debug:3 -l=4 -r:2"
+ var p = parseopt.initOptParser(argv)
+ for kind, key, val in parseopt.getopt(p):
+ echo "kind: ", kind, "\tkey:val -- ", key, ":", val
+ break
+ # reset getopt iterator and check arguments are returned correctly.
+ echo "second round"
+ for kind, key, val in parseopt.getopt(p):
+ echo "kind: ", kind, "\tkey:val -- ", key, ":", val
- # bug #9619
- var x = parseopt.initOptParser(@["--foo:", "--path"], allowWhitespaceAfterColon = false)
- for kind, key, val in parseopt.getopt(x):
- echo kind, " ", key
+ # bug #9619
+ var x = parseopt.initOptParser(@["--foo:", "--path"],
+ allowWhitespaceAfterColon = false)
+ for kind, key, val in parseopt.getopt(x):
+ echo kind, " ", key
-block:
- echo "parseoptNoVal"
- # test NoVal mode with custom cmdline arguments
- var argv = "--left --debug:3 -l -r:2 --debug 2 --debug=1 -r1 -r=0 -lr4"
- var p = parseopt.initOptParser(argv,
- shortNoVal = {'l'}, longNoVal = @["left"])
- for kind, key, val in parseopt.getopt(p):
- echo "kind: ", kind, "\tkey:val -- ", key, ":", val
+ block:
+ echo "parseoptNoVal"
+ # test NoVal mode with custom cmdline arguments
+ var argv = "--left --debug:3 -l -r:2 --debug 2 --debug=1 -r1 -r=0 -lr4"
+ var p = parseopt.initOptParser(argv,
+ shortNoVal = {'l'}, longNoVal = @["left"])
+ for kind, key, val in parseopt.getopt(p):
+ echo "kind: ", kind, "\tkey:val -- ", key, ":", val
-block:
- echo "parseopt2"
- for kind, key, val in parseopt2.getopt():
- echo "kind: ", kind, "\tkey:val -- ", key, ":", val
+ block:
+ echo "parseopt2"
+ for kind, key, val in parseopt2.getopt():
+ echo "kind: ", kind, "\tkey:val -- ", key, ":", val
- # pass custom cmdline arguments
- echo "first round"
- var argv: seq[string] = @["--left", "--debug:3", "-l=4", "-r:2"]
- var p = parseopt2.initOptParser(argv)
- for kind, key, val in parseopt2.getopt(p):
- echo "kind: ", kind, "\tkey:val -- ", key, ":", val
- break
- # reset getopt iterator and check arguments are returned correctly.
- echo "second round"
- for kind, key, val in parseopt2.getopt(p):
- echo "kind: ", kind, "\tkey:val -- ", key, ":", val
+ # pass custom cmdline arguments
+ echo "first round"
+ var argv: seq[string] = @["--left", "--debug:3", "-l=4", "-r:2"]
+ var p = parseopt2.initOptParser(argv)
+ for kind, key, val in parseopt2.getopt(p):
+ echo "kind: ", kind, "\tkey:val -- ", key, ":", val
+ break
+ # reset getopt iterator and check arguments are returned correctly.
+ echo "second round"
+ for kind, key, val in parseopt2.getopt(p):
+ echo "kind: ", kind, "\tkey:val -- ", key, ":", val
+
+ import osproc, os, strutils
+ from stdtest/specialpaths import buildDir
+ import "../.." / compiler/unittest_light
+
+ block: # fix #9951
+ var p = parseopt.initOptParser(@["echo \"quoted\""])
+ assertEquals parseopt.cmdLineRest(p), """'echo "quoted"'"""
+ let args = @["a1b", "a2 b", "", "a4\"b", "a5'b", r"a6\b", "a7\'b"]
+ var p2 = parseopt.initOptParser(args)
+ assertEquals parseopt.cmdLineRest(p2),
+ """a1b 'a2 b' '' 'a4"b' 'a5'"'"'b' 'a6\b' 'a7'"'"'b'"""
+ doAssert "a5'b" == "a5\'b"
+
+ block: # fix #9842
+ let exe = buildDir / "D20190112T145450".addFileExt(ExeExt)
+ defer: removeFile exe
+ let args = @["a1b", "a2 b", "", "a4\"b", "a5'b", r"a6\b", "a7\'b"]
+ let cmd = "$# c -r --verbosity:0 -o:$# -d:testament_tparseopt $# $#" %
+ [getCurrentCompilerExe(), exe, currentSourcePath(),
+ args.quoteShellCommand]
+ var ret = execCmdEx(cmd, options = {})
+ if ret.exitCode != 0:
+ # before bug fix, running cmd would show:
+ # sh: -c: line 0: unexpected EOF while looking for matching `"'\n
+ echo "exitCode: ", ret.exitCode, " cmd:", cmd
+ doAssert false
+ stripLineEnd(ret.output)
+ assertEquals ret.output,
+ """
+@["a1b", "a2 b", "", "a4\"b", "a5\'b", "a6\\b", "a7\'b"]
+arg 0 ai.len:3 :{a1b}
+arg 1 ai.len:4 :{a2 b}
+arg 2 ai.len:0 :{}
+arg 3 ai.len:4 :{a4"b}
+arg 4 ai.len:4 :{a5'b}
+arg 5 ai.len:4 :{a6\b}
+arg 6 ai.len:4 :{a7'b}"""
--
cgit 1.4.1-2-gfad0
From 8922063bd84e9109a5ba493188f201ebda74f66d Mon Sep 17 00:00:00 2001
From: Neelesh Chandola <neelesh.chandola@outlook.com>
Date: Tue, 15 Jan 2019 12:38:12 +0530
Subject: typed/untyped return type is invalid for everything except templates
and macros (#10275)
---
compiler/semstmts.nim | 3 ---
compiler/semtypes.nim | 7 +++++--
tests/proc/tillegalreturntype.nim | 12 ++++++++++++
3 files changed, 17 insertions(+), 5 deletions(-)
create mode 100644 tests/proc/tillegalreturntype.nim
(limited to 'compiler')
diff --git a/compiler/semstmts.nim b/compiler/semstmts.nim
index 12283e042..3fdbb85db 100644
--- a/compiler/semstmts.nim
+++ b/compiler/semstmts.nim
@@ -1253,9 +1253,6 @@ proc semTypeSection(c: PContext, n: PNode): PNode =
proc semParamList(c: PContext, n, genericParams: PNode, s: PSym) =
s.typ = semProcTypeNode(c, n, genericParams, nil, s.kind)
- if s.kind notin {skMacro, skTemplate}:
- if s.typ.sons[0] != nil and s.typ.sons[0].kind == tyStmt:
- localError(c.config, n.info, "invalid return type: 'stmt'")
proc addParams(c: PContext, n: PNode, kind: TSymKind) =
for i in countup(1, sonsLen(n)-1):
diff --git a/compiler/semtypes.nim b/compiler/semtypes.nim
index 7056eab5f..ddc42c5b4 100644
--- a/compiler/semtypes.nim
+++ b/compiler/semtypes.nim
@@ -1158,12 +1158,15 @@ proc semProcTypeNode(c: PContext, n, genericParams: PNode,
# turn explicit 'void' return type into 'nil' because the rest of the
# compiler only checks for 'nil':
if skipTypes(r, {tyGenericInst, tyAlias, tySink}).kind != tyVoid:
+ if kind notin {skMacro, skTemplate} and r.kind in {tyStmt, tyExpr}:
+ localError(c.config, n.sons[0].info, "return type '" & typeToString(r) &
+ "' is only valid for macros and templates")
# 'auto' as a return type does not imply a generic:
- if r.kind == tyAnything:
+ elif r.kind == tyAnything:
# 'p(): auto' and 'p(): expr' are equivalent, but the rest of the
# compiler is hardly aware of 'auto':
r = newTypeS(tyExpr, c)
- elif r.kind != tyExpr:
+ else:
if r.sym == nil or sfAnon notin r.sym.flags:
let lifted = liftParamType(c, kind, genericParams, r, "result",
n.sons[0].info)
diff --git a/tests/proc/tillegalreturntype.nim b/tests/proc/tillegalreturntype.nim
new file mode 100644
index 000000000..be9e2147e
--- /dev/null
+++ b/tests/proc/tillegalreturntype.nim
@@ -0,0 +1,12 @@
+discard """
+ cmd: "nim check $file"
+ errmsg: ""
+ nimout: '''tillegalreturntype.nim(8, 11) Error: return type 'typed' is only valid for macros and templates
+tillegalreturntype.nim(11, 11) Error: return type 'untyped' is only valid for macros and templates'''
+"""
+
+proc x(): typed =
+ discard
+
+proc y(): untyped =
+ discard
--
cgit 1.4.1-2-gfad0
From 05c52ff34f996bb44425bcc17ae3ae60ed896bef Mon Sep 17 00:00:00 2001
From: Andreas Rumpf <rumpf_a@web.de>
Date: Tue, 15 Jan 2019 10:15:27 +0100
Subject: fixes #10203 (#10290)
* fixes #10203
* make typredef test green again
* fixes the regressions differently
---
compiler/semtypes.nim | 28 +++++++++++++---------------
compiler/types.nim | 2 +-
tests/objects/tobject.nim | 20 ++++++++++++++++++++
3 files changed, 34 insertions(+), 16 deletions(-)
(limited to 'compiler')
diff --git a/compiler/semtypes.nim b/compiler/semtypes.nim
index ddc42c5b4..c28902b1f 100644
--- a/compiler/semtypes.nim
+++ b/compiler/semtypes.nim
@@ -1318,7 +1318,19 @@ proc semGeneric(c: PContext, n: PNode, s: PSym, prev: PType): PType =
if tx != result and tx.kind == tyObject and tx.sons[0] != nil:
semObjectTypeForInheritedGenericInst(c, n, tx)
-proc maybeAliasType(c: PContext; typeExpr, prev: PType): PType
+proc maybeAliasType(c: PContext; typeExpr, prev: PType): PType =
+ if typeExpr.kind in {tyObject, tyEnum, tyDistinct, tyForward} and prev != nil:
+ result = newTypeS(tyAlias, c)
+ result.rawAddSon typeExpr
+ result.sym = prev.sym
+ assignType(prev, result)
+
+proc fixupTypeOf(c: PContext, prev: PType, typExpr: PNode) =
+ if prev != nil:
+ let result = newTypeS(tyAlias, c)
+ result.rawAddSon typExpr.typ
+ result.sym = prev.sym
+ assignType(prev, result)
proc semTypeExpr(c: PContext, n: PNode; prev: PType): PType =
var n = semExprWithType(c, n, {efDetermineType})
@@ -1422,20 +1434,6 @@ proc semProcTypeWithScope(c: PContext, n: PNode,
when useEffectSystem: setEffectsForProcType(c.graph, result, n.sons[1])
closeScope(c)
-proc maybeAliasType(c: PContext; typeExpr, prev: PType): PType =
- if typeExpr.kind in {tyObject, tyEnum, tyDistinct} and prev != nil:
- result = newTypeS(tyAlias, c)
- result.rawAddSon typeExpr
- result.sym = prev.sym
- assignType(prev, result)
-
-proc fixupTypeOf(c: PContext, prev: PType, typExpr: PNode) =
- if prev != nil:
- let result = newTypeS(tyAlias, c)
- result.rawAddSon typExpr.typ
- result.sym = prev.sym
- assignType(prev, result)
-
proc symFromExpectedTypeNode(c: PContext, n: PNode): PSym =
if n.kind == nkType:
result = symFromType(c, n.typ, n.info)
diff --git a/compiler/types.nim b/compiler/types.nim
index 5b8b9e602..797336ddf 100644
--- a/compiler/types.nim
+++ b/compiler/types.nim
@@ -432,7 +432,7 @@ proc typeToString(typ: PType, prefer: TPreferedDesc = preferName): string =
sfAnon notin t.sym.flags:
if t.kind == tyInt and isIntLit(t):
result = t.sym.name.s & " literal(" & $t.n.intVal & ")"
- elif t.kind == tyAlias:
+ elif t.kind == tyAlias and t.sons[0].kind != tyAlias:
result = typeToString(t.sons[0])
elif prefer in {preferName, preferTypeName} or t.sym.owner.isNil:
result = t.sym.name.s
diff --git a/tests/objects/tobject.nim b/tests/objects/tobject.nim
index 61ef7442e..fbf531c3d 100644
--- a/tests/objects/tobject.nim
+++ b/tests/objects/tobject.nim
@@ -17,3 +17,23 @@ suite "object basic methods":
check($obj == "(foo: 1)")
test "it should test equality based on fields":
check(makeObj(1) == makeObj(1))
+
+# bug #10203
+
+type
+ TMyObj = TYourObj
+ TYourObj = object of RootObj
+ x, y: int
+
+proc init: TYourObj =
+ result.x = 0
+ result.y = -1
+
+proc f(x: var TYourObj) =
+ discard
+
+var m: TMyObj = init()
+f(m)
+
+var a: TYourObj = m
+var b: TMyObj = a
--
cgit 1.4.1-2-gfad0
From 4355f23ee5fd53acfdaa8ecb5dbb50f9b43f98b2 Mon Sep 17 00:00:00 2001
From: Timothee Cour <timothee.cour2@gmail.com>
Date: Tue, 15 Jan 2019 05:50:28 -0800
Subject: fix #10305 nim cpp is now nan-correct at CT (#10310)
* fix #10305 nim cpp is now nan-correct at CT
* add example where simply `nim cpp -d:release` would exhibit nan bug
---
compiler/extccomp.nim | 8 ++++----
doc/nimc.rst | 3 +++
tests/float/tfloatnan.nim | 28 ++++++++++++++++++++++++++++
3 files changed, 35 insertions(+), 4 deletions(-)
(limited to 'compiler')
diff --git a/compiler/extccomp.nim b/compiler/extccomp.nim
index ef371d5d0..2c5af6433 100644
--- a/compiler/extccomp.nim
+++ b/compiler/extccomp.nim
@@ -63,8 +63,8 @@ compiler gcc:
result = (
name: "gcc",
objExt: "o",
- optSpeed: " -O3 -ffast-math ",
- optSize: " -Os -ffast-math ",
+ optSpeed: " -O3 ",
+ optSize: " -Os ",
compilerExe: "gcc",
cppCompiler: "g++",
compileTmpl: "-c $options $include -o $objfile $file",
@@ -88,8 +88,8 @@ compiler nintendoSwitchGCC:
result = (
name: "switch_gcc",
objExt: "o",
- optSpeed: " -O3 -ffast-math ",
- optSize: " -Os -ffast-math ",
+ optSpeed: " -O3 ",
+ optSize: " -Os ",
compilerExe: "aarch64-none-elf-gcc",
cppCompiler: "aarch64-none-elf-g++",
compileTmpl: "-w -MMD -MP -MF $dfile -c $options $include -o $objfile $file",
diff --git a/doc/nimc.rst b/doc/nimc.rst
index 6f6d38d66..4ffb595c0 100644
--- a/doc/nimc.rst
+++ b/doc/nimc.rst
@@ -347,6 +347,9 @@ complete list.
Define Effect
====================== =========================================================
``release`` Turns off runtime checks and turns on the optimizer.
+ More aggressive optimizations are possible, eg:
+ ``--passC:-ffast-math`` (but see issue #10305)
+ ``--stacktrace:off``
``useWinAnsi`` Modules like ``os`` and ``osproc`` use the Ansi versions
of the Windows API. The default build uses the Unicode
version.
diff --git a/tests/float/tfloatnan.nim b/tests/float/tfloatnan.nim
index 29937a862..8f384c3d9 100644
--- a/tests/float/tfloatnan.nim
+++ b/tests/float/tfloatnan.nim
@@ -14,3 +14,31 @@ echo "Nim: ", f32, " (float)"
let f64: float64 = NaN
echo "Nim: ", f64, " (double)"
+
+block: # issue #10305
+ # with `-O3 -ffast-math`, generated C/C++ code is not nan compliant
+ # user can pass `--passC:-ffast-math` if he doesn't care.
+ proc fun() =
+ # this was previously failing at compile time with a nim compiler
+ # that was compiled with `nim cpp -d:release`
+ let a1 = 0.0
+ let a = 0.0/a1
+ let b1 = a == 0.0
+ let b2 = a == a
+ doAssert not b1
+ doAssert not b2
+
+ proc fun2(i: int) =
+ # this was previously failing simply with `nim cpp -d:release`; the
+ # difference with above example is that optimization (const folding) can't
+ # take place in this example to hide the non-compliant nan bug.
+ let a = 0.0/(i.float)
+ let b1 = a == 0.0
+ let b2 = a == a
+ doAssert not b1
+ doAssert not b2
+
+ static: fun()
+ fun()
+ fun2(0)
+
--
cgit 1.4.1-2-gfad0
From beed27b75d27118324d89b83974b7cf3065769cf Mon Sep 17 00:00:00 2001
From: Timothee Cour <timothee.cour2@gmail.com>
Date: Tue, 15 Jan 2019 10:02:01 -0800
Subject: improve vmgen.codeListing formatting (#10306)
* improve vmgen.codeListing formatting
* address comments
---
compiler/dfa.nim | 2 +-
compiler/vm.nim | 7 +++----
compiler/vmgen.nim | 31 ++++++++++++++++++++++---------
3 files changed, 26 insertions(+), 14 deletions(-)
(limited to 'compiler')
diff --git a/compiler/dfa.nim b/compiler/dfa.nim
index cd32d95d5..df9584576 100644
--- a/compiler/dfa.nim
+++ b/compiler/dfa.nim
@@ -86,7 +86,7 @@ proc codeListing(c: ControlFlowGraph, result: var string, start=0; last = -1) =
result.add("\n")
inc i
if i in jumpTargets: result.add("L" & $i & ": End\n")
-
+ # consider calling `asciitables.alignTable`
proc echoCfg*(c: ControlFlowGraph; start=0; last = -1) {.deprecated.} =
## echos the ControlFlowGraph for debugging purposes.
diff --git a/compiler/vm.nim b/compiler/vm.nim
index c001981f8..180f3800b 100644
--- a/compiler/vm.nim
+++ b/compiler/vm.nim
@@ -10,10 +10,6 @@
## This file implements the new evaluation engine for Nim code.
## An instruction is 1-3 int32s in memory, it is a register based VM.
-const
- debugEchoCode = false
- traceCode = debugEchoCode
-
import ast except getstr
import
@@ -26,6 +22,9 @@ from evaltempl import evalTemplate
from modulegraphs import ModuleGraph, PPassContext
+const
+ traceCode = debugEchoCode
+
when hasFFI:
import evalffi
diff --git a/compiler/vmgen.nim b/compiler/vmgen.nim
index afadb4169..033cc81f0 100644
--- a/compiler/vmgen.nim
+++ b/compiler/vmgen.nim
@@ -33,6 +33,11 @@ import
import platform
from os import splitFile
+const
+ debugEchoCode* = defined(nimVMDebug)
+
+when debugEchoCode:
+ import asciitables
when hasFFI:
import evalffi
@@ -43,9 +48,10 @@ type
TGenFlags = set[TGenFlag]
proc debugInfo(c: PCtx; info: TLineInfo): string =
- result = toFilename(c.config, info).splitFile.name & ":" & $info.line
+ result = toFileLineCol(c.config, info)
proc codeListing(c: PCtx, result: var string, start=0; last = -1) =
+ ## for debugging purposes
# first iteration: compute all necessary labels:
var jumpTargets = initIntSet()
let last = if last < 0: c.code.len-1 else: min(last, c.code.len-1)
@@ -54,7 +60,9 @@ proc codeListing(c: PCtx, result: var string, start=0; last = -1) =
if x.opcode in relativeJumps:
jumpTargets.incl(i+x.regBx-wordExcess)
- # for debugging purposes
+ template toStr(opc: TOpcode): string = ($opc).substr(3)
+
+ result.add "code listing:\n"
var i = start
while i <= last:
if i in jumpTargets: result.addf("L$1:\n", i)
@@ -62,34 +70,39 @@ proc codeListing(c: PCtx, result: var string, start=0; last = -1) =
result.add($i)
let opc = opcode(x)
- if opc in {opcConv, opcCast}:
+ if opc in {opcIndCall, opcIndCallAsgn}:
+ result.addf("\t$#\tr$#, r$#, nargs:$#", opc.toStr, x.regA,
+ x.regB, x.regC)
+ elif opc in {opcConv, opcCast}:
let y = c.code[i+1]
let z = c.code[i+2]
- result.addf("\t$#\tr$#, r$#, $#, $#", ($opc).substr(3), x.regA, x.regB,
+ result.addf("\t$#\tr$#, r$#, $#, $#", opc.toStr, x.regA, x.regB,
c.types[y.regBx-wordExcess].typeToString,
c.types[z.regBx-wordExcess].typeToString)
inc i, 2
elif opc < firstABxInstr:
- result.addf("\t$#\tr$#, r$#, r$#", ($opc).substr(3), x.regA,
+ result.addf("\t$#\tr$#, r$#, r$#", opc.toStr, x.regA,
x.regB, x.regC)
elif opc in relativeJumps:
- result.addf("\t$#\tr$#, L$#", ($opc).substr(3), x.regA,
+ result.addf("\t$#\tr$#, L$#", opc.toStr, x.regA,
i+x.regBx-wordExcess)
elif opc in {opcLdConst, opcAsgnConst}:
let idx = x.regBx-wordExcess
- result.addf("\t$#\tr$#, $# ($#)", ($opc).substr(3), x.regA,
+ result.addf("\t$#\tr$#, $# ($#)", opc.toStr, x.regA,
c.constants[idx].renderTree, $idx)
elif opc in {opcMarshalLoad, opcMarshalStore}:
let y = c.code[i+1]
- result.addf("\t$#\tr$#, r$#, $#", ($opc).substr(3), x.regA, x.regB,
+ result.addf("\t$#\tr$#, r$#, $#", opc.toStr, x.regA, x.regB,
c.types[y.regBx-wordExcess].typeToString)
inc i
else:
- result.addf("\t$#\tr$#, $#", ($opc).substr(3), x.regA, x.regBx-wordExcess)
+ result.addf("\t$#\tr$#, $#", opc.toStr, x.regA, x.regBx-wordExcess)
result.add("\t#")
result.add(debugInfo(c, c.debug[i]))
result.add("\n")
inc i
+ when debugEchoCode:
+ result = result.alignTable
proc echoCode*(c: PCtx; start=0; last = -1) {.deprecated.} =
var buf = ""
--
cgit 1.4.1-2-gfad0
From 7920dc2898b9518a89c4a588dac2bcdea5658a92 Mon Sep 17 00:00:00 2001
From: nepeckman <nepeckman@protonmail.com>
Date: Tue, 15 Jan 2019 16:58:44 -0500
Subject: Added support for --genDeps on JS backend (#10320)
---
compiler/main.nim | 3 +++
1 file changed, 3 insertions(+)
(limited to 'compiler')
diff --git a/compiler/main.nim b/compiler/main.nim
index b5f7e8364..49c2666ea 100644
--- a/compiler/main.nim
+++ b/compiler/main.nim
@@ -92,6 +92,7 @@ proc commandJsonScript(graph: ModuleGraph) =
when not defined(leanCompiler):
proc commandCompileToJS(graph: ModuleGraph) =
+ let conf = graph.config
#incl(gGlobalOptions, optSafeCode)
setTarget(graph.config.target, osJS, cpuJS)
#initDefines()
@@ -100,6 +101,8 @@ when not defined(leanCompiler):
semanticPasses(graph)
registerPass(graph, JSgenPass)
compileProject(graph)
+ if optGenScript in graph.config.globalOptions:
+ writeDepsFile(graph, toGeneratedFile(conf, conf.projectFull, ""))
proc interactivePasses(graph: ModuleGraph) =
initDefines(graph.config.symbols)
--
cgit 1.4.1-2-gfad0
From 15584879b91e14565156ca140eef1dc100cf34c4 Mon Sep 17 00:00:00 2001
From: LemonBoy <LemonBoy@users.noreply.github.com>
Date: Thu, 17 Jan 2019 07:55:29 +0100
Subject: Properly wrap discarded statements (#10322)
Failing to do so lead the codegen to emit invalid code sometimes,
especially when C++ references were involved.
Fixes #10241
---
compiler/semexprs.nim | 4 ++--
compiler/semstmts.nim | 24 ++++++++++++++----------
tests/cpp/t10241.nim | 19 +++++++++++++++++++
3 files changed, 35 insertions(+), 12 deletions(-)
create mode 100644 tests/cpp/t10241.nim
(limited to 'compiler')
diff --git a/compiler/semexprs.nim b/compiler/semexprs.nim
index 657df36dd..e74d56a86 100644
--- a/compiler/semexprs.nim
+++ b/compiler/semexprs.nim
@@ -917,7 +917,7 @@ proc semExprNoType(c: PContext, n: PNode): PNode =
let isPush = hintExtendedContext in c.config.notes
if isPush: pushInfoContext(c.config, n.info)
result = semExpr(c, n, {efWantStmt})
- discardCheck(c, result, {})
+ result = discardCheck(c, result, {})
if isPush: popInfoContext(c.config)
proc isTypeExpr(n: PNode): bool =
@@ -1639,7 +1639,7 @@ proc semProcBody(c: PContext, n: PNode): PNode =
a.sons[1] = result
result = semAsgn(c, a)
else:
- discardCheck(c, result, {})
+ result = discardCheck(c, result, {})
if c.p.owner.kind notin {skMacro, skTemplate} and
c.p.resultSym != nil and c.p.resultSym.typ.isMetaType:
diff --git a/compiler/semstmts.nim b/compiler/semstmts.nim
index 3fdbb85db..70a16b290 100644
--- a/compiler/semstmts.nim
+++ b/compiler/semstmts.nim
@@ -130,13 +130,13 @@ proc fixNilType(c: PContext; n: PNode) =
for it in n: fixNilType(c, it)
n.typ = nil
-proc discardCheck(c: PContext, result: PNode, flags: TExprFlags) =
+proc discardCheck(c: PContext, expr: PNode, flags: TExprFlags): PNode =
+ result = expr
if c.matchedConcept != nil or efInTypeof in flags: return
if result.typ != nil and result.typ.kind notin {tyStmt, tyVoid}:
if implicitlyDiscardable(result):
- var n = newNodeI(nkDiscardStmt, result.info, 1)
- n[0] = result
+ result = newNode(nkDiscardStmt, result.info, @[result])
elif result.typ.kind != tyError and c.config.cmd != cmdInteractive:
var n = result
while n.kind in skipForDiscardable: n = n.lastSon
@@ -168,7 +168,8 @@ proc semIf(c: PContext, n: PNode; flags: TExprFlags): PNode =
else: illFormedAst(it, c.config)
if isEmptyType(typ) or typ.kind in {tyNil, tyExpr} or
(not hasElse and efInTypeof notin flags):
- for it in n: discardCheck(c, it.lastSon, flags)
+ for it in n:
+ it.sons[^1] = discardCheck(c, it.sons[^1], flags)
result.kind = nkIfStmt
# propagate any enforced VoidContext:
if typ == c.enforceVoidContext: result.typ = c.enforceVoidContext
@@ -266,12 +267,14 @@ proc semTry(c: PContext, n: PNode; flags: TExprFlags): PNode =
dec c.p.inTryStmt
if isEmptyType(typ) or typ.kind in {tyNil, tyExpr}:
- discardCheck(c, n.sons[0], flags)
- for i in 1..n.len-1: discardCheck(c, n.sons[i].lastSon, flags)
+ n.sons[0] = discardCheck(c, n.sons[0], flags)
+ for i in 1..n.len-1:
+ n.sons[i].sons[^1] = discardCheck(c, n.sons[i].sons[^1], flags)
if typ == c.enforceVoidContext:
result.typ = c.enforceVoidContext
else:
- if n.lastSon.kind == nkFinally: discardCheck(c, n.lastSon.lastSon, flags)
+ if n.lastSon.kind == nkFinally:
+ n.sons[^1].sons[^1] = discardCheck(c, n.sons[^1].sons[^1], flags)
n.sons[0] = fitNode(c, typ, n.sons[0], n.sons[0].info)
for i in 1..last:
var it = n.sons[i]
@@ -679,7 +682,7 @@ proc semForVars(c: PContext, n: PNode; flags: TExprFlags): PNode =
openScope(c)
n.sons[length-1] = semExprBranch(c, n.sons[length-1], flags)
if efInTypeof notin flags:
- discardCheck(c, n.sons[length-1], flags)
+ n.sons[^1] = discardCheck(c, n.sons[^1], flags)
closeScope(c)
dec(c.p.nestedLoopCounter)
@@ -866,7 +869,8 @@ proc semCase(c: PContext, n: PNode; flags: TExprFlags): PNode =
closeScope(c)
if isEmptyType(typ) or typ.kind in {tyNil, tyExpr} or
(not hasElse and efInTypeof notin flags):
- for i in 1..n.len-1: discardCheck(c, n.sons[i].lastSon, flags)
+ for i in 1..n.len-1:
+ n.sons[i].sons[^1] = discardCheck(c, n.sons[i].sons[^1], flags)
# propagate any enforced VoidContext:
if typ == c.enforceVoidContext:
result.typ = c.enforceVoidContext
@@ -2029,7 +2033,7 @@ proc semStmtList(c: PContext, n: PNode, flags: TExprFlags): PNode =
n.typ = n.sons[i].typ
if not isEmptyType(n.typ): n.kind = nkStmtListExpr
elif i != last or voidContext:
- discardCheck(c, n.sons[i], flags)
+ n.sons[i] = discardCheck(c, n.sons[i], flags)
else:
n.typ = n.sons[i].typ
if not isEmptyType(n.typ): n.kind = nkStmtListExpr
diff --git a/tests/cpp/t10241.nim b/tests/cpp/t10241.nim
new file mode 100644
index 000000000..21d6a0f4e
--- /dev/null
+++ b/tests/cpp/t10241.nim
@@ -0,0 +1,19 @@
+discard """
+ targets: "cpp"
+ action: "compile"
+"""
+
+type
+ String* {.importcpp: "std::string", header: "string".} = object
+
+proc initString*(): String
+ {.importcpp: "std::string()", header: "string".}
+
+proc append*(this: var String, str: String): var String
+ {.importcpp: "append", header: "string", discardable.}
+
+var
+ s1 = initString()
+ s2 = initString()
+
+s1.append s2
--
cgit 1.4.1-2-gfad0
From 1e63f1edb3fa594bcdce39eb5195d5f5d2644e67 Mon Sep 17 00:00:00 2001
From: cooldome <cdome@bk.ru>
Date: Fri, 18 Jan 2019 07:51:22 +0000
Subject: destructors: first step towards fixing #9617 (#10341)
---
compiler/semasgn.nim | 126 ++++++++++++++++++-------------------
compiler/semdata.nim | 7 +++
compiler/semexprs.nim | 4 +-
compiler/semstmts.nim | 17 ++++-
tests/destructor/helper.nim | 3 +
tests/destructor/terror_module.nim | 20 ++++++
6 files changed, 110 insertions(+), 67 deletions(-)
create mode 100644 tests/destructor/helper.nim
create mode 100644 tests/destructor/terror_module.nim
(limited to 'compiler')
diff --git a/compiler/semasgn.nim b/compiler/semasgn.nim
index c1ecaf8a2..9f1ef313b 100644
--- a/compiler/semasgn.nim
+++ b/compiler/semasgn.nim
@@ -14,7 +14,7 @@
type
TLiftCtx = object
- c: PContext
+ graph: ModuleGraph
info: TLineInfo # for construction
kind: TTypeAttachedOp
fn: PSym
@@ -22,7 +22,7 @@ type
recurse: bool
proc liftBodyAux(c: var TLiftCtx; t: PType; body, x, y: PNode)
-proc liftBody(c: PContext; typ: PType; kind: TTypeAttachedOp;
+proc liftBody(g: ModuleGraph; typ: PType; kind: TTypeAttachedOp;
info: TLineInfo): PSym {.discardable.}
proc at(a, i: PNode, elemType: PType): PNode =
@@ -33,7 +33,7 @@ proc at(a, i: PNode, elemType: PType): PNode =
proc liftBodyTup(c: var TLiftCtx; t: PType; body, x, y: PNode) =
for i in 0 ..< t.len:
- let lit = lowerings.newIntLit(c.c.graph, x.info, i)
+ let lit = lowerings.newIntLit(c.graph, x.info, i)
liftBodyAux(c, t.sons[i], body, x.at(lit, t.sons[i]), y.at(lit, t.sons[i]))
proc dotField(x: PNode, f: PSym): PNode =
@@ -77,22 +77,22 @@ proc liftBodyObj(c: var TLiftCtx; n, body, x, y: PNode) =
of nkRecList:
for t in items(n): liftBodyObj(c, t, body, x, y)
else:
- illFormedAstLocal(n, c.c.config)
+ illFormedAstLocal(n, c.graph.config)
-proc genAddr(c: PContext; x: PNode): PNode =
+proc genAddr(g: ModuleGraph; x: PNode): PNode =
if x.kind == nkHiddenDeref:
- checkSonsLen(x, 1, c.config)
+ checkSonsLen(x, 1, g.config)
result = x.sons[0]
else:
- result = newNodeIT(nkHiddenAddr, x.info, makeVarType(c, x.typ))
+ result = newNodeIT(nkHiddenAddr, x.info, makeVarType(x.typ.owner, x.typ))
addSon(result, x)
-proc newAsgnCall(c: PContext; op: PSym; x, y: PNode): PNode =
+proc newAsgnCall(g: ModuleGraph; op: PSym; x, y: PNode): PNode =
#if sfError in op.flags:
# localError(c.config, x.info, "usage of '$1' is a user-defined error" % op.name.s)
result = newNodeI(nkCall, x.info)
result.add newSymNode(op)
- result.add genAddr(c, x)
+ result.add genAddr(g, x)
result.add y
proc newAsgnStmt(le, ri: PNode): PNode =
@@ -105,10 +105,10 @@ proc newOpCall(op: PSym; x: PNode): PNode =
result.add(newSymNode(op))
result.add x
-proc destructorCall(c: PContext; op: PSym; x: PNode): PNode =
+proc destructorCall(g: ModuleGraph; op: PSym; x: PNode): PNode =
result = newNodeIT(nkCall, x.info, op.typ.sons[0])
result.add(newSymNode(op))
- result.add genAddr(c, x)
+ result.add genAddr(g, x)
proc newDeepCopyCall(op: PSym; x, y: PNode): PNode =
result = newAsgnStmt(x, newOpCall(op, y))
@@ -127,13 +127,13 @@ proc considerAsgnOrSink(c: var TLiftCtx; t: PType; body, x, y: PNode;
else:
op = field
if op == nil:
- op = liftBody(c.c, t, c.kind, c.info)
+ op = liftBody(c.graph, t, c.kind, c.info)
if sfError in op.flags:
incl c.fn.flags, sfError
else:
- markUsed(c.c.config, c.info, op, c.c.graph.usageSym)
+ markUsed(c.graph.config, c.info, op, c.graph.usageSym)
onUse(c.info, op)
- body.add newAsgnCall(c.c, op, x, y)
+ body.add newAsgnCall(c.graph, op, x, y)
result = true
proc considerOverloadedOp(c: var TLiftCtx; t: PType; body, x, y: PNode): bool =
@@ -141,9 +141,9 @@ proc considerOverloadedOp(c: var TLiftCtx; t: PType; body, x, y: PNode): bool =
of attachedDestructor:
let op = t.destructor
if op != nil:
- markUsed(c.c.config, c.info, op, c.c.graph.usageSym)
+ markUsed(c.graph.config, c.info, op, c.graph.usageSym)
onUse(c.info, op)
- body.add destructorCall(c.c, op, x)
+ body.add destructorCall(c.graph, op, x)
result = true
of attachedAsgn:
result = considerAsgnOrSink(c, t, body, x, y, t.assignment)
@@ -152,7 +152,7 @@ proc considerOverloadedOp(c: var TLiftCtx; t: PType; body, x, y: PNode): bool =
of attachedDeepCopy:
let op = t.deepCopy
if op != nil:
- markUsed(c.c.config, c.info, op, c.c.graph.usageSym)
+ markUsed(c.graph.config, c.info, op, c.graph.usageSym)
onUse(c.info, op)
body.add newDeepCopyCall(op, x, y)
result = true
@@ -169,13 +169,13 @@ proc addVar(father, v, value: PNode) =
addSon(father, vpart)
proc declareCounter(c: var TLiftCtx; body: PNode; first: BiggestInt): PNode =
- var temp = newSym(skTemp, getIdent(c.c.cache, lowerings.genPrefix), c.fn, c.info)
- temp.typ = getSysType(c.c.graph, body.info, tyInt)
+ var temp = newSym(skTemp, getIdent(c.graph.cache, lowerings.genPrefix), c.fn, c.info)
+ temp.typ = getSysType(c.graph, body.info, tyInt)
incl(temp.flags, sfFromGeneric)
var v = newNodeI(nkVarSection, c.info)
result = newSymNode(temp)
- v.addVar(result, lowerings.newIntLit(c.c.graph, body.info, first))
+ v.addVar(result, lowerings.newIntLit(c.graph, body.info, first))
body.add v
proc genBuiltin(g: ModuleGraph; magic: TMagic; name: string; i: PNode): PNode =
@@ -185,22 +185,22 @@ proc genBuiltin(g: ModuleGraph; magic: TMagic; name: string; i: PNode): PNode =
proc genWhileLoop(c: var TLiftCtx; i, dest: PNode): PNode =
result = newNodeI(nkWhileStmt, c.info, 2)
- let cmp = genBuiltin(c.c.graph, mLeI, "<=", i)
- cmp.add genHigh(c.c.graph, dest)
- cmp.typ = getSysType(c.c.graph, c.info, tyBool)
+ let cmp = genBuiltin(c.graph, mLeI, "<=", i)
+ cmp.add genHigh(c.graph, dest)
+ cmp.typ = getSysType(c.graph, c.info, tyBool)
result.sons[0] = cmp
result.sons[1] = newNodeI(nkStmtList, c.info)
proc addIncStmt(c: var TLiftCtx; body, i: PNode) =
- let incCall = genBuiltin(c.c.graph, mInc, "inc", i)
- incCall.add lowerings.newIntLit(c.c.graph, c.info, 1)
+ let incCall = genBuiltin(c.graph, mInc, "inc", i)
+ incCall.add lowerings.newIntLit(c.graph, c.info, 1)
body.add incCall
-proc newSeqCall(c: PContext; x, y: PNode): PNode =
+proc newSeqCall(g: ModuleGraph; x, y: PNode): PNode =
# don't call genAddr(c, x) here:
- result = genBuiltin(c.graph, mNewSeq, "newSeq", x)
- let lenCall = genBuiltin(c.graph, mLengthSeq, "len", y)
- lenCall.typ = getSysType(c.graph, x.info, tyInt)
+ result = genBuiltin(g, mNewSeq, "newSeq", x)
+ let lenCall = genBuiltin(g, mLengthSeq, "len", y)
+ lenCall.typ = getSysType(g, x.info, tyInt)
result.add lenCall
proc liftBodyAux(c: var TLiftCtx; t: PType; body, x, y: PNode) =
@@ -211,7 +211,7 @@ proc liftBodyAux(c: var TLiftCtx; t: PType; body, x, y: PNode) =
defaultOp(c, t, body, x, y)
of tyArray:
if tfHasAsgn in t.flags:
- let i = declareCounter(c, body, firstOrd(c.c.config, t))
+ let i = declareCounter(c, body, firstOrd(c.graph.config, t))
let whileLoop = genWhileLoop(c, i, x)
let elemType = t.lastSon
liftBodyAux(c, elemType, whileLoop.sons[1], x.at(i, elemType),
@@ -223,12 +223,12 @@ proc liftBodyAux(c: var TLiftCtx; t: PType; body, x, y: PNode) =
of tySequence:
# note that tfHasAsgn is propagated so we need the check on
# 'selectedGC' here to determine if we have the new runtime.
- if c.c.config.selectedGC == gcDestructors:
+ if c.graph.config.selectedGC == gcDestructors:
discard considerOverloadedOp(c, t, body, x, y)
elif tfHasAsgn in t.flags:
if c.kind != attachedDestructor:
- body.add newSeqCall(c.c, x, y)
- let i = declareCounter(c, body, firstOrd(c.c.config, t))
+ body.add newSeqCall(c.graph, x, y)
+ let i = declareCounter(c, body, firstOrd(c.graph.config, t))
let whileLoop = genWhileLoop(c, i, x)
let elemType = t.lastSon
liftBodyAux(c, elemType, whileLoop.sons[1], x.at(i, elemType),
@@ -258,20 +258,20 @@ proc liftBodyAux(c: var TLiftCtx; t: PType; body, x, y: PNode) =
# have to go through some indirection; we delegate this to the codegen:
let call = newNodeI(nkCall, c.info, 2)
call.typ = t
- call.sons[0] = newSymNode(createMagic(c.c.graph, "deepCopy", mDeepCopy))
+ call.sons[0] = newSymNode(createMagic(c.graph, "deepCopy", mDeepCopy))
call.sons[1] = y
body.add newAsgnStmt(x, call)
of tyVarargs, tyOpenArray:
- localError(c.c.config, c.info, "cannot copy openArray")
+ localError(c.graph.config, c.info, "cannot copy openArray")
of tyFromExpr, tyProxy, tyBuiltInTypeClass, tyUserTypeClass,
tyUserTypeClassInst, tyCompositeTypeClass, tyAnd, tyOr, tyNot, tyAnything,
tyGenericParam, tyGenericBody, tyNil, tyExpr, tyStmt,
tyTypeDesc, tyGenericInvocation, tyForward:
- internalError(c.c.config, c.info, "assignment requested for type: " & typeToString(t))
+ internalError(c.graph.config, c.info, "assignment requested for type: " & typeToString(t))
of tyOrdinal, tyRange, tyInferred,
tyGenericInst, tyStatic, tyVar, tyLent, tyAlias, tySink:
liftBodyAux(c, lastSon(t), body, x, y)
- of tyOptAsRef: internalError(c.c.config, "liftBodyAux")
+ of tyOptAsRef: internalError(c.graph.config, "liftBodyAux")
proc newProcType(info: TLineInfo; owner: PSym): PType =
result = newType(tyProc, owner)
@@ -287,54 +287,54 @@ proc addParam(procType: PType; param: PSym) =
addSon(procType.n, newSymNode(param))
rawAddSon(procType, param.typ)
-proc liftBodyDistinctType(c: PContext; typ: PType; kind: TTypeAttachedOp; info: TLineInfo): PSym =
+proc liftBodyDistinctType(g: ModuleGraph; typ: PType; kind: TTypeAttachedOp; info: TLineInfo): PSym =
assert typ.kind == tyDistinct
let baseType = typ[0]
case kind
of attachedAsgn:
if baseType.assignment == nil:
- discard liftBody(c, baseType, kind, info)
+ discard liftBody(g, baseType, kind, info)
typ.assignment = baseType.assignment
result = typ.assignment
of attachedSink:
if baseType.sink == nil:
- discard liftBody(c, baseType, kind, info)
+ discard liftBody(g, baseType, kind, info)
typ.sink = baseType.sink
result = typ.sink
of attachedDeepCopy:
if baseType.deepCopy == nil:
- discard liftBody(c, baseType, kind, info)
+ discard liftBody(g, baseType, kind, info)
typ.deepCopy = baseType.deepCopy
result = typ.deepCopy
of attachedDestructor:
if baseType.destructor == nil:
- discard liftBody(c, baseType, kind, info)
+ discard liftBody(g, baseType, kind, info)
typ.destructor = baseType.destructor
result = typ.destructor
-proc liftBody(c: PContext; typ: PType; kind: TTypeAttachedOp;
+proc liftBody(g: ModuleGraph; typ: PType; kind: TTypeAttachedOp;
info: TLineInfo): PSym =
if typ.kind == tyDistinct:
- return liftBodyDistinctType(c, typ, kind, info)
+ return liftBodyDistinctType(g, typ, kind, info)
var a: TLiftCtx
a.info = info
- a.c = c
+ a.graph = g
a.kind = kind
let body = newNodeI(nkStmtList, info)
let procname = case kind
- of attachedAsgn: getIdent(c.cache, "=")
- of attachedSink: getIdent(c.cache, "=sink")
- of attachedDeepCopy: getIdent(c.cache, "=deepcopy")
- of attachedDestructor: getIdent(c.cache, "=destroy")
+ of attachedAsgn: getIdent(g.cache, "=")
+ of attachedSink: getIdent(g.cache, "=sink")
+ of attachedDeepCopy: getIdent(g.cache, "=deepcopy")
+ of attachedDestructor: getIdent(g.cache, "=destroy")
result = newSym(skProc, procname, typ.owner, info)
a.fn = result
a.asgnForType = typ
- let dest = newSym(skParam, getIdent(c.cache, "dest"), result, info)
- let src = newSym(skParam, getIdent(c.cache, "src"), result, info)
- dest.typ = makeVarType(c, typ)
+ let dest = newSym(skParam, getIdent(g.cache, "dest"), result, info)
+ let src = newSym(skParam, getIdent(g.cache, "src"), result, info)
+ dest.typ = makeVarType(typ.owner, typ)
src.typ = typ
result.typ = newProcType(info, typ.owner)
@@ -345,7 +345,7 @@ proc liftBody(c: PContext; typ: PType; kind: TTypeAttachedOp;
liftBodyAux(a, typ, body, newSymNode(dest).newDeref, newSymNode(src))
# recursion is handled explicitly, do not register the type based operation
# before 'liftBodyAux':
- if c.config.selectedGC == gcDestructors and
+ if g.config.selectedGC == gcDestructors and
typ.kind in {tySequence, tyString} and body.len == 0:
discard "do not cache it yet"
else:
@@ -364,17 +364,17 @@ proc liftBody(c: PContext; typ: PType; kind: TTypeAttachedOp;
incl result.flags, sfFromGeneric
-proc getAsgnOrLiftBody(c: PContext; typ: PType; info: TLineInfo): PSym =
+proc getAsgnOrLiftBody(g: ModuleGraph; typ: PType; info: TLineInfo): PSym =
let t = typ.skipTypes({tyGenericInst, tyVar, tyLent, tyAlias, tySink})
result = t.assignment
if result.isNil:
- result = liftBody(c, t, attachedAsgn, info)
+ result = liftBody(g, t, attachedAsgn, info)
-proc overloadedAsgn(c: PContext; dest, src: PNode): PNode =
- let a = getAsgnOrLiftBody(c, dest.typ, dest.info)
- result = newAsgnCall(c, a, dest, src)
+proc overloadedAsgn(g: ModuleGraph; dest, src: PNode): PNode =
+ let a = getAsgnOrLiftBody(g, dest.typ, dest.info)
+ result = newAsgnCall(g, a, dest, src)
-proc liftTypeBoundOps*(c: PContext; typ: PType; info: TLineInfo) =
+proc liftTypeBoundOps*(g: ModuleGraph; typ: PType; info: TLineInfo) =
## In the semantic pass this is called in strategic places
## to ensure we lift assignment, destructors and moves properly.
## The later 'destroyer' pass depends on it.
@@ -386,11 +386,11 @@ proc liftTypeBoundOps*(c: PContext; typ: PType; info: TLineInfo) =
let typ = typ.skipTypes({tyGenericInst, tyAlias})
# we generate the destructor first so that other operators can depend on it:
if typ.destructor == nil:
- liftBody(c, typ, attachedDestructor, info)
+ liftBody(g, typ, attachedDestructor, info)
if typ.assignment == nil:
- liftBody(c, typ, attachedAsgn, info)
+ liftBody(g, typ, attachedAsgn, info)
if typ.sink == nil:
- liftBody(c, typ, attachedSink, info)
+ liftBody(g, typ, attachedSink, info)
-#proc patchResolvedTypeBoundOp*(c: PContext; n: PNode): PNode =
+#proc patchResolvedTypeBoundOp*(g: ModuleGraph; n: PNode): PNode =
# if n.kind == nkCall and
diff --git a/compiler/semdata.nim b/compiler/semdata.nim
index 735c6f6b1..a05bda32d 100644
--- a/compiler/semdata.nim
+++ b/compiler/semdata.nim
@@ -286,6 +286,13 @@ proc makeVarType*(c: PContext, baseType: PType; kind = tyVar): PType =
result = newTypeS(kind, c)
addSonSkipIntLit(result, baseType)
+proc makeVarType*(owner: PSym, baseType: PType; kind = tyVar): PType =
+ if baseType.kind == kind:
+ result = baseType
+ else:
+ result = newType(kind, owner)
+ addSonSkipIntLit(result, baseType)
+
proc makeTypeDesc*(c: PContext, typ: PType): PType =
if typ.kind == tyTypeDesc:
result = typ
diff --git a/compiler/semexprs.nim b/compiler/semexprs.nim
index e74d56a86..6f2981f63 100644
--- a/compiler/semexprs.nim
+++ b/compiler/semexprs.nim
@@ -802,7 +802,7 @@ proc afterCallActions(c: PContext; n, orig: PNode, flags: TExprFlags): PNode =
result = magicsAfterOverloadResolution(c, result, flags)
if result.typ != nil and
not (result.typ.kind == tySequence and result.typ.sons[0].kind == tyEmpty):
- liftTypeBoundOps(c, result.typ, n.info)
+ liftTypeBoundOps(c.graph, result.typ, n.info)
#result = patchResolvedTypeBoundOp(c, result)
if c.matchedConcept == nil:
result = evalAtCompileTime(c, result)
@@ -1592,7 +1592,7 @@ proc semAsgn(c: PContext, n: PNode; mode=asgnNormal): PNode =
typeMismatch(c.config, n.info, lhs.typ, rhsTyp)
n.sons[1] = fitNode(c, le, rhs, goodLineInfo(n[1]))
- liftTypeBoundOps(c, lhs.typ, lhs.info)
+ liftTypeBoundOps(c.graph, lhs.typ, lhs.info)
#liftTypeBoundOps(c, n.sons[0].typ, n.sons[0].info)
fixAbstractType(c, n)
diff --git a/compiler/semstmts.nim b/compiler/semstmts.nim
index 70a16b290..de39e95c8 100644
--- a/compiler/semstmts.nim
+++ b/compiler/semstmts.nim
@@ -476,7 +476,7 @@ proc semVarOrLet(c: PContext, n: PNode, symkind: TSymKind): PNode =
# this can only happen for errornous var statements:
if typ == nil: continue
typeAllowedCheck(c.config, a.info, typ, symkind, if c.matchedConcept != nil: {taConcept} else: {})
- liftTypeBoundOps(c, typ, a.info)
+ liftTypeBoundOps(c.graph, typ, a.info)
var tup = skipTypes(typ, {tyGenericInst, tyAlias, tySink})
if a.kind == nkVarTuple:
if tup.kind != tyTuple:
@@ -1479,7 +1479,8 @@ proc canonType(c: PContext, t: PType): PType =
result = t
proc semOverride(c: PContext, s: PSym, n: PNode) =
- case s.name.s.normalize
+ let name = s.name.s.normalize
+ case name
of "=destroy":
let t = s.typ
var noError = false
@@ -1498,6 +1499,9 @@ proc semOverride(c: PContext, s: PSym, n: PNode) =
localError(c.config, n.info, errGenerated,
"cannot bind another '" & s.name.s & "' to: " & typeToString(obj))
noError = true
+ if obj.owner.getModule != s.getModule:
+ localError(c.config, n.info, errGenerated,
+ "type bound operation `=destroy` can be defined only in the same module with its type (" & obj.typeToString() & ")")
if not noError and sfSystemModule notin s.owner.flags:
localError(c.config, n.info, errGenerated,
"signature for '" & s.name.s & "' must be proc[T: object](x: var T)")
@@ -1521,6 +1525,11 @@ proc semOverride(c: PContext, s: PSym, n: PNode) =
else:
localError(c.config, n.info, errGenerated,
"cannot bind 'deepCopy' to: " & typeToString(t))
+
+ if t.owner.getModule != s.getModule:
+ localError(c.config, n.info, errGenerated,
+ "type bound operation `" & name & "` can be defined only in the same module with its type (" & t.typeToString() & ")")
+
else:
localError(c.config, n.info, errGenerated,
"signature for 'deepCopy' must be proc[T: ptr|ref](x: T): T")
@@ -1551,6 +1560,10 @@ proc semOverride(c: PContext, s: PSym, n: PNode) =
else:
localError(c.config, n.info, errGenerated,
"cannot bind another '" & s.name.s & "' to: " & typeToString(obj))
+ if obj.owner.getModule != s.getModule:
+ localError(c.config, n.info, errGenerated,
+ "type bound operation `" & name & "` can be defined only in the same module with its type (" & obj.typeToString() & ")")
+
return
if sfSystemModule notin s.owner.flags:
localError(c.config, n.info, errGenerated,
diff --git a/tests/destructor/helper.nim b/tests/destructor/helper.nim
new file mode 100644
index 000000000..466065747
--- /dev/null
+++ b/tests/destructor/helper.nim
@@ -0,0 +1,3 @@
+type
+ MyTestObject*[T] = object
+ p: ptr T
diff --git a/tests/destructor/terror_module.nim b/tests/destructor/terror_module.nim
new file mode 100644
index 000000000..f3d7c9b26
--- /dev/null
+++ b/tests/destructor/terror_module.nim
@@ -0,0 +1,20 @@
+discard """
+joinable: false
+cmd: "nim check $file"
+errormsg: "type bound operation `=deepcopy` can be defined only in the same module with its type (MyTestObject)"
+nimout: '''
+terror_module.nim(14, 1) Error: type bound operation `=destroy` can be defined only in the same module with its type (MyTestObject)
+terror_module.nim(16, 1) Error: type bound operation `=sink` can be defined only in the same module with its type (MyTestObject)
+terror_module.nim(18, 1) Error: type bound operation `=` can be defined only in the same module with its type (MyTestObject)
+terror_module.nim(20, 1) Error: type bound operation `=deepcopy` can be defined only in the same module with its type (MyTestObject)
+'''
+"""
+import helper
+
+proc `=destroy`[T](x: var MyTestObject[T]) = discard
+
+proc `=sink`[T](x: var MyTestObject[T], y:MyTestObject[T]) = discard
+
+proc `=`[T](x: var MyTestObject[T], y: MyTestObject[T]) = discard
+
+proc `=deepcopy`[T](x: ptr MyTestObject[T]): ptr MyTestObject[T] = discard
--
cgit 1.4.1-2-gfad0
From 27e2ed4375c21b196f5fd403c2199c63dcdb8bf0 Mon Sep 17 00:00:00 2001
From: Timothee Cour <timothee.cour2@gmail.com>
Date: Fri, 18 Jan 2019 00:03:26 -0800
Subject: fix #9629 every binary cmd line option allows on/off/empty=on
(#10353)
* fix #9629 every binary cmd line option allows on/off/empty=on
* workaround refs #10359
---
compiler/commands.nim | 62 +++++++++++++++++-------------------------------
doc/advopt.txt | 30 +++++++++++------------
doc/basicopt.txt | 4 ++--
tests/misc/tparseopt.nim | 5 +++-
4 files changed, 43 insertions(+), 58 deletions(-)
(limited to 'compiler')
diff --git a/compiler/commands.nim b/compiler/commands.nim
index 47687046f..30521f9ca 100644
--- a/compiler/commands.nim
+++ b/compiler/commands.nim
@@ -142,7 +142,7 @@ proc splitSwitch(conf: ConfigRef; switch: string, cmd, arg: var string, pass: TC
proc processOnOffSwitch(conf: ConfigRef; op: TOptions, arg: string, pass: TCmdLinePass,
info: TLineInfo) =
case arg.normalize
- of "on": conf.options = conf.options + op
+ of "","on": conf.options = conf.options + op
of "off": conf.options = conf.options - op
else: localError(conf, info, errOnOrOffExpectedButXFound % arg)
@@ -158,7 +158,7 @@ proc processOnOffSwitchOrList(conf: ConfigRef; op: TOptions, arg: string, pass:
proc processOnOffSwitchG(conf: ConfigRef; op: TGlobalOptions, arg: string, pass: TCmdLinePass,
info: TLineInfo) =
case arg.normalize
- of "on": conf.globalOptions = conf.globalOptions + op
+ of "", "on": conf.globalOptions = conf.globalOptions + op
of "off": conf.globalOptions = conf.globalOptions - op
else: localError(conf, info, errOnOrOffExpectedButXFound % arg)
@@ -414,26 +414,19 @@ proc processSwitch*(switch, arg: string, pass: TCmdLinePass, info: TLineInfo;
if pass in {passCmd2, passPP}:
addExternalFileToLink(conf, AbsoluteFile arg)
of "debuginfo":
- expectNoArg(conf, switch, arg, pass, info)
- incl(conf.globalOptions, optCDebug)
+ processOnOffSwitchG(conf, {optCDebug}, arg, pass, info)
of "embedsrc":
- expectNoArg(conf, switch, arg, pass, info)
- incl(conf.globalOptions, optEmbedOrigSrc)
+ processOnOffSwitchG(conf, {optEmbedOrigSrc}, arg, pass, info)
of "compileonly", "c":
- expectNoArg(conf, switch, arg, pass, info)
- incl(conf.globalOptions, optCompileOnly)
+ processOnOffSwitchG(conf, {optCompileOnly}, arg, pass, info)
of "nolinking":
- expectNoArg(conf, switch, arg, pass, info)
- incl(conf.globalOptions, optNoLinking)
+ processOnOffSwitchG(conf, {optNoLinking}, arg, pass, info)
of "nomain":
- expectNoArg(conf, switch, arg, pass, info)
- incl(conf.globalOptions, optNoMain)
+ processOnOffSwitchG(conf, {optNoMain}, arg, pass, info)
of "forcebuild", "f":
- expectNoArg(conf, switch, arg, pass, info)
- incl(conf.globalOptions, optForceFullMake)
+ processOnOffSwitchG(conf, {optForceFullMake}, arg, pass, info)
of "project":
- expectNoArg(conf, switch, arg, pass, info)
- incl conf.globalOptions, optWholeProject
+ processOnOffSwitchG(conf, {optWholeProject}, arg, pass, info)
of "gc":
expectArg(conf, switch, arg, pass, info)
case arg.normalize
@@ -499,7 +492,7 @@ proc processSwitch*(switch, arg: string, pass: TCmdLinePass, info: TLineInfo;
else: undefSymbol(conf.symbols, "hotcodereloading")
of "oldnewlines":
case arg.normalize
- of "on":
+ of "","on":
conf.oldNewlines = true
defineSymbol(conf.symbols, "nimOldNewlines")
of "off":
@@ -599,11 +592,9 @@ proc processSwitch*(switch, arg: string, pass: TCmdLinePass, info: TLineInfo;
if pass in {passCmd2, passPP}:
conf.implicitIncludes.add findModule(conf, arg, toFullPath(conf, info)).string
of "listcmd":
- expectNoArg(conf, switch, arg, pass, info)
- incl(conf.globalOptions, optListCmd)
+ processOnOffSwitchG(conf, {optListCmd}, arg, pass, info)
of "genmapping":
- expectNoArg(conf, switch, arg, pass, info)
- incl(conf.globalOptions, optGenMapping)
+ processOnOffSwitchG(conf, {optGenMapping}, arg, pass, info)
of "os":
expectArg(conf, switch, arg, pass, info)
if pass in {passCmd1, passPP}:
@@ -619,8 +610,7 @@ proc processSwitch*(switch, arg: string, pass: TCmdLinePass, info: TLineInfo;
elif cpu != conf.target.hostCPU:
setTarget(conf.target, conf.target.targetOS, cpu)
of "run", "r":
- expectNoArg(conf, switch, arg, pass, info)
- incl(conf.globalOptions, optRun)
+ processOnOffSwitchG(conf, {optRun}, arg, pass, info)
of "errormax":
expectArg(conf, switch, arg, pass, info)
# Note: `nim check` (etc) can overwrite this.
@@ -668,21 +658,16 @@ proc processSwitch*(switch, arg: string, pass: TCmdLinePass, info: TLineInfo;
of "v2": conf.symbolFiles = v2Sf
else: localError(conf, info, "invalid option for --incremental: " & arg)
of "skipcfg":
- expectNoArg(conf, switch, arg, pass, info)
- incl(conf.globalOptions, optSkipSystemConfigFile)
+ processOnOffSwitchG(conf, {optSkipSystemConfigFile}, arg, pass, info)
of "skipprojcfg":
- expectNoArg(conf, switch, arg, pass, info)
- incl(conf.globalOptions, optSkipProjConfigFile)
+ processOnOffSwitchG(conf, {optSkipProjConfigFile}, arg, pass, info)
of "skipusercfg":
- expectNoArg(conf, switch, arg, pass, info)
- incl(conf.globalOptions, optSkipUserConfigFile)
+ processOnOffSwitchG(conf, {optSkipUserConfigFile}, arg, pass, info)
of "skipparentcfg":
- expectNoArg(conf, switch, arg, pass, info)
- incl(conf.globalOptions, optSkipParentConfigFiles)
+ processOnOffSwitchG(conf, {optSkipParentConfigFiles}, arg, pass, info)
of "genscript", "gendeps":
- expectNoArg(conf, switch, arg, pass, info)
- incl(conf.globalOptions, optGenScript)
- incl(conf.globalOptions, optCompileOnly)
+ processOnOffSwitchG(conf, {optGenScript}, arg, pass, info)
+ processOnOffSwitchG(conf, {optCompileOnly}, arg, pass, info)
of "colors": processOnOffSwitchG(conf, {optUseColors}, arg, pass, info)
of "lib":
expectArg(conf, switch, arg, pass, info)
@@ -716,16 +701,13 @@ proc processSwitch*(switch, arg: string, pass: TCmdLinePass, info: TLineInfo;
expectNoArg(conf, switch, arg, pass, info)
conf.ideCmd = ideUse
of "stdout":
- expectNoArg(conf, switch, arg, pass, info)
- incl(conf.globalOptions, optStdout)
+ processOnOffSwitchG(conf, {optStdout}, arg, pass, info)
of "listfullpaths":
- expectNoArg(conf, switch, arg, pass, info)
- incl conf.globalOptions, optListFullPaths
+ processOnOffSwitchG(conf, {optListFullPaths}, arg, pass, info)
of "dynliboverride":
dynlibOverride(conf, switch, arg, pass, info)
of "dynliboverrideall":
- expectNoArg(conf, switch, arg, pass, info)
- incl conf.globalOptions, optDynlibOverrideAll
+ processOnOffSwitchG(conf, {optDynlibOverrideAll}, arg, pass, info)
of "cs":
# only supported for compatibility. Does nothing.
expectArg(conf, switch, arg, pass, info)
diff --git a/doc/advopt.txt b/doc/advopt.txt
index c2e09a3ff..7ab85abfc 100644
--- a/doc/advopt.txt
+++ b/doc/advopt.txt
@@ -18,9 +18,9 @@ Advanced commands:
Advanced options:
-o:FILE, --out:FILE set the output filename
- --stdout output to stdout
+ --stdout:on|off output to stdout
--colors:on|off turn compiler messages coloring on|off
- --listFullPaths list full paths in messages
+ --listFullPaths:on|off list full paths in messages
-w:on|off|list, --warnings:on|off|list
turn all warnings on|off or list all available
--warning[X]:on|off turn specific warning X on|off
@@ -39,16 +39,16 @@ Advanced options:
--nimcache:PATH set the path used for generated files
--header:FILE the compiler should produce a .h file (FILE
is optional)
- -c, --compileOnly compile Nim files only; do not assemble or link
- --noLinking compile Nim and generated files but do not link
- --noMain do not generate a main procedure
- --genScript generate a compile script (in the 'nimcache'
+ -c, --compileOnly:on|off compile Nim files only; do not assemble or link
+ --noLinking:on|off compile Nim and generated files but do not link
+ --noMain:on|off do not generate a main procedure
+ --genScript:on|off generate a compile script (in the 'nimcache'
subdirectory named 'compile_$$project$$scriptext'),
implies --compileOnly
- --genDeps generate a '.deps' file containing the dependencies
+ --genDeps:on|off generate a '.deps' file containing the dependencies
--os:SYMBOL set the target operating system (cross-compilation)
--cpu:SYMBOL set the target processor (cross-compilation)
- --debuginfo enables debug information
+ --debuginfo:on|off enables debug information
-t, --passC:OPTION pass an option to the C compiler
-l, --passL:OPTION pass an option to the linker
--cincludes:DIR modify the C compiler header search path
@@ -59,7 +59,7 @@ Advanced options:
--docSeeSrcUrl:url activate 'see source' for doc and doc2 commands
(see doc.item.seesrc in config/nimdoc.cfg)
--lineDir:on|off generation of #line directive on|off
- --embedsrc embeds the original source code as comments
+ --embedsrc:on|off embeds the original source code as comments
in the generated output
--threadanalysis:on|off turn thread analysis on|off
--tlsEmulation:on|off turn thread local storage emulation on|off
@@ -77,10 +77,10 @@ Advanced options:
--nilseqs:on|off allow 'nil' for strings/seqs for
backwards compatibility
--oldast:on|off use old AST for backwards compatibility
- --skipCfg do not read the nim installation's configuration file
- --skipUserCfg do not read the user's configuration file
- --skipParentCfg do not read the parent dirs' configuration files
- --skipProjCfg do not read the project's configuration file
+ --skipCfg:on|off do not read the nim installation's configuration file
+ --skipUserCfg:on|off do not read the user's configuration file
+ --skipParentCfg:on|off do not read the parent dirs' configuration files
+ --skipProjCfg:on|off do not read the project's configuration file
--gc:refc|markAndSweep|boehm|go|none|regions
select the GC to use; default is 'refc'
--index:on|off turn index file generation on|off
@@ -97,8 +97,8 @@ Advanced options:
symbol matching is fuzzy so
that --dynlibOverride:lua matches
dynlib: "liblua.so.3"
- --dynlibOverrideAll makes the dynlib pragma have no effect
- --listCmd list the commands used to execute external programs
+ --dynlibOverrideAll:on|off makes the dynlib pragma have no effect
+ --listCmd:on|off list the commands used to execute external programs
--parallelBuild:0|1|... perform a parallel build
value = number of processors (0 for auto-detect)
--incremental:on|off only recompile the changed modules (experimental!)
diff --git a/doc/basicopt.txt b/doc/basicopt.txt
index a9166d36c..96c9ced3d 100644
--- a/doc/basicopt.txt
+++ b/doc/basicopt.txt
@@ -15,7 +15,7 @@ Options:
(Optionally: Define the value for that symbol,
see: "compile time define pragmas")
-u, --undef:SYMBOL undefine a conditional symbol
- -f, --forceBuild force rebuilding of all modules
+ -f, --forceBuild:on|off force rebuilding of all modules
--stackTrace:on|off turn stack tracing on|off
--lineTrace:on|off turn line tracing on|off
--threads:on|off turn support for multi-threading on|off
@@ -35,7 +35,7 @@ Options:
--debugger:native|endb use native debugger (gdb) | ENDB (experimental)
--app:console|gui|lib|staticlib
generate a console app|GUI app|DLL|static library
- -r, --run run the compiled program with given arguments
+ -r, --run:on|off run the compiled program with given arguments
--fullhelp show all command line switches
-h, --help show this help
diff --git a/tests/misc/tparseopt.nim b/tests/misc/tparseopt.nim
index d8824e522..7d5071c3e 100644
--- a/tests/misc/tparseopt.nim
+++ b/tests/misc/tparseopt.nim
@@ -121,7 +121,10 @@ else:
block: # fix #9842
let exe = buildDir / "D20190112T145450".addFileExt(ExeExt)
- defer: removeFile exe
+ defer:
+ when not defined(windows):
+ # workaround #10359 ; innocuous to skip since we're saving under `buildDir`
+ removeFile exe
let args = @["a1b", "a2 b", "", "a4\"b", "a5'b", r"a6\b", "a7\'b"]
let cmd = "$# c -r --verbosity:0 -o:$# -d:testament_tparseopt $# $#" %
[getCurrentCompilerExe(), exe, currentSourcePath(),
--
cgit 1.4.1-2-gfad0
From 095eaacf21a80c72d15ba9a7a422ddc192124ae1 Mon Sep 17 00:00:00 2001
From: Federico Ceratto <federico.ceratto@gmail.com>
Date: Sat, 19 Jan 2019 15:01:27 +0000
Subject: Fix spelling errors (#10379)
---
compiler/semexprs.nim | 2 +-
lib/pure/includes/osseps.nim | 4 ++--
lib/pure/net.nim | 38 +++++++++++++++++++-------------------
tests/stdlib/ttimes.nim | 2 +-
4 files changed, 23 insertions(+), 23 deletions(-)
(limited to 'compiler')
diff --git a/compiler/semexprs.nim b/compiler/semexprs.nim
index 6f2981f63..5e1e4cbbd 100644
--- a/compiler/semexprs.nim
+++ b/compiler/semexprs.nim
@@ -230,7 +230,7 @@ proc semConv(c: PContext, n: PNode): PNode =
# special case to make MyObject(x = 3) produce a nicer error message:
if n[1].kind == nkExprEqExpr and
targetType.skipTypes(abstractPtrs).kind == tyObject:
- localError(c.config, n.info, "object contruction uses ':', not '='")
+ localError(c.config, n.info, "object construction uses ':', not '='")
var op = semExprWithType(c, n.sons[1])
if targetType.isMetaType:
let final = inferWithMetatype(c, targetType, op, true)
diff --git a/lib/pure/includes/osseps.nim b/lib/pure/includes/osseps.nim
index 9a79fe303..944ad123e 100644
--- a/lib/pure/includes/osseps.nim
+++ b/lib/pure/includes/osseps.nim
@@ -85,9 +85,9 @@ elif doslikeFileSystem:
const
CurDir* = '.'
ParDir* = ".."
- DirSep* = '\\' # seperator within paths
+ DirSep* = '\\' # separator within paths
AltSep* = '/'
- PathSep* = ';' # seperator between paths
+ PathSep* = ';' # separator between paths
FileSystemCaseSensitive* = false
ExeExt* = "exe"
ScriptExt* = "bat"
diff --git a/lib/pure/net.nim b/lib/pure/net.nim
index d4c5a88b7..a5bdf3ce6 100644
--- a/lib/pure/net.nim
+++ b/lib/pure/net.nim
@@ -233,7 +233,7 @@ proc parseIPv4Address(addressStr: string): IpAddress =
var
byteCount = 0
currentByte:uint16 = 0
- seperatorValid = false
+ separatorValid = false
result.family = IpAddressFamily.IPv4
@@ -244,20 +244,20 @@ proc parseIPv4Address(addressStr: string): IpAddress =
if currentByte > 255'u16:
raise newException(ValueError,
"Invalid IP Address. Value is out of range")
- seperatorValid = true
+ separatorValid = true
elif addressStr[i] == '.': # IPv4 address separator
- if not seperatorValid or byteCount >= 3:
+ if not separatorValid or byteCount >= 3:
raise newException(ValueError,
"Invalid IP Address. The address consists of too many groups")
result.address_v4[byteCount] = cast[uint8](currentByte)
currentByte = 0
byteCount.inc
- seperatorValid = false
+ separatorValid = false
else:
raise newException(ValueError,
"Invalid IP Address. Address contains an invalid character")
- if byteCount != 3 or not seperatorValid:
+ if byteCount != 3 or not separatorValid:
raise newException(ValueError, "Invalid IP Address")
result.address_v4[byteCount] = cast[uint8](currentByte)
@@ -272,7 +272,7 @@ proc parseIPv6Address(addressStr: string): IpAddress =
groupCount = 0
currentGroupStart = 0
currentShort:uint32 = 0
- seperatorValid = true
+ separatorValid = true
dualColonGroup = -1
lastWasColon = false
v4StartPos = -1
@@ -280,15 +280,15 @@ proc parseIPv6Address(addressStr: string): IpAddress =
for i,c in addressStr:
if c == ':':
- if not seperatorValid:
+ if not separatorValid:
raise newException(ValueError,
- "Invalid IP Address. Address contains an invalid seperator")
+ "Invalid IP Address. Address contains an invalid separator")
if lastWasColon:
if dualColonGroup != -1:
raise newException(ValueError,
- "Invalid IP Address. Address contains more than one \"::\" seperator")
+ "Invalid IP Address. Address contains more than one \"::\" separator")
dualColonGroup = groupCount
- seperatorValid = false
+ separatorValid = false
elif i != 0 and i != high(addressStr):
if groupCount >= 8:
raise newException(ValueError,
@@ -297,7 +297,7 @@ proc parseIPv6Address(addressStr: string): IpAddress =
result.address_v6[groupCount*2+1] = cast[uint8](currentShort and 0xFF)
currentShort = 0
groupCount.inc()
- if dualColonGroup != -1: seperatorValid = false
+ if dualColonGroup != -1: separatorValid = false
elif i == 0: # only valid if address starts with ::
if addressStr[1] != ':':
raise newException(ValueError,
@@ -309,11 +309,11 @@ proc parseIPv6Address(addressStr: string): IpAddress =
lastWasColon = true
currentGroupStart = i + 1
elif c == '.': # Switch to parse IPv4 mode
- if i < 3 or not seperatorValid or groupCount >= 7:
+ if i < 3 or not separatorValid or groupCount >= 7:
raise newException(ValueError, "Invalid IP Address")
v4StartPos = currentGroupStart
currentShort = 0
- seperatorValid = false
+ separatorValid = false
break
elif c in strutils.HexDigits:
if c in strutils.Digits: # Normal digit
@@ -326,14 +326,14 @@ proc parseIPv6Address(addressStr: string): IpAddress =
raise newException(ValueError,
"Invalid IP Address. Value is out of range")
lastWasColon = false
- seperatorValid = true
+ separatorValid = true
else:
raise newException(ValueError,
"Invalid IP Address. Address contains an invalid character")
if v4StartPos == -1: # Don't parse v4. Copy the remaining v6 stuff
- if seperatorValid: # Copy remaining data
+ if separatorValid: # Copy remaining data
if groupCount >= 8:
raise newException(ValueError,
"Invalid IP Address. The address consists of too many groups")
@@ -347,19 +347,19 @@ proc parseIPv6Address(addressStr: string): IpAddress =
if currentShort > 255'u32:
raise newException(ValueError,
"Invalid IP Address. Value is out of range")
- seperatorValid = true
+ separatorValid = true
elif c == '.': # IPv4 address separator
- if not seperatorValid or byteCount >= 3:
+ if not separatorValid or byteCount >= 3:
raise newException(ValueError, "Invalid IP Address")
result.address_v6[groupCount*2 + byteCount] = cast[uint8](currentShort)
currentShort = 0
byteCount.inc()
- seperatorValid = false
+ separatorValid = false
else: # Invalid character
raise newException(ValueError,
"Invalid IP Address. Address contains an invalid character")
- if byteCount != 3 or not seperatorValid:
+ if byteCount != 3 or not separatorValid:
raise newException(ValueError, "Invalid IP Address")
result.address_v6[groupCount*2 + byteCount] = cast[uint8](currentShort)
groupCount += 2
diff --git a/tests/stdlib/ttimes.nim b/tests/stdlib/ttimes.nim
index 32f39953d..3999c968f 100644
--- a/tests/stdlib/ttimes.nim
+++ b/tests/stdlib/ttimes.nim
@@ -253,7 +253,7 @@ suite "ttimes":
parseTestExcp("+1", "mm")
parseTestExcp("+1", "ss")
- test "_ as a seperator":
+ test "_ as a separator":
discard parse("2000_01_01", "YYYY'_'MM'_'dd")
test "dynamic timezone":
--
cgit 1.4.1-2-gfad0
From 9a003bae06014beb017c7a77b351f676cee6ce5d Mon Sep 17 00:00:00 2001
From: Oscar Nihlgård <oscarnihlgard@gmail.com>
Date: Mon, 21 Jan 2019 15:14:38 +0100
Subject: Fix error lexer error messages for to large numbers (#10394)
---
compiler/lexer.nim | 62 +++++++++++++++++--------------------
tests/errmsgs/tinteger_literals.nim | 15 +++++++++
2 files changed, 44 insertions(+), 33 deletions(-)
create mode 100644 tests/errmsgs/tinteger_literals.nim
(limited to 'compiler')
diff --git a/compiler/lexer.nim b/compiler/lexer.nim
index 635e6f08d..a4414d186 100644
--- a/compiler/lexer.nim
+++ b/compiler/lexer.nim
@@ -17,7 +17,7 @@
import
hashes, options, msgs, strutils, platform, idents, nimlexbase, llstream,
- wordrecg, lineinfos, pathutils
+ wordrecg, lineinfos, pathutils, parseutils
const
MaxLineLength* = 80 # lines longer than this lead to a warning
@@ -307,20 +307,6 @@ template tokenEndPrevious(tok, pos) =
when defined(nimpretty):
tok.offsetB = L.offsetBase + pos
-{.push overflowChecks: off.}
-# We need to parse the largest uint literal without overflow checks
-proc unsafeParseUInt(s: string, b: var BiggestInt, start = 0): int =
- var i = start
- if i < s.len and s[i] in {'0'..'9'}:
- b = 0
- while i < s.len and s[i] in {'0'..'9'}:
- b = b * 10 + (ord(s[i]) - ord('0'))
- inc(i)
- while i < s.len and s[i] == '_': inc(i) # underscores are allowed and ignored
- result = i - start
-{.pop.} # overflowChecks
-
-
template eatChar(L: var TLexer, t: var TToken, replacementChar: char) =
add(t.literal, replacementChar)
inc(L.bufpos)
@@ -586,33 +572,43 @@ proc getNumber(L: var TLexer, result: var TToken) =
of floatTypes:
result.fNumber = parseFloat(result.literal)
of tkUint64Lit:
- xi = 0
- let len = unsafeParseUInt(result.literal, xi)
- if len != result.literal.len or len == 0:
- raise newException(ValueError, "invalid integer: " & $xi)
- result.iNumber = xi
+ var iNumber: uint64
+ var len: int
+ try:
+ len = parseBiggestUInt(result.literal, iNumber)
+ except ValueError:
+ raise newException(OverflowError, "number out of range: " & $result.literal)
+ if len != result.literal.len:
+ raise newException(ValueError, "invalid integer: " & $result.literal)
+ result.iNumber = cast[int64](iNumber)
else:
- result.iNumber = parseBiggestInt(result.literal)
-
- # Explicit bounds checks
+ var iNumber: int64
+ var len: int
+ try:
+ len = parseBiggestInt(result.literal, iNumber)
+ except ValueError:
+ raise newException(OverflowError, "number out of range: " & $result.literal)
+ if len != result.literal.len:
+ raise newException(ValueError, "invalid integer: " & $result.literal)
+ result.iNumber = iNumber
+
+ # Explicit bounds checks. Only T.high needs to be considered
+ # since result.iNumber can't be negative.
let outOfRange =
case result.tokType
- of tkInt8Lit: (result.iNumber < int8.low or result.iNumber > int8.high)
- of tkUInt8Lit: (result.iNumber < BiggestInt(uint8.low) or
- result.iNumber > BiggestInt(uint8.high))
- of tkInt16Lit: (result.iNumber < int16.low or result.iNumber > int16.high)
- of tkUInt16Lit: (result.iNumber < BiggestInt(uint16.low) or
- result.iNumber > BiggestInt(uint16.high))
- of tkInt32Lit: (result.iNumber < int32.low or result.iNumber > int32.high)
- of tkUInt32Lit: (result.iNumber < BiggestInt(uint32.low) or
- result.iNumber > BiggestInt(uint32.high))
+ of tkInt8Lit: result.iNumber > int8.high
+ of tkUInt8Lit: result.iNumber > BiggestInt(uint8.high)
+ of tkInt16Lit: result.iNumber > int16.high
+ of tkUInt16Lit: result.iNumber > BiggestInt(uint16.high)
+ of tkInt32Lit: result.iNumber > int32.high
+ of tkUInt32Lit: result.iNumber > BiggestInt(uint32.high)
else: false
if outOfRange: lexMessageLitNum(L, "number out of range: '$1'", startpos)
# Promote int literal to int64? Not always necessary, but more consistent
if result.tokType == tkIntLit:
- if (result.iNumber < low(int32)) or (result.iNumber > high(int32)):
+ if result.iNumber > high(int32):
result.tokType = tkInt64Lit
except ValueError:
diff --git a/tests/errmsgs/tinteger_literals.nim b/tests/errmsgs/tinteger_literals.nim
new file mode 100644
index 000000000..98c92a227
--- /dev/null
+++ b/tests/errmsgs/tinteger_literals.nim
@@ -0,0 +1,15 @@
+discard """
+cmd: "nim check $file"
+errormsg: "number out of range: '300'u8'"
+nimout: '''
+tinteger_literals.nim(12, 9) Error: number out of range: '18446744073709551616'u64'
+tinteger_literals.nim(13, 9) Error: number out of range: '9223372036854775808'i64'
+tinteger_literals.nim(14, 9) Error: number out of range: '9223372036854775808'
+tinteger_literals.nim(15, 9) Error: number out of range: '300'u8'
+'''
+"""
+
+discard 18446744073709551616'u64 # high(uint64) + 1
+discard 9223372036854775808'i64 # high(int64) + 1
+discard 9223372036854775808 # high(int64) + 1
+discard 300'u8
\ No newline at end of file
--
cgit 1.4.1-2-gfad0
From 413755fd45f5a77f9c3323cf7185830249c3f310 Mon Sep 17 00:00:00 2001
From: alaviss <alaviss@users.noreply.github.com>
Date: Mon, 21 Jan 2019 22:57:48 +0700
Subject: Correct lineinfo for accent quoted symbols in proc definition
(#10399)
* compiler/parser: preserve lineinfo for accent quoted symbols
Previously the lineinfo for symbol $$$ in this example is:
proc `$$$`
^
After this commit:
proc `$$$`
^
* compiler/semstmts: correct lineinfo for accent quoted idents
Previously nimsuggest would highlight this as:
proc `$$$`
^~~
After this commit:
proc `$$$`
^~~
* nimsuggest/tests: add a test for accent quoted proc
Disabled by default
---
compiler/parser.nim | 5 ++++-
compiler/semstmts.nim | 20 ++++++++++----------
nimsuggest/tests/taccent_highlight.nim | 8 ++++++++
3 files changed, 22 insertions(+), 11 deletions(-)
create mode 100644 nimsuggest/tests/taccent_highlight.nim
(limited to 'compiler')
diff --git a/compiler/parser.nim b/compiler/parser.nim
index afc49c0d3..c9626c527 100644
--- a/compiler/parser.nim
+++ b/compiler/parser.nim
@@ -332,12 +332,15 @@ proc parseSymbol(p: var TParser, mode = smNormal): PNode =
parMessage(p, errIdentifierExpected, p.tok)
break
of tkOpr, tkDot, tkDotDot, tkEquals, tkParLe..tkParDotRi:
+ let lineinfo = parLineinfo(p)
var accm = ""
while p.tok.tokType in {tkOpr, tkDot, tkDotDot, tkEquals,
tkParLe..tkParDotRi}:
accm.add(tokToStr(p.tok))
getTok(p)
- result.add(newIdentNodeP(p.lex.cache.getIdent(accm), p))
+ let node = newNodeI(nkIdent, lineinfo)
+ node.ident = p.lex.cache.getIdent(accm)
+ result.add(node)
of tokKeywordLow..tokKeywordHigh, tkSymbol, tkIntLit..tkCharLit:
result.add(newIdentNodeP(p.lex.cache.getIdent(tokToStr(p.tok)), p))
getTok(p)
diff --git a/compiler/semstmts.nim b/compiler/semstmts.nim
index de39e95c8..288820d86 100644
--- a/compiler/semstmts.nim
+++ b/compiler/semstmts.nim
@@ -318,16 +318,16 @@ proc semIdentDef(c: PContext, n: PNode, kind: TSymKind): PSym =
result = semIdentWithPragma(c, kind, n, {})
if result.owner.kind == skModule:
incl(result.flags, sfGlobal)
- let info = case n.kind
- of nkPostfix:
- n.sons[1].info
- of nkPragmaExpr:
- if n.sons[0].kind == nkPostfix:
- n.sons[0].sons[1].info
- else:
- n.sons[0].info
- else:
- n.info
+
+ proc getLineInfo(n: PNode): TLineInfo =
+ case n.kind
+ of nkPostfix:
+ getLineInfo(n.sons[1])
+ of nkAccQuoted, nkPragmaExpr:
+ getLineInfo(n.sons[0])
+ else:
+ n.info
+ let info = getLineInfo(n)
suggestSym(c.config, info, result, c.graph.usageSym)
proc checkNilable(c: PContext; v: PSym) =
diff --git a/nimsuggest/tests/taccent_highlight.nim b/nimsuggest/tests/taccent_highlight.nim
new file mode 100644
index 000000000..2f03d7c86
--- /dev/null
+++ b/nimsuggest/tests/taccent_highlight.nim
@@ -0,0 +1,8 @@
+proc `$$$`#[!]#
+
+discard """
+disabled:true
+$nimsuggest --tester $file
+>highlight $1
+highlight;;skProc;;1;;6;;3
+"""
--
cgit 1.4.1-2-gfad0
From a4cdd25b19b0ec98826a01e1f57da1c2fb8920af Mon Sep 17 00:00:00 2001
From: Oscar Nihlgård <oscarnihlgard@gmail.com>
Date: Mon, 21 Jan 2019 17:00:33 +0100
Subject: Support system.reset in vm (#10400)
---
compiler/vm.nim | 2 --
compiler/vmdef.nim | 2 +-
compiler/vmgen.nim | 4 +++-
tests/vm/treset.nim | 28 ++++++++++++++++++++++++++++
4 files changed, 32 insertions(+), 4 deletions(-)
create mode 100644 tests/vm/treset.nim
(limited to 'compiler')
diff --git a/compiler/vm.nim b/compiler/vm.nim
index 180f3800b..10d38fe77 100644
--- a/compiler/vm.nim
+++ b/compiler/vm.nim
@@ -1249,8 +1249,6 @@ proc rawExecute(c: PCtx, start: int, tos: PStackFrame): TFullReg =
let newLen = regs[rb].intVal.int
if regs[ra].node.isNil: stackTrace(c, tos, pc, errNilAccess)
else: c.setLenSeq(regs[ra].node, newLen, c.debug[pc])
- of opcReset:
- internalError(c.config, c.debug[pc], "too implement")
of opcNarrowS:
decodeB(rkInt)
let min = -(1.BiggestInt shl (rb-1))
diff --git a/compiler/vmdef.nim b/compiler/vmdef.nim
index 493078f74..a43f8dbba 100644
--- a/compiler/vmdef.nim
+++ b/compiler/vmdef.nim
@@ -73,7 +73,7 @@ type
opcContainsSet, opcRepr, opcSetLenStr, opcSetLenSeq,
opcIsNil, opcOf, opcIs,
opcSubStr, opcParseFloat, opcConv, opcCast,
- opcQuit, opcReset,
+ opcQuit,
opcNarrowS, opcNarrowU,
opcAddStrCh,
diff --git a/compiler/vmgen.nim b/compiler/vmgen.nim
index 033cc81f0..e7993dfb2 100644
--- a/compiler/vmgen.nim
+++ b/compiler/vmgen.nim
@@ -1105,7 +1105,9 @@ proc genMagic(c: PCtx; n: PNode; dest: var TDest; m: TMagic) =
of mReset:
unused(c, n, dest)
var d = c.genx(n.sons[1])
- c.gABC(n, opcReset, d)
+ c.gABx(n, opcLdNull, d, c.genType(n.sons[1].typ))
+ c.gABx(n, opcNodeToReg, d, d)
+ c.genAsgnPatch(n.sons[1], d)
of mOf, mIs:
if dest < 0: dest = c.getTemp(n.typ)
var tmp = c.genx(n.sons[1])
diff --git a/tests/vm/treset.nim b/tests/vm/treset.nim
new file mode 100644
index 000000000..56fe19b19
--- /dev/null
+++ b/tests/vm/treset.nim
@@ -0,0 +1,28 @@
+static:
+ type Obj = object
+ field: int
+ var o = Obj(field: 1)
+ reset(o)
+ doAssert o.field == 0
+
+static:
+ var i = 2
+ reset(i)
+ doAssert i == 0
+
+static:
+ var i = new int
+ reset(i)
+ doAssert i.isNil
+
+static:
+ var s = @[1, 2, 3]
+ reset(s)
+ doAssert s == @[]
+
+static:
+ proc f() =
+ var i = 2
+ reset(i)
+ doAssert i == 0
+ f()
\ No newline at end of file
--
cgit 1.4.1-2-gfad0
From ae5d8fbd9d6b0c6469c2245da8a54d7b4c12f54f Mon Sep 17 00:00:00 2001
From: LemonBoy <LemonBoy@users.noreply.github.com>
Date: Mon, 21 Jan 2019 17:27:36 +0100
Subject: Proper check for tyStatic[T] -> U conversions (#10382)
Drop the outer tyStatic shell then perform the check.
Fixes #7609
---
compiler/semexprs.nim | 2 ++
tests/statictypes/tstatictypes.nim | 5 +++++
2 files changed, 7 insertions(+)
(limited to 'compiler')
diff --git a/compiler/semexprs.nim b/compiler/semexprs.nim
index 5e1e4cbbd..82f948492 100644
--- a/compiler/semexprs.nim
+++ b/compiler/semexprs.nim
@@ -108,6 +108,8 @@ const
proc checkConvertible(c: PContext, castDest, src: PType): TConvStatus =
result = convOK
+ # We're interested in the inner type and not in the static tag
+ var src = src.skipTypes({tyStatic})
if sameType(castDest, src) and castDest.sym == src.sym:
# don't annoy conversions that may be needed on another processor:
if castDest.kind notin IntegralTypes+{tyRange}:
diff --git a/tests/statictypes/tstatictypes.nim b/tests/statictypes/tstatictypes.nim
index 9888165cc..b7cde6124 100644
--- a/tests/statictypes/tstatictypes.nim
+++ b/tests/statictypes/tstatictypes.nim
@@ -132,3 +132,8 @@ block:
var x = foo(y, 10, 15, [1, 2, 3])
doAssert x == (20, 10, 15, 3)
+# #7609
+block:
+ type
+ Coord[N: static[int]] = tuple[col, row: range[0'i8 .. (N.int8-1)]]
+ Point[N: static[int]] = range[0'i16 .. N.int16 * N.int16 - 1]
--
cgit 1.4.1-2-gfad0
From ee89ba6bdb664fe4972f2917499cff1afdac0bab Mon Sep 17 00:00:00 2001
From: LemonBoy <LemonBoy@users.noreply.github.com>
Date: Mon, 21 Jan 2019 19:12:17 +0100
Subject: Fix subtype conversion w/ varargs arguments (#10402)
The type matching is done on the `T` of the `varargs[T]` so the
conversion must be performed to `T` and not to the whole type.
This problem is only noticeable with the cpp backend since C doesn't
give a damn shit about your fucking (wrong) types.
Fixes #9845
---
compiler/sigmatch.nim | 5 +++--
tests/typerel/t4799.nim | 1 +
tests/typerel/t4799_1.nim | 1 +
tests/typerel/t4799_2.nim | 1 +
tests/typerel/t4799_3.nim | 1 +
5 files changed, 7 insertions(+), 2 deletions(-)
(limited to 'compiler')
diff --git a/compiler/sigmatch.nim b/compiler/sigmatch.nim
index 9aae254f3..e08559db6 100644
--- a/compiler/sigmatch.nim
+++ b/compiler/sigmatch.nim
@@ -2071,6 +2071,7 @@ proc paramTypesMatchAux(m: var TCandidate, f, a: PType,
# constructor in a call:
if result == nil and f.kind == tyVarargs:
if f.n != nil:
+ # Forward to the varargs converter
result = localConvMatch(c, m, f, a, arg)
else:
r = typeRel(m, base(f), a)
@@ -2083,10 +2084,10 @@ proc paramTypesMatchAux(m: var TCandidate, f, a: PType,
# bug #4799, varargs accepting subtype relation object
elif r == isSubtype:
inc(m.subtypeMatches)
- if f.kind == tyTypeDesc:
+ if base(f).kind == tyTypeDesc:
result = arg
else:
- result = implicitConv(nkHiddenSubConv, f, arg, m, c)
+ result = implicitConv(nkHiddenSubConv, base(f), arg, m, c)
m.baseTypeMatch = true
else:
result = userConvMatch(c, m, base(f), a, arg)
diff --git a/tests/typerel/t4799.nim b/tests/typerel/t4799.nim
index 075893476..814ad361d 100644
--- a/tests/typerel/t4799.nim
+++ b/tests/typerel/t4799.nim
@@ -1,4 +1,5 @@
discard """
+ targets: "c cpp"
output: "OK"
"""
diff --git a/tests/typerel/t4799_1.nim b/tests/typerel/t4799_1.nim
index 549b6bf3c..e66aa1a9a 100644
--- a/tests/typerel/t4799_1.nim
+++ b/tests/typerel/t4799_1.nim
@@ -1,4 +1,5 @@
discard """
+ targets: "c cpp"
outputsub: '''ObjectAssignmentError'''
exitcode: "1"
"""
diff --git a/tests/typerel/t4799_2.nim b/tests/typerel/t4799_2.nim
index cfd399a6e..ff20c2426 100644
--- a/tests/typerel/t4799_2.nim
+++ b/tests/typerel/t4799_2.nim
@@ -1,4 +1,5 @@
discard """
+ targets: "c cpp"
outputsub: '''ObjectAssignmentError'''
exitcode: "1"
"""
diff --git a/tests/typerel/t4799_3.nim b/tests/typerel/t4799_3.nim
index 784eee8fc..4a8a158dd 100644
--- a/tests/typerel/t4799_3.nim
+++ b/tests/typerel/t4799_3.nim
@@ -1,4 +1,5 @@
discard """
+ targets: "c cpp"
outputsub: '''ObjectAssignmentError'''
exitcode: "1"
"""
--
cgit 1.4.1-2-gfad0
From 4b1e227531dcc056c209f9430c615232d7be2618 Mon Sep 17 00:00:00 2001
From: genotrance <dev@genotrance.com>
Date: Mon, 21 Jan 2019 23:24:45 -0600
Subject: Fix gorge caching (#10407)
---
compiler/gorgeimpl.nim | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'compiler')
diff --git a/compiler/gorgeimpl.nim b/compiler/gorgeimpl.nim
index 44636f382..534ef9fdc 100644
--- a/compiler/gorgeimpl.nim
+++ b/compiler/gorgeimpl.nim
@@ -24,11 +24,11 @@ proc readOutput(p: Process): (string, int) =
proc opGorge*(cmd, input, cache: string, info: TLineInfo; conf: ConfigRef): (string, int) =
let workingDir = parentDir(toFullPath(conf, info))
- if cache.len > 0:# and optForceFullMake notin gGlobalOptions:
+ if cache.len > 0:
let h = secureHash(cmd & "\t" & input & "\t" & cache)
let filename = toGeneratedFile(conf, AbsoluteFile("gorge_" & $h), "txt").string
var f: File
- if open(f, filename):
+ if optForceFullMake notin conf.globalOptions and open(f, filename):
result = (f.readAll, 0)
f.close
return
--
cgit 1.4.1-2-gfad0
From 3ea099bc7f75d35ee127932208d9d012b57f11f8 Mon Sep 17 00:00:00 2001
From: LemonBoy <LemonBoy@users.noreply.github.com>
Date: Tue, 22 Jan 2019 07:35:52 +0100
Subject: Finalizer proc must be global (#10388)
Fixes #10376
---
compiler/semmagic.nim | 5 +++++
tests/errmsgs/t10376.nim | 31 +++++++++++++++++++++++++++++++
2 files changed, 36 insertions(+)
create mode 100644 tests/errmsgs/t10376.nim
(limited to 'compiler')
diff --git a/compiler/semmagic.nim b/compiler/semmagic.nim
index 05c8b181c..2311136b4 100644
--- a/compiler/semmagic.nim
+++ b/compiler/semmagic.nim
@@ -410,4 +410,9 @@ proc magicsAfterOverloadResolution(c: PContext, n: PNode,
result = n
else:
result = plugin(c, n)
+ of mNewFinalize:
+ # Make sure the finalizer procedure refers to a procedure
+ if n[^1].kind == nkSym and n[^1].sym.kind notin {skProc, skFunc}:
+ localError(c.config, n.info, "finalizer must be a direct reference to a procedure")
+ result = n
else: result = n
diff --git a/tests/errmsgs/t10376.nim b/tests/errmsgs/t10376.nim
new file mode 100644
index 000000000..a33d5e40f
--- /dev/null
+++ b/tests/errmsgs/t10376.nim
@@ -0,0 +1,31 @@
+discard """
+ errormsg: "finalizer must be a direct reference to a procedure"
+ line: 29
+"""
+
+type
+ A = ref object
+
+proc my_callback(a: A) {. nimcall .} =
+ discard
+
+proc foo(callback: proc(a: A) {. nimcall .}) =
+ var x1: A
+ new(x1, proc (x: A) {.nimcall.} = discard)
+ var x2: A
+ new(x2, func (x: A) {.nimcall.} = discard)
+
+ var x3: A
+ proc foo1(a: A) {.nimcall.} = discard
+ new(x3, foo1)
+ var x4: A
+ func foo2(a: A) {.nimcall.} = discard
+ new(x4, foo2)
+
+ var x5: A
+ new(x5, my_callback)
+
+ var x6: A
+ new(x6, callback)
+
+foo(my_callback)
--
cgit 1.4.1-2-gfad0
From 44c04b35717336595dad03ac532ee9e141a0e374 Mon Sep 17 00:00:00 2001
From: LemonBoy <LemonBoy@users.noreply.github.com>
Date: Tue, 22 Jan 2019 07:36:40 +0100
Subject: Object downconversion in VM should not copy (#10378)
Hopefully the type-check phase already rejected all the invalid
conversions by the time we execute the VM bytecode.
Problem reported by chrisheller on the Nim Forum
---
compiler/vm.nim | 5 +++++
tests/vm/tconstobj.nim | 17 +++++++++++++++++
2 files changed, 22 insertions(+)
(limited to 'compiler')
diff --git a/compiler/vm.nim b/compiler/vm.nim
index 10d38fe77..131501380 100644
--- a/compiler/vm.nim
+++ b/compiler/vm.nim
@@ -399,6 +399,11 @@ proc opConv(c: PCtx; dest: var TFullReg, src: TFullReg, desttyp, srctyp: PType):
dest.floatVal = toBiggestFloat(src.intVal)
else:
dest.floatVal = src.floatVal
+ of tyObject:
+ if srctyp.skipTypes(abstractRange).kind != tyObject:
+ internalError(c.config, "invalid object-to-object conversion")
+ # A object-to-object conversion is essentially a no-op
+ moveConst(dest, src)
else:
asgnComplex(dest, src)
diff --git a/tests/vm/tconstobj.nim b/tests/vm/tconstobj.nim
index 021fcb728..3cf256eed 100644
--- a/tests/vm/tconstobj.nim
+++ b/tests/vm/tconstobj.nim
@@ -48,3 +48,20 @@ let people = {
}.toTable()
echo people["001"]
+
+# Object downconversion should not copy
+
+type
+ SomeBaseObj {.inheritable.} = object of RootObj
+ txt : string
+ InheritedFromBase = object of SomeBaseObj
+ other : string
+
+proc initBase(sbo: var SomeBaseObj) =
+ sbo.txt = "Initialized string from base"
+
+static:
+ var ifb2: InheritedFromBase
+ initBase(SomeBaseObj(ifb2))
+ echo repr(ifb2)
+ doAssert(ifb2.txt == "Initialized string from base")
--
cgit 1.4.1-2-gfad0
From 226c15499fe829d533b4811aa5c68b15de870b04 Mon Sep 17 00:00:00 2001
From: Neelesh Chandola <neelesh.chandola@outlook.com>
Date: Tue, 22 Jan 2019 12:25:11 +0530
Subject: Fix compileTime pragma applying to whole var/let section (#10389)
---
compiler/semstmts.nim | 10 ++++------
tests/vm/tvarsection.nim | 15 +++++++++++++++
2 files changed, 19 insertions(+), 6 deletions(-)
create mode 100644 tests/vm/tvarsection.nim
(limited to 'compiler')
diff --git a/compiler/semstmts.nim b/compiler/semstmts.nim
index 288820d86..17f88d039 100644
--- a/compiler/semstmts.nim
+++ b/compiler/semstmts.nim
@@ -432,7 +432,6 @@ proc setVarType(c: PContext; v: PSym, typ: PType) =
proc semVarOrLet(c: PContext, n: PNode, symkind: TSymKind): PNode =
var b: PNode
result = copyNode(n)
- var hasCompileTime = false
for i in countup(0, sonsLen(n)-1):
var a = n.sons[i]
if c.config.cmd == cmdIdeTools: suggestStmt(c, a)
@@ -556,13 +555,12 @@ proc semVarOrLet(c: PContext, n: PNode, symkind: TSymKind): PNode =
else: v.typ = tup
b.sons[j] = newSymNode(v)
checkNilable(c, v)
- if sfCompileTime in v.flags: hasCompileTime = true
+ if sfCompileTime in v.flags:
+ var x = newNodeI(result.kind, v.info)
+ addSon(x, result[i])
+ vm.setupCompileTimeVar(c.module, c.graph, x)
if v.flags * {sfGlobal, sfThread} == {sfGlobal}:
message(c.config, v.info, hintGlobalVar)
- if hasCompileTime:
- vm.setupCompileTimeVar(c.module, c.graph, result)
- # handled by the VM codegen:
- #c.graph.recordStmt(c.graph, c.module, result)
proc semConst(c: PContext, n: PNode): PNode =
result = copyNode(n)
diff --git a/tests/vm/tvarsection.nim b/tests/vm/tvarsection.nim
new file mode 100644
index 000000000..d1c4926a0
--- /dev/null
+++ b/tests/vm/tvarsection.nim
@@ -0,0 +1,15 @@
+discard """
+ output: '''-1abc'''
+"""
+
+var
+ a {.compileTime.} = 2
+ b = -1
+ c {.compileTime.} = 3
+ d = "abc"
+
+static:
+ assert a == 2
+ assert c == 3
+
+echo b, d
--
cgit 1.4.1-2-gfad0
From 68254308312ce352612b11af164d82d930a1bf68 Mon Sep 17 00:00:00 2001
From: LemonBoy <LemonBoy@users.noreply.github.com>
Date: Tue, 22 Jan 2019 11:17:20 +0100
Subject: Restrict ptr/ref to ptr/ref implicit conversion (#10411)
* Restrict ptr/ref to ptr/ref implicit conversion
Fixes #10409
* Make the ptr conversions explicit in db_odbc
---
compiler/sigmatch.nim | 2 +-
lib/impure/db_odbc.nim | 14 +++++++++-----
tests/typerel/tptrs.nim | 8 ++++++++
3 files changed, 18 insertions(+), 6 deletions(-)
create mode 100644 tests/typerel/tptrs.nim
(limited to 'compiler')
diff --git a/compiler/sigmatch.nim b/compiler/sigmatch.nim
index e08559db6..fa4ab3703 100644
--- a/compiler/sigmatch.nim
+++ b/compiler/sigmatch.nim
@@ -1316,7 +1316,7 @@ proc typeRelImpl(c: var TCandidate, f, aOrig: PType,
if typeRel(c, f.sons[i], a.sons[i]) == isNone: return isNone
result = typeRel(c, f.lastSon, a.lastSon, flags + {trNoCovariance})
subtypeCheck()
- if result <= isConvertible: result = isNone
+ if result <= isIntConv: result = isNone
elif tfNotNil in f.flags and tfNotNil notin a.flags:
result = isNilConversion
elif a.kind == tyNil: result = f.allowsNil
diff --git a/lib/impure/db_odbc.nim b/lib/impure/db_odbc.nim
index b7af5128a..a533a28ff 100644
--- a/lib/impure/db_odbc.nim
+++ b/lib/impure/db_odbc.nim
@@ -128,7 +128,7 @@ proc getErrInfo(db: var DbConn): tuple[res: int, ss, ne, msg: string] {.
cast[PSQLCHAR](sqlState.addr),
cast[PSQLCHAR](nativeErr.addr),
cast[PSQLCHAR](errMsg.addr),
- 511.TSqlSmallInt, retSz.addr.PSQLSMALLINT)
+ 511.TSqlSmallInt, retSz.addr.PSQLINTEGER)
except:
discard
return (res.int, $(addr sqlState), $(addr nativeErr), $(addr errMsg))
@@ -297,7 +297,8 @@ iterator fastRows*(db: var DbConn, query: SqlQuery,
for colId in 1..cCnt:
buf[0] = '\0'
db.sqlCheck(SQLGetData(db.stmt, colId.SqlUSmallInt, SQL_C_CHAR,
- cast[cstring](buf.addr), 4095.TSqlSmallInt, sz.addr))
+ cast[cstring](buf.addr), 4095.TSqlSmallInt,
+ sz.addr.PSQLINTEGER))
rowRes[colId-1] = $(addr buf)
cCnt = tempcCnt
yield rowRes
@@ -332,7 +333,8 @@ iterator instantRows*(db: var DbConn, query: SqlQuery,
for colId in 1..cCnt:
buf[0] = '\0'
db.sqlCheck(SQLGetData(db.stmt, colId.SqlUSmallInt, SQL_C_CHAR,
- cast[cstring](buf.addr), 4095.TSqlSmallInt, sz.addr))
+ cast[cstring](buf.addr), 4095.TSqlSmallInt,
+ sz.addr.PSQLINTEGER))
rowRes[colId-1] = $(addr buf)
cCnt = tempcCnt
yield (row: rowRes, len: cCnt.int)
@@ -374,7 +376,8 @@ proc getRow*(db: var DbConn, query: SqlQuery,
for colId in 1..cCnt:
buf[0] = '\0'
db.sqlCheck(SQLGetData(db.stmt, colId.SqlUSmallInt, SQL_C_CHAR,
- cast[cstring](buf.addr), 4095.TSqlSmallInt, sz.addr))
+ cast[cstring](buf.addr), 4095.TSqlSmallInt,
+ sz.addr.PSQLINTEGER))
rowRes[colId-1] = $(addr buf)
cCnt = tempcCnt
res = SQLFetch(db.stmt)
@@ -409,7 +412,8 @@ proc getAllRows*(db: var DbConn, query: SqlQuery,
for colId in 1..cCnt:
buf[0] = '\0'
db.sqlCheck(SQLGetData(db.stmt, colId.SqlUSmallInt, SQL_C_CHAR,
- cast[cstring](buf.addr), 4095.TSqlSmallInt, sz.addr))
+ cast[cstring](buf.addr), 4095.TSqlSmallInt,
+ sz.addr.PSQLINTEGER))
rowRes[colId-1] = $(addr buf)
cCnt = tempcCnt
rows.add(rowRes)
diff --git a/tests/typerel/tptrs.nim b/tests/typerel/tptrs.nim
new file mode 100644
index 000000000..3505a7736
--- /dev/null
+++ b/tests/typerel/tptrs.nim
@@ -0,0 +1,8 @@
+discard """
+ errormsg: "type mismatch: got <ptr int16> but expected 'ptr int'"
+ line: 8
+"""
+
+var
+ n: int16
+ p: ptr int = addr n
--
cgit 1.4.1-2-gfad0
From 53eda40d40cedd8110bd73541a20b7a88fb41614 Mon Sep 17 00:00:00 2001
From: LemonBoy <LemonBoy@users.noreply.github.com>
Date: Tue, 22 Jan 2019 22:38:52 +0100
Subject: Restore compatibility with old vcc versions [backport] (#10415)
Local variables are declared before anything else.
Fixes #10352
---
compiler/cgen.nim | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
(limited to 'compiler')
diff --git a/compiler/cgen.nim b/compiler/cgen.nim
index e4f16f4ed..190814b79 100644
--- a/compiler/cgen.nim
+++ b/compiler/cgen.nim
@@ -1313,9 +1313,19 @@ proc genInitCode(m: BModule) =
appcg(m, m.s[cfsTypeInit1], "static #TNimType $1[$2];$n",
[m.nimTypesName, rope(m.nimTypes)])
- # Give this small function its own scope
- addf(prc, "{$N", [])
- block:
+ if m.initProc.gcFrameId > 0:
+ moduleInitRequired = true
+ add(prc, initGCFrame(m.initProc))
+
+ if m.initProc.s(cpsLocals).len > 0:
+ moduleInitRequired = true
+ add(prc, genSectionStart(cpsLocals, m.config))
+ add(prc, m.initProc.s(cpsLocals))
+ add(prc, genSectionEnd(cpsLocals, m.config))
+
+ if m.preInitProc.s(cpsInit).len > 0 or m.preInitProc.s(cpsStmts).len > 0:
+ # Give this small function its own scope
+ addf(prc, "{$N", [])
# Keep a bogus frame in case the code needs one
add(prc, ~"\tTFrame FR_; FR_.len = 0;$N")
@@ -1336,17 +1346,7 @@ proc genInitCode(m: BModule) =
add(prc, genSectionStart(cpsStmts, m.config))
add(prc, m.preInitProc.s(cpsStmts))
add(prc, genSectionEnd(cpsStmts, m.config))
- addf(prc, "}$N", [])
-
- if m.initProc.gcFrameId > 0:
- moduleInitRequired = true
- add(prc, initGCFrame(m.initProc))
-
- if m.initProc.s(cpsLocals).len > 0:
- moduleInitRequired = true
- add(prc, genSectionStart(cpsLocals, m.config))
- add(prc, m.initProc.s(cpsLocals))
- add(prc, genSectionEnd(cpsLocals, m.config))
+ addf(prc, "}$N", [])
if m.initProc.s(cpsInit).len > 0 or m.initProc.s(cpsStmts).len > 0:
moduleInitRequired = true
--
cgit 1.4.1-2-gfad0
From 94f6a6b29447caa1814016c61f9dd30b82d83eab Mon Sep 17 00:00:00 2001
From: Ray Imber <rayimber@gmail.com>
Date: Tue, 22 Jan 2019 17:05:26 -0800
Subject: Fix for issue #10342. better message for generic subclass
instantiation (#10354)
* Fix for issue #10342. better message for generic subclass instantiation errors.
---
compiler/semtypinst.nim | 15 ++++++++++++++-
compiler/types.nim | 9 +++++++--
tests/generics/tsubclassgenericerror.nim | 11 +++++++++++
tests/generics/twrong_generic_object.nim | 2 +-
4 files changed, 33 insertions(+), 4 deletions(-)
create mode 100644 tests/generics/tsubclassgenericerror.nim
(limited to 'compiler')
diff --git a/compiler/semtypinst.nim b/compiler/semtypinst.nim
index f3c12e557..027ffd4aa 100644
--- a/compiler/semtypinst.nim
+++ b/compiler/semtypinst.nim
@@ -490,7 +490,12 @@ proc replaceTypeVarsTAux(cl: var TReplTypeVars, t: PType): PType =
result.kind = tyUserTypeClassInst
of tyGenericBody:
- localError(cl.c.config, cl.info, "cannot instantiate: '" & typeToString(t) & "'")
+ localError(
+ cl.c.config,
+ cl.info,
+ "cannot instantiate: '" &
+ typeToString(t, preferDesc) &
+ "'; Maybe generic arguments are missing?")
result = errorType(cl.c)
#result = replaceTypeVarsT(cl, lastSon(t))
@@ -555,6 +560,14 @@ proc replaceTypeVarsTAux(cl: var TReplTypeVars, t: PType): PType =
for i in countup(0, sonsLen(result) - 1):
if result.sons[i] != nil:
+ if result.sons[i].kind == tyGenericBody:
+ localError(
+ cl.c.config,
+ t.sym.info,
+ "cannot instantiate '" &
+ typeToString(result.sons[i], preferDesc) &
+ "' inside of type definition: '" &
+ t.owner.name.s & "'; Maybe generic arguments are missing?")
var r = replaceTypeVarsT(cl, result.sons[i])
if result.kind == tyObject:
# carefully coded to not skip the precious tyGenericInst:
diff --git a/compiler/types.nim b/compiler/types.nim
index 797336ddf..1d6e71f14 100644
--- a/compiler/types.nim
+++ b/compiler/types.nim
@@ -456,12 +456,18 @@ proc typeToString(typ: PType, prefer: TPreferedDesc = preferName): string =
result = $t.n.intVal
else:
result = "int literal(" & $t.n.intVal & ")"
- of tyGenericBody, tyGenericInst, tyGenericInvocation:
+ of tyGenericInst, tyGenericInvocation:
result = typeToString(t.sons[0]) & '['
for i in countup(1, sonsLen(t)-1-ord(t.kind != tyGenericInvocation)):
if i > 1: add(result, ", ")
add(result, typeToString(t.sons[i], preferGenericArg))
add(result, ']')
+ of tyGenericBody:
+ result = typeToString(t.lastSon) & '['
+ for i in countup(0, sonsLen(t)-2):
+ if i > 0: add(result, ", ")
+ add(result, typeToString(t.sons[i], preferTypeName))
+ add(result, ']')
of tyTypeDesc:
if t.sons[0].kind == tyNone: result = "typedesc"
else: result = "type " & typeToString(t.sons[0])
@@ -612,7 +618,6 @@ proc typeToString(typ: PType, prefer: TPreferedDesc = preferName): string =
result = typeToStr[t.kind]
result.addTypeFlags(t)
-
proc firstOrd*(conf: ConfigRef; t: PType): BiggestInt =
case t.kind
of tyBool, tyChar, tySequence, tyOpenArray, tyString, tyVarargs, tyProxy:
diff --git a/tests/generics/tsubclassgenericerror.nim b/tests/generics/tsubclassgenericerror.nim
new file mode 100644
index 000000000..87f8a8e64
--- /dev/null
+++ b/tests/generics/tsubclassgenericerror.nim
@@ -0,0 +1,11 @@
+discard """
+ errormsg: "cannot instantiate 'GenericParentType[T]' inside of type definition: 'GenericChildType'; Maybe generic arguments are missing?"
+ line: 8
+"""
+
+type
+ GenericParentType[T] = ref object of RootObj
+ GenericChildType[T] = ref object of GenericParentType # missing the [T]
+ val: T
+
+var instance : GenericChildType[int] = nil
diff --git a/tests/generics/twrong_generic_object.nim b/tests/generics/twrong_generic_object.nim
index 00d90c55e..442b89ea1 100644
--- a/tests/generics/twrong_generic_object.nim
+++ b/tests/generics/twrong_generic_object.nim
@@ -1,5 +1,5 @@
discard """
- errormsg: "cannot instantiate: 'GenericNodeObj'"
+ errormsg: "cannot instantiate: 'GenericNodeObj[T]'; Maybe generic arguments are missing?"
line: 21
"""
# bug #2509
--
cgit 1.4.1-2-gfad0
From eee9729f536fecd94565e879f28edcb73bcf3861 Mon Sep 17 00:00:00 2001
From: LemonBoy <LemonBoy@users.noreply.github.com>
Date: Wed, 23 Jan 2019 07:30:49 +0100
Subject: Fix semantic analysis with noReturn proc in tail pos (#10422)
Fixes #10417
---
compiler/semstmts.nim | 3 ++-
tests/exception/texceptions.nim | 10 ++++++++++
2 files changed, 12 insertions(+), 1 deletion(-)
(limited to 'compiler')
diff --git a/compiler/semstmts.nim b/compiler/semstmts.nim
index 17f88d039..cac24d33e 100644
--- a/compiler/semstmts.nim
+++ b/compiler/semstmts.nim
@@ -279,7 +279,8 @@ proc semTry(c: PContext, n: PNode; flags: TExprFlags): PNode =
for i in 1..last:
var it = n.sons[i]
let j = it.len-1
- it.sons[j] = fitNode(c, typ, it.sons[j], it.sons[j].info)
+ if not endsInNoReturn(it.sons[j]):
+ it.sons[j] = fitNode(c, typ, it.sons[j], it.sons[j].info)
result.typ = typ
proc fitRemoveHiddenConv(c: PContext, typ: PType, n: PNode): PNode =
diff --git a/tests/exception/texceptions.nim b/tests/exception/texceptions.nim
index b30b3874b..d63187b0e 100644
--- a/tests/exception/texceptions.nim
+++ b/tests/exception/texceptions.nim
@@ -64,3 +64,13 @@ proc return_in_except =
try: return_in_except()
except: echo "RECOVER"
+block: #10417
+ proc moo() {.noreturn.} = discard
+
+ let bar =
+ try:
+ 1
+ except:
+ moo()
+
+ doAssert(bar == 1)
--
cgit 1.4.1-2-gfad0
From e962be8981ff6ef09625b3cc89e0c0aa1f07b35a Mon Sep 17 00:00:00 2001
From: alaviss <alaviss@users.noreply.github.com>
Date: Wed, 23 Jan 2019 15:24:21 +0700
Subject: compiler/sem*: improve lineinfo for qualified and generic procs
(#10427)
Previously the compiler will believe these are where `newSeq` symbol
starts:
newSeq[int]()
^
system.newSeq[int]()
^
This commit moves them back to:
newSeq[int]()
^
system.newSeq[int]()
^
---
compiler/semcall.nim | 28 ++++++++++++++++++----------
compiler/semexprs.nim | 7 ++++---
compiler/semtempl.nim | 13 +++++++------
nimsuggest/tests/tgeneric_highlight.nim | 18 ++++++++++++++++++
nimsuggest/tests/tqualified_highlight.nim | 9 +++++++++
5 files changed, 56 insertions(+), 19 deletions(-)
create mode 100644 nimsuggest/tests/tgeneric_highlight.nim
create mode 100644 nimsuggest/tests/tqualified_highlight.nim
(limited to 'compiler')
diff --git a/compiler/semcall.nim b/compiler/semcall.nim
index 3723d3fc1..0613a4145 100644
--- a/compiler/semcall.nim
+++ b/compiler/semcall.nim
@@ -462,16 +462,23 @@ proc updateDefaultParams(call: PNode) =
if nfDefaultRefsParam in def.flags: call.flags.incl nfDefaultRefsParam
call[i] = def
+proc getCallLineInfo(n: PNode): TLineInfo =
+ case n.kind
+ of nkBracketExpr, nkCall, nkCommand: getCallLineInfo(n.sons[0])
+ of nkDotExpr: getCallLineInfo(n.sons[1])
+ else: n.info
+
proc semResolvedCall(c: PContext, x: TCandidate,
n: PNode, flags: TExprFlags): PNode =
assert x.state == csMatch
var finalCallee = x.calleeSym
- markUsed(c.config, n.sons[0].info, finalCallee, c.graph.usageSym)
- onUse(n.sons[0].info, finalCallee)
+ let info = getCallLineInfo(n)
+ markUsed(c.config, info, finalCallee, c.graph.usageSym)
+ onUse(info, finalCallee)
assert finalCallee.ast != nil
if x.hasFauxMatch:
result = x.call
- result.sons[0] = newSymNode(finalCallee, result.sons[0].info)
+ result.sons[0] = newSymNode(finalCallee, getCallLineInfo(result.sons[0]))
if containsGenericType(result.typ) or x.fauxMatch == tyUnknown:
result.typ = newTypeS(x.fauxMatch, c)
return
@@ -496,7 +503,7 @@ proc semResolvedCall(c: PContext, x: TCandidate,
result = x.call
instGenericConvertersSons(c, result, x)
- result[0] = newSymNode(finalCallee, result[0].info)
+ result[0] = newSymNode(finalCallee, getCallLineInfo(result[0]))
result.typ = finalCallee.typ.sons[0]
updateDefaultParams(result)
@@ -551,7 +558,7 @@ proc semOverloadedCall(c: PContext, n, nOrig: PNode,
notFoundError(c, n, errors)
proc explicitGenericInstError(c: PContext; n: PNode): PNode =
- localError(c.config, n.info, errCannotInstantiateX % renderTree(n))
+ localError(c.config, getCallLineInfo(n), errCannotInstantiateX % renderTree(n))
result = n
proc explicitGenericSym(c: PContext, n: PNode, s: PSym): PNode =
@@ -574,9 +581,10 @@ proc explicitGenericSym(c: PContext, n: PNode, s: PSym): PNode =
if tm in {isNone, isConvertible}: return nil
var newInst = generateInstance(c, s, m.bindings, n.info)
newInst.typ.flags.excl tfUnresolved
- markUsed(c.config, n.info, s, c.graph.usageSym)
- onUse(n.info, s)
- result = newSymNode(newInst, n.info)
+ let info = getCallLineInfo(n)
+ markUsed(c.config, info, s, c.graph.usageSym)
+ onUse(info, s)
+ result = newSymNode(newInst, info)
proc explicitGenericInstantiation(c: PContext, n: PNode, s: PSym): PNode =
assert n.kind == nkBracketExpr
@@ -593,7 +601,7 @@ proc explicitGenericInstantiation(c: PContext, n: PNode, s: PSym): PNode =
# number of generic type parameters:
if safeLen(s.ast.sons[genericParamsPos]) != n.len-1:
let expected = safeLen(s.ast.sons[genericParamsPos])
- localError(c.config, n.info, errGenerated, "cannot instantiate: '" & renderTree(n) &
+ localError(c.config, getCallLineInfo(n), errGenerated, "cannot instantiate: '" & renderTree(n) &
"'; got " & $(n.len-1) & " type(s) but expected " & $expected)
return n
result = explicitGenericSym(c, n, s)
@@ -602,7 +610,7 @@ proc explicitGenericInstantiation(c: PContext, n: PNode, s: PSym): PNode =
# choose the generic proc with the proper number of type parameters.
# XXX I think this could be improved by reusing sigmatch.paramTypesMatch.
# It's good enough for now.
- result = newNodeI(a.kind, n.info)
+ result = newNodeI(a.kind, getCallLineInfo(n))
for i in countup(0, len(a)-1):
var candidate = a.sons[i].sym
if candidate.kind in {skProc, skMethod, skConverter,
diff --git a/compiler/semexprs.nim b/compiler/semexprs.nim
index 82f948492..96fefa4b8 100644
--- a/compiler/semexprs.nim
+++ b/compiler/semexprs.nim
@@ -1171,9 +1171,10 @@ proc semSym(c: PContext, n: PNode, sym: PSym, flags: TExprFlags): PNode =
onUse(n.info, s)
result = newSymNode(s, n.info)
else:
- markUsed(c.config, n.info, s, c.graph.usageSym)
- onUse(n.info, s)
- result = newSymNode(s, n.info)
+ let info = getCallLineInfo(n)
+ markUsed(c.config, info, s, c.graph.usageSym)
+ onUse(info, s)
+ result = newSymNode(s, info)
proc builtinFieldAccess(c: PContext, n: PNode, flags: TExprFlags): PNode =
## returns nil if it's not a built-in field access
diff --git a/compiler/semtempl.nim b/compiler/semtempl.nim
index 14507cf9d..d920a54b8 100644
--- a/compiler/semtempl.nim
+++ b/compiler/semtempl.nim
@@ -58,25 +58,26 @@ proc symChoice(c: PContext, n: PNode, s: PSym, r: TSymChoiceRule): PNode =
inc(i)
if i > 1: break
a = nextOverloadIter(o, c, n)
+ let info = getCallLineInfo(n)
if i <= 1 and r != scForceOpen:
# XXX this makes more sense but breaks bootstrapping for now:
# (s.kind notin routineKinds or s.magic != mNone):
# for instance 'nextTry' is both in tables.nim and astalgo.nim ...
- result = newSymNode(s, n.info)
- markUsed(c.config, n.info, s, c.graph.usageSym)
- onUse(n.info, s)
+ result = newSymNode(s, info)
+ markUsed(c.config, info, s, c.graph.usageSym)
+ onUse(info, s)
else:
# semantic checking requires a type; ``fitNode`` deals with it
# appropriately
let kind = if r == scClosed or n.kind == nkDotExpr: nkClosedSymChoice
else: nkOpenSymChoice
- result = newNodeIT(kind, n.info, newTypeS(tyNone, c))
+ result = newNodeIT(kind, info, newTypeS(tyNone, c))
a = initOverloadIter(o, c, n)
while a != nil:
if a.kind != skModule:
incl(a.flags, sfUsed)
- addSon(result, newSymNode(a, n.info))
- onUse(n.info, a)
+ addSon(result, newSymNode(a, info))
+ onUse(info, a)
a = nextOverloadIter(o, c, n)
proc semBindStmt(c: PContext, n: PNode, toBind: var IntSet): PNode =
diff --git a/nimsuggest/tests/tgeneric_highlight.nim b/nimsuggest/tests/tgeneric_highlight.nim
new file mode 100644
index 000000000..85bef7c43
--- /dev/null
+++ b/nimsuggest/tests/tgeneric_highlight.nim
@@ -0,0 +1,18 @@
+newSeq[int]()
+system.newSeq[int]()#[!]#
+
+discard """
+disabled:true
+$nimsuggest --tester $file
+>highlight $1
+highlight;;skType;;1;;7;;3
+highlight;;skProc;;1;;0;;6
+highlight;;skProc;;1;;0;;6
+highlight;;skType;;1;;7;;3
+highlight;;skProc;;1;;0;;6
+highlight;;skType;;2;;14;;3
+highlight;;skProc;;2;;7;;6
+highlight;;skProc;;2;;7;;6
+highlight;;skType;;2;;14;;3
+highlight;;skProc;;2;;7;;6
+"""
diff --git a/nimsuggest/tests/tqualified_highlight.nim b/nimsuggest/tests/tqualified_highlight.nim
new file mode 100644
index 000000000..fe7c889d6
--- /dev/null
+++ b/nimsuggest/tests/tqualified_highlight.nim
@@ -0,0 +1,9 @@
+system.echo#[!]#
+
+discard """
+disabled:true
+$nimsuggest --tester $file
+>highlight $1
+highlight;;skProc;;1;;7;;4
+highlight;;skProc;;1;;7;;4
+"""
--
cgit 1.4.1-2-gfad0
From 11022fea1b530aceced4c3f24d9295898d2eaf44 Mon Sep 17 00:00:00 2001
From: Andreas Rumpf <rumpf_a@web.de>
Date: Mon, 21 Jan 2019 14:35:49 +0100
Subject: control flow graphs: introduce 'join' points for easy analyses based
on abstract interpretation
---
compiler/destroyer.nim | 4 +-
compiler/dfa.nim | 543 +++++++++++++++++++++++++++++++++++--------------
compiler/sempass2.nim | 2 +-
3 files changed, 395 insertions(+), 154 deletions(-)
(limited to 'compiler')
diff --git a/compiler/destroyer.nim b/compiler/destroyer.nim
index 03ce9a5cf..ca2aa8558 100644
--- a/compiler/destroyer.nim
+++ b/compiler/destroyer.nim
@@ -184,7 +184,7 @@ proc isHarmlessVar*(s: PSym; c: Con): bool =
inc usages
#of useWithinCall:
# if c.g[i].sym == s: return false
- of goto, fork:
+ of goto, fork, InstrKind.join:
discard "we do not perform an abstract interpretation yet"
result = usages <= 1
@@ -246,6 +246,8 @@ proc isLastRead(n: PNode; c: var Con): bool =
if not takenForks.containsOrIncl(pc):
pcs.add pc + c.g[pc].dest
inc pc
+ of InstrKind.join:
+ inc pc
#echo c.graph.config $ n.info, " last read here!"
return true
diff --git a/compiler/dfa.nim b/compiler/dfa.nim
index df9584576..f34981000 100644
--- a/compiler/dfa.nim
+++ b/compiler/dfa.nim
@@ -34,12 +34,12 @@ import ast, astalgo, types, intsets, tables, msgs, options, lineinfos
type
InstrKind* = enum
- goto, fork, def, use
+ goto, fork, join, def, use
Instr* = object
n*: PNode
case kind*: InstrKind
of def, use: sym*: PSym
- of goto, fork: dest*: int
+ of goto, fork, join: dest*: int
ControlFlowGraph* = seq[Instr]
@@ -56,6 +56,7 @@ type
inCall, inTryStmt: int
blocks: seq[TBlock]
tryStmtFixups: seq[TPosition]
+ forks: seq[TPosition]
owner: PSym
proc debugInfo(info: TLineInfo): string =
@@ -67,7 +68,7 @@ proc codeListing(c: ControlFlowGraph, result: var string, start=0; last = -1) =
var jumpTargets = initIntSet()
let last = if last < 0: c.len-1 else: min(last, c.len-1)
for i in start..last:
- if c[i].kind in {goto, fork}:
+ if c[i].kind in {goto, fork, join}:
jumpTargets.incl(i+c[i].dest)
var i = start
while i <= last:
@@ -78,7 +79,7 @@ proc codeListing(c: ControlFlowGraph, result: var string, start=0; last = -1) =
case c[i].kind
of def, use:
result.add c[i].sym.name.s
- of goto, fork:
+ of goto, fork, join:
result.add "L"
result.add c[i].dest+i
result.add("\t#")
@@ -98,11 +99,166 @@ proc echoCfg*(c: ControlFlowGraph; start=0; last = -1) {.deprecated.} =
proc forkI(c: var Con; n: PNode): TPosition =
result = TPosition(c.code.len)
c.code.add Instr(n: n, kind: fork, dest: 0)
+ c.forks.add result
proc gotoI(c: var Con; n: PNode): TPosition =
result = TPosition(c.code.len)
c.code.add Instr(n: n, kind: goto, dest: 0)
+#[
+
+Design of join
+==============
+
+block:
+ if cond: break
+ def(x)
+
+use(x)
+
+Generates:
+
+L0: fork L1
+ join L0 # patched.
+ goto Louter
+L1:
+ def x
+ join L0
+Louter:
+ use x
+
+
+block outer:
+ while a:
+ while b:
+ if foo:
+ if bar:
+ break outer # --> we need to 'join' every pushed 'fork' here
+
+
+This works and then our abstract interpretation needs to deal with 'fork'
+differently. It really causes a split in execution. Two threads are
+"spawned" and both need to reach the 'join L' instruction. Afterwards
+the abstract interpretations are joined and execution resumes single
+threaded.
+
+
+Abstract Interpretation
+-----------------------
+
+proc interpret(pc, state, comesFrom): state =
+ result = state
+ # we need an explicit 'create' instruction (an explicit heap), in order
+ # to deal with 'var x = create(); var y = x; var z = y; destroy(z)'
+ while true:
+ case pc
+ of fork:
+ let a = interpret(pc+1, result, pc)
+ let b = interpret(forkTarget, result, pc)
+ result = a ++ b # ++ is a union operation
+ inc pc
+ of join:
+ if joinTarget == comesFrom: return result
+ else: inc pc
+ of use X:
+ if not result.contains(x):
+ error "variable not initialized " & x
+ inc pc
+ of def X:
+ if not result.contains(x):
+ result.incl X
+ else:
+ error "overwrite of variable causes memory leak " & x
+ inc pc
+ of destroy X:
+ result.excl X
+
+This is correct but still can lead to false positives:
+
+proc p(cond: bool) =
+ if cond:
+ new(x)
+ otherThings()
+ if cond:
+ destroy x
+
+Is not a leak. We should find a way to model *data* flow, not just
+control flow. One solution is to rewrite the 'if' without a fork
+instruction. The unstructured aspect can now be easily dealt with
+the 'goto' and 'join' instructions.
+
+proc p(cond: bool) =
+ L0: fork Lend
+ new(x)
+ # do not 'join' here!
+
+ Lend:
+ otherThings()
+ join L0 # SKIP THIS FOR new(x) SOMEHOW
+ destroy x
+ join L0 # but here.
+
+
+
+But if we follow 'goto Louter' we will never come to the join point.
+We restore the bindings after popping pc from the stack then there
+"no" problem?!
+
+
+while cond:
+ prelude()
+ if not condB: break
+ postlude()
+
+--->
+var setFlag = true
+while cond and not setFlag:
+ prelude()
+ if not condB:
+ setFlag = true # BUT: Dependency
+ if not setFlag: # HERE
+ postlude()
+
+--->
+var setFlag = true
+while cond and not setFlag:
+ prelude()
+ if not condB:
+ postlude()
+ setFlag = true
+
+
+-------------------------------------------------
+
+while cond:
+ prelude()
+ if more:
+ if not condB: break
+ stuffHere()
+ postlude()
+
+-->
+var setFlag = true
+while cond and not setFlag:
+ prelude()
+ if more:
+ if not condB:
+ setFlag = false
+ else:
+ stuffHere()
+ postlude()
+ else:
+ postlude()
+
+This is getting complicated. Instead we keep the whole 'join' idea but
+duplicate the 'join' instructions on breaks and return exits!
+
+]#
+
+proc joinI(c: var Con; fromFork: TPosition; n: PNode) =
+ let dist = fromFork.int - c.code.len
+ c.code.add Instr(n: n, kind: join, dest: dist)
+
proc genLabel(c: Con): TPosition =
result = TPosition(c.code.len)
@@ -135,30 +291,97 @@ proc isTrue(n: PNode): bool =
proc gen(c: var Con; n: PNode) # {.noSideEffect.}
-proc genWhile(c: var Con; n: PNode) =
- # L1:
- # cond, tmp
- # fork tmp, L2
- # body
- # jmp L1
- # L2:
- let L1 = c.genLabel
- withBlock(nil):
+when true:
+ proc genWhile(c: var Con; n: PNode) =
+ # We unroll every loop 3 times. We emulate 0, 1, 2 iterations
+ # through the loop. We need to prove this is correct for our
+ # purposes. But Herb Sutter claims it is. (Proof by authority.)
+ #[
+ while cond:
+ body
+
+ Becomes:
+
+ if cond:
+ body
+ if cond:
+ body
+ if cond:
+ body
+
+ We still need to ensure 'break' resolves properly, so an AST to AST
+ translation is impossible.
+
+ So the code to generate is:
+
+ cond
+ fork L4 # F1
+ body
+ cond
+ fork L5 # F2
+ body
+ cond
+ fork L6 # F3
+ body
+ L6:
+ join F3
+ L5:
+ join F2
+ L4:
+ join F1
+ ]#
if isTrue(n.sons[0]):
- c.gen(n.sons[1])
- c.jmpBack(n, L1)
+ # 'while true' is an idiom in Nim and so we produce
+ # better code for it:
+ for i in 0..2:
+ withBlock(nil):
+ c.gen(n.sons[1])
else:
- c.gen(n.sons[0])
- let L2 = c.forkI(n)
- c.gen(n.sons[1])
- c.jmpBack(n, L1)
- c.patch(L2)
+ let oldForksLen = c.forks.len
+ var endings: array[3, TPosition]
+ for i in 0..2:
+ withBlock(nil):
+ c.gen(n.sons[0])
+ endings[i] = c.forkI(n)
+ c.gen(n.sons[1])
+ for i in countdown(endings.high, 0):
+ let endPos = endings[i]
+ c.patch(endPos)
+ c.joinI(c.forks.pop(), n)
+ doAssert(c.forks.len == oldForksLen)
+
+else:
+
+ proc genWhile(c: var Con; n: PNode) =
+ # L1:
+ # cond, tmp
+ # fork tmp, L2
+ # body
+ # jmp L1
+ # L2:
+ let oldForksLen = c.forks.len
+ let L1 = c.genLabel
+ withBlock(nil):
+ if isTrue(n.sons[0]):
+ c.gen(n.sons[1])
+ c.jmpBack(n, L1)
+ else:
+ c.gen(n.sons[0])
+ let L2 = c.forkI(n)
+ c.gen(n.sons[1])
+ c.jmpBack(n, L1)
+ c.patch(L2)
+ setLen(c.forks, oldForksLen)
proc genBlock(c: var Con; n: PNode) =
withBlock(n.sons[0].sym):
c.gen(n.sons[1])
+proc genJoins(c: var Con; n: PNode) =
+ for i in countdown(c.forks.high, 0): joinI(c, c.forks[i], n)
+
proc genBreak(c: var Con; n: PNode) =
+ genJoins(c, n)
let L1 = c.gotoI(n)
if n.sons[0].kind == nkSym:
#echo cast[int](n.sons[0].sym)
@@ -170,28 +393,76 @@ proc genBreak(c: var Con; n: PNode) =
else:
c.blocks[c.blocks.high].fixups.add L1
+template forkT(n, body) =
+ let oldLen = c.forks.len
+ let L1 = c.forkI(n)
+ body
+ c.patch(L1)
+ c.joinI(L1, n)
+ setLen(c.forks, oldLen)
+
proc genIf(c: var Con, n: PNode) =
+ #[
+
+ if cond:
+ A
+ elif condB:
+ B
+ elif condC:
+ C
+ else:
+ D
+
+ cond
+ fork L1
+ A
+ goto Lend
+ L1:
+ condB
+ fork L2
+ B
+ goto Lend2
+ L2:
+ condC
+ fork L3
+ C
+ goto Lend3
+ L3:
+ D
+ goto Lend3 # not eliminated to simplify the join generation
+ Lend3:
+ join F3
+ Lend2:
+ join F2
+ Lend:
+ join F1
+
+ ]#
+ let oldLen = c.forks.len
var endings: seq[TPosition] = @[]
for i in countup(0, len(n) - 1):
var it = n.sons[i]
c.gen(it.sons[0])
if it.len == 2:
- let elsePos = c.forkI(it.sons[1])
+ let elsePos = forkI(c, it[1])
c.gen(it.sons[1])
- if i < sonsLen(n)-1:
- endings.add(c.gotoI(it.sons[1]))
+ endings.add(c.gotoI(it.sons[1]))
c.patch(elsePos)
- for endPos in endings: c.patch(endPos)
+ for i in countdown(endings.high, 0):
+ let endPos = endings[i]
+ c.patch(endPos)
+ c.joinI(c.forks.pop(), n)
+ doAssert(c.forks.len == oldLen)
proc genAndOr(c: var Con; n: PNode) =
# asgn dest, a
# fork L1
# asgn dest, b
# L1:
+ # join F1
c.gen(n.sons[1])
- let L1 = c.forkI(n)
- c.gen(n.sons[2])
- c.patch(L1)
+ forkT(n):
+ c.gen(n.sons[2])
proc genCase(c: var Con; n: PNode) =
# if (!expr1) goto L1;
@@ -204,56 +475,73 @@ proc genCase(c: var Con; n: PNode) =
# L2:
# elsePart
# Lend:
- when false:
- # XXX Exhaustiveness is not yet mapped to the control flow graph as
- # it seems to offer no benefits for the 'last read of' question.
- let isExhaustive = skipTypes(n.sons[0].typ,
- abstractVarRange-{tyTypeDesc}).kind in {tyFloat..tyFloat128, tyString} or
- lastSon(n).kind == nkElse
+ let isExhaustive = skipTypes(n.sons[0].typ,
+ abstractVarRange-{tyTypeDesc}).kind notin {tyFloat..tyFloat128, tyString}
var endings: seq[TPosition] = @[]
+ let oldLen = c.forks.len
c.gen(n.sons[0])
for i in 1 ..< n.len:
let it = n.sons[i]
if it.len == 1:
c.gen(it.sons[0])
+ elif i == n.len-1 and isExhaustive:
+ # treat the last branch as 'else' if this is an exhaustive case statement.
+ c.gen(it.lastSon)
else:
let elsePos = c.forkI(it.lastSon)
c.gen(it.lastSon)
- if i < sonsLen(n)-1:
- endings.add(c.gotoI(it.lastSon))
+ endings.add(c.gotoI(it.lastSon))
c.patch(elsePos)
- for endPos in endings: c.patch(endPos)
+ for i in countdown(endings.high, 0):
+ let endPos = endings[i]
+ c.patch(endPos)
+ c.joinI(c.forks.pop(), n)
+ doAssert(c.forks.len == oldLen)
proc genTry(c: var Con; n: PNode) =
+ let oldLen = c.forks.len
var endings: seq[TPosition] = @[]
inc c.inTryStmt
- var newFixups: seq[TPosition]
- swap(newFixups, c.tryStmtFixups)
+ let oldFixups = c.tryStmtFixups.len
- let elsePos = c.forkI(n)
+ #let elsePos = c.forkI(n)
c.gen(n.sons[0])
dec c.inTryStmt
- for f in newFixups:
+ for i in oldFixups..c.tryStmtFixups.high:
+ let f = c.tryStmtFixups[i]
c.patch(f)
- swap(newFixups, c.tryStmtFixups)
+ # we also need to produce join instructions
+ # for the 'fork' that might preceed the goto instruction
+ if f.int-1 >= 0 and c.code[f.int-1].kind == fork:
+ c.joinI(TPosition(f.int-1), n)
+
+ setLen(c.tryStmtFixups, oldFixups)
- c.patch(elsePos)
+ #c.patch(elsePos)
for i in 1 ..< n.len:
let it = n.sons[i]
if it.kind != nkFinally:
var blen = len(it)
let endExcept = c.forkI(it)
c.gen(it.lastSon)
- if i < sonsLen(n)-1:
- endings.add(c.gotoI(it))
+ endings.add(c.gotoI(it))
c.patch(endExcept)
- for endPos in endings: c.patch(endPos)
+ for i in countdown(endings.high, 0):
+ let endPos = endings[i]
+ c.patch(endPos)
+ c.joinI(c.forks.pop(), n)
+
+ # join the 'elsePos' forkI instruction:
+ #c.joinI(c.forks.pop(), n)
+
let fin = lastSon(n)
if fin.kind == nkFinally:
c.gen(fin.sons[0])
+ doAssert(c.forks.len == oldLen)
proc genRaise(c: var Con; n: PNode) =
+ genJoins(c, n)
gen(c, n.sons[0])
if c.inTryStmt > 0:
c.tryStmtFixups.add c.gotoI(n)
@@ -265,6 +553,7 @@ proc genImplicitReturn(c: var Con) =
gen(c, c.owner.ast.sons[resultPos])
proc genReturn(c: var Con; n: PNode) =
+ genJoins(c, n)
if n.sons[0].kind != nkEmpty:
gen(c, n.sons[0])
else:
@@ -287,6 +576,14 @@ proc genDef(c: var Con; n: PNode) =
if n.kind == nkSym and n.sym.kind in InterestingSyms:
c.code.add Instr(n: n, kind: def, sym: n.sym)
+proc canRaise(fn: PNode): bool =
+ const magicsThatCanRaise = {
+ mNone, mSlurp, mStaticExec, mParseExprToAst, mParseStmtToAst}
+ if fn.kind == nkSym and fn.sym.magic notin magicsThatCanRaise:
+ result = false
+ else:
+ result = true
+
proc genCall(c: var Con; n: PNode) =
gen(c, n[0])
var t = n[0].typ
@@ -297,8 +594,16 @@ proc genCall(c: var Con; n: PNode) =
if t != nil and i < t.len and t.sons[i].kind == tyVar:
genDef(c, n[i])
# every call can potentially raise:
- if c.inTryStmt > 0:
- c.tryStmtFixups.add c.forkI(n)
+ if c.inTryStmt > 0 and canRaise(n[0]):
+ # we generate the instruction sequence:
+ # fork L1
+ # goto exceptionHandler (except or finally)
+ # L1:
+ # join F1
+ let endGoto = c.forkI(n)
+ c.tryStmtFixups.add c.gotoI(n)
+ c.patch(endGoto)
+ c.joinI(c.forks.pop(), n)
dec c.inCall
proc genMagic(c: var Con; n: PNode; m: TMagic) =
@@ -368,114 +673,48 @@ proc gen(c: var Con; n: PNode) =
doAssert false, "dfa construction pass requires the elimination of 'defer'"
else: discard
-proc dfa(code: seq[Instr]; conf: ConfigRef) =
- var u = newSeq[IntSet](code.len) # usages
- var d = newSeq[IntSet](code.len) # defs
- var c = newSeq[IntSet](code.len) # consumed
- var backrefs = initTable[int, int]()
- for i in 0..<code.len:
- u[i] = initIntSet()
- d[i] = initIntSet()
- c[i] = initIntSet()
- case code[i].kind
- of use: u[i].incl(code[i].sym.id)
- of def: d[i].incl(code[i].sym.id)
- of fork, goto:
- let d = i+code[i].dest
- backrefs.add(d, i)
-
- var w = @[0]
- var maxIters = 50
- var someChange = true
- var takenGotos = initIntSet()
- var consuming = -1
- while w.len > 0 and maxIters > 0: # and someChange:
- dec maxIters
- var pc = w.pop() # w[^1]
- var prevPc = -1
- # this simulates a single linear control flow execution:
- while pc < code.len:
- if prevPc >= 0:
- someChange = false
- # merge step and test for changes (we compute the fixpoints here):
- # 'u' needs to be the union of prevPc, pc
- # 'd' needs to be the intersection of 'pc'
- for id in u[prevPc]:
- if not u[pc].containsOrIncl(id):
- someChange = true
- # in (a; b) if ``a`` sets ``v`` so does ``b``. The intersection
- # is only interesting on merge points:
- for id in d[prevPc]:
- if not d[pc].containsOrIncl(id):
- someChange = true
- # if this is a merge point, we take the intersection of the 'd' sets:
- if backrefs.hasKey(pc):
- var intersect = initIntSet()
- assign(intersect, d[pc])
- var first = true
- for prevPc in backrefs.allValues(pc):
- for def in d[pc]:
- if def notin d[prevPc]:
- excl(intersect, def)
- someChange = true
- when defined(debugDfa):
- echo "Excluding ", pc, " prev ", prevPc
- assign d[pc], intersect
- if consuming >= 0:
- if not c[pc].containsOrIncl(consuming):
- someChange = true
- consuming = -1
-
- # our interpretation ![I!]:
- prevPc = pc
- case code[pc].kind
- of goto:
- # we must leave endless loops eventually:
- if not takenGotos.containsOrIncl(pc) or someChange:
- pc = pc + code[pc].dest
- else:
- inc pc
- of fork:
- # we follow the next instruction but push the dest onto our "work" stack:
- #if someChange:
- w.add pc + code[pc].dest
- inc pc
- of use:
- #if not d[prevPc].missingOrExcl():
- # someChange = true
- consuming = code[pc].sym.id
- inc pc
- of def:
- if not d[pc].containsOrIncl(code[pc].sym.id):
- someChange = true
- inc pc
-
- when defined(useDfa) and defined(debugDfa):
- for i in 0..<code.len:
- echo "PC ", i, ": defs: ", d[i], "; uses ", u[i], "; consumes ", c[i]
-
- # now check the condition we're interested in:
- for i in 0..<code.len:
- case code[i].kind
- of use:
- let s = code[i].sym
- if s.id notin d[i]:
- localError(conf, code[i].n.info, "usage of uninitialized variable: " & s.name.s)
- if s.id in c[i]:
- localError(conf, code[i].n.info, "usage of an already consumed variable: " & s.name.s)
-
- else: discard
-
-proc dataflowAnalysis*(s: PSym; body: PNode; conf: ConfigRef) =
- var c = Con(code: @[], blocks: @[])
- gen(c, body)
- genImplicitReturn(c)
- when defined(useDfa) and defined(debugDfa): echoCfg(c.code)
- dfa(c.code, conf)
-
proc constructCfg*(s: PSym; body: PNode): ControlFlowGraph =
## constructs a control flow graph for ``body``.
var c = Con(code: @[], blocks: @[], owner: s)
gen(c, body)
genImplicitReturn(c)
shallowCopy(result, c.code)
+
+proc interpret(code: ControlFlowGraph; pc: int, state: seq[PSym], comesFrom: int; threadId: int): (seq[PSym], int) =
+ var res = state
+ var pc = pc
+ while pc < code.len:
+ #echo threadId, " ", code[pc].kind
+ case code[pc].kind
+ of goto:
+ pc = pc + code[pc].dest
+ of fork:
+ let target = pc + code[pc].dest
+ let (branchA, pcA) = interpret(code, pc+1, res, pc, threadId+1)
+ let (branchB, _) = interpret(code, target, res, pc, threadId+2)
+ # we add vars if they are in both branches:
+ for v in branchB:
+ if v in branchA:
+ if v notin res:
+ res.add v
+ pc = pcA+1
+ of join:
+ let target = pc + code[pc].dest
+ if comesFrom == target: return (res, pc)
+ inc pc
+ of use:
+ let v = code[pc].sym
+ if v notin res and v.kind != skParam:
+ echo "attempt to read uninitialized variable ", v.name.s
+ inc pc
+ of def:
+ let v = code[pc].sym
+ if v notin res:
+ res.add v
+ inc pc
+ return (res, pc)
+
+proc dataflowAnalysis*(s: PSym; body: PNode) =
+ let c = constructCfg(s, body)
+ #echoCfg c
+ discard interpret(c, 0, @[], -1, 1)
diff --git a/compiler/sempass2.nim b/compiler/sempass2.nim
index 75dea069f..81d637fee 100644
--- a/compiler/sempass2.nim
+++ b/compiler/sempass2.nim
@@ -1013,7 +1013,7 @@ proc trackProc*(g: ModuleGraph; s: PSym, body: PNode) =
"declared lock level is $1, but real lock level is $2" %
[$s.typ.lockLevel, $t.maxLockLevel])
when defined(useDfa):
- if s.kind == skFunc:
+ if s.name.s == "testp":
dataflowAnalysis(s, body)
when false: trackWrites(s, body)
--
cgit 1.4.1-2-gfad0
From 1b0372c6e9d316d64770c2384bd29caf8e6e60c9 Mon Sep 17 00:00:00 2001
From: Andreas Rumpf <rumpf_a@web.de>
Date: Mon, 21 Jan 2019 19:46:06 +0100
Subject: make tests green again
---
compiler/destroyer.nim | 131 ++++++++++++++++++++++++++++++-------------------
1 file changed, 81 insertions(+), 50 deletions(-)
(limited to 'compiler')
diff --git a/compiler/destroyer.nim b/compiler/destroyer.nim
index ca2aa8558..1881730e8 100644
--- a/compiler/destroyer.nim
+++ b/compiler/destroyer.nim
@@ -188,6 +188,35 @@ proc isHarmlessVar*(s: PSym; c: Con): bool =
discard "we do not perform an abstract interpretation yet"
result = usages <= 1
+proc isLastRead(s: PSym; c: var Con; pc, comesFrom: int): int =
+ var pc = pc
+ while pc < c.g.len:
+ case c.g[pc].kind
+ of def:
+ if c.g[pc].sym == s:
+ # the path lead to a redefinition of 's' --> abandon it.
+ return pc
+ inc pc
+ of use:
+ if c.g[pc].sym == s:
+ c.otherRead = c.g[pc].n
+ return -1
+ inc pc
+ of goto:
+ pc = pc + c.g[pc].dest
+ of fork:
+ # every branch must lead to the last read of the location:
+ let variantA = isLastRead(s, c, pc+1, pc)
+ if variantA < 0: return -1
+ let variantB = isLastRead(s, c, pc + c.g[pc].dest, pc)
+ if variantB < 0: return -1
+ pc = variantA+1
+ of InstrKind.join:
+ let dest = pc + c.g[pc].dest
+ if dest == comesFrom: return pc
+ inc pc
+ return pc
+
proc isLastRead(n: PNode; c: var Con): bool =
# first we need to search for the instruction that belongs to 'n':
doAssert n.kind == nkSym
@@ -195,61 +224,63 @@ proc isLastRead(n: PNode; c: var Con): bool =
var instr = -1
for i in 0..<c.g.len:
if c.g[i].n == n:
- if instr < 0: instr = i
- else:
- # eh, we found two positions that belong to 'n'?
- # better return 'false' then:
- return false
+ if instr < 0:
+ instr = i
+ break
+
if instr < 0: return false
# we go through all paths beginning from 'instr+1' and need to
# ensure that we don't find another 'use X' instruction.
if instr+1 >= c.g.len: return true
- let s = n.sym
- var pcs: seq[int] = @[instr+1]
- var takenGotos: IntSet
- var takenForks = initIntSet()
- while pcs.len > 0:
- var pc = pcs.pop
-
- takenGotos = initIntSet()
- while pc < c.g.len:
- case c.g[pc].kind
- of def:
- if c.g[pc].sym == s:
- # the path lead to a redefinition of 's' --> abandon it.
- when false:
- # Too complex thinking ahead: In reality it is enough to find
- # the 'def x' here on the current path to make the 'use x' valid.
- # but for this the definition needs to dominate the usage:
- var dominates = true
- for j in pc+1 .. instr:
- # not within the same basic block?
- if c.g[j].kind in {goto, fork} and (j + c.g[j].dest) in (pc+1 .. instr):
- #if j in c.jumpTargets:
- dominates = false
- if dominates: break
- break
- inc pc
- of use:
- if c.g[pc].sym == s:
- c.otherRead = c.g[pc].n
- return false
- inc pc
- of goto:
- # we must leave endless loops eventually:
- if not takenGotos.containsOrIncl(pc):
- pc = pc + c.g[pc].dest
- else:
+ when false:
+ result = isLastRead(n.sym, c, 0, -1) >= 0
+ else:
+ let s = n.sym
+ var pcs: seq[int] = @[instr+1]
+ var takenGotos: IntSet
+ var takenForks = initIntSet()
+ while pcs.len > 0:
+ var pc = pcs.pop
+
+ takenGotos = initIntSet()
+ while pc < c.g.len:
+ case c.g[pc].kind
+ of def:
+ if c.g[pc].sym == s:
+ # the path lead to a redefinition of 's' --> abandon it.
+ when false:
+ # Too complex thinking ahead: In reality it is enough to find
+ # the 'def x' here on the current path to make the 'use x' valid.
+ # but for this the definition needs to dominate the usage:
+ var dominates = true
+ for j in pc+1 .. instr:
+ # not within the same basic block?
+ if c.g[j].kind in {goto, fork} and (j + c.g[j].dest) in (pc+1 .. instr):
+ #if j in c.jumpTargets:
+ dominates = false
+ if dominates: break
+ break
+ inc pc
+ of use:
+ if c.g[pc].sym == s:
+ c.otherRead = c.g[pc].n
+ return false
+ inc pc
+ of goto:
+ # we must leave endless loops eventually:
+ if not takenGotos.containsOrIncl(pc):
+ pc = pc + c.g[pc].dest
+ else:
+ inc pc
+ of fork:
+ # we follow the next instruction but push the dest onto our "work" stack:
+ if not takenForks.containsOrIncl(pc):
+ pcs.add pc + c.g[pc].dest
+ inc pc
+ of InstrKind.join:
inc pc
- of fork:
- # we follow the next instruction but push the dest onto our "work" stack:
- if not takenForks.containsOrIncl(pc):
- pcs.add pc + c.g[pc].dest
- inc pc
- of InstrKind.join:
- inc pc
- #echo c.graph.config $ n.info, " last read here!"
- return true
+ #echo c.graph.config $ n.info, " last read here!"
+ return true
template interestingSym(s: PSym): bool =
s.owner == c.owner and s.kind in InterestingSyms and hasDestructor(s.typ)
--
cgit 1.4.1-2-gfad0
From 112f7e650aad3200b123174d8d835f989e707fcb Mon Sep 17 00:00:00 2001
From: Andreas Rumpf <rumpf_a@web.de>
Date: Mon, 21 Jan 2019 19:56:58 +0100
Subject: destroyer.nim: code cleanup
---
compiler/destroyer.nim | 67 --------------------------------------------------
1 file changed, 67 deletions(-)
(limited to 'compiler')
diff --git a/compiler/destroyer.nim b/compiler/destroyer.nim
index 1881730e8..a97b49dac 100644
--- a/compiler/destroyer.nim
+++ b/compiler/destroyer.nim
@@ -132,62 +132,6 @@ type
emptyNode: PNode
otherRead: PNode
-
-proc isHarmlessVar*(s: PSym; c: Con): bool =
- # 's' is harmless if it used only once and its
- # definition/usage are not split by any labels:
- #
- # let s = foo()
- # while true:
- # a[i] = s
- #
- # produces:
- #
- # def s
- # L1:
- # use s
- # goto L1
- #
- # let s = foo()
- # if cond:
- # a[i] = s
- # else:
- # a[j] = s
- #
- # produces:
- #
- # def s
- # fork L2
- # use s
- # goto L3
- # L2:
- # use s
- # L3
- #
- # So this analysis is for now overly conservative, but correct.
- var defsite = -1
- var usages = 0
- for i in 0..<c.g.len:
- case c.g[i].kind
- of def:
- if c.g[i].sym == s:
- if defsite < 0: defsite = i
- else: return false
- of use:
- if c.g[i].sym == s:
- if defsite < 0: return false
- for j in defsite .. i:
- # not within the same basic block?
- if j in c.jumpTargets: return false
- # if we want to die after the first 'use':
- if usages > 1: return false
- inc usages
- #of useWithinCall:
- # if c.g[i].sym == s: return false
- of goto, fork, InstrKind.join:
- discard "we do not perform an abstract interpretation yet"
- result = usages <= 1
-
proc isLastRead(s: PSym; c: var Con; pc, comesFrom: int): int =
var pc = pc
while pc < c.g.len:
@@ -248,17 +192,6 @@ proc isLastRead(n: PNode; c: var Con): bool =
of def:
if c.g[pc].sym == s:
# the path lead to a redefinition of 's' --> abandon it.
- when false:
- # Too complex thinking ahead: In reality it is enough to find
- # the 'def x' here on the current path to make the 'use x' valid.
- # but for this the definition needs to dominate the usage:
- var dominates = true
- for j in pc+1 .. instr:
- # not within the same basic block?
- if c.g[j].kind in {goto, fork} and (j + c.g[j].dest) in (pc+1 .. instr):
- #if j in c.jumpTargets:
- dominates = false
- if dominates: break
break
inc pc
of use:
--
cgit 1.4.1-2-gfad0
From 2655f242a838a5845a71bc4857cbc4a7df297eb6 Mon Sep 17 00:00:00 2001
From: Andreas Rumpf <rumpf_a@web.de>
Date: Mon, 21 Jan 2019 20:11:42 +0100
Subject: use the lastRead analysis; it's correct by construction, not a mess
of special cases and seems to be just as fast as the old algorithm
---
compiler/destroyer.nim | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'compiler')
diff --git a/compiler/destroyer.nim b/compiler/destroyer.nim
index a97b49dac..06d4dcbef 100644
--- a/compiler/destroyer.nim
+++ b/compiler/destroyer.nim
@@ -176,8 +176,8 @@ proc isLastRead(n: PNode; c: var Con): bool =
# we go through all paths beginning from 'instr+1' and need to
# ensure that we don't find another 'use X' instruction.
if instr+1 >= c.g.len: return true
- when false:
- result = isLastRead(n.sym, c, 0, -1) >= 0
+ when true:
+ result = isLastRead(n.sym, c, instr+1, -1) >= 0
else:
let s = n.sym
var pcs: seq[int] = @[instr+1]
--
cgit 1.4.1-2-gfad0
From 7fcf51248bb5c37cf49765bac020fa7bc86dea34 Mon Sep 17 00:00:00 2001
From: Ico Doornekamp <ico@pruts.nl>
Date: Mon, 21 Jan 2019 22:56:40 +0100
Subject: Added --docInternal option to allow 'nim doc' to include non-exported
symbols
---
compiler/commands.nim | 2 ++
compiler/docgen.nim | 5 ++++-
compiler/options.nim | 1 +
doc/advopt.txt | 1 +
4 files changed, 8 insertions(+), 1 deletion(-)
(limited to 'compiler')
diff --git a/compiler/commands.nim b/compiler/commands.nim
index 30521f9ca..af775f5cd 100644
--- a/compiler/commands.nim
+++ b/compiler/commands.nim
@@ -746,6 +746,8 @@ proc processSwitch*(switch, arg: string, pass: TCmdLinePass, info: TLineInfo;
else:
conf.cppCustomNamespace = "Nim"
defineSymbol(conf.symbols, "cppCompileToNamespace", conf.cppCustomNamespace)
+ of "docinternal":
+ processOnOffSwitchG(conf, {optDocInternal}, arg, pass, info)
else:
if strutils.find(switch, '.') >= 0: options.setConfigVar(conf, switch, arg)
else: invalidCmdLineOption(conf, pass, switch, info)
diff --git a/compiler/docgen.nim b/compiler/docgen.nim
index 33cd98f38..4271a116e 100644
--- a/compiler/docgen.nim
+++ b/compiler/docgen.nim
@@ -464,7 +464,10 @@ proc isVisible(d: PDoc; n: PNode): bool =
# we cannot generate code for forwarded symbols here as we have no
# exception tracking information here. Instead we copy over the comment
# from the proc header.
- result = {sfExported, sfFromGeneric, sfForward}*n.sym.flags == {sfExported}
+ if optDocInternal in d.conf.globalOptions:
+ result = {sfFromGeneric, sfForward}*n.sym.flags == {}
+ else:
+ result = {sfExported, sfFromGeneric, sfForward}*n.sym.flags == {sfExported}
if result and containsOrIncl(d.emitted, n.sym.id):
result = false
elif n.kind == nkPragmaExpr:
diff --git a/compiler/options.nim b/compiler/options.nim
index d39b0a268..54276f99d 100644
--- a/compiler/options.nim
+++ b/compiler/options.nim
@@ -77,6 +77,7 @@ type # please make sure we have under 32 options
optExcessiveStackTrace # fully qualified module filenames
optShowAllMismatches # show all overloading resolution candidates
optWholeProject # for 'doc2': output any dependency
+ optDocInternal # generate documentation for non-exported symbols
optMixedMode # true if some module triggered C++ codegen
optListFullPaths # use full paths in toMsgFilename, toFilename
optNoNimblePath
diff --git a/doc/advopt.txt b/doc/advopt.txt
index f713839d8..58ed9edd0 100644
--- a/doc/advopt.txt
+++ b/doc/advopt.txt
@@ -58,6 +58,7 @@ Advanced options:
--project document the whole project (doc2)
--docSeeSrcUrl:url activate 'see source' for doc and doc2 commands
(see doc.item.seesrc in config/nimdoc.cfg)
+ --docInternal also generate documentation for non-exported symbols
--lineDir:on|off generation of #line directive on|off
--embedsrc:on|off embeds the original source code as comments
in the generated output
--
cgit 1.4.1-2-gfad0
From 9c0e5c4c074ac9d4db7b215ba202ad9e09f18254 Mon Sep 17 00:00:00 2001
From: LemonBoy <LemonBoy@users.noreply.github.com>
Date: Wed, 23 Jan 2019 11:10:51 +0100
Subject: Harmonize the var/let and const handling (#10410)
Fixes #10333
---
compiler/semstmts.nim | 18 ++++++++++++++----
tests/vm/tvmmisc.nim | 11 +++++++++++
2 files changed, 25 insertions(+), 4 deletions(-)
(limited to 'compiler')
diff --git a/compiler/semstmts.nim b/compiler/semstmts.nim
index cac24d33e..5e9d5d9c5 100644
--- a/compiler/semstmts.nim
+++ b/compiler/semstmts.nim
@@ -440,11 +440,11 @@ proc semVarOrLet(c: PContext, n: PNode, symkind: TSymKind): PNode =
if a.kind notin {nkIdentDefs, nkVarTuple, nkConstDef}: illFormedAst(a, c.config)
checkMinSonsLen(a, 3, c.config)
var length = sonsLen(a)
- var typ: PType
+
+ var typ: PType = nil
if a.sons[length-2].kind != nkEmpty:
typ = semTypeNode(c, a.sons[length-2], nil)
- else:
- typ = nil
+
var def: PNode = c.graph.emptyNode
if a.sons[length-1].kind != nkEmpty:
def = semExprWithType(c, a.sons[length-1], {efAllowDestructor})
@@ -582,9 +582,19 @@ proc semConst(c: PContext, n: PNode): PNode =
if def == nil:
localError(c.config, a.sons[length-1].info, errConstExprExpected)
continue
+
+ if def.typ.kind == tyTypeDesc and c.p.owner.kind != skMacro:
+ # prevent the all too common 'const x = int' bug:
+ localError(c.config, def.info, "'typedesc' metatype is not valid here; typed '=' instead of ':'?")
+ def.typ = errorType(c)
+
# check type compatibility between def.typ and typ:
if typ != nil:
- def = fitRemoveHiddenConv(c, typ, def)
+ if typ.isMetaType:
+ def = inferWithMetatype(c, typ, def)
+ typ = def.typ
+ else:
+ def = fitRemoveHiddenConv(c, typ, def)
else:
typ = def.typ
if typ == nil:
diff --git a/tests/vm/tvmmisc.nim b/tests/vm/tvmmisc.nim
index bd3aa2fcd..78871d103 100644
--- a/tests/vm/tvmmisc.nim
+++ b/tests/vm/tvmmisc.nim
@@ -149,3 +149,14 @@ static:
static:
doAssert foo().i == 1
+
+# #10333
+block:
+ const
+ encoding: auto = [
+ ["", "I", "II", "III", "IV", "V", "VI", "VII", "VIII", "IX"],
+ ["", "X", "XX", "XXX", "XL", "L", "LX", "LXX", "LXXX", "XC"],
+ ["", "C", "CC", "CCC", "CD", "D", "DC", "DCC", "DCCC", "CM"],
+ ["", "M", "MM", "MMM", "--", "-", "--", "---", "----", "--"],
+ ]
+ doAssert encoding.len == 4
--
cgit 1.4.1-2-gfad0
From efa4b9adaa6babb46b463e785ccc06e3494bd342 Mon Sep 17 00:00:00 2001
From: Ico Doornekamp <github@zevv.nl>
Date: Wed, 23 Jan 2019 11:13:44 +0100
Subject: Fixes #10263; [backport]
---
compiler/msgs.nim | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'compiler')
diff --git a/compiler/msgs.nim b/compiler/msgs.nim
index 0dd5820b4..698b81061 100644
--- a/compiler/msgs.nim
+++ b/compiler/msgs.nim
@@ -432,7 +432,7 @@ proc addSourceLine(conf: ConfigRef; fileIdx: FileIndex, line: string) =
proc sourceLine*(conf: ConfigRef; i: TLineInfo): string =
if i.fileIndex.int32 < 0: return ""
- if not optPreserveOrigSource(conf) and conf.m.fileInfos[i.fileIndex.int32].lines.len == 0:
+ if conf.m.fileInfos[i.fileIndex.int32].lines.len == 0:
try:
for line in lines(toFullPath(conf, i)):
addSourceLine conf, i.fileIndex, line.string
--
cgit 1.4.1-2-gfad0
From d9ee377517fe22e307592f4d6c019388600b5e57 Mon Sep 17 00:00:00 2001
From: Vindaar <basti90@gmail.com>
Date: Wed, 23 Jan 2019 11:17:32 +0100
Subject: fix #10339 by returning type attached to nkEmpty (#10370)
* fix #10339 by checking for nkObjConstr
* revert check for nkObjConstr, return type from nkEmpty node
The correct type needed in `semObjConstr` to fix #10339 is indeed
available, but attached to an `nkEmpty` node. These were previously
discarded in `semTypeNode`, which is used to extract the type for the
object.
* simplify return of PType from `nkEmpty`
* also fixes #9866, add test case
---
compiler/semtypes.nim | 2 +-
tests/macros/tquotedo.nim | 15 +++++++++++++++
tests/statictypes/tstatictypes.nim | 17 +++++++++++++++++
3 files changed, 33 insertions(+), 1 deletion(-)
(limited to 'compiler')
diff --git a/compiler/semtypes.nim b/compiler/semtypes.nim
index c28902b1f..e4f7dc147 100644
--- a/compiler/semtypes.nim
+++ b/compiler/semtypes.nim
@@ -1474,7 +1474,7 @@ proc semTypeNode(c: PContext, n: PNode, prev: PType): PType =
if c.config.cmd == cmdIdeTools: suggestExpr(c, n)
case n.kind
- of nkEmpty: discard
+ of nkEmpty: result = n.typ
of nkTypeOfExpr:
# for ``type(countup(1,3))``, see ``tests/ttoseq``.
checkSonsLen(n, 1, c.config)
diff --git a/tests/macros/tquotedo.nim b/tests/macros/tquotedo.nim
index 0aae87bf0..6acb8ef4e 100644
--- a/tests/macros/tquotedo.nim
+++ b/tests/macros/tquotedo.nim
@@ -4,6 +4,7 @@ output: '''
Hallo Welt
Hallo Welt
1
+()
'''
"""
@@ -34,3 +35,17 @@ macro t(): untyped =
t()
echo tp()
+
+
+# https://github.com/nim-lang/Nim/issues/9866
+type
+ # Foo = int # works
+ Foo = object # fails
+
+macro dispatchGen(): untyped =
+ var shOpt: Foo
+ result = quote do:
+ let baz = `shOpt`
+ echo `shOpt`
+
+dispatchGen()
diff --git a/tests/statictypes/tstatictypes.nim b/tests/statictypes/tstatictypes.nim
index b7cde6124..2a4ab0c63 100644
--- a/tests/statictypes/tstatictypes.nim
+++ b/tests/statictypes/tstatictypes.nim
@@ -137,3 +137,20 @@ block:
type
Coord[N: static[int]] = tuple[col, row: range[0'i8 .. (N.int8-1)]]
Point[N: static[int]] = range[0'i16 .. N.int16 * N.int16 - 1]
+
+# https://github.com/nim-lang/Nim/issues/10339
+block:
+ type
+ MicroKernel = object
+ a: float
+ b: int
+
+ macro extractA(ukernel: static MicroKernel): untyped =
+ result = newLit ukernel.a
+
+ proc tFunc[ukernel: static MicroKernel]() =
+ const x = ukernel.extractA
+ doAssert x == 5.5
+
+ const uk = MicroKernel(a: 5.5, b: 1)
+ tFunc[uk]()
--
cgit 1.4.1-2-gfad0
From 35d96d8749809863bbbb6ead1e8cf887a95a94e5 Mon Sep 17 00:00:00 2001
From: alaviss <alaviss@users.noreply.github.com>
Date: Wed, 23 Jan 2019 22:35:34 +0700
Subject: compiler/sem*: better lineinfo for templates (#10428)
* compiler/sem*: better lineinfo for templates
Lineinfo for templates is inconsistant across the compiler, for example:
doAssert true
^ ^
a[int](10)
^^ ^
The `^` marks where the compiler thinks the template starts.
For qualified call, we got the same situation with `proc`s before #10427:
system.once
^
Generics lineinfo within template declaration is also incorrect, for
example, this is where the compiler believes the `T` in `[T]` is:
template a[T](b: T)
^
This PR addresses all of these problems.
* nimsuggest: add tests for template highlighting
---
compiler/semexprs.nim | 14 +++++++++-----
compiler/semtypes.nim | 4 ++--
nimsuggest/tests/tgeneric_highlight.nim | 4 +++-
nimsuggest/tests/tqualified_highlight.nim | 5 ++++-
nimsuggest/tests/ttemplate_highlight.nim | 9 +++++++++
5 files changed, 27 insertions(+), 9 deletions(-)
create mode 100644 nimsuggest/tests/ttemplate_highlight.nim
(limited to 'compiler')
diff --git a/compiler/semexprs.nim b/compiler/semexprs.nim
index 96fefa4b8..37e2ca33f 100644
--- a/compiler/semexprs.nim
+++ b/compiler/semexprs.nim
@@ -24,15 +24,18 @@ const
proc semTemplateExpr(c: PContext, n: PNode, s: PSym,
flags: TExprFlags = {}): PNode =
- markUsed(c.config, n.info, s, c.graph.usageSym)
- onUse(n.info, s)
+ let info = getCallLineInfo(n)
+ markUsed(c.config, info, s, c.graph.usageSym)
+ onUse(info, s)
+ # Note: This is n.info on purpose. It prevents template from creating an info
+ # context when called from an another template
pushInfoContext(c.config, n.info, s.detailedInfo)
result = evalTemplate(n, s, getCurrOwner(c), c.config, efFromHlo in flags)
if efNoSemCheck notin flags: result = semAfterMacroCall(c, n, result, s, flags)
popInfoContext(c.config)
# XXX: A more elaborate line info rewrite might be needed
- result.info = n.info
+ result.info = info
proc semFieldAccess(c: PContext, n: PNode, flags: TExprFlags = {}): PNode
@@ -1084,8 +1087,9 @@ proc semSym(c: PContext, n: PNode, sym: PSym, flags: TExprFlags): PNode =
if efNoEvaluateGeneric in flags and s.ast[genericParamsPos].len > 0 or
(n.kind notin nkCallKinds and s.requiredParams > 0) or
sfCustomPragma in sym.flags:
- markUsed(c.config, n.info, s, c.graph.usageSym)
- onUse(n.info, s)
+ let info = getCallLineInfo(n)
+ markUsed(c.config, info, s, c.graph.usageSym)
+ onUse(info, s)
result = symChoice(c, n, s, scClosed)
else:
result = semTemplateExpr(c, n, s, flags)
diff --git a/compiler/semtypes.nim b/compiler/semtypes.nim
index e4f7dc147..fbf363834 100644
--- a/compiler/semtypes.nim
+++ b/compiler/semtypes.nim
@@ -1015,8 +1015,8 @@ proc liftParamType(c: PContext, procKind: TSymKind, genericParams: PNode,
result = addImplicitGeneric(copyType(paramType, getCurrOwner(c), false))
of tyGenericParam:
- markUsed(c.config, info, paramType.sym, c.graph.usageSym)
- onUse(info, paramType.sym)
+ markUsed(c.config, paramType.sym.info, paramType.sym, c.graph.usageSym)
+ onUse(paramType.sym.info, paramType.sym)
if tfWildcard in paramType.flags:
paramType.flags.excl tfWildcard
paramType.sym.kind = skType
diff --git a/nimsuggest/tests/tgeneric_highlight.nim b/nimsuggest/tests/tgeneric_highlight.nim
index 85bef7c43..334323613 100644
--- a/nimsuggest/tests/tgeneric_highlight.nim
+++ b/nimsuggest/tests/tgeneric_highlight.nim
@@ -1,8 +1,8 @@
newSeq[int]()
system.newSeq[int]()#[!]#
+offsetOf[int]()
discard """
-disabled:true
$nimsuggest --tester $file
>highlight $1
highlight;;skType;;1;;7;;3
@@ -15,4 +15,6 @@ highlight;;skProc;;2;;7;;6
highlight;;skProc;;2;;7;;6
highlight;;skType;;2;;14;;3
highlight;;skProc;;2;;7;;6
+highlight;;skTemplate;;3;;0;;8
+highlight;;skType;;3;;9;;3
"""
diff --git a/nimsuggest/tests/tqualified_highlight.nim b/nimsuggest/tests/tqualified_highlight.nim
index fe7c889d6..1b34dbade 100644
--- a/nimsuggest/tests/tqualified_highlight.nim
+++ b/nimsuggest/tests/tqualified_highlight.nim
@@ -1,9 +1,12 @@
system.echo#[!]#
+system.once
discard """
-disabled:true
$nimsuggest --tester $file
>highlight $1
highlight;;skProc;;1;;7;;4
highlight;;skProc;;1;;7;;4
+highlight;;skTemplate;;2;;7;;4
+highlight;;skTemplate;;2;;7;;4
+highlight;;skTemplate;;2;;7;;4
"""
diff --git a/nimsuggest/tests/ttemplate_highlight.nim b/nimsuggest/tests/ttemplate_highlight.nim
new file mode 100644
index 000000000..2cbac3be5
--- /dev/null
+++ b/nimsuggest/tests/ttemplate_highlight.nim
@@ -0,0 +1,9 @@
+doAssert true#[!]#
+
+discard """
+$nimsuggest --tester $1
+>highlight $1
+highlight;;skTemplate;;1;;0;;8
+highlight;;skTemplate;;1;;0;;8
+highlight;;skEnumField;;1;;9;;4
+"""
--
cgit 1.4.1-2-gfad0
From 400b4e4e0ea33ef3d7ad94c503c5e00001dec536 Mon Sep 17 00:00:00 2001
From: Araq <rumpf_a@web.de>
Date: Tue, 22 Jan 2019 12:27:44 +0100
Subject: improve the generated code size for --gc:regions
---
compiler/cgen.nim | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'compiler')
diff --git a/compiler/cgen.nim b/compiler/cgen.nim
index 190814b79..78f9e72da 100644
--- a/compiler/cgen.nim
+++ b/compiler/cgen.nim
@@ -321,7 +321,7 @@ proc resetLoc(p: BProc, loc: var TLoc) =
else:
if optNilCheck in p.options:
linefmt(p, cpsStmts, "#chckNil((void*)$1);$n", addrLoc(p.config, loc))
- if loc.storage != OnStack:
+ if loc.storage != OnStack and containsGcRef:
linefmt(p, cpsStmts, "#genericReset((void*)$1, $2);$n",
addrLoc(p.config, loc), genTypeInfo(p.module, loc.t, loc.lode.info))
# XXX: generated reset procs should not touch the m_type
--
cgit 1.4.1-2-gfad0
From 28cb81ea87aee0a6a2a9d8445abba2a580bb158e Mon Sep 17 00:00:00 2001
From: Araq <rumpf_a@web.de>
Date: Wed, 23 Jan 2019 17:10:00 +0100
Subject: make DLLs tests compile again; remove dependency on nimbase.h
slightly
---
compiler/cgen.nim | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
(limited to 'compiler')
diff --git a/compiler/cgen.nim b/compiler/cgen.nim
index 78f9e72da..464ef3975 100644
--- a/compiler/cgen.nim
+++ b/compiler/cgen.nim
@@ -1056,9 +1056,22 @@ proc genVarPrototype(m: BModule, n: PNode) =
if sfVolatile in sym.flags: add(m.s[cfsVars], " volatile")
addf(m.s[cfsVars], " $1;$n", [sym.loc.r])
+const
+ frameDefines = """
+$1 define nimfr_(proc, file) \
+ TFrame FR_; \
+ FR_.procname = proc; FR_.filename = file; FR_.line = 0; FR_.len = 0; #nimFrame(&FR_);
+
+$1 define nimfrs_(proc, file, slots, length) \
+ struct {TFrame* prev;NCSTRING procname;NI line;NCSTRING filename; NI len; VarSlot s[slots];} FR_; \
+ FR_.procname = proc; FR_.filename = file; FR_.line = 0; FR_.len = length; #nimFrame((TFrame*)&FR_);
+
+$1 define nimln_(n, file) \
+ FR_.line = n; FR_.filename = file;
+"""
+
proc addIntTypes(result: var Rope; conf: ConfigRef) {.inline.} =
- addf(result, "#define NIM_NEW_MANGLING_RULES\L" &
- "#define NIM_INTBITS $1\L", [
+ addf(result, "#define NIM_INTBITS $1\L", [
platform.CPU[conf.target.targetCPU].intSize.rope])
if conf.cppCustomNamespace.len > 0:
result.add("#define USE_NIM_NAMESPACE ")
@@ -1302,6 +1315,7 @@ proc genInitCode(m: BModule) =
## this function is called in cgenWriteModules after all modules are closed,
## it means raising dependency on the symbols is too late as it will not propogate
## into other modules, only simple rope manipulations are allowed
+ appcg(m, m.s[cfsForwardTypes], frameDefines, [rope("#")])
var moduleInitRequired = false
let initname = getInitName(m.module)
--
cgit 1.4.1-2-gfad0
From 6555d89c2c7f403a45800903457ee62a62ff327a Mon Sep 17 00:00:00 2001
From: Arne Döring <arne.doering@gmx.net>
Date: Thu, 24 Jan 2019 11:33:44 +0100
Subject: free some registers after usage, allows more complex macros (#10443)
---
compiler/vmgen.nim | 6 ++++++
1 file changed, 6 insertions(+)
(limited to 'compiler')
diff --git a/compiler/vmgen.nim b/compiler/vmgen.nim
index e7993dfb2..f87821da4 100644
--- a/compiler/vmgen.nim
+++ b/compiler/vmgen.nim
@@ -326,8 +326,14 @@ proc genWhile(c: PCtx; n: PNode) =
c.patch(L2)
proc genBlock(c: PCtx; n: PNode; dest: var TDest) =
+ let oldRegisterCount = c.prc.maxSlots
withBlock(n.sons[0].sym):
c.gen(n.sons[1], dest)
+
+ for i in oldRegisterCount ..< c.prc.maxSlots:
+ if c.prc.slots[i].kind in {slotFixedVar, slotFixedLet}:
+ c.prc.slots[i] = (inUse: false, kind: slotEmpty)
+
c.clearDest(n, dest)
proc genBreak(c: PCtx; n: PNode) =
--
cgit 1.4.1-2-gfad0
From d72921ecf6b3c62fdc0be2c179752ee08b4169b8 Mon Sep 17 00:00:00 2001
From: alaviss <alaviss@users.noreply.github.com>
Date: Thu, 24 Jan 2019 18:22:19 +0700
Subject: compiler/sem: correct macros lineinfo (#10438)
The compiler believes these are where a macro call starts (marked with
`^`):
m "string"
^ ^
This commit addresses that.
---
compiler/sem.nim | 9 +++++----
nimsuggest/tests/tmacro_highlight.nim | 13 +++++++++++++
2 files changed, 18 insertions(+), 4 deletions(-)
create mode 100644 nimsuggest/tests/tmacro_highlight.nim
(limited to 'compiler')
diff --git a/compiler/sem.nim b/compiler/sem.nim
index 3763c9b84..0a3b60ab3 100644
--- a/compiler/sem.nim
+++ b/compiler/sem.nim
@@ -450,17 +450,18 @@ proc semMacroExpr(c: PContext, n, nOrig: PNode, sym: PSym,
flags: TExprFlags = {}): PNode =
pushInfoContext(c.config, nOrig.info, sym.detailedInfo)
- markUsed(c.config, n.info, sym, c.graph.usageSym)
- onUse(n.info, sym)
+ let info = getCallLineInfo(n)
+ markUsed(c.config, info, sym, c.graph.usageSym)
+ onUse(info, sym)
if sym == c.p.owner:
- globalError(c.config, n.info, "recursive dependency: '$1'" % sym.name.s)
+ globalError(c.config, info, "recursive dependency: '$1'" % sym.name.s)
let genericParams = if sfImmediate in sym.flags: 0
else: sym.ast[genericParamsPos].len
let suppliedParams = max(n.safeLen - 1, 0)
if suppliedParams < genericParams:
- globalError(c.config, n.info, errMissingGenericParamsForTemplate % n.renderTree)
+ globalError(c.config, info, errMissingGenericParamsForTemplate % n.renderTree)
#if c.evalContext == nil:
# c.evalContext = c.createEvalContext(emStatic)
diff --git a/nimsuggest/tests/tmacro_highlight.nim b/nimsuggest/tests/tmacro_highlight.nim
new file mode 100644
index 000000000..6f5b5e8a7
--- /dev/null
+++ b/nimsuggest/tests/tmacro_highlight.nim
@@ -0,0 +1,13 @@
+macro a(b: string): untyped = discard
+
+a "string"#[!]#
+
+discard """
+$nimsuggest --tester $file
+>highlight $1
+highlight;;skMacro;;1;;6;;1
+highlight;;skType;;1;;11;;6
+highlight;;skType;;1;;20;;7
+highlight;;skMacro;;3;;0;;1
+highlight;;skMacro;;3;;0;;1
+"""
--
cgit 1.4.1-2-gfad0
From 251b014bf4b1cdd0d79511ab4a140db301925d0b Mon Sep 17 00:00:00 2001
From: Miran <narimiran@disroot.org>
Date: Thu, 24 Jan 2019 14:40:16 +0100
Subject: fix #9556 (#10445)
The old logic wasn't very useful because
`relPath` is almost always shorter than `absPath`,
e.g. `../../../../../` is shorter than `C:\Program Files`.
This way allows the usage of a relative path for
at most two levels deep, e.g. `../../relPath`,
otherwise the absolute path is used.
---
compiler/msgs.nim | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'compiler')
diff --git a/compiler/msgs.nim b/compiler/msgs.nim
index 698b81061..6bb2c3fa3 100644
--- a/compiler/msgs.nim
+++ b/compiler/msgs.nim
@@ -203,7 +203,7 @@ proc toMsgFilename*(conf: ConfigRef; info: TLineInfo): string =
result = absPath
else:
let relPath = conf.m.fileInfos[info.fileIndex.int32].projPath.string
- result = if absPath.len < relPath.len: absPath else: relPath
+ result = if relPath.count("..") > 2: absPath else: relPath
proc toLinenumber*(info: TLineInfo): int {.inline.} =
result = int info.line
--
cgit 1.4.1-2-gfad0
From 46d5fb9ed72f7d3a6dd504898a95c7fb286f7856 Mon Sep 17 00:00:00 2001
From: Araq <rumpf_a@web.de>
Date: Thu, 24 Jan 2019 08:23:24 +0100
Subject: docgen: nicer indentation
---
compiler/docgen.nim | 44 ++++++++++++++++++++++----------------------
1 file changed, 22 insertions(+), 22 deletions(-)
(limited to 'compiler')
diff --git a/compiler/docgen.nim b/compiler/docgen.nim
index 4271a116e..a2166784b 100644
--- a/compiler/docgen.nim
+++ b/compiler/docgen.nim
@@ -144,28 +144,28 @@ proc newDocumentor*(filename: AbsoluteFile; cache: IdentCache; conf: ConfigRef,
initStrTable result.types
result.onTestSnippet =
proc (gen: var RstGenerator; filename, cmd: string; status: int; content: string) =
- var d = TDocumentor(gen)
- var outp: AbsoluteFile
- if filename.len == 0:
- inc(d.id)
- let nameOnly = splitFile(d.filename).name
- let subdir = getNimcacheDir(conf) / RelativeDir(nameOnly)
- createDir(subdir)
- outp = subdir / RelativeFile(nameOnly & "_snippet_" & $d.id & ".nim")
- elif isAbsolute(filename):
- outp = AbsoluteFile filename
- else:
- # Nim's convention: every path is relative to the file it was written in:
- outp = splitFile(d.filename).dir.AbsoluteDir / RelativeFile(filename)
- # Include the current file if we're parsing a nim file
- let importStmt = if d.isPureRst: "" else: "import \"$1\"\n" % [d.filename]
- writeFile(outp, importStmt & content)
- let c = if cmd.startsWith("nim "): os.getAppFilename() & cmd.substr(3)
- else: cmd
- let c2 = c % quoteShell(outp)
- rawMessage(conf, hintExecuting, c2)
- if execShellCmd(c2) != status:
- rawMessage(conf, errGenerated, "executing of external program failed: " & c2)
+ var d = TDocumentor(gen)
+ var outp: AbsoluteFile
+ if filename.len == 0:
+ inc(d.id)
+ let nameOnly = splitFile(d.filename).name
+ let subdir = getNimcacheDir(conf) / RelativeDir(nameOnly)
+ createDir(subdir)
+ outp = subdir / RelativeFile(nameOnly & "_snippet_" & $d.id & ".nim")
+ elif isAbsolute(filename):
+ outp = AbsoluteFile filename
+ else:
+ # Nim's convention: every path is relative to the file it was written in:
+ outp = splitFile(d.filename).dir.AbsoluteDir / RelativeFile(filename)
+ # Include the current file if we're parsing a nim file
+ let importStmt = if d.isPureRst: "" else: "import \"$1\"\n" % [d.filename]
+ writeFile(outp, importStmt & content)
+ let c = if cmd.startsWith("nim "): os.getAppFilename() & cmd.substr(3)
+ else: cmd
+ let c2 = c % quoteShell(outp)
+ rawMessage(conf, hintExecuting, c2)
+ if execShellCmd(c2) != status:
+ rawMessage(conf, errGenerated, "executing of external program failed: " & c2)
result.emitted = initIntSet()
result.destFile = getOutFile2(conf, relativeTo(filename, conf.projectPath),
outExt, RelativeDir"htmldocs", false)
--
cgit 1.4.1-2-gfad0
From 13d667ee5312a4705a7ca51ead933739514c70dd Mon Sep 17 00:00:00 2001
From: Araq <rumpf_a@web.de>
Date: Fri, 25 Jan 2019 09:11:06 +0100
Subject: docgen: produce links for proc names
---
compiler/docgen.nim | 22 ++++++++++++++++------
nimdoc/tester.nim | 3 ++-
.../expected/subdir/subdir_b/utils.html | 6 +++---
nimdoc/testproject/expected/testproject.html | 10 +++++-----
4 files changed, 26 insertions(+), 15 deletions(-)
(limited to 'compiler')
diff --git a/compiler/docgen.nim b/compiler/docgen.nim
index a2166784b..f34a83145 100644
--- a/compiler/docgen.nim
+++ b/compiler/docgen.nim
@@ -300,13 +300,17 @@ proc externalDep(d: PDoc; module: PSym): string =
else:
result = extractFilename toFullPath(d.conf, FileIndex module.position)
-proc nodeToHighlightedHtml(d: PDoc; n: PNode; result: var Rope; renderFlags: TRenderFlags = {}) =
+proc nodeToHighlightedHtml(d: PDoc; n: PNode; result: var Rope; renderFlags: TRenderFlags = {};
+ procLink: Rope) =
var r: TSrcGen
var literal = ""
initTokRender(r, n, renderFlags)
var kind = tkEof
+ var tokenPos = 0
+ var procTokenPos = 0
while true:
getNextTok(r, kind, literal)
+ inc tokenPos
case kind
of tkEof:
break
@@ -314,6 +318,8 @@ proc nodeToHighlightedHtml(d: PDoc; n: PNode; result: var Rope; renderFlags: TRe
dispA(d.conf, result, "<span class=\"Comment\">$1</span>", "\\spanComment{$1}",
[rope(esc(d.target, literal))])
of tokKeywordLow..tokKeywordHigh:
+ if kind in {tkProc, tkMethod, tkIterator, tkMacro, tkTemplate, tkFunc, tkConverter}:
+ procTokenPos = tokenPos
dispA(d.conf, result, "<span class=\"Keyword\">$1</span>", "\\spanKeyword{$1}",
[rope(literal)])
of tkOpr:
@@ -333,7 +339,11 @@ proc nodeToHighlightedHtml(d: PDoc; n: PNode; result: var Rope; renderFlags: TRe
"\\spanFloatNumber{$1}", [rope(esc(d.target, literal))])
of tkSymbol:
let s = getTokSym(r)
- if s != nil and s.kind == skType and sfExported in s.flags and
+ # -2 because of the whitespace in between:
+ if procTokenPos == tokenPos-2 and procLink != nil:
+ dispA(d.conf, result, "<a href=\"#$2\"><span class=\"Identifier\">$1</span></a>",
+ "\\spanIdentifier{$1}", [rope(esc(d.target, literal)), procLink])
+ elif s != nil and s.kind == skType and sfExported in s.flags and
s.owner != nil and belongsToPackage(d.conf, s.owner) and
d.target == outHtml:
let external = externalDep(d, s.owner)
@@ -445,7 +455,7 @@ proc getAllRunnableExamplesRec(d: PDoc; n, orig: PNode; dest: var Rope) =
for b in body:
if i > 0: dest.add "\n"
inc i
- nodeToHighlightedHtml(d, b, dest, {})
+ nodeToHighlightedHtml(d, b, dest, {}, nil)
dest.add(d.config.getOrDefault"doc.listing_end" % id)
else: discard
for i in 0 ..< n.safeLen:
@@ -615,9 +625,6 @@ proc genItem(d: PDoc, n, nameNode: PNode, k: TSymKind) =
break
plainName.add(literal)
- nodeToHighlightedHtml(d, n, result, {renderNoBody, renderNoComments,
- renderDocComments, renderSyms})
-
inc(d.id)
let
plainNameRope = rope(xmltree.escape(plainName.strip))
@@ -630,6 +637,9 @@ proc genItem(d: PDoc, n, nameNode: PNode, k: TSymKind) =
symbolOrIdRope = symbolOrId.rope
symbolOrIdEncRope = encodeUrl(symbolOrId).rope
+ nodeToHighlightedHtml(d, n, result, {renderNoBody, renderNoComments,
+ renderDocComments, renderSyms}, symbolOrIdEncRope)
+
var seeSrcRope: Rope = nil
let docItemSeeSrc = getConfigVar(d.conf, "doc.item.seesrc")
if docItemSeeSrc.len > 0:
diff --git a/nimdoc/tester.nim b/nimdoc/tester.nim
index db2095128..997ed8596 100644
--- a/nimdoc/tester.nim
+++ b/nimdoc/tester.nim
@@ -26,7 +26,8 @@ proc test(dir: string; fixup = false) =
copyFile(produced, expected)
else:
echo "SUCCESS: files identical: ", produced
- removeDir(dir / "htmldocs")
+ if failures == 0:
+ removeDir(dir / "htmldocs")
test("nimdoc/testproject", defined(fixup))
if failures > 0: quit($failures & " failures occurred.")
diff --git a/nimdoc/testproject/expected/subdir/subdir_b/utils.html b/nimdoc/testproject/expected/subdir/subdir_b/utils.html
index 9ba3c24e1..5d6dbbc5b 100644
--- a/nimdoc/testproject/expected/subdir/subdir_b/utils.html
+++ b/nimdoc/testproject/expected/subdir/subdir_b/utils.html
@@ -1305,7 +1305,7 @@ function main() {
<h1><a class="toc-backref" href="#12">Procs</a></h1>
<dl class="item">
<a id="someType,"></a>
-<dt><pre><span class="Keyword">proc</span> <span class="Identifier">someType</span><span class="Other">(</span><span class="Other">)</span><span class="Other">:</span> <a href="utils.html#SomeType"><span class="Identifier">SomeType</span></a> <span><span class="Other">{</span><span class="Other pragmadots">...</span><span class="Other">}</span></span><span class="pragmawrap"><span class="Other">{.</span><span class="pragma"><span class="Identifier">raises</span><span class="Other">:</span> <span class="Other">[</span><span class="Other">]</span><span class="Other">,</span> <span class="Identifier">tags</span><span class="Other">:</span> <span class="Other">[</span><span class="Other">]</span></span><span class="Other">.}</span></span></pre></dt>
+<dt><pre><span class="Keyword">proc</span> <a href="#someType%2C"><span class="Identifier">someType</span></a><span class="Other">(</span><span class="Other">)</span><span class="Other">:</span> <a href="utils.html#SomeType"><span class="Identifier">SomeType</span></a> <span><span class="Other">{</span><span class="Other pragmadots">...</span><span class="Other">}</span></span><span class="pragmawrap"><span class="Other">{.</span><span class="pragma"><span class="Identifier">raises</span><span class="Other">:</span> <span class="Other">[</span><span class="Other">]</span><span class="Other">,</span> <span class="Identifier">tags</span><span class="Other">:</span> <span class="Other">[</span><span class="Other">]</span></span><span class="Other">.}</span></span></pre></dt>
<dd>
constructor.
@@ -1316,13 +1316,13 @@ constructor.
<h1><a class="toc-backref" href="#18">Templates</a></h1>
<dl class="item">
<a id="aEnum.t,"></a>
-<dt><pre><span class="Keyword">template</span> <span class="Identifier">aEnum</span><span class="Other">(</span><span class="Other">)</span><span class="Other">:</span> <span class="Identifier">untyped</span></pre></dt>
+<dt><pre><span class="Keyword">template</span> <a href="#aEnum.t%2C"><span class="Identifier">aEnum</span></a><span class="Other">(</span><span class="Other">)</span><span class="Other">:</span> <span class="Identifier">untyped</span></pre></dt>
<dd>
</dd>
<a id="bEnum.t,"></a>
-<dt><pre><span class="Keyword">template</span> <span class="Identifier">bEnum</span><span class="Other">(</span><span class="Other">)</span><span class="Other">:</span> <span class="Identifier">untyped</span></pre></dt>
+<dt><pre><span class="Keyword">template</span> <a href="#bEnum.t%2C"><span class="Identifier">bEnum</span></a><span class="Other">(</span><span class="Other">)</span><span class="Other">:</span> <span class="Identifier">untyped</span></pre></dt>
<dd>
diff --git a/nimdoc/testproject/expected/testproject.html b/nimdoc/testproject/expected/testproject.html
index dd1541a56..9c13eb6e6 100644
--- a/nimdoc/testproject/expected/testproject.html
+++ b/nimdoc/testproject/expected/testproject.html
@@ -1350,13 +1350,13 @@ The enum B.
<h1><a class="toc-backref" href="#12">Procs</a></h1>
<dl class="item">
<a id="bar,T,T"></a>
-<dt><pre><span class="Keyword">proc</span> <span class="Identifier">bar</span><span class="Other">[</span><span class="Identifier">T</span><span class="Other">]</span><span class="Other">(</span><span class="Identifier">a</span><span class="Other">,</span> <span class="Identifier">b</span><span class="Other">:</span> <span class="Identifier">T</span><span class="Other">)</span><span class="Other">:</span> <span class="Identifier">T</span></pre></dt>
+<dt><pre><span class="Keyword">proc</span> <a href="#bar%2CT%2CT"><span class="Identifier">bar</span></a><span class="Other">[</span><span class="Identifier">T</span><span class="Other">]</span><span class="Other">(</span><span class="Identifier">a</span><span class="Other">,</span> <span class="Identifier">b</span><span class="Other">:</span> <span class="Identifier">T</span><span class="Other">)</span><span class="Other">:</span> <span class="Identifier">T</span></pre></dt>
<dd>
</dd>
<a id="isValid,T"></a>
-<dt><pre><span class="Keyword">proc</span> <span class="Identifier">isValid</span><span class="Other">[</span><span class="Identifier">T</span><span class="Other">]</span><span class="Other">(</span><span class="Identifier">x</span><span class="Other">:</span> <span class="Identifier">T</span><span class="Other">)</span><span class="Other">:</span> <span class="Identifier">bool</span></pre></dt>
+<dt><pre><span class="Keyword">proc</span> <a href="#isValid%2CT"><span class="Identifier">isValid</span></a><span class="Other">[</span><span class="Identifier">T</span><span class="Other">]</span><span class="Other">(</span><span class="Identifier">x</span><span class="Other">:</span> <span class="Identifier">T</span><span class="Other">)</span><span class="Other">:</span> <span class="Identifier">bool</span></pre></dt>
<dd>
@@ -1367,7 +1367,7 @@ The enum B.
<h1><a class="toc-backref" href="#13">Funcs</a></h1>
<dl class="item">
<a id="someFunc,"></a>
-<dt><pre><span class="Keyword">func</span> <span class="Identifier">someFunc</span><span class="Other">(</span><span class="Other">)</span> <span><span class="Other">{</span><span class="Other pragmadots">...</span><span class="Other">}</span></span><span class="pragmawrap"><span class="Other">{.</span><span class="pragma"><span class="Identifier">raises</span><span class="Other">:</span> <span class="Other">[</span><span class="Other">]</span><span class="Other">,</span> <span class="Identifier">tags</span><span class="Other">:</span> <span class="Other">[</span><span class="Other">]</span></span><span class="Other">.}</span></span></pre></dt>
+<dt><pre><span class="Keyword">func</span> <a href="#someFunc%2C"><span class="Identifier">someFunc</span></a><span class="Other">(</span><span class="Other">)</span> <span><span class="Other">{</span><span class="Other pragmadots">...</span><span class="Other">}</span></span><span class="pragmawrap"><span class="Other">{.</span><span class="pragma"><span class="Identifier">raises</span><span class="Other">:</span> <span class="Other">[</span><span class="Other">]</span><span class="Other">,</span> <span class="Identifier">tags</span><span class="Other">:</span> <span class="Other">[</span><span class="Other">]</span></span><span class="Other">.}</span></span></pre></dt>
<dd>
My someFunc. Stuff in <tt class="docutils literal"><span class="pre">quotes</span></tt> here. <a class="reference external" href="https://nim-lang.org">Some link</a>
@@ -1378,7 +1378,7 @@ My someFunc. Stuff in <tt class="docutils literal"><span class="pre">quotes</spa
<h1><a class="toc-backref" href="#17">Macros</a></h1>
<dl class="item">
<a id="bar.m,"></a>
-<dt><pre><span class="Keyword">macro</span> <span class="Identifier">bar</span><span class="Other">(</span><span class="Other">)</span><span class="Other">:</span> <span class="Identifier">untyped</span></pre></dt>
+<dt><pre><span class="Keyword">macro</span> <a href="#bar.m%2C"><span class="Identifier">bar</span></a><span class="Other">(</span><span class="Other">)</span><span class="Other">:</span> <span class="Identifier">untyped</span></pre></dt>
<dd>
@@ -1389,7 +1389,7 @@ My someFunc. Stuff in <tt class="docutils literal"><span class="pre">quotes</spa
<h1><a class="toc-backref" href="#18">Templates</a></h1>
<dl class="item">
<a id="foo.t,SomeType,SomeType"></a>
-<dt><pre><span class="Keyword">template</span> <span class="Identifier">foo</span><span class="Other">(</span><span class="Identifier">a</span><span class="Other">,</span> <span class="Identifier">b</span><span class="Other">:</span> <a href="subdir/subdir_b/utils.html#SomeType"><span class="Identifier">SomeType</span></a><span class="Other">)</span></pre></dt>
+<dt><pre><span class="Keyword">template</span> <a href="#foo.t%2CSomeType%2CSomeType"><span class="Identifier">foo</span></a><span class="Other">(</span><span class="Identifier">a</span><span class="Other">,</span> <span class="Identifier">b</span><span class="Other">:</span> <a href="subdir/subdir_b/utils.html#SomeType"><span class="Identifier">SomeType</span></a><span class="Other">)</span></pre></dt>
<dd>
This does nothing
--
cgit 1.4.1-2-gfad0
From 3de255541a978f2f51ffdc4e49e0876d61cec128 Mon Sep 17 00:00:00 2001
From: Araq <rumpf_a@web.de>
Date: Fri, 25 Jan 2019 09:21:35 +0100
Subject: docgen: do not produce trailing commas for links
---
compiler/docgen.nim | 17 ++++++++++-------
nimdoc/testproject/expected/subdir/subdir_b/utils.html | 18 +++++++++---------
nimdoc/testproject/expected/testproject.html | 12 ++++++------
nimdoc/testproject/expected/theindex.html | 10 +++++-----
4 files changed, 30 insertions(+), 27 deletions(-)
(limited to 'compiler')
diff --git a/compiler/docgen.nim b/compiler/docgen.nim
index f34a83145..207d7e30b 100644
--- a/compiler/docgen.nim
+++ b/compiler/docgen.nim
@@ -559,15 +559,18 @@ proc complexName(k: TSymKind, n: PNode, baseName: string): string =
## section of ``doc/docgen.txt``.
result = baseName
case k:
- of skProc, skFunc: result.add(defaultParamSeparator)
- of skMacro: result.add(".m" & defaultParamSeparator)
- of skMethod: result.add(".e" & defaultParamSeparator)
- of skIterator: result.add(".i" & defaultParamSeparator)
- of skTemplate: result.add(".t" & defaultParamSeparator)
- of skConverter: result.add(".c" & defaultParamSeparator)
+ of skProc, skFunc: discard
+ of skMacro: result.add(".m")
+ of skMethod: result.add(".e")
+ of skIterator: result.add(".i")
+ of skTemplate: result.add(".t")
+ of skConverter: result.add(".c")
else: discard
if len(n) > paramsPos and n[paramsPos].kind == nkFormalParams:
- result.add(renderParamTypes(n[paramsPos]))
+ let params = renderParamTypes(n[paramsPos])
+ if params.len > 0:
+ result.add(defaultParamSeparator)
+ result.add(params)
proc isCallable(n: PNode): bool =
## Returns true if `n` contains a callable node.
diff --git a/nimdoc/testproject/expected/subdir/subdir_b/utils.html b/nimdoc/testproject/expected/subdir/subdir_b/utils.html
index 5d6dbbc5b..f057df7e3 100644
--- a/nimdoc/testproject/expected/subdir/subdir_b/utils.html
+++ b/nimdoc/testproject/expected/subdir/subdir_b/utils.html
@@ -1255,7 +1255,7 @@ function main() {
<li>
<a class="reference reference-toplevel" href="#12" id="62">Procs</a>
<ul class="simple simple-toc-section">
- <li><a class="reference" href="#someType%2C"
+ <li><a class="reference" href="#someType_2"
title="someType(): SomeType"><wbr />some<wbr />Type<span class="attachedType" style="visibility:hidden">SomeType</span></a></li>
</ul>
@@ -1263,9 +1263,9 @@ function main() {
<li>
<a class="reference reference-toplevel" href="#18" id="68">Templates</a>
<ul class="simple simple-toc-section">
- <li><a class="reference" href="#aEnum.t%2C"
+ <li><a class="reference" href="#aEnum.t"
title="aEnum(): untyped"><wbr />a<wbr />Enum<span class="attachedType" style="visibility:hidden"></span></a></li>
- <li><a class="reference" href="#bEnum.t%2C"
+ <li><a class="reference" href="#bEnum.t"
title="bEnum(): untyped"><wbr />b<wbr />Enum<span class="attachedType" style="visibility:hidden"></span></a></li>
</ul>
@@ -1304,8 +1304,8 @@ function main() {
<div class="section" id="12">
<h1><a class="toc-backref" href="#12">Procs</a></h1>
<dl class="item">
-<a id="someType,"></a>
-<dt><pre><span class="Keyword">proc</span> <a href="#someType%2C"><span class="Identifier">someType</span></a><span class="Other">(</span><span class="Other">)</span><span class="Other">:</span> <a href="utils.html#SomeType"><span class="Identifier">SomeType</span></a> <span><span class="Other">{</span><span class="Other pragmadots">...</span><span class="Other">}</span></span><span class="pragmawrap"><span class="Other">{.</span><span class="pragma"><span class="Identifier">raises</span><span class="Other">:</span> <span class="Other">[</span><span class="Other">]</span><span class="Other">,</span> <span class="Identifier">tags</span><span class="Other">:</span> <span class="Other">[</span><span class="Other">]</span></span><span class="Other">.}</span></span></pre></dt>
+<a id="someType_2"></a>
+<dt><pre><span class="Keyword">proc</span> <a href="#someType_2"><span class="Identifier">someType</span></a><span class="Other">(</span><span class="Other">)</span><span class="Other">:</span> <a href="utils.html#SomeType"><span class="Identifier">SomeType</span></a> <span><span class="Other">{</span><span class="Other pragmadots">...</span><span class="Other">}</span></span><span class="pragmawrap"><span class="Other">{.</span><span class="pragma"><span class="Identifier">raises</span><span class="Other">:</span> <span class="Other">[</span><span class="Other">]</span><span class="Other">,</span> <span class="Identifier">tags</span><span class="Other">:</span> <span class="Other">[</span><span class="Other">]</span></span><span class="Other">.}</span></span></pre></dt>
<dd>
constructor.
@@ -1315,14 +1315,14 @@ constructor.
<div class="section" id="18">
<h1><a class="toc-backref" href="#18">Templates</a></h1>
<dl class="item">
-<a id="aEnum.t,"></a>
-<dt><pre><span class="Keyword">template</span> <a href="#aEnum.t%2C"><span class="Identifier">aEnum</span></a><span class="Other">(</span><span class="Other">)</span><span class="Other">:</span> <span class="Identifier">untyped</span></pre></dt>
+<a id="aEnum.t"></a>
+<dt><pre><span class="Keyword">template</span> <a href="#aEnum.t"><span class="Identifier">aEnum</span></a><span class="Other">(</span><span class="Other">)</span><span class="Other">:</span> <span class="Identifier">untyped</span></pre></dt>
<dd>
</dd>
-<a id="bEnum.t,"></a>
-<dt><pre><span class="Keyword">template</span> <a href="#bEnum.t%2C"><span class="Identifier">bEnum</span></a><span class="Other">(</span><span class="Other">)</span><span class="Other">:</span> <span class="Identifier">untyped</span></pre></dt>
+<a id="bEnum.t"></a>
+<dt><pre><span class="Keyword">template</span> <a href="#bEnum.t"><span class="Identifier">bEnum</span></a><span class="Other">(</span><span class="Other">)</span><span class="Other">:</span> <span class="Identifier">untyped</span></pre></dt>
<dd>
diff --git a/nimdoc/testproject/expected/testproject.html b/nimdoc/testproject/expected/testproject.html
index 9c13eb6e6..21a7a0cf8 100644
--- a/nimdoc/testproject/expected/testproject.html
+++ b/nimdoc/testproject/expected/testproject.html
@@ -1277,7 +1277,7 @@ function main() {
<li>
<a class="reference reference-toplevel" href="#13" id="63">Funcs</a>
<ul class="simple simple-toc-section">
- <li><a class="reference" href="#someFunc%2C"
+ <li><a class="reference" href="#someFunc"
title="someFunc()"><wbr />some<wbr />Func<span class="attachedType" style="visibility:hidden"></span></a></li>
</ul>
@@ -1285,7 +1285,7 @@ function main() {
<li>
<a class="reference reference-toplevel" href="#17" id="67">Macros</a>
<ul class="simple simple-toc-section">
- <li><a class="reference" href="#bar.m%2C"
+ <li><a class="reference" href="#bar.m"
title="bar(): untyped"><wbr />bar<span class="attachedType" style="visibility:hidden"></span></a></li>
</ul>
@@ -1366,8 +1366,8 @@ The enum B.
<div class="section" id="13">
<h1><a class="toc-backref" href="#13">Funcs</a></h1>
<dl class="item">
-<a id="someFunc,"></a>
-<dt><pre><span class="Keyword">func</span> <a href="#someFunc%2C"><span class="Identifier">someFunc</span></a><span class="Other">(</span><span class="Other">)</span> <span><span class="Other">{</span><span class="Other pragmadots">...</span><span class="Other">}</span></span><span class="pragmawrap"><span class="Other">{.</span><span class="pragma"><span class="Identifier">raises</span><span class="Other">:</span> <span class="Other">[</span><span class="Other">]</span><span class="Other">,</span> <span class="Identifier">tags</span><span class="Other">:</span> <span class="Other">[</span><span class="Other">]</span></span><span class="Other">.}</span></span></pre></dt>
+<a id="someFunc"></a>
+<dt><pre><span class="Keyword">func</span> <a href="#someFunc"><span class="Identifier">someFunc</span></a><span class="Other">(</span><span class="Other">)</span> <span><span class="Other">{</span><span class="Other pragmadots">...</span><span class="Other">}</span></span><span class="pragmawrap"><span class="Other">{.</span><span class="pragma"><span class="Identifier">raises</span><span class="Other">:</span> <span class="Other">[</span><span class="Other">]</span><span class="Other">,</span> <span class="Identifier">tags</span><span class="Other">:</span> <span class="Other">[</span><span class="Other">]</span></span><span class="Other">.}</span></span></pre></dt>
<dd>
My someFunc. Stuff in <tt class="docutils literal"><span class="pre">quotes</span></tt> here. <a class="reference external" href="https://nim-lang.org">Some link</a>
@@ -1377,8 +1377,8 @@ My someFunc. Stuff in <tt class="docutils literal"><span class="pre">quotes</spa
<div class="section" id="17">
<h1><a class="toc-backref" href="#17">Macros</a></h1>
<dl class="item">
-<a id="bar.m,"></a>
-<dt><pre><span class="Keyword">macro</span> <a href="#bar.m%2C"><span class="Identifier">bar</span></a><span class="Other">(</span><span class="Other">)</span><span class="Other">:</span> <span class="Identifier">untyped</span></pre></dt>
+<a id="bar.m"></a>
+<dt><pre><span class="Keyword">macro</span> <a href="#bar.m"><span class="Identifier">bar</span></a><span class="Other">(</span><span class="Other">)</span><span class="Other">:</span> <span class="Identifier">untyped</span></pre></dt>
<dd>
diff --git a/nimdoc/testproject/expected/theindex.html b/nimdoc/testproject/expected/theindex.html
index 95c667acc..5a6e575bf 100644
--- a/nimdoc/testproject/expected/theindex.html
+++ b/nimdoc/testproject/expected/theindex.html
@@ -1227,7 +1227,7 @@ function main() {
</ul></dd>
<dt><a name="aEnum" href="#aEnum"><span>aEnum:</span></a></dt><dd><ul class="simple">
<li><a class="reference external"
- data-doc-search-tag="utils: aEnum(): untyped" href="subdir/subdir_b/utils.html#aEnum.t%2C">utils: aEnum(): untyped</a></li>
+ data-doc-search-tag="utils: aEnum(): untyped" href="subdir/subdir_b/utils.html#aEnum.t">utils: aEnum(): untyped</a></li>
</ul></dd>
<dt><a name="aVariable" href="#aVariable"><span>aVariable:</span></a></dt><dd><ul class="simple">
<li><a class="reference external"
@@ -1241,11 +1241,11 @@ function main() {
<li><a class="reference external"
data-doc-search-tag="testproject: bar[T](a, b: T): T" href="testproject.html#bar%2CT%2CT">testproject: bar[T](a, b: T): T</a></li>
<li><a class="reference external"
- data-doc-search-tag="testproject: bar(): untyped" href="testproject.html#bar.m%2C">testproject: bar(): untyped</a></li>
+ data-doc-search-tag="testproject: bar(): untyped" href="testproject.html#bar.m">testproject: bar(): untyped</a></li>
</ul></dd>
<dt><a name="bEnum" href="#bEnum"><span>bEnum:</span></a></dt><dd><ul class="simple">
<li><a class="reference external"
- data-doc-search-tag="utils: bEnum(): untyped" href="subdir/subdir_b/utils.html#bEnum.t%2C">utils: bEnum(): untyped</a></li>
+ data-doc-search-tag="utils: bEnum(): untyped" href="subdir/subdir_b/utils.html#bEnum.t">utils: bEnum(): untyped</a></li>
</ul></dd>
<dt><a name="enumValueA" href="#enumValueA"><span>enumValueA:</span></a></dt><dd><ul class="simple">
<li><a class="reference external"
@@ -1269,7 +1269,7 @@ function main() {
</ul></dd>
<dt><a name="someFunc" href="#someFunc"><span>someFunc:</span></a></dt><dd><ul class="simple">
<li><a class="reference external"
- data-doc-search-tag="testproject: someFunc()" href="testproject.html#someFunc%2C">testproject: someFunc()</a></li>
+ data-doc-search-tag="testproject: someFunc()" href="testproject.html#someFunc">testproject: someFunc()</a></li>
</ul></dd>
<dt><a name="SomeType" href="#SomeType"><span>SomeType:</span></a></dt><dd><ul class="simple">
<li><a class="reference external"
@@ -1277,7 +1277,7 @@ function main() {
</ul></dd>
<dt><a name="someType" href="#someType"><span>someType:</span></a></dt><dd><ul class="simple">
<li><a class="reference external"
- data-doc-search-tag="utils: someType(): SomeType" href="subdir/subdir_b/utils.html#someType%2C">utils: someType(): SomeType</a></li>
+ data-doc-search-tag="utils: someType(): SomeType" href="subdir/subdir_b/utils.html#someType_2">utils: someType(): SomeType</a></li>
</ul></dd>
</dl>
<div class="row">
--
cgit 1.4.1-2-gfad0
From 43613ff49dcbfb171fd14786dfb0fb3845b8692f Mon Sep 17 00:00:00 2001
From: Araq <rumpf_a@web.de>
Date: Fri, 25 Jan 2019 09:22:31 +0100
Subject: docgen: style tweak
---
compiler/docgen.nim | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'compiler')
diff --git a/compiler/docgen.nim b/compiler/docgen.nim
index 207d7e30b..a7f7d77b5 100644
--- a/compiler/docgen.nim
+++ b/compiler/docgen.nim
@@ -558,7 +558,7 @@ proc complexName(k: TSymKind, n: PNode, baseName: string): string =
## If you modify the output of this proc, please update the anchor generation
## section of ``doc/docgen.txt``.
result = baseName
- case k:
+ case k
of skProc, skFunc: discard
of skMacro: result.add(".m")
of skMethod: result.add(".e")
--
cgit 1.4.1-2-gfad0
From 1c2abb8d880b8a7553251891e816617f060b6b69 Mon Sep 17 00:00:00 2001
From: cooldome <cdome@bk.ru>
Date: Fri, 25 Jan 2019 08:25:11 +0000
Subject: fixes double object field symbol lookups (no test case available)
(#10450)
---
compiler/semexprs.nim | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
(limited to 'compiler')
diff --git a/compiler/semexprs.nim b/compiler/semexprs.nim
index 37e2ca33f..68f1c6c3a 100644
--- a/compiler/semexprs.nim
+++ b/compiler/semexprs.nim
@@ -1291,7 +1291,11 @@ proc builtinFieldAccess(c: PContext, n: PNode, flags: TExprFlags): PNode =
if ty.sons[0] == nil: break
ty = skipTypes(ty.sons[0], skipPtrs)
if f != nil:
- if fieldVisible(c, f):
+ let visibilityCheckNeeded =
+ if n[1].kind == nkSym and n[1].sym == f:
+ false # field lookup was done already, likely by hygienic template or bindSym
+ else: true
+ if not visibilityCheckNeeded or fieldVisible(c, f):
# is the access to a public field or in the same module or in a friend?
markUsed(c.config, n.sons[1].info, f, c.graph.usageSym)
onUse(n.sons[1].info, f)
--
cgit 1.4.1-2-gfad0
From 3ce6b2acb9ce21d33f0f14161b0abf89a9ff7af9 Mon Sep 17 00:00:00 2001
From: LemonBoy <LemonBoy@users.noreply.github.com>
Date: Sun, 27 Jan 2019 10:32:44 +0100
Subject: Fix exception tracking in try blocks (#10455)
Exceptions raised inside a nkFinally/nkExcept block are not caught by
the block itself.
Fixes #3886
---
compiler/sempass2.nim | 10 +++++++++-
tests/effects/teffects7.nim | 14 ++++++++++++++
2 files changed, 23 insertions(+), 1 deletion(-)
create mode 100644 tests/effects/teffects7.nim
(limited to 'compiler')
diff --git a/compiler/sempass2.nim b/compiler/sempass2.nim
index 81d637fee..622e72074 100644
--- a/compiler/sempass2.nim
+++ b/compiler/sempass2.nim
@@ -353,6 +353,8 @@ proc trackTryStmt(tracked: PEffects, n: PNode) =
var branches = 1
var hasFinally = false
+
+ # Collect the exceptions caught by the except branches
for i in 1 ..< n.len:
let b = n.sons[i]
let blen = sonsLen(b)
@@ -368,12 +370,18 @@ proc trackTryStmt(tracked: PEffects, n: PNode) =
else:
assert(b.sons[j].kind == nkType)
catches(tracked, b.sons[j].typ)
+ else:
+ assert b.kind == nkFinally
+ # Add any other exception raised in the except bodies
+ for i in 1 ..< n.len:
+ let b = n.sons[i]
+ let blen = sonsLen(b)
+ if b.kind == nkExceptBranch:
setLen(tracked.init, oldState)
track(tracked, b.sons[blen-1])
for i in oldState..<tracked.init.len:
addToIntersection(inter, tracked.init[i])
else:
- assert b.kind == nkFinally
setLen(tracked.init, oldState)
track(tracked, b.sons[blen-1])
hasFinally = true
diff --git a/tests/effects/teffects7.nim b/tests/effects/teffects7.nim
new file mode 100644
index 000000000..1cd144459
--- /dev/null
+++ b/tests/effects/teffects7.nim
@@ -0,0 +1,14 @@
+discard """
+ errormsg: "can raise an unlisted exception: ref FloatingPointError"
+ line: 10
+"""
+
+proc foo() {.raises: [].} =
+ try:
+ discard
+ except KeyError:
+ raise newException(FloatingPointError, "foo")
+ except Exception:
+ discard
+
+foo()
--
cgit 1.4.1-2-gfad0
From 0b02241fc53eff2687b4fad3997159b953888634 Mon Sep 17 00:00:00 2001
From: alaviss <alaviss@users.noreply.github.com>
Date: Sun, 27 Jan 2019 20:58:10 +0700
Subject: semcall: correct lineinfo for accquoted symbols (#10461)
---
compiler/semcall.nim | 2 +-
nimsuggest/tests/tqualified_highlight.nim | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
(limited to 'compiler')
diff --git a/compiler/semcall.nim b/compiler/semcall.nim
index 0613a4145..e8723e3df 100644
--- a/compiler/semcall.nim
+++ b/compiler/semcall.nim
@@ -464,7 +464,7 @@ proc updateDefaultParams(call: PNode) =
proc getCallLineInfo(n: PNode): TLineInfo =
case n.kind
- of nkBracketExpr, nkCall, nkCommand: getCallLineInfo(n.sons[0])
+ of nkAccQuoted, nkBracketExpr, nkCall, nkCommand: getCallLineInfo(n.sons[0])
of nkDotExpr: getCallLineInfo(n.sons[1])
else: n.info
diff --git a/nimsuggest/tests/tqualified_highlight.nim b/nimsuggest/tests/tqualified_highlight.nim
index 1b34dbade..3b521ecc1 100644
--- a/nimsuggest/tests/tqualified_highlight.nim
+++ b/nimsuggest/tests/tqualified_highlight.nim
@@ -1,5 +1,6 @@
system.echo#[!]#
system.once
+system.`$` 1
discard """
$nimsuggest --tester $file
@@ -9,4 +10,5 @@ highlight;;skProc;;1;;7;;4
highlight;;skTemplate;;2;;7;;4
highlight;;skTemplate;;2;;7;;4
highlight;;skTemplate;;2;;7;;4
+highlight;;skProc;;3;;8;;1
"""
--
cgit 1.4.1-2-gfad0
From 690f21043d7c1cad321e116fdc666b2951ba1da3 Mon Sep 17 00:00:00 2001
From: cooldome <cdome@bk.ru>
Date: Mon, 28 Jan 2019 07:32:14 +0000
Subject: isLastRead regression fix (#10463)
* fixes #10462
* add a test
---
compiler/destroyer.nim | 10 ++++++----
compiler/dfa.nim | 15 +++++++++------
tests/destructor/tmove_objconstr.nim | 9 +++++++++
3 files changed, 24 insertions(+), 10 deletions(-)
(limited to 'compiler')
diff --git a/compiler/destroyer.nim b/compiler/destroyer.nim
index 06d4dcbef..e21d532ea 100644
--- a/compiler/destroyer.nim
+++ b/compiler/destroyer.nim
@@ -139,7 +139,7 @@ proc isLastRead(s: PSym; c: var Con; pc, comesFrom: int): int =
of def:
if c.g[pc].sym == s:
# the path lead to a redefinition of 's' --> abandon it.
- return pc
+ return high(int)
inc pc
of use:
if c.g[pc].sym == s:
@@ -150,14 +150,16 @@ proc isLastRead(s: PSym; c: var Con; pc, comesFrom: int): int =
pc = pc + c.g[pc].dest
of fork:
# every branch must lead to the last read of the location:
- let variantA = isLastRead(s, c, pc+1, pc)
+ var variantA = isLastRead(s, c, pc+1, pc)
if variantA < 0: return -1
let variantB = isLastRead(s, c, pc + c.g[pc].dest, pc)
if variantB < 0: return -1
- pc = variantA+1
+ elif variantA == high(int):
+ variantA = variantB
+ pc = variantA
of InstrKind.join:
let dest = pc + c.g[pc].dest
- if dest == comesFrom: return pc
+ if dest == comesFrom: return pc + 1
inc pc
return pc
diff --git a/compiler/dfa.nim b/compiler/dfa.nim
index f34981000..462cf0fb7 100644
--- a/compiler/dfa.nim
+++ b/compiler/dfa.nim
@@ -74,7 +74,7 @@ proc codeListing(c: ControlFlowGraph, result: var string, start=0; last = -1) =
while i <= last:
if i in jumpTargets: result.add("L" & $i & ":\n")
result.add "\t"
- result.add $c[i].kind
+ result.add ($i & " " & $c[i].kind)
result.add "\t"
case c[i].kind
of def, use:
@@ -540,13 +540,17 @@ proc genTry(c: var Con; n: PNode) =
c.gen(fin.sons[0])
doAssert(c.forks.len == oldLen)
+template genNoReturn(c: var Con; n: PNode) =
+ # leave the graph
+ c.code.add Instr(n: n, kind: goto, dest: high(int) - c.code.len)
+
proc genRaise(c: var Con; n: PNode) =
genJoins(c, n)
gen(c, n.sons[0])
if c.inTryStmt > 0:
c.tryStmtFixups.add c.gotoI(n)
else:
- c.code.add Instr(n: n, kind: goto, dest: high(int) - c.code.len)
+ genNoReturn(c, n)
proc genImplicitReturn(c: var Con) =
if c.owner.kind in {skProc, skFunc, skMethod, skIterator, skConverter} and resultPos < c.owner.ast.len:
@@ -558,7 +562,7 @@ proc genReturn(c: var Con; n: PNode) =
gen(c, n.sons[0])
else:
genImplicitReturn(c)
- c.code.add Instr(n: n, kind: goto, dest: high(int) - c.code.len)
+ genNoReturn(c, n)
const
InterestingSyms = {skVar, skResult, skLet, skParam}
@@ -612,9 +616,6 @@ proc genMagic(c: var Con; n: PNode; m: TMagic) =
of mNew, mNewFinalize:
genDef(c, n[1])
for i in 2..<n.len: gen(c, n[i])
- of mExit:
- genCall(c, n)
- c.code.add Instr(n: n, kind: goto, dest: high(int) - c.code.len)
else:
genCall(c, n)
@@ -639,6 +640,8 @@ proc gen(c: var Con; n: PNode) =
genMagic(c, n, s.magic)
else:
genCall(c, n)
+ if sfNoReturn in n.sons[0].sym.flags:
+ genNoReturn(c, n)
else:
genCall(c, n)
of nkCharLit..nkNilLit: discard
diff --git a/tests/destructor/tmove_objconstr.nim b/tests/destructor/tmove_objconstr.nim
index 875f78283..7e2b765fc 100644
--- a/tests/destructor/tmove_objconstr.nim
+++ b/tests/destructor/tmove_objconstr.nim
@@ -166,3 +166,12 @@ seq4 =
var ii = 1
let arr2 = [newMySeq(2, 5.0), if i > 1: newMySeq(3, 1.0) else: newMySeq(0, 0.0)]
var seqOfSeq2 = @[newMySeq(2, 5.0), newMySeq(3, 1.0)]
+
+
+## issue #10462
+proc myfuncLoop(x: int): MySeqNonCopyable =
+ for i in 0..<x:
+ var cc = newMySeq(i, 5.0)
+ result = cc
+
+discard myfuncLoop(3)
\ No newline at end of file
--
cgit 1.4.1-2-gfad0
From 74a7b0941252d64d2b3f5093af6986a54220c7d8 Mon Sep 17 00:00:00 2001
From: alaviss <alaviss@users.noreply.github.com>
Date: Mon, 28 Jan 2019 15:29:49 +0700
Subject: suggest: quote operators and keywords on suggestion (#10460)
---
compiler/suggest.nim | 8 ++++++--
nimsuggest/tests/tsug_accquote.nim | 10 ++++++++++
2 files changed, 16 insertions(+), 2 deletions(-)
create mode 100644 nimsuggest/tests/tsug_accquote.nim
(limited to 'compiler')
diff --git a/compiler/suggest.nim b/compiler/suggest.nim
index f3f960136..09eacbbed 100644
--- a/compiler/suggest.nim
+++ b/compiler/suggest.nim
@@ -33,7 +33,7 @@
# included from sigmatch.nim
import algorithm, prefixmatches, lineinfos, pathutils
-from wordrecg import wDeprecated, wError
+from wordrecg import wDeprecated, wError, wAddr, wYield, specialWords
when defined(nimsuggest):
import passes, tables # importer
@@ -109,7 +109,11 @@ proc symToSuggest(conf: ConfigRef; s: PSym, isLocal: bool, section: IdeCmd, info
result.qualifiedPath.add(ow2.origModuleName)
if ow != nil:
result.qualifiedPath.add(ow.origModuleName)
- result.qualifiedPath.add(s.name.s)
+ if s.name.s[0] in OpChars + {'[', '{', '('} or
+ s.name.id in ord(wAddr)..ord(wYield):
+ result.qualifiedPath.add('`' & s.name.s & '`')
+ else:
+ result.qualifiedPath.add(s.name.s)
if s.typ != nil:
result.forth = typeToString(s.typ)
diff --git a/nimsuggest/tests/tsug_accquote.nim b/nimsuggest/tests/tsug_accquote.nim
new file mode 100644
index 000000000..5b98feac4
--- /dev/null
+++ b/nimsuggest/tests/tsug_accquote.nim
@@ -0,0 +1,10 @@
+proc `%%%`(a: int) = discard
+proc `cast`() = discard
+tsug_accquote.#[!]#
+
+discard """
+$nimsuggest --tester $file
+>sug $1
+sug;;skProc;;tsug_accquote.`%%%`;;proc (a: int);;$file;;1;;5;;"";;100;;None
+sug;;skProc;;tsug_accquote.`cast`;;proc ();;$file;;2;;5;;"";;100;;None
+"""
--
cgit 1.4.1-2-gfad0
From dfa5faea0fa5ef8cd33b16233828ebaa03192f1e Mon Sep 17 00:00:00 2001
From: slangmgh <37659406+slangmgh@users.noreply.github.com>
Date: Mon, 28 Jan 2019 16:34:03 +0800
Subject: Fixes #10352 (#10416)
---
compiler/cgen.nim | 24 ++++++++++++++----------
1 file changed, 14 insertions(+), 10 deletions(-)
(limited to 'compiler')
diff --git a/compiler/cgen.nim b/compiler/cgen.nim
index 464ef3975..2d9814621 100644
--- a/compiler/cgen.nim
+++ b/compiler/cgen.nim
@@ -1327,16 +1327,6 @@ proc genInitCode(m: BModule) =
appcg(m, m.s[cfsTypeInit1], "static #TNimType $1[$2];$n",
[m.nimTypesName, rope(m.nimTypes)])
- if m.initProc.gcFrameId > 0:
- moduleInitRequired = true
- add(prc, initGCFrame(m.initProc))
-
- if m.initProc.s(cpsLocals).len > 0:
- moduleInitRequired = true
- add(prc, genSectionStart(cpsLocals, m.config))
- add(prc, m.initProc.s(cpsLocals))
- add(prc, genSectionEnd(cpsLocals, m.config))
-
if m.preInitProc.s(cpsInit).len > 0 or m.preInitProc.s(cpsStmts).len > 0:
# Give this small function its own scope
addf(prc, "{$N", [])
@@ -1362,6 +1352,19 @@ proc genInitCode(m: BModule) =
add(prc, genSectionEnd(cpsStmts, m.config))
addf(prc, "}$N", [])
+ # add new scope for following code, because old vcc compiler need variable
+ # be defined at the top of the block
+ addf(prc, "{$N", [])
+ if m.initProc.gcFrameId > 0:
+ moduleInitRequired = true
+ add(prc, initGCFrame(m.initProc))
+
+ if m.initProc.s(cpsLocals).len > 0:
+ moduleInitRequired = true
+ add(prc, genSectionStart(cpsLocals, m.config))
+ add(prc, m.initProc.s(cpsLocals))
+ add(prc, genSectionEnd(cpsLocals, m.config))
+
if m.initProc.s(cpsInit).len > 0 or m.initProc.s(cpsStmts).len > 0:
moduleInitRequired = true
if optStackTrace in m.initProc.options and frameDeclared notin m.flags:
@@ -1388,6 +1391,7 @@ proc genInitCode(m: BModule) =
if m.initProc.gcFrameId > 0:
moduleInitRequired = true
add(prc, deinitGCFrame(m.initProc))
+ addf(prc, "}$N", [])
addf(prc, "}$N$N", [])
--
cgit 1.4.1-2-gfad0
From 2b0ed9995d6fd64873ad0b42c2953944b0384908 Mon Sep 17 00:00:00 2001
From: Neelesh Chandola <neelesh.chandola@outlook.com>
Date: Mon, 28 Jan 2019 14:22:48 +0530
Subject: Fixes https://github.com/nim-lang/Nim/issues/8484 (#10470) [backport]
---
compiler/vm.nim | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'compiler')
diff --git a/compiler/vm.nim b/compiler/vm.nim
index 131501380..e95a491fd 100644
--- a/compiler/vm.nim
+++ b/compiler/vm.nim
@@ -934,7 +934,8 @@ proc rawExecute(c: PCtx, start: int, tos: PStackFrame): TFullReg =
stackTrace(c, tos, pc, errNilAccess)
of opcGetImpl:
decodeB(rkNode)
- let a = regs[rb].node
+ var a = regs[rb].node
+ if a.kind == nkVarTy: a = a[0]
if a.kind == nkSym:
regs[ra].node = if a.sym.ast.isNil: newNode(nkNilLit)
else: copyTree(a.sym.ast)
--
cgit 1.4.1-2-gfad0
From dee8e6e98ae868b8d933a718250c8e471bc125ea Mon Sep 17 00:00:00 2001
From: Andreas Rumpf <rumpf_a@web.de>
Date: Tue, 29 Jan 2019 15:12:16 +0100
Subject: gc: destructors is beginning to work (#10483)
* kochdocs.nim: code cleanup
* docgen: nicer indentation
* parser.nim: code cleanup
* fixes #10458
* make tests green again
* make =destroy mixins
* gc:destructors: produced C code is almost working
* --gc:destructors simple program compiles (but leaks memory)
* gc:destructors make examples compile in C++ mode
* destructors: string implementation bugfixes
* strs.nim: minor code cleanup
* destructors: builtin seqs are beginning to work
* remove debugging helpers
---
compiler/ast.nim | 1 -
compiler/ccgexprs.nim | 6 ++---
compiler/cgen.nim | 6 +++++
compiler/destroyer.nim | 14 +++++++++--
compiler/parser.nim | 48 +++++++++++++++++--------------------
compiler/semasgn.nim | 5 ++++
compiler/semstmts.nim | 3 ++-
compiler/semtypes.nim | 17 +++++++------
compiler/semtypinst.nim | 37 ++++++++++++++++++----------
compiler/sigmatch.nim | 5 ++++
lib/core/seqs.nim | 10 +++++---
lib/core/strs.nim | 17 ++++++-------
lib/system.nim | 36 ++++++++++++++--------------
lib/system/excpt.nim | 21 +++++++++-------
lib/system/gc_regions.nim | 20 ++++++++++++----
lib/system/helpers2.nim | 4 ++--
tests/misc/tinvalidarrayaccess.nim | 2 +-
tests/misc/tinvalidarrayaccess2.nim | 2 +-
tests/parser/tprecedence.nim | 9 +++++++
19 files changed, 162 insertions(+), 101 deletions(-)
(limited to 'compiler')
diff --git a/compiler/ast.nim b/compiler/ast.nim
index 24891d6d3..fc470b7a8 100644
--- a/compiler/ast.nim
+++ b/compiler/ast.nim
@@ -1352,7 +1352,6 @@ proc copySym*(s: PSym): PSym =
result = newSym(s.kind, s.name, s.owner, s.info, s.options)
#result.ast = nil # BUGFIX; was: s.ast which made problems
result.typ = s.typ
- result.id = getID()
when debugIds: registerId(result)
result.flags = s.flags
result.magic = s.magic
diff --git a/compiler/ccgexprs.nim b/compiler/ccgexprs.nim
index ed6255004..5bcbcda1c 100644
--- a/compiler/ccgexprs.nim
+++ b/compiler/ccgexprs.nim
@@ -460,7 +460,7 @@ proc binaryStmtAddr(p: BProc, e: PNode, d: var TLoc, frmt: string) =
if d.k != locNone: internalError(p.config, e.info, "binaryStmtAddr")
initLocExpr(p, e.sons[1], a)
initLocExpr(p, e.sons[2], b)
- lineCg(p, cpsStmts, frmt, addrLoc(p.config, a), rdLoc(b))
+ lineCg(p, cpsStmts, frmt, byRefLoc(p, a), rdLoc(b))
proc unaryStmt(p: BProc, e: PNode, d: var TLoc, frmt: string) =
var a: TLoc
@@ -1028,7 +1028,7 @@ proc gcUsage(conf: ConfigRef; n: PNode) =
proc strLoc(p: BProc; d: TLoc): Rope =
if p.config.selectedGc == gcDestructors:
- result = addrLoc(p.config, d)
+ result = byRefLoc(p, d)
else:
result = rdLoc(d)
@@ -1110,7 +1110,7 @@ proc genStrAppend(p: BProc, e: PNode, d: var TLoc) =
strLoc(p, dest), rdLoc(a)))
if p.config.selectedGC == gcDestructors:
linefmt(p, cpsStmts, "#prepareAdd($1, $2$3);$n",
- addrLoc(p.config, dest), lens, rope(L))
+ byRefLoc(p, dest), lens, rope(L))
else:
initLoc(call, locCall, e, OnHeap)
call.r = ropecg(p.module, "#resizeString($1, $2$3)", [rdLoc(dest), lens, rope(L)])
diff --git a/compiler/cgen.nim b/compiler/cgen.nim
index 2d9814621..d020b1bd7 100644
--- a/compiler/cgen.nim
+++ b/compiler/cgen.nim
@@ -264,6 +264,12 @@ proc addrLoc(conf: ConfigRef; a: TLoc): Rope =
if lfIndirect notin a.flags and mapType(conf, a.t) != ctArray:
result = "(&" & result & ")"
+proc byRefLoc(p: BProc; a: TLoc): Rope =
+ result = a.r
+ if lfIndirect notin a.flags and mapType(p.config, a.t) != ctArray and not
+ p.module.compileToCpp:
+ result = "(&" & result & ")"
+
proc rdCharLoc(a: TLoc): Rope =
# read a location that may need a char-cast:
result = rdLoc(a)
diff --git a/compiler/destroyer.nim b/compiler/destroyer.nim
index e21d532ea..22ace3634 100644
--- a/compiler/destroyer.nim
+++ b/compiler/destroyer.nim
@@ -244,7 +244,10 @@ proc patchHead(n: PNode) =
proc patchHead(s: PSym) =
if sfFromGeneric in s.flags:
- patchHead(s.ast[bodyPos])
+ # do not patch the builtin type bound operators for seqs:
+ let dest = s.typ.sons[1].skipTypes(abstractVar)
+ if dest.kind != tySequence:
+ patchHead(s.ast[bodyPos])
proc checkForErrorPragma(c: Con; t: PType; ri: PNode; opname: string) =
var m = "'" & opname & "' is not available for type <" & typeToString(t) & ">"
@@ -267,7 +270,8 @@ template genOp(opr, opname, ri) =
globalError(c.graph.config, dest.info, "internal error: '" & opname &
"' operator not found for type " & typeToString(t))
elif op.ast[genericParamsPos].kind != nkEmpty:
- globalError(c.graph.config, dest.info, "internal error: '" & opname & "' operator is generic")
+ globalError(c.graph.config, dest.info, "internal error: '" & opname &
+ "' operator is generic")
patchHead op
if sfError in op.flags: checkForErrorPragma(c, t, ri, opname)
let addrExp = newNodeIT(nkHiddenAddr, dest.info, makePtrType(c, dest.typ))
@@ -275,6 +279,12 @@ template genOp(opr, opname, ri) =
result = newTree(nkCall, newSymNode(op), addrExp)
proc genSink(c: Con; t: PType; dest, ri: PNode): PNode =
+ when false:
+ if t.kind != tyString:
+ echo "this one ", c.graph.config$dest.info, " for ", typeToString(t, preferDesc)
+ debug t.sink.typ.sons[2]
+ echo t.sink.id, " owner ", t.id
+ quit 1
let t = t.skipTypes({tyGenericInst, tyAlias, tySink})
genOp(if t.sink != nil: t.sink else: t.assignment, "=sink", ri)
diff --git a/compiler/parser.nim b/compiler/parser.nim
index c9626c527..01a3ce4d0 100644
--- a/compiler/parser.nim
+++ b/compiler/parser.nim
@@ -724,6 +724,14 @@ const
tkTypeClasses = {tkRef, tkPtr, tkVar, tkStatic, tkType,
tkEnum, tkTuple, tkObject, tkProc}
+proc commandExpr(p: var TParser; r: PNode; mode: TPrimaryMode): PNode =
+ result = newNodeP(nkCommand, p)
+ addSon(result, r)
+ var isFirstParam = true
+ # progress NOT guaranteed
+ p.hasProgress = false
+ addSon result, commandParam(p, isFirstParam, mode)
+
proc primarySuffix(p: var TParser, r: PNode,
baseIndent: int, mode: TPrimaryMode): PNode =
#| primarySuffix = '(' (exprColonEqExpr comma?)* ')' doBlocks?
@@ -734,8 +742,6 @@ proc primarySuffix(p: var TParser, r: PNode,
#| | &( '`'|IDENT|literal|'cast'|'addr'|'type') expr # command syntax
result = r
- template somePar() =
- if p.tok.strongSpaceA > 0: break
# progress guaranteed
while p.tok.indent < 0 or
(p.tok.tokType == tkDot and p.tok.indent >= baseIndent):
@@ -749,6 +755,8 @@ proc primarySuffix(p: var TParser, r: PNode,
result = newNodeP(nkCommand, p)
result.addSon r
result.addSon primary(p, pmNormal)
+ else:
+ result = commandExpr(p, result, mode)
break
result = namedParams(p, result, nkCall, tkParRi)
if result.len > 1 and result.sons[1].kind == nkExprColonExpr:
@@ -759,39 +767,27 @@ proc primarySuffix(p: var TParser, r: PNode,
result = parseGStrLit(p, result)
of tkBracketLe:
# progress guaranteed
- somePar()
+ if p.tok.strongSpaceA > 0:
+ result = commandExpr(p, result, mode)
+ break
result = namedParams(p, result, nkBracketExpr, tkBracketRi)
of tkCurlyLe:
# progress guaranteed
- somePar()
+ if p.tok.strongSpaceA > 0:
+ result = commandExpr(p, result, mode)
+ break
result = namedParams(p, result, nkCurlyExpr, tkCurlyRi)
of tkSymbol, tkAccent, tkIntLit..tkCharLit, tkNil, tkCast,
tkOpr, tkDotDot, tkTypeClasses - {tkRef, tkPtr}:
- # XXX: In type sections we allow the free application of the
- # command syntax, with the exception of expressions such as
- # `foo ref` or `foo ptr`. Unfortunately, these two are also
- # used as infix operators for the memory regions feature and
- # the current parsing rules don't play well here.
+ # XXX: In type sections we allow the free application of the
+ # command syntax, with the exception of expressions such as
+ # `foo ref` or `foo ptr`. Unfortunately, these two are also
+ # used as infix operators for the memory regions feature and
+ # the current parsing rules don't play well here.
if p.inPragma == 0 and (isUnary(p) or p.tok.tokType notin {tkOpr, tkDotDot}):
# actually parsing {.push hints:off.} as {.push(hints:off).} is a sweet
# solution, but pragmas.nim can't handle that
- let a = result
- result = newNodeP(nkCommand, p)
- addSon(result, a)
- var isFirstParam = true
- when true:
- # progress NOT guaranteed
- p.hasProgress = false
- addSon result, commandParam(p, isFirstParam, mode)
- if not p.hasProgress: break
- else:
- while p.tok.tokType != tkEof:
- let x = parseExpr(p)
- addSon(result, x)
- if p.tok.tokType != tkComma: break
- getTok(p)
- optInd(p, x)
- result = postExprBlocks(p, result)
+ result = commandExpr(p, result, mode)
break
else:
break
diff --git a/compiler/semasgn.nim b/compiler/semasgn.nim
index 9f1ef313b..41b0879e6 100644
--- a/compiler/semasgn.nim
+++ b/compiler/semasgn.nim
@@ -316,6 +316,11 @@ proc liftBody(g: ModuleGraph; typ: PType; kind: TTypeAttachedOp;
info: TLineInfo): PSym =
if typ.kind == tyDistinct:
return liftBodyDistinctType(g, typ, kind, info)
+ when false:
+ var typ = typ
+ if c.config.selectedGC == gcDestructors and typ.kind == tySequence:
+ # use the canonical type to access the =sink and =destroy etc.
+ typ = c.graph.sysTypes[tySequence]
var a: TLiftCtx
a.info = info
diff --git a/compiler/semstmts.nim b/compiler/semstmts.nim
index 5e9d5d9c5..f1778e816 100644
--- a/compiler/semstmts.nim
+++ b/compiler/semstmts.nim
@@ -168,7 +168,7 @@ proc semIf(c: PContext, n: PNode; flags: TExprFlags): PNode =
else: illFormedAst(it, c.config)
if isEmptyType(typ) or typ.kind in {tyNil, tyExpr} or
(not hasElse and efInTypeof notin flags):
- for it in n:
+ for it in n:
it.sons[^1] = discardCheck(c, it.sons[^1], flags)
result.kind = nkIfStmt
# propagate any enforced VoidContext:
@@ -1563,6 +1563,7 @@ proc semOverride(c: PContext, s: PSym, n: PNode) =
if obj.kind in {tyObject, tyDistinct, tySequence, tyString} and sameType(obj, objB):
# attach these ops to the canonical tySequence
obj = canonType(c, obj)
+ #echo "ATTACHING TO ", obj.id, " ", s.name.s, " ", cast[int](obj)
let opr = if s.name.s == "=": addr(obj.assignment) else: addr(obj.sink)
if opr[].isNil:
opr[] = s
diff --git a/compiler/semtypes.nim b/compiler/semtypes.nim
index fbf363834..744746323 100644
--- a/compiler/semtypes.nim
+++ b/compiler/semtypes.nim
@@ -1159,7 +1159,7 @@ proc semProcTypeNode(c: PContext, n, genericParams: PNode,
# compiler only checks for 'nil':
if skipTypes(r, {tyGenericInst, tyAlias, tySink}).kind != tyVoid:
if kind notin {skMacro, skTemplate} and r.kind in {tyStmt, tyExpr}:
- localError(c.config, n.sons[0].info, "return type '" & typeToString(r) &
+ localError(c.config, n.sons[0].info, "return type '" & typeToString(r) &
"' is only valid for macros and templates")
# 'auto' as a return type does not imply a generic:
elif r.kind == tyAnything:
@@ -1577,11 +1577,16 @@ proc semTypeNode(c: PContext, n: PNode, prev: PType): PType =
assert s != nil
assert prev == nil
result = copyType(s, s.owner, keepId=false)
- # XXX figure out why this has children already...
+ # Remove the 'T' parameter from tySequence:
result.sons.setLen 0
result.n = nil
result.flags = {tfHasAsgn}
semContainerArg(c, n, "seq", result)
+ if result.len > 0:
+ var base = result[0]
+ if base.kind in {tyGenericInst, tyAlias, tySink}: base = lastSon(base)
+ if base.kind != tyGenericParam:
+ c.typesWithOps.add((result, result))
else:
result = semContainer(c, n, tySequence, "seq", prev)
if c.config.selectedGc == gcDestructors:
@@ -1714,11 +1719,9 @@ proc semTypeNode(c: PContext, n: PNode, prev: PType): PType =
result = newOrPrevType(tyError, prev, c)
n.typ = result
dec c.inTypeContext
- if c.inTypeContext == 0: instAllTypeBoundOp(c, n.info)
-
-when false:
- proc semTypeNode(c: PContext, n: PNode, prev: PType): PType =
- result = semTypeNodeInner(c, n, prev)
+ if c.inTypeContext == 0:
+ #if $n == "var seq[StackTraceEntry]":
+ # echo "begin ", n
instAllTypeBoundOp(c, n.info)
proc setMagicType(conf: ConfigRef; m: PSym, kind: TTypeKind, size: int) =
diff --git a/compiler/semtypinst.nim b/compiler/semtypinst.nim
index 027ffd4aa..ebe822cdf 100644
--- a/compiler/semtypinst.nim
+++ b/compiler/semtypinst.nim
@@ -297,12 +297,6 @@ proc instCopyType*(cl: var TReplTypeVars, t: PType): PType =
#result.destructor = nil
result.sink = nil
-template typeBound(c, newty, oldty, field, info) =
- let opr = newty.field
- if opr != nil and sfFromGeneric notin opr.flags:
- # '=' needs to be instantiated for generics when the type is constructed:
- newty.field = c.instTypeBoundOp(c, opr, oldty, info, attachedAsgn, 1)
-
proc handleGenericInvocation(cl: var TReplTypeVars, t: PType): PType =
# tyGenericInvocation[A, tyGenericInvocation[A, B]]
# is difficult to handle:
@@ -317,7 +311,10 @@ proc handleGenericInvocation(cl: var TReplTypeVars, t: PType): PType =
else:
result = searchInstTypes(t)
- if result != nil and eqFlags*result.flags == eqFlags*t.flags: return
+ if result != nil and eqFlags*result.flags == eqFlags*t.flags:
+ when defined(reportCacheHits):
+ echo "Generic instantiation cached ", typeToString(result), " for ", typeToString(t)
+ return
for i in countup(1, sonsLen(t) - 1):
var x = t.sons[i]
if x.kind in {tyGenericParam}:
@@ -332,7 +329,11 @@ proc handleGenericInvocation(cl: var TReplTypeVars, t: PType): PType =
if header != t:
# search again after first pass:
result = searchInstTypes(header)
- if result != nil and eqFlags*result.flags == eqFlags*t.flags: return
+ if result != nil and eqFlags*result.flags == eqFlags*t.flags:
+ when defined(reportCacheHits):
+ echo "Generic instantiation cached ", typeToString(result), " for ",
+ typeToString(t), " header ", typeToString(header)
+ return
else:
header = instCopyType(cl, t)
@@ -384,7 +385,7 @@ proc handleGenericInvocation(cl: var TReplTypeVars, t: PType): PType =
rawAddSon(result, newbody)
checkPartialConstructedType(cl.c.config, cl.info, newbody)
let dc = newbody.deepCopy
- if cl.allowMetaTypes == false:
+ if not cl.allowMetaTypes:
if dc != nil and sfFromGeneric notin newbody.deepCopy.flags:
# 'deepCopy' needs to be instantiated for
# generics *when the type is constructed*:
@@ -402,6 +403,11 @@ proc handleGenericInvocation(cl: var TReplTypeVars, t: PType): PType =
discard
else:
newbody.lastSon.typeInst = result
+ # DESTROY: adding object|opt for opt[topttree.Tree]
+ # sigmatch: Formal opt[=destroy.T] real opt[topttree.Tree]
+ # adding myseq for myseq[system.int]
+ # sigmatch: Formal myseq[=destroy.T] real myseq[system.int]
+ #echo "DESTROY: adding ", typeToString(newbody), " for ", typeToString(result, preferDesc)
cl.c.typesWithOps.add((newbody, result))
let mm = skipTypes(bbody, abstractPtrs)
if tfFromGeneric notin mm.flags:
@@ -432,7 +438,7 @@ proc eraseVoidParams*(t: PType) =
inc pos
setLen t.sons, pos
setLen t.n.sons, pos
- return
+ break
proc skipIntLiteralParams*(t: PType) =
for i in 0 ..< t.sonsLen:
@@ -561,9 +567,7 @@ proc replaceTypeVarsTAux(cl: var TReplTypeVars, t: PType): PType =
for i in countup(0, sonsLen(result) - 1):
if result.sons[i] != nil:
if result.sons[i].kind == tyGenericBody:
- localError(
- cl.c.config,
- t.sym.info,
+ localError(cl.c.config, t.sym.info,
"cannot instantiate '" &
typeToString(result.sons[i], preferDesc) &
"' inside of type definition: '" &
@@ -603,6 +607,13 @@ proc replaceTypeVarsTAux(cl: var TReplTypeVars, t: PType): PType =
result.size = -1
result.n = replaceObjBranches(cl, result.n)
+template typeBound(c, newty, oldty, field, info) =
+ let opr = newty.field
+ if opr != nil and sfFromGeneric notin opr.flags:
+ # '=' needs to be instantiated for generics when the type is constructed:
+ #echo "DESTROY: instantiating ", astToStr(field), " for ", typeToString(oldty)
+ newty.field = c.instTypeBoundOp(c, opr, oldty, info, attachedAsgn, 1)
+
proc instAllTypeBoundOp*(c: PContext, info: TLineInfo) =
var i = 0
while i < c.typesWithOps.len:
diff --git a/compiler/sigmatch.nim b/compiler/sigmatch.nim
index fa4ab3703..3eaac06e5 100644
--- a/compiler/sigmatch.nim
+++ b/compiler/sigmatch.nim
@@ -2505,6 +2505,11 @@ proc instTypeBoundOp*(c: PContext; dc: PSym; t: PType; info: TLineInfo;
if f.kind in {tyRef, tyPtr}: f = f.lastSon
else:
if f.kind == tyVar: f = f.lastSon
+ #if c.config.selectedGC == gcDestructors and f.kind == tySequence:
+ # use the canonical type to access the =sink and =destroy etc.
+ # f = c.graph.sysTypes[tySequence]
+ #echo "YUP_---------Formal ", typeToString(f, preferDesc), " real ", typeToString(t, preferDesc), " ", f.id, " ", t.id
+
if typeRel(m, f, t) == isNone:
localError(c.config, info, "cannot instantiate: '" & dc.name.s & "'")
else:
diff --git a/lib/core/seqs.nim b/lib/core/seqs.nim
index 977b23b26..1a81b89ea 100644
--- a/lib/core/seqs.nim
+++ b/lib/core/seqs.nim
@@ -15,7 +15,7 @@ proc supportsCopyMem(t: typedesc): bool {.magic: "TypeTrait".}
## Default seq implementation used by Nim's core.
type
- NimSeqPayload {.core.}[T] = object
+ NimSeqPayload[T] = object
cap: int
region: Allocator
data: UncheckedArray[T]
@@ -40,6 +40,7 @@ proc `=destroy`[T](s: var seq[T]) =
var x = cast[ptr NimSeqV2[T]](addr s)
var p = x.p
if p != nil:
+ mixin `=destroy`
when not supportsCopyMem(T):
for i in 0..<x.len: `=destroy`(p.data[i])
p.region.dealloc(p.region, p, payloadSize(p.cap))
@@ -47,11 +48,12 @@ proc `=destroy`[T](s: var seq[T]) =
x.len = 0
proc `=`[T](x: var seq[T]; y: seq[T]) =
+ mixin `=destroy`
var a = cast[ptr NimSeqV2[T]](addr x)
var b = cast[ptr NimSeqV2[T]](unsafeAddr y)
if a.p == b.p: return
- `=destroy`(a)
+ `=destroy`(x)
a.len = b.len
if b.p != nil:
a.p = cast[type(a.p)](alloc(payloadSize(a.len)))
@@ -63,10 +65,11 @@ proc `=`[T](x: var seq[T]; y: seq[T]) =
a.p.data[i] = b.p.data[i]
proc `=sink`[T](x: var seq[T]; y: seq[T]) =
+ mixin `=destroy`
var a = cast[ptr NimSeqV2[T]](addr x)
var b = cast[ptr NimSeqV2[T]](unsafeAddr y)
if a.p != nil and a.p != b.p:
- `=destroy`(a)
+ `=destroy`(x)
a.len = b.len
a.p = b.p
@@ -109,6 +112,7 @@ proc prepareSeqAdd(len: int; p: pointer; addlen, elemSize: int): pointer {.
result = q
proc shrink*[T](x: var seq[T]; newLen: Natural) =
+ mixin `=destroy`
sysAssert newLen <= x.len, "invalid newLen parameter for 'shrink'"
when not supportsCopyMem(T):
for i in countdown(x.len - 1, newLen - 1):
diff --git a/lib/core/strs.nim b/lib/core/strs.nim
index 186add52a..ccbde76fe 100644
--- a/lib/core/strs.nim
+++ b/lib/core/strs.nim
@@ -51,15 +51,12 @@ proc `=destroy`(s: var string) =
a.len = 0
a.p = nil
-template lose(a) =
- frees(a)
-
proc `=sink`(x: var string, y: string) =
var a = cast[ptr NimStringV2](addr x)
var b = cast[ptr NimStringV2](unsafeAddr y)
# we hope this is optimized away for not yet alive objects:
if unlikely(a.p == b.p): return
- lose(a)
+ frees(a)
a.len = b.len
a.p = b.p
@@ -67,13 +64,13 @@ proc `=`(x: var string, y: string) =
var a = cast[ptr NimStringV2](addr x)
var b = cast[ptr NimStringV2](unsafeAddr y)
if unlikely(a.p == b.p): return
- lose(a)
+ frees(a)
a.len = b.len
if isLiteral(b):
# we can shallow copy literals:
a.p = b.p
else:
- let region = if a.p.region != nil: a.p.region else: getLocalAllocator()
+ let region = if a.p != nil and a.p.region != nil: a.p.region else: getLocalAllocator()
# we have to allocate the 'cap' here, consider
# 'let y = newStringOfCap(); var x = y'
# on the other hand... These get turned into moves now.
@@ -136,6 +133,7 @@ proc appendString(dest: var NimStringV2; src: NimStringV2) {.compilerproc, inlin
if src.len > 0:
# also copy the \0 terminator:
copyMem(unsafeAddr dest.p.data[dest.len], unsafeAddr src.p.data[0], src.len+1)
+ inc dest.len, src.len
proc appendChar(dest: var NimStringV2; c: char) {.compilerproc, inline.} =
dest.p.data[dest.len] = c
@@ -166,7 +164,6 @@ proc mnewString(len: int): NimStringV2 {.compilerProc.} =
proc setLengthStrV2(s: var NimStringV2, newLen: int) {.compilerRtl.} =
if newLen > s.len:
prepareAdd(s, newLen - s.len)
- else:
- s.len = newLen
- # this also only works because the destructor
- # looks at s.p and not s.len
+ s.len = newLen
+ # this also only works because the destructor
+ # looks at s.p and not s.len
diff --git a/lib/system.nim b/lib/system.nim
index 4951961ca..a7cf251f6 100644
--- a/lib/system.nim
+++ b/lib/system.nim
@@ -3049,6 +3049,19 @@ else:
if x < 0: -x else: x
{.pop.}
+when defined(nimNewRoof):
+ iterator `..<`*[T](a, b: T): T =
+ var i = T(a)
+ while i < b:
+ yield i
+ inc i
+else:
+ iterator `..<`*[S, T](a: S, b: T): T =
+ var i = T(a)
+ while i < b:
+ yield i
+ inc i
+
when not defined(JS):
proc likelyProc(val: bool): bool {.importc: "likely", nodecl, nosideeffect.}
proc unlikelyProc(val: bool): bool {.importc: "unlikely", nodecl, nosideeffect.}
@@ -3144,7 +3157,7 @@ when not defined(JS): #and not defined(nimscript):
# ----------------- IO Part ------------------------------------------------
type
CFile {.importc: "FILE", header: "<stdio.h>",
- final, incompletestruct.} = object
+ incompletestruct.} = object
File* = ptr CFile ## The type representing a file handle.
FileMode* = enum ## The file mode when opening a file.
@@ -3392,6 +3405,10 @@ when not defined(JS): #and not defined(nimscript):
## returns the OS file handle of the file ``f``. This is only useful for
## platform specific programming.
+ when defined(gcDestructors) and not defined(nimscript):
+ include "core/strs"
+ include "core/seqs"
+
when declared(newSeq):
proc cstringArrayToSeq*(a: cstringArray, len: Natural): seq[string] =
## converts a ``cstringArray`` to a ``seq[string]``. `a` is supposed to be
@@ -3483,10 +3500,6 @@ when not defined(JS): #and not defined(nimscript):
when defined(memtracker):
include "system/memtracker"
- when defined(gcDestructors):
- include "core/strs"
- include "core/seqs"
-
when hostOS == "standalone":
include "system/embedded"
else:
@@ -3716,19 +3729,6 @@ template `..<`*(a, b: untyped): untyped =
## a shortcut for 'a .. (when b is BackwardsIndex: succ(b) else: pred(b))'.
a .. (when b is BackwardsIndex: succ(b) else: pred(b))
-when defined(nimNewRoof):
- iterator `..<`*[T](a, b: T): T =
- var i = T(a)
- while i < b:
- yield i
- inc i
-else:
- iterator `..<`*[S, T](a: S, b: T): T =
- var i = T(a)
- while i < b:
- yield i
- inc i
-
template spliceImpl(s, a, L, b: untyped): untyped =
# make room for additional elements or cut:
var shift = b.len - max(0,L) # ignore negative slice size
diff --git a/lib/system/excpt.nim b/lib/system/excpt.nim
index cc0c1f54b..f2f82c3b8 100644
--- a/lib/system/excpt.nim
+++ b/lib/system/excpt.nim
@@ -220,11 +220,12 @@ proc auxWriteStackTrace(f: PFrame; s: var seq[StackTraceEntry]) =
inc(i)
it = it.prev
var last = i-1
- if s.len == 0:
- s = newSeq[StackTraceEntry](i)
- else:
- last = s.len + i - 1
- s.setLen(last+1)
+ when true: # not defined(gcDestructors):
+ if s.len == 0:
+ s = newSeq[StackTraceEntry](i)
+ else:
+ last = s.len + i - 1
+ s.setLen(last+1)
it = f
while it != nil:
s[last] = StackTraceEntry(procname: it.procname,
@@ -440,11 +441,13 @@ proc getStackTrace(e: ref Exception): string =
else:
result = ""
-when not defined(gcDestructors):
- proc getStackTraceEntries*(e: ref Exception): seq[StackTraceEntry] =
- ## Returns the attached stack trace to the exception ``e`` as
- ## a ``seq``. This is not yet available for the JS backend.
+proc getStackTraceEntries*(e: ref Exception): seq[StackTraceEntry] =
+ ## Returns the attached stack trace to the exception ``e`` as
+ ## a ``seq``. This is not yet available for the JS backend.
+ when not defined(gcDestructors):
shallowCopy(result, e.trace)
+ else:
+ result = move(e.trace)
const nimCallDepthLimit {.intdefine.} = 2000
diff --git a/lib/system/gc_regions.nim b/lib/system/gc_regions.nim
index 59f68918f..797eeeebf 100644
--- a/lib/system/gc_regions.nim
+++ b/lib/system/gc_regions.nim
@@ -195,6 +195,19 @@ proc runFinalizers(c: Chunk) =
(cast[Finalizer](it.typ.finalizer))(it+!sizeof(ObjHeader))
it = it.nextFinal
+proc runFinalizers(c: Chunk; newbump: pointer) =
+ var it = c.head
+ var prev: ptr ObjHeader = nil
+ while it != nil:
+ let nxt = it.nextFinal
+ if it >= newbump:
+ if it.typ != nil and it.typ.finalizer != nil:
+ (cast[Finalizer](it.typ.finalizer))(it+!sizeof(ObjHeader))
+ elif prev != nil:
+ prev.nextFinal = nil
+ prev = it
+ it = nxt
+
proc dealloc(r: var MemRegion; p: pointer; size: int) =
let it = cast[ptr ObjHeader](p-!sizeof(ObjHeader))
if it.typ != nil and it.typ.finalizer != nil:
@@ -237,16 +250,15 @@ template computeRemaining(r): untyped =
proc setObstackPtr*(r: var MemRegion; sp: StackPtr) =
# free everything after 'sp':
- if sp.current.next != nil:
+ if sp.current != nil and sp.current.next != nil:
deallocAll(r, sp.current.next)
sp.current.next = nil
when false:
# better leak this memory than be sorry:
for i in 0..high(r.freeLists): r.freeLists[i] = nil
r.holes = nil
- #else:
- # deallocAll(r, r.head)
- # r.head = nil
+ if r.tail != nil: runFinalizers(r.tail, sp.bump)
+
r.bump = sp.bump
r.tail = sp.current
r.remaining = sp.remaining
diff --git a/lib/system/helpers2.nim b/lib/system/helpers2.nim
index c67a2c278..8bd69ad71 100644
--- a/lib/system/helpers2.nim
+++ b/lib/system/helpers2.nim
@@ -1,7 +1,7 @@
# imported by other modules, unlike helpers.nim which is included
template formatErrorIndexBound*[T](i, a, b: T): string =
- "index out of bounds: (a:" & $a & ") <= (i:" & $i & ") <= (b:" & $b & ") "
+ "index out of bounds: (a: " & $a & ") <= (i: " & $i & ") <= (b: " & $b & ") "
template formatErrorIndexBound*[T](i, n: T): string =
- "index out of bounds: (i:" & $i & ") <= (n:" & $n & ") "
+ "index out of bounds: (i: " & $i & ") <= (n: " & $n & ") "
diff --git a/tests/misc/tinvalidarrayaccess.nim b/tests/misc/tinvalidarrayaccess.nim
index 57ad38b85..ab44d98e8 100644
--- a/tests/misc/tinvalidarrayaccess.nim
+++ b/tests/misc/tinvalidarrayaccess.nim
@@ -1,5 +1,5 @@
discard """
- errormsg: "index out of bounds: (a:0) <= (i:2) <= (b:1) "
+ errormsg: "index out of bounds: (a: 0) <= (i: 2) <= (b: 1) "
line: 18
"""
diff --git a/tests/misc/tinvalidarrayaccess2.nim b/tests/misc/tinvalidarrayaccess2.nim
index 86d349457..a791dc4e7 100644
--- a/tests/misc/tinvalidarrayaccess2.nim
+++ b/tests/misc/tinvalidarrayaccess2.nim
@@ -1,5 +1,5 @@
discard """
- errormsg: "index out of bounds: (a:0) <= (i:3) <= (b:1) "
+ errormsg: "index out of bounds: (a: 0) <= (i: 3) <= (b: 1) "
line: 9
"""
diff --git a/tests/parser/tprecedence.nim b/tests/parser/tprecedence.nim
index aff7c6aca..3e1c03dd1 100644
--- a/tests/parser/tprecedence.nim
+++ b/tests/parser/tprecedence.nim
@@ -40,3 +40,12 @@ proc getX(x: MyObject): lent MyField {.inline.} =
let a = MyObject()
echo a.getX.b.len
+
+
+# bug #10458
+template t(x: untyped): untyped = "x"
+
+let
+ aaa = t 2 + 4
+ ccc = t (1, 1) + 6
+ ddd = t [0, 1, 2] + 5
--
cgit 1.4.1-2-gfad0
From 9031c8fb0faeae35748fa311c22d7b0ee817d356 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Tue, 29 Jan 2019 11:51:04 +0100
Subject: Make sure the test snippet directory exists
---
compiler/docgen.nim | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
(limited to 'compiler')
diff --git a/compiler/docgen.nim b/compiler/docgen.nim
index a7f7d77b5..90b6d0426 100644
--- a/compiler/docgen.nim
+++ b/compiler/docgen.nim
@@ -149,14 +149,16 @@ proc newDocumentor*(filename: AbsoluteFile; cache: IdentCache; conf: ConfigRef,
if filename.len == 0:
inc(d.id)
let nameOnly = splitFile(d.filename).name
- let subdir = getNimcacheDir(conf) / RelativeDir(nameOnly)
- createDir(subdir)
- outp = subdir / RelativeFile(nameOnly & "_snippet_" & $d.id & ".nim")
+ outp = getNimcacheDir(conf) / RelativeDir(nameOnly) /
+ RelativeFile(nameOnly & "_snippet_" & $d.id & ".nim")
elif isAbsolute(filename):
- outp = AbsoluteFile filename
+ outp = AbsoluteFile(filename)
else:
# Nim's convention: every path is relative to the file it was written in:
- outp = splitFile(d.filename).dir.AbsoluteDir / RelativeFile(filename)
+ let nameOnly = splitFile(d.filename).name
+ outp = AbsoluteDir(nameOnly) / RelativeFile(filename)
+ # Make sure the destination directory exists
+ createDir(outp.splitFile.dir)
# Include the current file if we're parsing a nim file
let importStmt = if d.isPureRst: "" else: "import \"$1\"\n" % [d.filename]
writeFile(outp, importStmt & content)
--
cgit 1.4.1-2-gfad0
From 49710b9d14291389529cdc627c21a25a99ff238d Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Tue, 29 Jan 2019 11:52:19 +0100
Subject: The `file` directive is relative to the file it is in
---
compiler/docgen.nim | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'compiler')
diff --git a/compiler/docgen.nim b/compiler/docgen.nim
index 90b6d0426..b70561a1d 100644
--- a/compiler/docgen.nim
+++ b/compiler/docgen.nim
@@ -246,7 +246,7 @@ proc genComment(d: PDoc, n: PNode): string =
result = ""
var dummyHasToc: bool
if n.comment.len > 0:
- renderRstToOut(d[], parseRst(n.comment, toFilename(d.conf, n.info),
+ renderRstToOut(d[], parseRst(n.comment, toFullPath(d.conf, n.info),
toLinenumber(n.info), toColumn(n.info),
dummyHasToc, d.options, d.conf), result)
--
cgit 1.4.1-2-gfad0
From 0a628f36f077f4ae1162e17549203ba30a8bf1f2 Mon Sep 17 00:00:00 2001
From: Araq <rumpf_a@web.de>
Date: Wed, 30 Jan 2019 18:17:40 +0100
Subject: destructors: do not produce strong backrefs in closure environments
so that refcounting works
---
compiler/lambdalifting.nim | 21 +++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
(limited to 'compiler')
diff --git a/compiler/lambdalifting.nim b/compiler/lambdalifting.nim
index ddde1be31..1c12688a3 100644
--- a/compiler/lambdalifting.nim
+++ b/compiler/lambdalifting.nim
@@ -320,17 +320,30 @@ proc getEnvTypeForOwner(c: var DetectionPass; owner: PSym;
rawAddSon(result, obj)
c.ownerToType[owner.id] = result
+proc getEnvTypeForOwnerUp(c: var DetectionPass; owner: PSym;
+ info: TLineInfo): PType =
+ var r = c.getEnvTypeForOwner(owner, info)
+ result = newType(tyPtr, owner)
+ rawAddSon(result, r.base)
+
proc createUpField(c: var DetectionPass; dest, dep: PSym; info: TLineInfo) =
let refObj = c.getEnvTypeForOwner(dest, info) # getHiddenParam(dest).typ
let obj = refObj.lastSon
- let fieldType = c.getEnvTypeForOwner(dep, info) #getHiddenParam(dep).typ
+ # The assumption here is that gcDestructors means we cannot deal
+ # with cycles properly, so it's better to produce a weak ref (=ptr) here.
+ # This seems to be generally correct but since it's a bit risky it's only
+ # enabled for gcDestructors.
+ let fieldType = if c.graph.config.selectedGc == gcDestructors:
+ c.getEnvTypeForOwnerUp(dep, info) #getHiddenParam(dep).typ
+ else:
+ c.getEnvTypeForOwner(dest, info)
if refObj == fieldType:
localError(c.graph.config, dep.info, "internal error: invalid up reference computed")
let upIdent = getIdent(c.graph.cache, upName)
let upField = lookupInRecord(obj.n, upIdent)
if upField != nil:
- if upField.typ != fieldType:
+ if upField.typ.base != fieldType.base:
localError(c.graph.config, dep.info, "internal error: up references do not agree")
else:
let result = newSym(skField, upIdent, obj.owner, obj.owner.info)
@@ -555,7 +568,7 @@ proc rawClosureCreation(owner: PSym;
let upField = lookupInRecord(env.typ.lastSon.n, getIdent(d.graph.cache, upName))
if upField != nil:
let up = getUpViaParam(d.graph, owner)
- if up != nil and upField.typ == up.typ:
+ if up != nil and upField.typ.base == up.typ.base:
result.add(newAsgnStmt(rawIndirectAccess(env, upField, env.info),
up, env.info))
#elif oldenv != nil and oldenv.typ == upField.typ:
@@ -586,7 +599,7 @@ proc closureCreationForIter(iter: PNode;
let upField = lookupInRecord(v.typ.lastSon.n, getIdent(d.graph.cache, upName))
if upField != nil:
let u = setupEnvVar(owner, d, c)
- if u.typ == upField.typ:
+ if u.typ.base == upField.typ.base:
result.add(newAsgnStmt(rawIndirectAccess(vnode, upField, iter.info),
u, iter.info))
else:
--
cgit 1.4.1-2-gfad0
From 2ce9845fe4bd2196fd08a2bca0b3c259ed8838d2 Mon Sep 17 00:00:00 2001
From: Araq <rumpf_a@web.de>
Date: Wed, 30 Jan 2019 19:48:21 +0100
Subject: fixes silly typo causing tons of async regressions
---
compiler/lambdalifting.nim | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'compiler')
diff --git a/compiler/lambdalifting.nim b/compiler/lambdalifting.nim
index 1c12688a3..ba67f0d4e 100644
--- a/compiler/lambdalifting.nim
+++ b/compiler/lambdalifting.nim
@@ -336,7 +336,7 @@ proc createUpField(c: var DetectionPass; dest, dep: PSym; info: TLineInfo) =
let fieldType = if c.graph.config.selectedGc == gcDestructors:
c.getEnvTypeForOwnerUp(dep, info) #getHiddenParam(dep).typ
else:
- c.getEnvTypeForOwner(dest, info)
+ c.getEnvTypeForOwner(dep, info)
if refObj == fieldType:
localError(c.graph.config, dep.info, "internal error: invalid up reference computed")
--
cgit 1.4.1-2-gfad0
From fa058773db018405ff218bc8ff4682a192e9131f Mon Sep 17 00:00:00 2001
From: Miran <narimiran@disroot.org>
Date: Thu, 31 Jan 2019 08:20:00 +0100
Subject: fixes #10042 (allow spaces in import) (#10504)
This allows spaces in imports, by using the following syntax:
* `import "directory with spaces" / subdir / file`, or
* `import "directory with spaces/subdir/file"`
---
compiler/modulepaths.nim | 1 -
tests/dir with space/more spaces/mspace.nim | 1 +
tests/dir with space/tspace.nim | 4 ++++
3 files changed, 5 insertions(+), 1 deletion(-)
create mode 100644 tests/dir with space/more spaces/mspace.nim
(limited to 'compiler')
diff --git a/compiler/modulepaths.nim b/compiler/modulepaths.nim
index 9e27a2d7d..129f719e2 100644
--- a/compiler/modulepaths.nim
+++ b/compiler/modulepaths.nim
@@ -114,7 +114,6 @@ proc getModuleName*(conf: ConfigRef; n: PNode): string =
try:
result =
pathSubs(conf, n.strVal, toFullPath(conf, n.info).splitFile().dir)
- .replace(" ")
except ValueError:
localError(conf, n.info, "invalid path: " & n.strVal)
result = n.strVal
diff --git a/tests/dir with space/more spaces/mspace.nim b/tests/dir with space/more spaces/mspace.nim
new file mode 100644
index 000000000..bc2c90f5e
--- /dev/null
+++ b/tests/dir with space/more spaces/mspace.nim
@@ -0,0 +1 @@
+proc tenTimes*(x: int): int = 10*x
diff --git a/tests/dir with space/tspace.nim b/tests/dir with space/tspace.nim
index 59237c9a1..87a52c271 100644
--- a/tests/dir with space/tspace.nim
+++ b/tests/dir with space/tspace.nim
@@ -2,5 +2,9 @@ discard """
output: "Successful"
"""
# Test for the compiler to be able to compile a Nim file with spaces in the directory name.
+# Also test if import of a directory with a space works.
+import "more spaces" / mspace
+
+assert tenTimes(5) == 50
echo("Successful")
--
cgit 1.4.1-2-gfad0
From 1d5437e9d2c5800e4b90e87e32acc600c52cf739 Mon Sep 17 00:00:00 2001
From: cooldome <cdome@bk.ru>
Date: Thu, 31 Jan 2019 18:48:39 +0000
Subject: vm fix for bitwise signed ints (#10507)
* fixes #10482
* add missing file
* bug fix
---
compiler/vmgen.nim | 8 ++++----
tests/vm/tbitops.nim | 39 +++++++++++++++++++++++++++++++++++++++
2 files changed, 43 insertions(+), 4 deletions(-)
create mode 100644 tests/vm/tbitops.nim
(limited to 'compiler')
diff --git a/compiler/vmgen.nim b/compiler/vmgen.nim
index f87821da4..4b1551884 100644
--- a/compiler/vmgen.nim
+++ b/compiler/vmgen.nim
@@ -987,10 +987,10 @@ proc genMagic(c: PCtx; n: PNode; dest: var TDest; m: TMagic) =
c.freeTemp(tmp2)
of mShlI: genBinaryABCnarrowU(c, n, dest, opcShlInt)
- of mAshrI: genBinaryABCnarrow(c, n, dest, opcAshrInt)
- of mBitandI: genBinaryABCnarrowU(c, n, dest, opcBitandInt)
- of mBitorI: genBinaryABCnarrowU(c, n, dest, opcBitorInt)
- of mBitxorI: genBinaryABCnarrowU(c, n, dest, opcBitxorInt)
+ of mAshrI: genBinaryABC(c, n, dest, opcAshrInt)
+ of mBitandI: genBinaryABC(c, n, dest, opcBitandInt)
+ of mBitorI: genBinaryABC(c, n, dest, opcBitorInt)
+ of mBitxorI: genBinaryABC(c, n, dest, opcBitxorInt)
of mAddU: genBinaryABCnarrowU(c, n, dest, opcAddu)
of mSubU: genBinaryABCnarrowU(c, n, dest, opcSubu)
of mMulU: genBinaryABCnarrowU(c, n, dest, opcMulu)
diff --git a/tests/vm/tbitops.nim b/tests/vm/tbitops.nim
new file mode 100644
index 000000000..3d1a8aa0c
--- /dev/null
+++ b/tests/vm/tbitops.nim
@@ -0,0 +1,39 @@
+discard """
+output: ""
+"""
+
+import strutils
+
+const x = [1'i32, -1, -10, 10, -10, 10, -20, 30, -40, 50, 7 shl 28, -(7 shl 28), 7 shl 28, -(7 shl 28)]
+const y = [-1'i32, 1, -10, -10, 10, 10, -20, -30, 40, 50, 1 shl 30, 1 shl 30, -(1 shl 30), -(1 shl 30)]
+
+
+const res_xor = block:
+ var tmp: seq[int64]
+ for i in 0..<x.len:
+ tmp.add(int64(x[i] xor y[i]))
+ tmp
+
+const res_and = block:
+ var tmp: seq[int64]
+ for i in 0..<x.len:
+ tmp.add(int64(x[i] and y[i]))
+ tmp
+
+const res_or = block:
+ var tmp: seq[int64]
+ for i in 0..<x.len:
+ tmp.add(int64(x[i] or y[i]))
+ tmp
+
+
+let xx = x
+let yy = y
+
+for i in 0..<xx.len:
+ let z_xor = int64(xx[i] xor yy[i])
+ let z_and = int64(xx[i] and yy[i])
+ let z_or = int64(xx[i] or yy[i])
+ doAssert(z_xor == res_xor[i], $i & ": " & $res_xor[i] & " " & $z_xor)
+ doAssert(z_and == res_and[i], $i & ": " & $res_and[i] & " " & $z_and)
+ doAssert(z_or == res_or[i], $i & ": " & $res_or[i] & " " & $z_or)
--
cgit 1.4.1-2-gfad0
From b80dbdb77d373cda27b00a742f17d1c385dc4a46 Mon Sep 17 00:00:00 2001
From: Arne Döring <arne.doering@gmx.net>
Date: Fri, 1 Feb 2019 12:12:10 +0100
Subject: Fix vm signed xor (#10519)
* fix #10482
* undo changes
* fix for bitwise not
* remove dead opcode
---
compiler/vmgen.nim | 7 +++++--
tests/vm/tbitops.nim | 16 +++++++++++-----
2 files changed, 16 insertions(+), 7 deletions(-)
(limited to 'compiler')
diff --git a/compiler/vmgen.nim b/compiler/vmgen.nim
index 4b1551884..7f3ca84ae 100644
--- a/compiler/vmgen.nim
+++ b/compiler/vmgen.nim
@@ -1009,7 +1009,7 @@ proc genMagic(c: PCtx; n: PNode; dest: var TDest; m: TMagic) =
of mLtPtr, mLtU, mLtU64: genBinaryABC(c, n, dest, opcLtu)
of mEqProc, mEqRef, mEqUntracedRef:
genBinaryABC(c, n, dest, opcEqRef)
- of mXor: genBinaryABCnarrowU(c, n, dest, opcXor)
+ of mXor: genBinaryABC(c, n, dest, opcXor)
of mNot: genUnaryABC(c, n, dest, opcNot)
of mUnaryMinusI, mUnaryMinusI64:
genUnaryABC(c, n, dest, opcUnaryMinusInt)
@@ -1018,7 +1018,10 @@ proc genMagic(c: PCtx; n: PNode; dest: var TDest; m: TMagic) =
of mUnaryPlusI, mUnaryPlusF64: gen(c, n.sons[1], dest)
of mBitnotI:
genUnaryABC(c, n, dest, opcBitnotInt)
- genNarrowU(c, n, dest)
+ #genNarrowU modified, do not narrow signed types
+ let t = skipTypes(n.typ, abstractVar-{tyTypeDesc})
+ if t.kind in {tyUInt8..tyUInt32} or (t.kind == tyUInt and t.size < 8):
+ c.gABC(n, opcNarrowU, dest, TRegister(t.size*8))
of mToFloat, mToBiggestFloat, mToInt,
mToBiggestInt, mCharToStr, mBoolToStr, mIntToStr, mInt64ToStr,
mFloatToStr, mCStrToStr, mStrToStr, mEnumToStr:
diff --git a/tests/vm/tbitops.nim b/tests/vm/tbitops.nim
index 3d1a8aa0c..90d463ec9 100644
--- a/tests/vm/tbitops.nim
+++ b/tests/vm/tbitops.nim
@@ -7,25 +7,29 @@ import strutils
const x = [1'i32, -1, -10, 10, -10, 10, -20, 30, -40, 50, 7 shl 28, -(7 shl 28), 7 shl 28, -(7 shl 28)]
const y = [-1'i32, 1, -10, -10, 10, 10, -20, -30, 40, 50, 1 shl 30, 1 shl 30, -(1 shl 30), -(1 shl 30)]
-
const res_xor = block:
var tmp: seq[int64]
- for i in 0..<x.len:
+ for i in 0 ..< x.len:
tmp.add(int64(x[i] xor y[i]))
tmp
const res_and = block:
var tmp: seq[int64]
- for i in 0..<x.len:
+ for i in 0 ..< x.len:
tmp.add(int64(x[i] and y[i]))
tmp
-
+
const res_or = block:
var tmp: seq[int64]
- for i in 0..<x.len:
+ for i in 0 ..< x.len:
tmp.add(int64(x[i] or y[i]))
tmp
+const res_not = block:
+ var tmp: seq[int64]
+ for i in 0 ..< x.len:
+ tmp.add(not x[i])
+ tmp
let xx = x
let yy = y
@@ -34,6 +38,8 @@ for i in 0..<xx.len:
let z_xor = int64(xx[i] xor yy[i])
let z_and = int64(xx[i] and yy[i])
let z_or = int64(xx[i] or yy[i])
+ let z_not = int64(not xx[i])
doAssert(z_xor == res_xor[i], $i & ": " & $res_xor[i] & " " & $z_xor)
doAssert(z_and == res_and[i], $i & ": " & $res_and[i] & " " & $z_and)
doAssert(z_or == res_or[i], $i & ": " & $res_or[i] & " " & $z_or)
+ doAssert(z_not == res_not[i], $i & ": " & $res_not[i] & " " & $z_not)
--
cgit 1.4.1-2-gfad0
From ad4e3fd28c03a8429a3b4bc0068af77018e81724 Mon Sep 17 00:00:00 2001
From: Miran <narimiran@disroot.org>
Date: Sat, 2 Feb 2019 13:23:10 +0100
Subject: devel docs should point to devel src (#10529)
Currently, devel docs (https://nim-lang.github.io/Nim/lib.html)
source links point to master branch,
leading to outdated source code and showing the wrong line.
---
compiler/docgen.nim | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'compiler')
diff --git a/compiler/docgen.nim b/compiler/docgen.nim
index b70561a1d..5af4c464e 100644
--- a/compiler/docgen.nim
+++ b/compiler/docgen.nim
@@ -656,7 +656,8 @@ proc genItem(d: PDoc, n, nameNode: PNode, k: TSymKind) =
path = path[cwd.len+1 .. ^1].replace('\\', '/')
let gitUrl = getConfigVar(d.conf, "git.url")
if gitUrl.len > 0:
- let commit = getConfigVar(d.conf, "git.commit", "master")
+ let defaultBranch = if NimPatch mod 2 == 1: "devel" else: "master"
+ let commit = getConfigVar(d.conf, "git.commit", defaultBranch)
let develBranch = getConfigVar(d.conf, "git.devel", "devel")
dispA(d.conf, seeSrcRope, "$1", "", [ropeFormatNamedVars(d.conf, docItemSeeSrc,
["path", "line", "url", "commit", "devel"], [rope path.string,
--
cgit 1.4.1-2-gfad0
From 0091f2ad3bfa57aa1d5bdd1a1062975135a2a6d9 Mon Sep 17 00:00:00 2001
From: Oscar Nihlgård <oscarnihlgard@gmail.com>
Date: Sun, 3 Feb 2019 09:06:00 +0100
Subject: Implement {.booldefine.} (#10533)
---
compiler/ast.nim | 2 +-
compiler/condsyms.nim | 11 +++--------
compiler/options.nim | 2 +-
compiler/pragmas.nim | 4 +++-
compiler/semfold.nim | 12 +++++++++++-
compiler/wordrecg.nim | 5 +++--
doc/manual.rst | 6 ++++--
lib/pure/strtabs.nim | 28 +++++++++++++++++++++++++++-
tests/misc/tdefine.nim | 18 ++++++++++++++++++
9 files changed, 71 insertions(+), 17 deletions(-)
create mode 100644 tests/misc/tdefine.nim
(limited to 'compiler')
diff --git a/compiler/ast.nim b/compiler/ast.nim
index fc470b7a8..3146722cb 100644
--- a/compiler/ast.nim
+++ b/compiler/ast.nim
@@ -655,7 +655,7 @@ type
mEqIdent, mEqNimrodNode, mSameNodeType, mGetImpl, mNGenSym,
mNHint, mNWarning, mNError,
mInstantiationInfo, mGetTypeInfo,
- mNimvm, mIntDefine, mStrDefine, mRunnableExamples,
+ mNimvm, mIntDefine, mStrDefine, mBoolDefine, mRunnableExamples,
mException, mBuiltinType, mSymOwner, mUncheckedArray, mGetImplTransf,
mSymIsInstantiationOf
diff --git a/compiler/condsyms.nim b/compiler/condsyms.nim
index 9a4c1701c..5e7ce3a08 100644
--- a/compiler/condsyms.nim
+++ b/compiler/condsyms.nim
@@ -15,26 +15,21 @@ import
from options import Feature
from lineinfos import HintsToStr, WarningsToStr
-const
- catNone = "false"
-
proc defineSymbol*(symbols: StringTableRef; symbol: string, value: string = "true") =
symbols[symbol] = value
proc undefSymbol*(symbols: StringTableRef; symbol: string) =
- symbols[symbol] = catNone
+ symbols.del(symbol)
#proc lookupSymbol*(symbols: StringTableRef; symbol: string): string =
# result = if isDefined(symbol): gSymbols[symbol] else: nil
iterator definedSymbolNames*(symbols: StringTableRef): string =
for key, val in pairs(symbols):
- if val != catNone: yield key
+ yield key
proc countDefinedSymbols*(symbols: StringTableRef): int =
- result = 0
- for key, val in pairs(symbols):
- if val != catNone: inc(result)
+ symbols.len
proc initDefines*(symbols: StringTableRef) =
# for bootstrapping purposes and old code:
diff --git a/compiler/options.nim b/compiler/options.nim
index 54276f99d..0a25b1b96 100644
--- a/compiler/options.nim
+++ b/compiler/options.nim
@@ -360,7 +360,7 @@ proc cppDefine*(c: ConfigRef; define: string) =
proc isDefined*(conf: ConfigRef; symbol: string): bool =
if conf.symbols.hasKey(symbol):
- result = conf.symbols[symbol] != "false"
+ result = true
elif cmpIgnoreStyle(symbol, CPU[conf.target.targetCPU].name) == 0:
result = true
elif cmpIgnoreStyle(symbol, platform.OS[conf.target.targetOS].name) == 0:
diff --git a/compiler/pragmas.nim b/compiler/pragmas.nim
index 3967fa22d..03c9127af 100644
--- a/compiler/pragmas.nim
+++ b/compiler/pragmas.nim
@@ -67,7 +67,7 @@ const
wGensym, wInject, wCodegenDecl, wGuard, wGoto, wExportNims, wUsed}
constPragmas* = {wImportc, wExportc, wHeader, wDeprecated, wMagic, wNodecl,
wExtern, wImportCpp, wImportObjC, wError, wGensym, wInject, wExportNims,
- wIntDefine, wStrDefine, wUsed, wCompilerProc, wCore}
+ wIntDefine, wStrDefine, wBoolDefine, wUsed, wCompilerProc, wCore}
letPragmas* = varPragmas
procTypePragmas* = {FirstCallConv..LastCallConv, wVarargs, wNosideeffect,
wThread, wRaises, wLocks, wTags, wGcSafe}
@@ -1106,6 +1106,8 @@ proc singlePragma(c: PContext, sym: PSym, n: PNode, i: var int,
sym.magic = mIntDefine
of wStrDefine:
sym.magic = mStrDefine
+ of wBoolDefine:
+ sym.magic = mBoolDefine
of wUsed:
noVal(c, it)
if sym == nil: invalidPragma(c, it)
diff --git a/compiler/semfold.nim b/compiler/semfold.nim
index 0bdd0b64c..2a2942191 100644
--- a/compiler/semfold.nim
+++ b/compiler/semfold.nim
@@ -569,10 +569,20 @@ proc getConstExpr(m: PSym, n: PNode; g: ModuleGraph): PNode =
try:
result = newIntNodeT(g.config.symbols[s.name.s].parseInt, n, g)
except ValueError:
- localError(g.config, n.info, "expression is not an integer literal")
+ localError(g.config, s.info,
+ "{.intdefine.} const was set to an invalid integer: '" &
+ g.config.symbols[s.name.s] & "'")
of mStrDefine:
if isDefined(g.config, s.name.s):
result = newStrNodeT(g.config.symbols[s.name.s], n, g)
+ of mBoolDefine:
+ if isDefined(g.config, s.name.s):
+ try:
+ result = newIntNodeT(g.config.symbols[s.name.s].parseBool.int, n, g)
+ except ValueError:
+ localError(g.config, s.info,
+ "{.booldefine.} const was set to an invalid bool: '" &
+ g.config.symbols[s.name.s] & "'")
else:
result = copyTree(s.ast)
of skProc, skFunc, skMethod:
diff --git a/compiler/wordrecg.nim b/compiler/wordrecg.nim
index 41bdc9fcb..6f78c9d6f 100644
--- a/compiler/wordrecg.nim
+++ b/compiler/wordrecg.nim
@@ -35,7 +35,7 @@ type
wColon, wColonColon, wEquals, wDot, wDotDot,
wStar, wMinus,
wMagic, wThread, wFinal, wProfiler, wMemTracker, wObjChecks,
- wIntDefine, wStrDefine,
+ wIntDefine, wStrDefine, wBoolDefine
wDestroy,
@@ -122,7 +122,8 @@ const
":", "::", "=", ".", "..",
"*", "-",
- "magic", "thread", "final", "profiler", "memtracker", "objchecks", "intdefine", "strdefine",
+ "magic", "thread", "final", "profiler", "memtracker", "objchecks",
+ "intdefine", "strdefine", "booldefine",
"destroy",
diff --git a/doc/manual.rst b/doc/manual.rst
index 170f0d550..bcb1581dd 100644
--- a/doc/manual.rst
+++ b/doc/manual.rst
@@ -7851,6 +7851,7 @@ pragma description
================= ============================================
`intdefine`:idx: Reads in a build-time define as an integer
`strdefine`:idx: Reads in a build-time define as a string
+`booldefine`:idx: Reads in a build-time define as a bool
================= ============================================
.. code-block:: nim
@@ -7858,13 +7859,14 @@ pragma description
echo FooBar
::
- nim c -d:FooBar=42 foobar.c
+ nim c -d:FooBar=42 foobar.nim
In the above example, providing the -d flag causes the symbol
``FooBar`` to be overwritten at compile time, printing out 42. If the
``-d:FooBar=42`` were to be omitted, the default value of 5 would be
-used.
+used. To see if a value was provided, `defined(FooBar)` can be used.
+The syntax `-d:flag` is actually just a shortcut for `-d:flag=true`.
Custom annotations
------------------
diff --git a/lib/pure/strtabs.nim b/lib/pure/strtabs.nim
index 7bafe1675..cff5293c9 100644
--- a/lib/pure/strtabs.nim
+++ b/lib/pure/strtabs.nim
@@ -28,7 +28,7 @@ runnableExamples:
## When using the style insensitive mode ``modeStyleInsensitive``,
-## all letters are compared case insensitively within the ASCII range
+## all letters are compared case insensitively within the ASCII range
## and underscores are ignored.
runnableExamples:
@@ -272,6 +272,32 @@ proc `%`*(f: string, t: StringTableRef, flags: set[FormatFlag] = {}): string {.
add(result, f[i])
inc(i)
+proc del*(t: StringTableRef, key: string) =
+ ## Removes `key` from `t`.
+ # Impl adapted from `tableimpl.delImplIdx`
+ var i = rawGet(t, key)
+ let msk = high(t.data)
+ if i >= 0:
+ dec(t.counter)
+ block outer:
+ while true: # KnuthV3 Algo6.4R adapted for i=i+1 instead of i=i-1
+ var j = i # The correctness of this depends on (h+1) in nextTry,
+ var r = j # though may be adaptable to other simple sequences.
+ t.data[i].hasValue = false # mark current EMPTY
+ t.data[i].key = ""
+ t.data[i].val = ""
+ while true:
+ i = (i + 1) and msk # increment mod table size
+ if not t.data[i].hasValue: # end of collision cluster; So all done
+ break outer
+ r = t.myhash(t.data[i].key) and msk # "home" location of key@i
+ if not ((i >= r and r > j) or (r > j and j > i) or (j > i and i >= r)):
+ break
+ when defined(js):
+ t.data[j] = t.data[i]
+ else:
+ shallowCopy(t.data[j], t.data[i]) # data[j] will be marked EMPTY next loop
+
proc `$`*(t: StringTableRef): string {.rtlFunc, extern: "nstDollar".} =
## The `$` operator for string tables.
if t.len == 0:
diff --git a/tests/misc/tdefine.nim b/tests/misc/tdefine.nim
new file mode 100644
index 000000000..1378b8901
--- /dev/null
+++ b/tests/misc/tdefine.nim
@@ -0,0 +1,18 @@
+discard """
+joinable: false
+cmd: "nim c -d:booldef -d:booldef2=false -d:intdef=2 -d:strdef=foobar -r $file"
+"""
+
+const booldef {.booldefine.} = false
+const booldef2 {.booldefine.} = true
+const intdef {.intdefine.} = 0
+const strdef {.strdefine.} = ""
+
+doAssert defined(booldef)
+doAssert defined(booldef2)
+doAssert defined(intdef)
+doAssert defined(strdef)
+doAssert booldef
+doAssert not booldef2
+doAssert intdef == 2
+doAssert strdef == "foobar"
--
cgit 1.4.1-2-gfad0
From 23c11987b4d3b689d963c1ab6211483ce4b00e87 Mon Sep 17 00:00:00 2001
From: Araq <rumpf_a@web.de>
Date: Mon, 4 Feb 2019 15:49:36 +0100
Subject: make the lexer more forgiving so that nim-regex compiles again
---
compiler/lexer.nim | 28 +++++++++++++++++-----------
1 file changed, 17 insertions(+), 11 deletions(-)
(limited to 'compiler')
diff --git a/compiler/lexer.nim b/compiler/lexer.nim
index a4414d186..06c318f94 100644
--- a/compiler/lexer.nim
+++ b/compiler/lexer.nim
@@ -618,7 +618,12 @@ proc getNumber(L: var TLexer, result: var TToken) =
tokenEnd(result, postPos-1)
L.bufpos = postPos
-proc handleHexChar(L: var TLexer, xi: var int) =
+proc handleHexChar(L: var TLexer, xi: var int; position: range[1..4]) =
+ template invalid() =
+ lexMessage(L, errGenerated,
+ "expected a hex digit, but found: " & L.buf[L.bufpos] &
+ "; maybe prepend with 0")
+
case L.buf[L.bufpos]
of '0'..'9':
xi = (xi shl 4) or (ord(L.buf[L.bufpos]) - ord('0'))
@@ -629,10 +634,11 @@ proc handleHexChar(L: var TLexer, xi: var int) =
of 'A'..'F':
xi = (xi shl 4) or (ord(L.buf[L.bufpos]) - ord('A') + 10)
inc(L.bufpos)
+ of '"', '\'':
+ if position == 1: invalid()
+ # do not progress the bufpos here.
else:
- lexMessage(L, errGenerated,
- "expected a hex digit, but found: " & L.buf[L.bufpos] &
- " ; maybe prepend with 0")
+ invalid()
# Need to progress for `nim check`
inc(L.bufpos)
@@ -727,8 +733,8 @@ proc getEscapedChar(L: var TLexer, tok: var TToken) =
of 'x', 'X':
inc(L.bufpos)
var xi = 0
- handleHexChar(L, xi)
- handleHexChar(L, xi)
+ handleHexChar(L, xi, 1)
+ handleHexChar(L, xi, 2)
add(tok.literal, chr(xi))
of 'u', 'U':
if tok.tokType == tkCharLit:
@@ -739,7 +745,7 @@ proc getEscapedChar(L: var TLexer, tok: var TToken) =
inc(L.bufpos)
var start = L.bufpos
while L.buf[L.bufpos] != '}':
- handleHexChar(L, xi)
+ handleHexChar(L, xi, 1)
if start == L.bufpos:
lexMessage(L, errGenerated,
"Unicode codepoint cannot be empty")
@@ -749,10 +755,10 @@ proc getEscapedChar(L: var TLexer, tok: var TToken) =
lexMessage(L, errGenerated,
"Unicode codepoint must be lower than 0x10FFFF, but was: " & hex)
else:
- handleHexChar(L, xi)
- handleHexChar(L, xi)
- handleHexChar(L, xi)
- handleHexChar(L, xi)
+ handleHexChar(L, xi, 1)
+ handleHexChar(L, xi, 2)
+ handleHexChar(L, xi, 3)
+ handleHexChar(L, xi, 4)
addUnicodeCodePoint(tok.literal, xi)
of '0'..'9':
if matchTwoChars(L, '0', {'0'..'9'}):
--
cgit 1.4.1-2-gfad0
From 9fa116b6e1e307be0aef1a23bb17526755287e77 Mon Sep 17 00:00:00 2001
From: Araq <rumpf_a@web.de>
Date: Mon, 4 Feb 2019 15:50:07 +0100
Subject: compiler: don't use 2 spaces in an error message
---
compiler/semcall.nim | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'compiler')
diff --git a/compiler/semcall.nim b/compiler/semcall.nim
index e8723e3df..950acb48f 100644
--- a/compiler/semcall.nim
+++ b/compiler/semcall.nim
@@ -221,7 +221,7 @@ proc presentFailedCandidates(c: PContext, n: PNode, errors: CandidateErrors):
candidates.add(diag & "\n")
if skipped > 0:
candidates.add($skipped & " other mismatching symbols have been " &
- " suppressed; compile with --showAllMismatches:on to see them\n")
+ "suppressed; compile with --showAllMismatches:on to see them\n")
result = (prefer, candidates)
const
--
cgit 1.4.1-2-gfad0
From 824f39b32e04e31514aade50da38516b8fadac12 Mon Sep 17 00:00:00 2001
From: Arne Döring <arne.doering@gmx.net>
Date: Tue, 5 Feb 2019 09:31:37 +0100
Subject: Vm bitops fixes (#10520)
---
compiler/vm.nim | 5 ++++
compiler/vmdef.nim | 1 +
compiler/vmgen.nim | 9 ++++++-
lib/pure/bitops.nim | 27 +++++++++++--------
tests/stdlib/tbitops.nim | 67 ++++++++++++------------------------------------
5 files changed, 47 insertions(+), 62 deletions(-)
(limited to 'compiler')
diff --git a/compiler/vm.nim b/compiler/vm.nim
index e95a491fd..71fd2722b 100644
--- a/compiler/vm.nim
+++ b/compiler/vm.nim
@@ -1264,6 +1264,11 @@ proc rawExecute(c: PCtx, start: int, tos: PStackFrame): TFullReg =
of opcNarrowU:
decodeB(rkInt)
regs[ra].intVal = regs[ra].intVal and ((1'i64 shl rb)-1)
+ of opcSignExtend:
+ # like opcNarrowS, but no out of range possible
+ decodeB(rkInt)
+ let imm = 64 - rb
+ regs[ra].intVal = ashr(regs[ra].intVal shl imm, imm)
of opcIsNil:
decodeB(rkInt)
let node = regs[rb].node
diff --git a/compiler/vmdef.nim b/compiler/vmdef.nim
index a43f8dbba..58158a7cc 100644
--- a/compiler/vmdef.nim
+++ b/compiler/vmdef.nim
@@ -75,6 +75,7 @@ type
opcSubStr, opcParseFloat, opcConv, opcCast,
opcQuit,
opcNarrowS, opcNarrowU,
+ opcSignExtend,
opcAddStrCh,
opcAddStrStr,
diff --git a/compiler/vmgen.nim b/compiler/vmgen.nim
index 7f3ca84ae..f513c59a7 100644
--- a/compiler/vmgen.nim
+++ b/compiler/vmgen.nim
@@ -986,7 +986,14 @@ proc genMagic(c: PCtx; n: PNode; dest: var TDest; m: TMagic) =
c.freeTemp(tmp)
c.freeTemp(tmp2)
- of mShlI: genBinaryABCnarrowU(c, n, dest, opcShlInt)
+ of mShlI:
+ genBinaryABC(c, n, dest, opcShlInt)
+ # genNarrowU modified
+ let t = skipTypes(n.typ, abstractVar-{tyTypeDesc})
+ if t.kind in {tyUInt8..tyUInt32} or (t.kind == tyUInt and t.size < 8):
+ c.gABC(n, opcNarrowU, dest, TRegister(t.size*8))
+ elif t.kind in {tyInt8..tyInt32} or (t.kind == tyInt and t.size < 8):
+ c.gABC(n, opcSignExtend, dest, TRegister(t.size*8))
of mAshrI: genBinaryABC(c, n, dest, opcAshrInt)
of mBitandI: genBinaryABC(c, n, dest, opcBitandInt)
of mBitorI: genBinaryABC(c, n, dest, opcBitorInt)
diff --git a/lib/pure/bitops.nim b/lib/pure/bitops.nim
index d258a42de..0eee3cd70 100644
--- a/lib/pure/bitops.nim
+++ b/lib/pure/bitops.nim
@@ -33,6 +33,18 @@ const useICC_builtins = defined(icc) and useBuiltins
const useVCC_builtins = defined(vcc) and useBuiltins
const arch64 = sizeof(int) == 8
+template forwardImpl(impl, arg) {.dirty.} =
+ when sizeof(x) <= 4:
+ when x is SomeSignedInt:
+ impl(cast[uint32](x.int32))
+ else:
+ impl(x.uint32)
+ else:
+ when x is SomeSignedInt:
+ impl(cast[uint64](x.int64))
+ else:
+ impl(x.uint64)
+
when defined(nimHasalignOf):
import macros
@@ -243,8 +255,7 @@ proc countSetBits*(x: SomeInteger): int {.inline, nosideeffect.} =
# TODO: figure out if ICC support _popcnt32/_popcnt64 on platform without POPCNT.
# like GCC and MSVC
when nimvm:
- when sizeof(x) <= 4: result = countSetBits_nim(x.uint32)
- else: result = countSetBits_nim(x.uint64)
+ result = forwardImpl(countSetBits_nim, x)
else:
when useGCC_builtins:
when sizeof(x) <= 4: result = builtin_popcount(x.cuint).int
@@ -274,8 +285,7 @@ proc parityBits*(x: SomeInteger): int {.inline, nosideeffect.} =
# Can be used a base if creating ASM version.
# https://stackoverflow.com/questions/21617970/how-to-check-if-value-has-even-parity-of-bits-or-odd
when nimvm:
- when sizeof(x) <= 4: result = parity_impl(x.uint32)
- else: result = parity_impl(x.uint64)
+ result = forwardImpl(parity_impl, x)
else:
when useGCC_builtins:
when sizeof(x) <= 4: result = builtin_parity(x.uint32).int
@@ -293,8 +303,7 @@ proc firstSetBit*(x: SomeInteger): int {.inline, nosideeffect.} =
when noUndefined:
if x == 0:
return 0
- when sizeof(x) <= 4: result = firstSetBit_nim(x.uint32)
- else: result = firstSetBit_nim(x.uint64)
+ result = forwardImpl(firstSetBit_nim, x)
else:
when noUndefined and not useGCC_builtins:
if x == 0:
@@ -328,8 +337,7 @@ proc fastLog2*(x: SomeInteger): int {.inline, nosideeffect.} =
if x == 0:
return -1
when nimvm:
- when sizeof(x) <= 4: result = fastlog2_nim(x.uint32)
- else: result = fastlog2_nim(x.uint64)
+ result = forwardImpl(fastlog2_nim, x)
else:
when useGCC_builtins:
when sizeof(x) <= 4: result = 31 - builtin_clz(x.uint32).int
@@ -360,8 +368,7 @@ proc countLeadingZeroBits*(x: SomeInteger): int {.inline, nosideeffect.} =
if x == 0:
return 0
when nimvm:
- when sizeof(x) <= 4: result = sizeof(x)*8 - 1 - fastlog2_nim(x.uint32)
- else: result = sizeof(x)*8 - 1 - fastlog2_nim(x.uint64)
+ result = sizeof(x)*8 - 1 - forwardImpl(fastlog2_nim, x)
else:
when useGCC_builtins:
when sizeof(x) <= 4: result = builtin_clz(x.uint32).int - (32 - sizeof(x)*8)
diff --git a/tests/stdlib/tbitops.nim b/tests/stdlib/tbitops.nim
index b8b44703c..1cbab4870 100644
--- a/tests/stdlib/tbitops.nim
+++ b/tests/stdlib/tbitops.nim
@@ -1,9 +1,9 @@
discard """
+ nimout: "OK"
output: "OK"
"""
import bitops
-
proc main() =
const U8 = 0b0011_0010'u8
const I8 = 0b0011_0010'i8
@@ -79,25 +79,6 @@ proc main() =
doAssert( U8.rotateLeftBits(3) == 0b10010001'u8)
doAssert( U8.rotateRightBits(3) == 0b0100_0110'u8)
- static :
- # test bitopts at compile time with vm
- doAssert( U8.fastLog2 == 5)
- doAssert( I8.fastLog2 == 5)
- doAssert( U8.countLeadingZeroBits == 2)
- doAssert( I8.countLeadingZeroBits == 2)
- doAssert( U8.countTrailingZeroBits == 1)
- doAssert( I8.countTrailingZeroBits == 1)
- doAssert( U8.firstSetBit == 2)
- doAssert( I8.firstSetBit == 2)
- doAssert( U8.parityBits == 1)
- doAssert( I8.parityBits == 1)
- doAssert( U8.countSetBits == 3)
- doAssert( I8.countSetBits == 3)
- doAssert( U8.rotateLeftBits(3) == 0b10010001'u8)
- doAssert( U8.rotateRightBits(3) == 0b0100_0110'u8)
-
-
-
template test_undefined_impl(ffunc: untyped; expected: int; is_static: bool) =
doAssert( ffunc(0'u8) == expected)
doAssert( ffunc(0'i8) == expected)
@@ -142,26 +123,6 @@ proc main() =
doAssert( U64A.rotateLeftBits(64) == U64A)
doAssert( U64A.rotateRightBits(64) == U64A)
- static: # check for undefined behavior with rotate by zero.
- doAssert( U8.rotateLeftBits(0) == U8)
- doAssert( U8.rotateRightBits(0) == U8)
- doAssert( U16.rotateLeftBits(0) == U16)
- doAssert( U16.rotateRightBits(0) == U16)
- doAssert( U32.rotateLeftBits(0) == U32)
- doAssert( U32.rotateRightBits(0) == U32)
- doAssert( U64A.rotateLeftBits(0) == U64A)
- doAssert( U64A.rotateRightBits(0) == U64A)
-
- # check for undefined behavior with rotate by integer width.
- doAssert( U8.rotateLeftBits(8) == U8)
- doAssert( U8.rotateRightBits(8) == U8)
- doAssert( U16.rotateLeftBits(16) == U16)
- doAssert( U16.rotateRightBits(16) == U16)
- doAssert( U32.rotateLeftBits(32) == U32)
- doAssert( U32.rotateRightBits(32) == U32)
- doAssert( U64A.rotateLeftBits(64) == U64A)
- doAssert( U64A.rotateRightBits(64) == U64A)
-
block:
# mask operations
var v: uint8
@@ -207,18 +168,22 @@ proc main() =
var v: uint64
v.setBit(63)
doAssert v == 0b1000_0000_0000_0000_0000_0000_0000_0000_0000_0000_0000_0000_0000_0000_0000_0000'u64
- block:
- # Test if RangeError is thrown if indexing out of range
- try:
- var v: uint32
- var i = 32
- v.setBit(i)
- doAssert false
- except RangeError:
- discard
- except:
- doAssert false
echo "OK"
+block: # not ready for vm because exception is compile error
+ try:
+ var v: uint32
+ var i = 32
+ v.setBit(i)
+ doAssert false
+ except RangeError:
+ discard
+ except:
+ doAssert false
+
+
main()
+static:
+ # test everything on vm as well
+ main()
--
cgit 1.4.1-2-gfad0
From 2e880c726b0072bec93e897e5caef8f5bbe3d6b6 Mon Sep 17 00:00:00 2001
From: Araq <rumpf_a@web.de>
Date: Tue, 5 Feb 2019 15:39:55 +0100
Subject: fixes a lexer regression for 'nimble check'
---
compiler/lexer.nim | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
(limited to 'compiler')
diff --git a/compiler/lexer.nim b/compiler/lexer.nim
index 06c318f94..5eaa4c09f 100644
--- a/compiler/lexer.nim
+++ b/compiler/lexer.nim
@@ -618,7 +618,7 @@ proc getNumber(L: var TLexer, result: var TToken) =
tokenEnd(result, postPos-1)
L.bufpos = postPos
-proc handleHexChar(L: var TLexer, xi: var int; position: range[1..4]) =
+proc handleHexChar(L: var TLexer, xi: var int; position: range[0..4]) =
template invalid() =
lexMessage(L, errGenerated,
"expected a hex digit, but found: " & L.buf[L.bufpos] &
@@ -635,8 +635,9 @@ proc handleHexChar(L: var TLexer, xi: var int; position: range[1..4]) =
xi = (xi shl 4) or (ord(L.buf[L.bufpos]) - ord('A') + 10)
inc(L.bufpos)
of '"', '\'':
- if position == 1: invalid()
+ if position <= 1: invalid()
# do not progress the bufpos here.
+ if position == 0: inc(L.bufpos)
else:
invalid()
# Need to progress for `nim check`
@@ -745,7 +746,7 @@ proc getEscapedChar(L: var TLexer, tok: var TToken) =
inc(L.bufpos)
var start = L.bufpos
while L.buf[L.bufpos] != '}':
- handleHexChar(L, xi, 1)
+ handleHexChar(L, xi, 0)
if start == L.bufpos:
lexMessage(L, errGenerated,
"Unicode codepoint cannot be empty")
--
cgit 1.4.1-2-gfad0
From 4c3f8412122f20bac5a8812732b8a5762d0006d6 Mon Sep 17 00:00:00 2001
From: LemonBoy <LemonBoy@users.noreply.github.com>
Date: Wed, 6 Feb 2019 09:14:09 +0100
Subject: Do not raise ProveInit/WanrUninit for .noinit. var (#10566)
---
compiler/sempass2.nim | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
(limited to 'compiler')
diff --git a/compiler/sempass2.nim b/compiler/sempass2.nim
index 622e72074..bf1b00aa0 100644
--- a/compiler/sempass2.nim
+++ b/compiler/sempass2.nim
@@ -232,7 +232,10 @@ proc listGcUnsafety(s: PSym; onlyWarning: bool; conf: ConfigRef) =
proc useVar(a: PEffects, n: PNode) =
let s = n.sym
if isLocalVar(a, s):
- if s.id notin a.init:
+ if sfNoInit in s.flags:
+ # If the variable is explicitly marked as .noinit. do not emit any error
+ a.init.add s.id
+ elif s.id notin a.init:
if {tfNeedsInit, tfNotNil} * s.typ.flags != {}:
message(a.config, n.info, warnProveInit, s.name.s)
else:
--
cgit 1.4.1-2-gfad0
From 580f62220c5384726fdcd526afeaf5e4954225e9 Mon Sep 17 00:00:00 2001
From: Michał Zieliński <michal@zielinscy.org.pl>
Date: Wed, 6 Feb 2019 10:13:44 +0100
Subject: Fixes #10568: Fix null pointer dereference in address computation.
According to https://hownot2code.com/2016/08/18/null-pointer-dereferencing-causes-undefined-behavior/ this was an undefined behaviour.
---
compiler/ccgexprs.nim | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'compiler')
diff --git a/compiler/ccgexprs.nim b/compiler/ccgexprs.nim
index 5bcbcda1c..fb2fd89a3 100644
--- a/compiler/ccgexprs.nim
+++ b/compiler/ccgexprs.nim
@@ -1123,7 +1123,7 @@ proc genSeqElemAppend(p: BProc, e: PNode, d: var TLoc) =
# seq = (typeof seq) incrSeq(&seq->Sup, sizeof(x));
# seq->data[seq->len-1] = x;
let seqAppendPattern = if not p.module.compileToCpp:
- "($2) #incrSeqV3(&($1)->Sup, $3)"
+ "($2) #incrSeqV3((TGenericSeq*)($1), $3)"
else:
"($2) #incrSeqV3($1, $3)"
var a, b, dest, tmpL, call: TLoc
--
cgit 1.4.1-2-gfad0
From 6c8dee418072dbf047e6b21ab083547683656702 Mon Sep 17 00:00:00 2001
From: LemonBoy <LemonBoy@users.noreply.github.com>
Date: Wed, 6 Feb 2019 11:35:44 +0100
Subject: Avoid evaluating macros twice in type sections (#10550)
Fixes #10548
---
compiler/semstmts.nim | 5 +++++
tests/macros/tmacrotypes.nim | 15 +++++++++++++++
2 files changed, 20 insertions(+)
(limited to 'compiler')
diff --git a/compiler/semstmts.nim b/compiler/semstmts.nim
index f1778e816..5e9c88f2b 100644
--- a/compiler/semstmts.nim
+++ b/compiler/semstmts.nim
@@ -1129,6 +1129,11 @@ proc typeSectionRightSidePass(c: PContext, n: PNode) =
#debug s.typ
s.ast = a
popOwner(c)
+ # If the right hand side expression was a macro call we replace it with
+ # its evaluated result here so that we don't execute it once again in the
+ # final pass
+ if a[2].kind in nkCallKinds:
+ a[2] = newNodeIT(nkType, a[2].info, t)
if sfExportc in s.flags and s.typ.kind == tyAlias:
localError(c.config, name.info, "{.exportc.} not allowed for type aliases")
let aa = a.sons[2]
diff --git a/tests/macros/tmacrotypes.nim b/tests/macros/tmacrotypes.nim
index 734503e6b..b4d708240 100644
--- a/tests/macros/tmacrotypes.nim
+++ b/tests/macros/tmacrotypes.nim
@@ -23,3 +23,18 @@ checkType(voidProc(), "void")
checkType(intProc(10, 20.0), "int")
checkType(voidProc, "procTy")
checkProcType(voidProc)
+
+# bug #10548
+block:
+ var c {.compileTime.} = 0
+
+ macro meshImpl(arg: typed): untyped =
+ inc c
+ result = arg
+
+ type
+ Blub = int32
+ Mesh = meshImpl(Club)
+ Club = Blub
+
+ static: doAssert(c == 1)
--
cgit 1.4.1-2-gfad0
From 294b2e03b2def1fe5a14e7116af412dc761c81f9 Mon Sep 17 00:00:00 2001
From: LemonBoy <LemonBoy@users.noreply.github.com>
Date: Wed, 6 Feb 2019 21:26:55 +0100
Subject: Reject assignments with nkEmpty RHS (#9000)
Fixes #8997
---
compiler/semexprs.nim | 16 +++++++++-------
tests/macros/t8997.nim | 26 ++++++++++++++++++++++++++
2 files changed, 35 insertions(+), 7 deletions(-)
create mode 100644 tests/macros/t8997.nim
(limited to 'compiler')
diff --git a/compiler/semexprs.nim b/compiler/semexprs.nim
index 68f1c6c3a..1b8a978ec 100644
--- a/compiler/semexprs.nim
+++ b/compiler/semexprs.nim
@@ -39,13 +39,14 @@ proc semTemplateExpr(c: PContext, n: PNode, s: PSym,
proc semFieldAccess(c: PContext, n: PNode, flags: TExprFlags = {}): PNode
+template rejectEmptyNode(n: PNode) =
+ # No matter what a nkEmpty node is not what we want here
+ if n.kind == nkEmpty: illFormedAst(n, c.config)
+
proc semOperand(c: PContext, n: PNode, flags: TExprFlags = {}): PNode =
+ rejectEmptyNode(n)
# same as 'semExprWithType' but doesn't check for proc vars
result = semExpr(c, n, flags + {efOperand})
- #if result.kind == nkEmpty and result.typ.isNil:
- # do not produce another redundant error message:
- #raiseRecoverableError("")
- # result = errorNode(c, n)
if result.typ != nil:
# XXX tyGenericInst here?
if result.typ.kind == tyProc and tfUnresolved in result.typ.flags:
@@ -59,10 +60,10 @@ proc semOperand(c: PContext, n: PNode, flags: TExprFlags = {}): PNode =
result.typ = errorType(c)
proc semExprWithType(c: PContext, n: PNode, flags: TExprFlags = {}): PNode =
+ rejectEmptyNode(n)
result = semExpr(c, n, flags+{efWantValue})
- if result.isNil or result.kind == nkEmpty:
+ if result.kind == nkEmpty:
# do not produce another redundant error message:
- #raiseRecoverableError("")
result = errorNode(c, n)
if result.typ == nil or result.typ == c.enforceVoidContext:
localError(c.config, n.info, errExprXHasNoType %
@@ -72,7 +73,8 @@ proc semExprWithType(c: PContext, n: PNode, flags: TExprFlags = {}): PNode =
if result.typ.kind in {tyVar, tyLent}: result = newDeref(result)
proc semExprNoDeref(c: PContext, n: PNode, flags: TExprFlags = {}): PNode =
- result = semExpr(c, n, flags)
+ rejectEmptyNode(n)
+ result = semExpr(c, n, flags+{efWantValue})
if result.kind == nkEmpty:
# do not produce another redundant error message:
result = errorNode(c, n)
diff --git a/tests/macros/t8997.nim b/tests/macros/t8997.nim
new file mode 100644
index 000000000..af04fb127
--- /dev/null
+++ b/tests/macros/t8997.nim
@@ -0,0 +1,26 @@
+discard """
+ line: 24
+ errormsg: "illformed AST: "
+"""
+
+import macros
+
+type
+ Node* = ref object
+ children: seq[Node]
+
+proc newNode*(): Node =
+ Node(children: newSeq[Node]())
+
+macro build*(body: untyped): untyped =
+
+ template appendElement(tmp, childrenBlock) {.dirty.} =
+ bind newNode
+ let tmp = newNode()
+ tmp.children = childrenBlock # this line seems to be the problem
+
+ let tmp = genSym(nskLet, "tmp")
+ let childrenBlock = newEmptyNode()
+ result = getAst(appendElement(tmp, childrenBlock))
+
+build(body)
--
cgit 1.4.1-2-gfad0
From 4338f86acbfcd0b436775228f510a376f0659b79 Mon Sep 17 00:00:00 2001
From: Andreas Rumpf <rumpf_a@web.de>
Date: Wed, 6 Feb 2019 21:59:41 +0100
Subject: fixes some bug
---
compiler/transf.nim | 1 +
1 file changed, 1 insertion(+)
(limited to 'compiler')
diff --git a/compiler/transf.nim b/compiler/transf.nim
index 82be4158f..9b226a47b 100644
--- a/compiler/transf.nim
+++ b/compiler/transf.nim
@@ -914,6 +914,7 @@ proc transform(c: PTransf, n: PNode): PTransNode =
let hoisted = hoistParamsUsedInDefault(c, call, hoistedParams, call[i])
if hoisted != nil: call[i] = hoisted
result = newTree(nkStmtListExpr, hoistedParams, call).PTransNode
+ PNode(result).typ = call.typ
of nkAddr, nkHiddenAddr:
result = transformAddrDeref(c, n, nkDerefExpr, nkHiddenDeref)
of nkDerefExpr, nkHiddenDeref:
--
cgit 1.4.1-2-gfad0
From 2851f316f69e709f1b7c784bdd50641fc4c38ed5 Mon Sep 17 00:00:00 2001
From: Andreas Rumpf <rumpf_a@web.de>
Date: Wed, 6 Feb 2019 22:00:06 +0100
Subject: ignore nkCommentStmt in lambda lifting
---
compiler/lambdalifting.nim | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'compiler')
diff --git a/compiler/lambdalifting.nim b/compiler/lambdalifting.nim
index ba67f0d4e..3054b1f2e 100644
--- a/compiler/lambdalifting.nim
+++ b/compiler/lambdalifting.nim
@@ -465,7 +465,7 @@ proc detectCapturedVars(n: PNode; owner: PSym; c: var DetectionPass) =
w = up
of nkEmpty..pred(nkSym), succ(nkSym)..nkNilLit,
nkTemplateDef, nkTypeSection, nkProcDef, nkMethodDef,
- nkConverterDef, nkMacroDef, nkFuncDef:
+ nkConverterDef, nkMacroDef, nkFuncDef, nkCommentStmt:
discard
of nkLambdaKinds, nkIteratorDef:
if n.typ != nil:
--
cgit 1.4.1-2-gfad0
From d5da450100f35008df06ecf812f1eeabda05d285 Mon Sep 17 00:00:00 2001
From: Araq <rumpf_a@web.de>
Date: Thu, 7 Feb 2019 12:12:20 +0100
Subject: helpers2 now has a real name
---
compiler/cgen.nim | 2 +-
compiler/semfold.nim | 2 +-
lib/system/chcks.nim | 2 +-
lib/system/helpers2.nim | 7 -------
lib/system/indexerrors.nim | 7 +++++++
5 files changed, 10 insertions(+), 10 deletions(-)
delete mode 100644 lib/system/helpers2.nim
create mode 100644 lib/system/indexerrors.nim
(limited to 'compiler')
diff --git a/compiler/cgen.nim b/compiler/cgen.nim
index d020b1bd7..4abefe463 100644
--- a/compiler/cgen.nim
+++ b/compiler/cgen.nim
@@ -16,7 +16,7 @@ import
condsyms, rodutils, renderer, idgen, cgendata, ccgmerge, semfold, aliases,
lowerings, tables, sets, ndi, lineinfos, pathutils, transf
-import system/helpers2
+import system/indexerrors
when not defined(leanCompiler):
import semparallel
diff --git a/compiler/semfold.nim b/compiler/semfold.nim
index 2a2942191..237a5127a 100644
--- a/compiler/semfold.nim
+++ b/compiler/semfold.nim
@@ -15,7 +15,7 @@ import
nversion, platform, math, msgs, os, condsyms, idents, renderer, types,
commands, magicsys, modulegraphs, strtabs, lineinfos
-import system/helpers2
+import system/indexerrors
proc newIntNodeT*(intVal: BiggestInt, n: PNode; g: ModuleGraph): PNode =
case skipTypes(n.typ, abstractVarRange).kind
diff --git a/lib/system/chcks.nim b/lib/system/chcks.nim
index 6f4e8ce37..0840d863a 100644
--- a/lib/system/chcks.nim
+++ b/lib/system/chcks.nim
@@ -8,7 +8,7 @@
#
# Implementation of some runtime checks.
-import system/helpers2
+import system/indexerrors
proc raiseRangeError(val: BiggestInt) {.compilerproc, noinline.} =
when hostOS == "standalone":
diff --git a/lib/system/helpers2.nim b/lib/system/helpers2.nim
deleted file mode 100644
index 8bd69ad71..000000000
--- a/lib/system/helpers2.nim
+++ /dev/null
@@ -1,7 +0,0 @@
-# imported by other modules, unlike helpers.nim which is included
-
-template formatErrorIndexBound*[T](i, a, b: T): string =
- "index out of bounds: (a: " & $a & ") <= (i: " & $i & ") <= (b: " & $b & ") "
-
-template formatErrorIndexBound*[T](i, n: T): string =
- "index out of bounds: (i: " & $i & ") <= (n: " & $n & ") "
diff --git a/lib/system/indexerrors.nim b/lib/system/indexerrors.nim
new file mode 100644
index 000000000..8bd69ad71
--- /dev/null
+++ b/lib/system/indexerrors.nim
@@ -0,0 +1,7 @@
+# imported by other modules, unlike helpers.nim which is included
+
+template formatErrorIndexBound*[T](i, a, b: T): string =
+ "index out of bounds: (a: " & $a & ") <= (i: " & $i & ") <= (b: " & $b & ") "
+
+template formatErrorIndexBound*[T](i, n: T): string =
+ "index out of bounds: (i: " & $i & ") <= (n: " & $n & ") "
--
cgit 1.4.1-2-gfad0
From 84d10f7d8a9488d4b5be3cccb582f966fc02aa64 Mon Sep 17 00:00:00 2001
From: Araq <rumpf_a@web.de>
Date: Thu, 7 Feb 2019 15:03:53 +0100
Subject: fixes #10585
---
compiler/vmops.nim | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
(limited to 'compiler')
diff --git a/compiler/vmops.nim b/compiler/vmops.nim
index 56c97dec6..4f9c7cf89 100644
--- a/compiler/vmops.nim
+++ b/compiler/vmops.nim
@@ -62,6 +62,9 @@ template wrap2svoid(op, modop) {.dirty.} =
op(getString(a, 0), getString(a, 1))
modop op
+template ioop(op) {.dirty.} =
+ registerCallback(c, "stdlib.io." & astToStr(op), `op Wrapper`)
+
proc getCurrentExceptionMsgWrapper(a: VmArgs) {.nimcall.} =
setResult(a, if a.currentException.isNil: ""
else: a.currentException.sons[3].skipColon.strVal)
@@ -113,8 +116,8 @@ proc registerAdditionalOps*(c: PCtx) =
wrap2svoid(putEnv, osop)
wrap1s(dirExists, osop)
wrap1s(fileExists, osop)
- wrap2svoid(writeFile, systemop)
- wrap1s(readFile, systemop)
+ wrap2svoid(writeFile, ioop)
+ wrap1s(readFile, ioop)
systemop getCurrentExceptionMsg
registerCallback c, "stdlib.*.staticWalkDir", proc (a: VmArgs) {.nimcall.} =
setResult(a, staticWalkDirImpl(getString(a, 0), getBool(a, 1)))
--
cgit 1.4.1-2-gfad0
From f23b0a7dc813db9bdfd556bdefbd201bb3e73502 Mon Sep 17 00:00:00 2001
From: LemonBoy <LemonBoy@users.noreply.github.com>
Date: Thu, 7 Feb 2019 17:07:03 +0100
Subject: Fix handling of reraise in effect tracking (#10582)
This is the MVP in order not to get a completely useless error message
from the compiler.
Fixes #10579
---
compiler/sempass2.nim | 16 +++++++++++-----
tests/effects/teffects8.nim | 12 ++++++++++++
2 files changed, 23 insertions(+), 5 deletions(-)
create mode 100644 tests/effects/teffects8.nim
(limited to 'compiler')
diff --git a/compiler/sempass2.nim b/compiler/sempass2.nim
index bf1b00aa0..b453971c2 100644
--- a/compiler/sempass2.nim
+++ b/compiler/sempass2.nim
@@ -721,11 +721,17 @@ proc track(tracked: PEffects, n: PNode) =
of nkSym:
useVar(tracked, n)
of nkRaiseStmt:
- n.sons[0].info = n.info
- #throws(tracked.exc, n.sons[0])
- addEffect(tracked, n.sons[0], useLineInfo=false)
- for i in 0 ..< safeLen(n):
- track(tracked, n.sons[i])
+ if n[0].kind != nkEmpty:
+ n.sons[0].info = n.info
+ #throws(tracked.exc, n.sons[0])
+ addEffect(tracked, n.sons[0], useLineInfo=false)
+ for i in 0 ..< safeLen(n):
+ track(tracked, n.sons[i])
+ else:
+ # A `raise` with no arguments means we're going to re-raise the exception
+ # being handled or, if outside of an `except` block, a `ReraiseError`.
+ # Here we add a `Exception` tag in order to cover both the cases.
+ addEffect(tracked, createRaise(tracked.graph, n))
of nkCallKinds:
if getConstExpr(tracked.owner_module, n, tracked.graph) != nil:
return
diff --git a/tests/effects/teffects8.nim b/tests/effects/teffects8.nim
new file mode 100644
index 000000000..fb3c088d6
--- /dev/null
+++ b/tests/effects/teffects8.nim
@@ -0,0 +1,12 @@
+discard """
+ errormsg: "can raise an unlisted exception: Exception"
+ line: 10
+"""
+
+proc foo() {.raises: [].} =
+ try:
+ discard
+ except ValueError:
+ raise
+
+foo()
--
cgit 1.4.1-2-gfad0
From 29fbf111a878db0ff095f8046a4de9e0f851d466 Mon Sep 17 00:00:00 2001
From: LemonBoy <LemonBoy@users.noreply.github.com>
Date: Thu, 7 Feb 2019 17:07:35 +0100
Subject: Fix codegen when debugger is enabled (#10595)
Decrement the frame length before closing the parent scope.
Fixes #10589
---
compiler/ccgstmts.nim | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
(limited to 'compiler')
diff --git a/compiler/ccgstmts.nim b/compiler/ccgstmts.nim
index 6c33b302d..382ad6a8e 100644
--- a/compiler/ccgstmts.nim
+++ b/compiler/ccgstmts.nim
@@ -124,13 +124,14 @@ proc endBlock(p: BProc, blockEnd: Rope) =
proc endBlock(p: BProc) =
let topBlock = p.blocks.len - 1
- var blockEnd = if p.blocks[topBlock].label != nil:
- ropecg(p.module, "} $1: ;$n", p.blocks[topBlock].label)
- else:
- ~"}$n"
let frameLen = p.blocks[topBlock].frameLen
+ var blockEnd: Rope
if frameLen > 0:
blockEnd.addf("FR_.len-=$1;$n", [frameLen.rope])
+ if p.blocks[topBlock].label != nil:
+ blockEnd.addf("} $1: ;$n", [p.blocks[topBlock].label])
+ else:
+ blockEnd.addf("}$n", [])
endBlock(p, blockEnd)
proc genSimpleBlock(p: BProc, stmts: PNode) {.inline.} =
--
cgit 1.4.1-2-gfad0
From 2fdf816332d48f55719c5709477756e872daab0d Mon Sep 17 00:00:00 2001
From: alaviss <alaviss@users.noreply.github.com>
Date: Thu, 7 Feb 2019 23:08:15 +0700
Subject: compiler/[msgs, suggest]: improve highlighter accuracy (#10496)
Previously the compiler would generate suggestions based on the symbol
identifier length, but that might not reflect the actual representation
of it within the actual source code.
This commit implements a simple source scanner for the suggest module to
address the problem outlined above.
Fixes nim-lang/nimsuggest#24
---
compiler/msgs.nim | 6 +++++-
compiler/suggest.nim | 39 ++++++++++++++++++++++++++++++++--
nimsuggest/tests/tsetter_highlight.nim | 10 +++++++++
nimsuggest/tests/tsi_highlight.nim | 11 ++++++++++
4 files changed, 63 insertions(+), 3 deletions(-)
create mode 100644 nimsuggest/tests/tsetter_highlight.nim
create mode 100644 nimsuggest/tests/tsi_highlight.nim
(limited to 'compiler')
diff --git a/compiler/msgs.nim b/compiler/msgs.nim
index 6bb2c3fa3..78f253bdc 100644
--- a/compiler/msgs.nim
+++ b/compiler/msgs.nim
@@ -171,6 +171,7 @@ proc toFullPath*(conf: ConfigRef; fileIdx: FileIndex): string =
proc setDirtyFile*(conf: ConfigRef; fileIdx: FileIndex; filename: AbsoluteFile) =
assert fileIdx.int32 >= 0
conf.m.fileInfos[fileIdx.int32].dirtyFile = filename
+ setLen conf.m.fileInfos[fileIdx.int32].lines, 0
proc setHash*(conf: ConfigRef; fileIdx: FileIndex; hash: string) =
assert fileIdx.int32 >= 0
@@ -194,6 +195,9 @@ template toFilename*(conf: ConfigRef; info: TLineInfo): string =
template toFullPath*(conf: ConfigRef; info: TLineInfo): string =
toFullPath(conf, info.fileIndex)
+template toFullPathConsiderDirty*(conf: ConfigRef; info: TLineInfo): string =
+ string toFullPathConsiderDirty(conf, info.fileIndex)
+
proc toMsgFilename*(conf: ConfigRef; info: TLineInfo): string =
if info.fileIndex.int32 < 0:
result = "???"
@@ -434,7 +438,7 @@ proc sourceLine*(conf: ConfigRef; i: TLineInfo): string =
if conf.m.fileInfos[i.fileIndex.int32].lines.len == 0:
try:
- for line in lines(toFullPath(conf, i)):
+ for line in lines(toFullPathConsiderDirty(conf, i)):
addSourceLine conf, i.fileIndex, line.string
except IOError:
discard
diff --git a/compiler/suggest.nim b/compiler/suggest.nim
index 09eacbbed..70a085bdf 100644
--- a/compiler/suggest.nim
+++ b/compiler/suggest.nim
@@ -32,7 +32,7 @@
# included from sigmatch.nim
-import algorithm, prefixmatches, lineinfos, pathutils
+import algorithm, prefixmatches, lineinfos, pathutils, parseutils
from wordrecg import wDeprecated, wError, wAddr, wYield, specialWords
when defined(nimsuggest):
@@ -81,6 +81,38 @@ proc cmpSuggestions(a, b: Suggest): int =
# independent of hashing order:
result = cmp(a.name[], b.name[])
+proc getTokenLenFromSource(conf: ConfigRef; ident: string; info: TLineInfo): int =
+ let
+ line = sourceLine(conf, info)
+ column = toColumn(info)
+
+ proc isOpeningBacktick(col: int): bool =
+ if col >= 0 and col < line.len:
+ if line[col] == '`':
+ not isOpeningBacktick(col - 1)
+ else:
+ isOpeningBacktick(col - 1)
+ else:
+ false
+
+ if column > line.len:
+ result = 0
+ elif column > 0 and line[column - 1] == '`' and isOpeningBacktick(column - 1):
+ result = skipUntil(line, '`', column)
+ if cmpIgnoreStyle(line[column..column + result - 1], ident) != 0:
+ result = 0
+ elif ident[0] in linter.Letters and ident[^1] != '=':
+ result = identLen(line, column)
+ if cmpIgnoreStyle(line[column..column + result - 1], ident) != 0:
+ result = 0
+ else:
+ result = skipWhile(line, OpChars + {'[', '(', '{', ']', ')', '}'}, column)
+ if ident[^1] == '=' and ident[0] in linter.Letters:
+ if line[column..column + result - 1] != "=":
+ result = 0
+ elif line[column..column + result - 1] != ident:
+ result = 0
+
proc symToSuggest(conf: ConfigRef; s: PSym, isLocal: bool, section: IdeCmd, info: TLineInfo;
quality: range[0..100]; prefix: PrefixMatch;
inTypeContext: bool; scope: int): Suggest =
@@ -88,7 +120,6 @@ proc symToSuggest(conf: ConfigRef; s: PSym, isLocal: bool, section: IdeCmd, info
result.section = section
result.quality = quality
result.isGlobal = sfGlobal in s.flags
- result.tokenLen = s.name.s.len
result.prefix = prefix
result.contextFits = inTypeContext == (s.kind in {skType, skGenericParam})
result.scope = scope
@@ -126,6 +157,10 @@ proc symToSuggest(conf: ConfigRef; s: PSym, isLocal: bool, section: IdeCmd, info
result.line = toLinenumber(infox)
result.column = toColumn(infox)
result.version = conf.suggestVersion
+ result.tokenLen = if section != ideHighlight:
+ s.name.s.len
+ else:
+ getTokenLenFromSource(conf, s.name.s, infox)
proc `$`*(suggest: Suggest): string =
result = $suggest.section
diff --git a/nimsuggest/tests/tsetter_highlight.nim b/nimsuggest/tests/tsetter_highlight.nim
new file mode 100644
index 000000000..e7388c798
--- /dev/null
+++ b/nimsuggest/tests/tsetter_highlight.nim
@@ -0,0 +1,10 @@
+proc `a=`(a, b: int) = discard
+10.a = 1000#[!]#
+
+discard """
+$nimsuggest --tester $file
+>highlight $1
+highlight;;skProc;;1;;6;;2
+highlight;;skType;;1;;16;;3
+highlight;;skProc;;2;;5;;1
+"""
diff --git a/nimsuggest/tests/tsi_highlight.nim b/nimsuggest/tests/tsi_highlight.nim
new file mode 100644
index 000000000..2c19582cc
--- /dev/null
+++ b/nimsuggest/tests/tsi_highlight.nim
@@ -0,0 +1,11 @@
+proc a: int = 0
+e_c_h_o#[!]#
+
+discard """
+$nimsuggest --tester $file
+>highlight $1
+highlight;;skProc;;1;;5;;1
+highlight;;skType;;1;;8;;3
+highlight;;skResult;;1;;0;;0
+highlight;;skProc;;2;;0;;7
+"""
--
cgit 1.4.1-2-gfad0
From 6b88ce3384c453fa3e872e059f5d9c73f247f42b Mon Sep 17 00:00:00 2001
From: LemonBoy <LemonBoy@users.noreply.github.com>
Date: Fri, 8 Feb 2019 08:59:38 +0100
Subject: Stop useless suggestion of unsafeAddr (#10598)
Fixes #10594
---
compiler/semexprs.nim | 2 +-
compiler/semmagic.nim | 7 ++++++-
tests/errmsgs/t10594.nim | 7 +++++++
3 files changed, 14 insertions(+), 2 deletions(-)
create mode 100644 tests/errmsgs/t10594.nim
(limited to 'compiler')
diff --git a/compiler/semexprs.nim b/compiler/semexprs.nim
index 1b8a978ec..239dbad54 100644
--- a/compiler/semexprs.nim
+++ b/compiler/semexprs.nim
@@ -15,7 +15,7 @@ const
errXExpectsTypeOrValue = "'$1' expects a type or value"
errVarForOutParamNeededX = "for a 'var' type a variable needs to be passed; but '$1' is immutable"
errXStackEscape = "address of '$1' may not escape its stack frame"
- errExprHasNoAddress = "expression has no address; maybe use 'unsafeAddr'"
+ errExprHasNoAddress = "expression has no address"
errCannotInterpretNodeX = "cannot evaluate '$1'"
errNamedExprExpected = "named expression expected"
errNamedExprNotAllowed = "named expression not allowed here"
diff --git a/compiler/semmagic.nim b/compiler/semmagic.nim
index 2311136b4..6e5563d69 100644
--- a/compiler/semmagic.nim
+++ b/compiler/semmagic.nim
@@ -16,7 +16,12 @@ proc semAddr(c: PContext; n: PNode; isUnsafeAddr=false): PNode =
if x.kind == nkSym:
x.sym.flags.incl(sfAddrTaken)
if isAssignable(c, x, isUnsafeAddr) notin {arLValue, arLocalLValue}:
- localError(c.config, n.info, errExprHasNoAddress)
+ # Do not suggest the use of unsafeAddr if this expression already is a
+ # unsafeAddr
+ if isUnsafeAddr:
+ localError(c.config, n.info, errExprHasNoAddress)
+ else:
+ localError(c.config, n.info, errExprHasNoAddress & "; maybe use 'unsafeAddr'")
result.add x
result.typ = makePtrType(c, x.typ)
diff --git a/tests/errmsgs/t10594.nim b/tests/errmsgs/t10594.nim
new file mode 100644
index 000000000..c9506c542
--- /dev/null
+++ b/tests/errmsgs/t10594.nim
@@ -0,0 +1,7 @@
+discard """
+ errormsg: "expression has no address"
+ line: 7
+"""
+
+template foo(v: varargs[int]) = unsafeAddr v
+foo(1, 2)
--
cgit 1.4.1-2-gfad0
From 631a8ab57f6935d34d290089b7cc36d23dc03504 Mon Sep 17 00:00:00 2001
From: LemonBoy <LemonBoy@users.noreply.github.com>
Date: Fri, 8 Feb 2019 09:56:32 +0100
Subject: Fix edge case in type hashing (#10601) [backport]
Empty types introduced by a template produced the same hash of the
"clean" type sharing the same name.
---
compiler/ccgtypes.nim | 1 -
compiler/sighashes.nim | 29 +++++++++++++++-----------
tests/ccgbugs/tsighash_typename_regression.nim | 15 +++++++++++++
3 files changed, 32 insertions(+), 13 deletions(-)
(limited to 'compiler')
diff --git a/compiler/ccgtypes.nim b/compiler/ccgtypes.nim
index 23e16cb93..c557123ac 100644
--- a/compiler/ccgtypes.nim
+++ b/compiler/ccgtypes.nim
@@ -165,7 +165,6 @@ proc mapType(conf: ConfigRef; typ: PType): TCTypeKind =
of tySet:
if mapSetType(conf, base) == ctArray: result = ctPtrToArray
else: result = ctPtr
- # XXX for some reason this breaks the pegs module
else: result = ctPtr
of tyPointer: result = ctPtr
of tySequence: result = ctNimSeq
diff --git a/compiler/sighashes.nim b/compiler/sighashes.nim
index 218011b1d..3096d94a0 100644
--- a/compiler/sighashes.nim
+++ b/compiler/sighashes.nim
@@ -196,18 +196,23 @@ proc hashType(c: var MD5Context, t: PType; flags: set[ConsiderFlag]) =
else:
c.hashSym(t.sym)
if {sfAnon, sfGenSym} * t.sym.flags != {}:
- # generated object names can be identical, so we need to
- # disambiguate furthermore by hashing the field types and names:
- # mild hack to prevent endless recursions (makes nimforum compile again):
- let oldFlags = t.sym.flags
- t.sym.flags = t.sym.flags - {sfAnon, sfGenSym}
- let n = t.n
- for i in 0 ..< n.len:
- assert n[i].kind == nkSym
- let s = n[i].sym
- c.hashSym s
- c.hashType s.typ, flags
- t.sym.flags = oldFlags
+ # Generated object names can be identical, so we need to
+ # disambiguate furthermore by hashing the field types and names.
+ if t.n.len > 0:
+ let oldFlags = t.sym.flags
+ # Mild hack to prevent endless recursion.
+ t.sym.flags = t.sym.flags - {sfAnon, sfGenSym}
+ for n in t.n:
+ assert(n.kind == nkSym)
+ let s = n.sym
+ c.hashSym s
+ c.hashType s.typ, flags
+ t.sym.flags = oldFlags
+ else:
+ # The object has no fields: we _must_ add something here in order to
+ # make the hash different from the one we produce by hashing only the
+ # type name.
+ c &= ".empty"
else:
c &= t.id
if t.len > 0 and t.sons[0] != nil:
diff --git a/tests/ccgbugs/tsighash_typename_regression.nim b/tests/ccgbugs/tsighash_typename_regression.nim
index 6e49bafc3..b93eebd20 100644
--- a/tests/ccgbugs/tsighash_typename_regression.nim
+++ b/tests/ccgbugs/tsighash_typename_regression.nim
@@ -15,3 +15,18 @@ proc foo[T](t: T) =
foo(123)
foo("baz")
+
+# Empty type in template is correctly disambiguated
+block:
+ template foo() =
+ type M = object
+ discard
+ var y = M()
+
+ foo()
+
+ type M = object
+ x: int
+
+ var x = M(x: 1)
+ doAssert(x.x == 1)
--
cgit 1.4.1-2-gfad0
From 710cfcecd30a779a38a1196fd031200ad8a8fe9b Mon Sep 17 00:00:00 2001
From: LemonBoy <LemonBoy@users.noreply.github.com>
Date: Fri, 8 Feb 2019 11:57:47 +0100
Subject: Rework exception handling in the VM (#10544)
* Rework exception handling in the VM
Make the safepoint handling more precise and less forgiving.
The new code is clearer and more commented.
Perform cleanup on `return`.
The no-exception-thrown case in a try block should be slightly faster
since we don't parse the whole set of exceptions every time.
More tests.
* Fix silly error that broke a few tests
* Testament doesn't like files having the same name
* Remove test case that failed compilation to js
---
compiler/vm.nim | 257 ++++++++++++++++++++++++----------------
compiler/vmgen.nim | 24 ++--
tests/exception/texceptions.nim | 51 ++++++++
tests/vm/tmisc_vm.nim | 20 ++++
4 files changed, 242 insertions(+), 110 deletions(-)
(limited to 'compiler')
diff --git a/compiler/vm.nim b/compiler/vm.nim
index 71fd2722b..f855da0cc 100644
--- a/compiler/vm.nim
+++ b/compiler/vm.nim
@@ -23,7 +23,7 @@ from evaltempl import evalTemplate
from modulegraphs import ModuleGraph, PPassContext
const
- traceCode = debugEchoCode
+ traceCode = defined(nimVMDebug)
when hasFFI:
import evalffi
@@ -259,64 +259,101 @@ proc pushSafePoint(f: PStackFrame; pc: int) =
f.safePoints.add(pc)
proc popSafePoint(f: PStackFrame) =
- # XXX this needs a proper fix!
- if f.safePoints.len > 0:
- discard f.safePoints.pop()
-
-proc cleanUpOnException(c: PCtx; tos: PStackFrame):
- tuple[pc: int, f: PStackFrame] =
- let raisedType = c.currentExceptionA.typ.skipTypes(abstractPtrs)
- var f = tos
- while true:
- while f.safePoints.len == 0:
- f = f.next
- if f.isNil: return (-1, nil)
- var pc2 = f.safePoints[f.safePoints.high]
-
- var nextExceptOrFinally = -1
- if c.code[pc2].opcode == opcExcept:
- nextExceptOrFinally = pc2 + c.code[pc2].regBx - wordExcess
- inc pc2
- while c.code[pc2].opcode == opcExcept:
- let excIndex = c.code[pc2].regBx-wordExcess
- let exceptType = if excIndex > 0: c.types[excIndex].skipTypes(
- abstractPtrs)
- else: nil
- #echo typeToString(exceptType), " ", typeToString(raisedType)
- if exceptType.isNil or inheritanceDiff(raisedType, exceptType) <= 0:
- # mark exception as handled but keep it in B for
- # the getCurrentException() builtin:
- c.currentExceptionB = c.currentExceptionA
- c.currentExceptionA = nil
- # execute the corresponding handler:
- while c.code[pc2].opcode == opcExcept: inc pc2
- discard f.safePoints.pop
- return (pc2, f)
- inc pc2
- if c.code[pc2].opcode != opcExcept and nextExceptOrFinally >= 0:
- # we're at the end of the *except list*, but maybe there is another
- # *except branch*?
- pc2 = nextExceptOrFinally+1
- if c.code[pc2].opcode == opcExcept:
- nextExceptOrFinally = pc2 + c.code[pc2].regBx - wordExcess
-
- if nextExceptOrFinally >= 0:
- pc2 = nextExceptOrFinally
- if c.code[pc2].opcode == opcFinally:
- # execute the corresponding handler, but don't quit walking the stack:
- discard f.safePoints.pop
- return (pc2+1, f)
- # not the right one:
- discard f.safePoints.pop
+ discard f.safePoints.pop()
+
+type
+ ExceptionGoto = enum
+ ExceptionGotoHandler,
+ ExceptionGotoFinally,
+ ExceptionGotoUnhandled
+
+proc findExceptionHandler(c: PCtx, f: PStackFrame, exc: PNode):
+ tuple[why: ExceptionGoto, where: int] =
+ let raisedType = exc.typ.skipTypes(abstractPtrs)
+
+ while f.safePoints.len > 0:
+ var pc = f.safePoints.pop()
+
+ var matched = false
+ var pcEndExcept = pc
+
+ # Scan the chain of exceptions starting at pc.
+ # The structure is the following:
+ # pc - opcExcept, <end of this block>
+ # - opcExcept, <pattern1>
+ # - opcExcept, <pattern2>
+ # ...
+ # - opcExcept, <patternN>
+ # - Exception handler body
+ # - ... more opcExcept blocks may follow
+ # - ... an optional opcFinally block may follow
+ #
+ # Note that the exception handler body already contains a jump to the
+ # finally block or, if that's not present, to the point where the execution
+ # should continue.
+ # Also note that opcFinally blocks are the last in the chain.
+ while c.code[pc].opcode == opcExcept:
+ # Where this Except block ends
+ pcEndExcept = pc + c.code[pc].regBx - wordExcess
+ inc pc
+
+ # A series of opcExcept follows for each exception type matched
+ while c.code[pc].opcode == opcExcept:
+ let excIndex = c.code[pc].regBx - wordExcess
+ let exceptType =
+ if excIndex > 0: c.types[excIndex].skipTypes(abstractPtrs)
+ else: nil
+
+ # echo typeToString(exceptType), " ", typeToString(raisedType)
+
+ # Determine if the exception type matches the pattern
+ if exceptType.isNil or inheritanceDiff(raisedType, exceptType) <= 0:
+ matched = true
+ break
+
+ inc pc
+
+ # Skip any further ``except`` pattern and find the first instruction of
+ # the handler body
+ while c.code[pc].opcode == opcExcept:
+ inc pc
+
+ if matched:
+ break
+
+ # If no handler in this chain is able to catch this exception we check if
+ # the "parent" chains are able to. If this chain ends with a `finally`
+ # block we must execute it before continuing.
+ pc = pcEndExcept
+
+ # Where the handler body starts
+ let pcBody = pc
+
+ if matched:
+ return (ExceptionGotoHandler, pcBody)
+ elif c.code[pc].opcode == opcFinally:
+ # The +1 here is here because we don't want to execute it since we've
+ # already pop'd this statepoint from the stack.
+ return (ExceptionGotoFinally, pc + 1)
+
+ return (ExceptionGotoUnhandled, 0)
proc cleanUpOnReturn(c: PCtx; f: PStackFrame): int =
- for s in f.safePoints:
- var pc = s
+ # Walk up the chain of safepoints and return the PC of the first `finally`
+ # block we find or -1 if no such block is found.
+ # Note that the safepoint is removed once the function returns!
+ result = -1
+
+ # Traverse the stack starting from the end in order to execute the blocks in
+ # the inteded order
+ for i in 1 .. f.safePoints.len:
+ var pc = f.safePoints[^i]
+ # Skip the `except` blocks
while c.code[pc].opcode == opcExcept:
- pc = pc + c.code[pc].regBx - wordExcess
+ pc += c.code[pc].regBx - wordExcess
if c.code[pc].opcode == opcFinally:
- return pc
- return -1
+ discard f.safePoints.pop
+ return pc + 1
proc opConv(c: PCtx; dest: var TFullReg, src: TFullReg, desttyp, srctyp: PType): bool =
if desttyp.kind == tyString:
@@ -449,6 +486,9 @@ const
proc rawExecute(c: PCtx, start: int, tos: PStackFrame): TFullReg =
var pc = start
var tos = tos
+ # Used to keep track of where the execution is resumed.
+ var savedPC = -1
+ var savedFrame: PStackFrame
var regs: seq[TFullReg] # alias to tos.slots for performance
move(regs, tos.slots)
#echo "NEW RUN ------------------------"
@@ -456,27 +496,31 @@ proc rawExecute(c: PCtx, start: int, tos: PStackFrame): TFullReg =
#{.computedGoto.}
let instr = c.code[pc]
let ra = instr.regA
- #if c.traceActive:
+
when traceCode:
echo "PC ", pc, " ", c.code[pc].opcode, " ra ", ra, " rb ", instr.regB, " rc ", instr.regC
- # message(c.config, c.debug[pc], warnUser, "Trace")
case instr.opcode
of opcEof: return regs[ra]
of opcRet:
- # XXX perform any cleanup actions
- pc = tos.comesFrom
- tos = tos.next
- let retVal = regs[0]
- if tos.isNil:
- #echo "RET ", retVal.rendertree
- return retVal
-
- move(regs, tos.slots)
- assert c.code[pc].opcode in {opcIndCall, opcIndCallAsgn}
- if c.code[pc].opcode == opcIndCallAsgn:
- regs[c.code[pc].regA] = retVal
- #echo "RET2 ", retVal.rendertree, " ", c.code[pc].regA
+ let newPc = c.cleanUpOnReturn(tos)
+ # Perform any cleanup action before returning
+ if newPc < 0:
+ pc = tos.comesFrom
+ tos = tos.next
+ let retVal = regs[0]
+ if tos.isNil:
+ return retVal
+
+ move(regs, tos.slots)
+ assert c.code[pc].opcode in {opcIndCall, opcIndCallAsgn}
+ if c.code[pc].opcode == opcIndCallAsgn:
+ regs[c.code[pc].regA] = retVal
+ else:
+ savedPC = pc
+ savedFrame = tos
+ # The -1 is needed because at the end of the loop we increment `pc`
+ pc = newPc - 1
of opcYldYoid: assert false
of opcYldVal: assert false
of opcAsgnInt:
@@ -1025,7 +1069,7 @@ proc rawExecute(c: PCtx, start: int, tos: PStackFrame): TFullReg =
# it's a callback:
c.callbacks[-prc.offset-2].value(
VmArgs(ra: ra, rb: rb, rc: rc, slots: cast[pointer](regs),
- currentException: c.currentExceptionB,
+ currentException: c.currentExceptionA,
currentLineInfo: c.debug[pc]))
elif sfImportc in prc.flags:
if allowFFI notin c.features:
@@ -1118,44 +1162,55 @@ proc rawExecute(c: PCtx, start: int, tos: PStackFrame): TFullReg =
tos.pushSafePoint(pc + rbx)
assert c.code[pc+rbx].opcode in {opcExcept, opcFinally}
of opcExcept:
- # just skip it; it's followed by a jump;
- # we'll execute in the 'raise' handler
- let rbx = instr.regBx - wordExcess - 1 # -1 for the following 'inc pc'
- inc pc, rbx
- while c.code[pc+1].opcode == opcExcept:
- let rbx = c.code[pc+1].regBx - wordExcess - 1
- inc pc, rbx
- #assert c.code[pc+1].opcode in {opcExcept, opcFinally}
- if c.code[pc+1].opcode != opcFinally:
- # in an except handler there is no active safe point for the 'try':
- tos.popSafePoint()
+ # This opcode is never executed, it only holds informations for the
+ # exception handling routines.
+ doAssert(false)
of opcFinally:
- # just skip it; it's followed by the code we need to execute anyway
+ # Pop the last safepoint introduced by a opcTry. This opcode is only
+ # executed _iff_ no exception was raised in the body of the `try`
+ # statement hence the need to pop the safepoint here.
+ doAssert(savedPC < 0)
tos.popSafePoint()
of opcFinallyEnd:
- if c.currentExceptionA != nil:
- # we are in a cleanup run:
- let (newPc, newTos) = cleanUpOnException(c, tos)
- if newPc-1 < 0:
- bailOut(c, tos)
- return
- pc = newPc-1
- if tos != newTos:
- tos = newTos
+ # The control flow may not resume at the next instruction since we may be
+ # raising an exception or performing a cleanup.
+ if not savedPC < 0:
+ pc = savedPC - 1
+ savedPC = -1
+ if tos != savedFrame:
+ tos = savedFrame
move(regs, tos.slots)
of opcRaise:
let raised = regs[ra].node
c.currentExceptionA = raised
c.exceptionInstr = pc
- let (newPc, newTos) = cleanUpOnException(c, tos)
- # -1 because of the following 'inc'
- if newPc-1 < 0:
+
+ var frame = tos
+ var jumpTo = findExceptionHandler(c, frame, raised)
+ while jumpTo.why == ExceptionGotoUnhandled and not frame.next.isNil:
+ frame = frame.next
+ jumpTo = findExceptionHandler(c, frame, raised)
+
+ case jumpTo.why:
+ of ExceptionGotoHandler:
+ # Jump to the handler, do nothing when the `finally` block ends.
+ savedPC = -1
+ pc = jumpTo.where - 1
+ if tos != frame:
+ tos = frame
+ move(regs, tos.slots)
+ of ExceptionGotoFinally:
+ # Jump to the `finally` block first then re-jump here to continue the
+ # traversal of the exception chain
+ savedPC = pc
+ savedFrame = tos
+ pc = jumpTo.where - 1
+ if tos != frame:
+ tos = frame
+ move(regs, tos.slots)
+ of ExceptionGotoUnhandled:
+ # Nobody handled this exception, error out.
bailOut(c, tos)
- return
- pc = newPc-1
- if tos != newTos:
- tos = newTos
- move(regs, tos.slots)
of opcNew:
ensureKind(rkNode)
let typ = c.types[instr.regBx - wordExcess]
@@ -1295,7 +1350,7 @@ proc rawExecute(c: PCtx, start: int, tos: PStackFrame): TFullReg =
idx = int(regs[rb+rc-1].intVal)
callback = c.callbacks[idx].value
args = VmArgs(ra: ra, rb: rb, rc: rc, slots: cast[pointer](regs),
- currentException: c.currentExceptionB,
+ currentException: c.currentExceptionA,
currentLineInfo: c.debug[pc])
callback(args)
regs[ra].node.flags.incl nfIsRef
diff --git a/compiler/vmgen.nim b/compiler/vmgen.nim
index f513c59a7..980901593 100644
--- a/compiler/vmgen.nim
+++ b/compiler/vmgen.nim
@@ -83,9 +83,12 @@ proc codeListing(c: PCtx, result: var string, start=0; last = -1) =
elif opc < firstABxInstr:
result.addf("\t$#\tr$#, r$#, r$#", opc.toStr, x.regA,
x.regB, x.regC)
- elif opc in relativeJumps:
+ elif opc in relativeJumps + {opcTry}:
result.addf("\t$#\tr$#, L$#", opc.toStr, x.regA,
i+x.regBx-wordExcess)
+ elif opc in {opcExcept}:
+ let idx = x.regBx-wordExcess
+ result.addf("\t$#\t$#, $#", opc.toStr, x.regA, $idx)
elif opc in {opcLdConst, opcAsgnConst}:
let idx = x.regBx-wordExcess
result.addf("\t$#\tr$#, $# ($#)", opc.toStr, x.regA,
@@ -480,10 +483,13 @@ proc genType(c: PCtx; typ: PType): int =
proc genTry(c: PCtx; n: PNode; dest: var TDest) =
if dest < 0 and not isEmptyType(n.typ): dest = getTemp(c, n.typ)
var endings: seq[TPosition] = @[]
- let elsePos = c.xjmp(n, opcTry, 0)
+ let ehPos = c.xjmp(n, opcTry, 0)
c.gen(n.sons[0], dest)
c.clearDest(n, dest)
- c.patch(elsePos)
+ # Add a jump past the exception handling code
+ endings.add(c.xjmp(n, opcJmp, 0))
+ # This signals where the body ends and where the exception handling begins
+ c.patch(ehPos)
for i in 1 ..< n.len:
let it = n.sons[i]
if it.kind != nkFinally:
@@ -499,14 +505,14 @@ proc genTry(c: PCtx; n: PNode; dest: var TDest) =
c.gABx(it, opcExcept, 0, 0)
c.gen(it.lastSon, dest)
c.clearDest(n, dest)
- if i < sonsLen(n)-1:
+ if i < sonsLen(n):
endings.add(c.xjmp(it, opcJmp, 0))
c.patch(endExcept)
- for endPos in endings: c.patch(endPos)
let fin = lastSon(n)
# we always generate an 'opcFinally' as that pops the safepoint
- # from the stack
+ # from the stack if no exception is raised in the body.
c.gABx(fin, opcFinally, 0, 0)
+ for endPos in endings: c.patch(endPos)
if fin.kind == nkFinally:
c.gen(fin.sons[0])
c.clearDest(n, dest)
@@ -2214,9 +2220,9 @@ proc genProc(c: PCtx; s: PSym): int =
c.gABC(body, opcEof, eofInstr.regA)
c.optimizeJumps(result)
s.offset = c.prc.maxSlots
- #if s.name.s == "calc":
- # echo renderTree(body)
- # c.echoCode(result)
+ # if s.name.s == "fun1":
+ # echo renderTree(body)
+ # c.echoCode(result)
c.prc = oldPrc
else:
c.prc.maxSlots = s.offset
diff --git a/tests/exception/texceptions.nim b/tests/exception/texceptions.nim
index d63187b0e..7bce32837 100644
--- a/tests/exception/texceptions.nim
+++ b/tests/exception/texceptions.nim
@@ -74,3 +74,54 @@ block: #10417
moo()
doAssert(bar == 1)
+
+# Make sure the VM handles the exceptions correctly
+block:
+ proc fun1(): seq[int] =
+ try:
+ try:
+ raise newException(ValueError, "xx")
+ except:
+ doAssert("xx" == getCurrentExceptionMsg())
+ raise newException(KeyError, "yy")
+ except:
+ doAssert("yy" == getCurrentExceptionMsg())
+ result.add(1212)
+ try:
+ try:
+ raise newException(AssertionError, "a")
+ finally:
+ result.add(42)
+ except AssertionError:
+ result.add(99)
+ finally:
+ result.add(10)
+ result.add(4)
+ result.add(0)
+ try:
+ result.add(1)
+ except KeyError:
+ result.add(-1)
+ except ValueError:
+ result.add(-1)
+ except IndexError:
+ result.add(2)
+ except:
+ result.add(3)
+
+ try:
+ try:
+ result.add(1)
+ return
+ except:
+ result.add(-1)
+ finally:
+ result.add(2)
+ except KeyError:
+ doAssert(false)
+ finally:
+ result.add(3)
+
+ let x1 = fun1()
+ const x2 = fun1()
+ doAssert(x1 == x2)
diff --git a/tests/vm/tmisc_vm.nim b/tests/vm/tmisc_vm.nim
index 6eb3dd627..bce0159ce 100644
--- a/tests/vm/tmisc_vm.nim
+++ b/tests/vm/tmisc_vm.nim
@@ -49,3 +49,23 @@ static:
echo "caught Defect"
except ValueError:
echo "caught ValueError"
+
+# bug #10538
+
+block:
+ proc fun1(): seq[int] =
+ try:
+ try:
+ result.add(1)
+ return
+ except:
+ result.add(-1)
+ finally:
+ result.add(2)
+ finally:
+ result.add(3)
+ result.add(4)
+
+ let x1 = fun1()
+ const x2 = fun1()
+ doAssert(x1 == x2)
--
cgit 1.4.1-2-gfad0
From 4ed7507cb2320aecbe10c753ee9b80e81b87211d Mon Sep 17 00:00:00 2001
From: Araq <rumpf_a@web.de>
Date: Fri, 8 Feb 2019 12:11:40 +0100
Subject: error messages can have spaces, don't be dyslexic
---
compiler/types.nim | 2 +-
tests/errmsgs/t8794.nim | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
(limited to 'compiler')
diff --git a/compiler/types.nim b/compiler/types.nim
index 1d6e71f14..23902459e 100644
--- a/compiler/types.nim
+++ b/compiler/types.nim
@@ -124,7 +124,7 @@ proc getProcHeader*(conf: ConfigRef; sym: PSym; prefer: TPreferedDesc = preferNa
add(result, ')')
if n.sons[0].typ != nil:
result.add(": " & typeToString(n.sons[0].typ, prefer))
- result.add "[declared in "
+ result.add " [declared in "
result.add(conf$sym.info)
result.add "]"
diff --git a/tests/errmsgs/t8794.nim b/tests/errmsgs/t8794.nim
index 7f16a42fe..22e4014f1 100644
--- a/tests/errmsgs/t8794.nim
+++ b/tests/errmsgs/t8794.nim
@@ -2,7 +2,7 @@ discard """
cmd: "nim check $options $file"
errormsg: ""
nimout: '''
-t8794.nim(39, 27) Error: undeclared field: 'a3' for type m8794.Foo3[declared in m8794.nim(1, 6)]
+t8794.nim(39, 27) Error: undeclared field: 'a3' for type m8794.Foo3 [declared in m8794.nim(1, 6)]
'''
"""
--
cgit 1.4.1-2-gfad0
From aa6e40abe6aa30b8fcabe63e3fc906d8fe62fa3b Mon Sep 17 00:00:00 2001
From: LemonBoy <LemonBoy@users.noreply.github.com>
Date: Fri, 8 Feb 2019 12:24:03 +0100
Subject: Fix wrong result in tuple assignment (#9340)
Fixes #9177
---
compiler/transf.nim | 34 ++++++++++++++++++++++++++++++++++
tests/tuples/t9177.nim | 15 +++++++++++++++
2 files changed, 49 insertions(+)
create mode 100644 tests/tuples/t9177.nim
(limited to 'compiler')
diff --git a/compiler/transf.nim b/compiler/transf.nim
index 9b226a47b..40cf70ff7 100644
--- a/compiler/transf.nim
+++ b/compiler/transf.nim
@@ -321,6 +321,38 @@ proc introduceNewLocalVars(c: PTransf, n: PNode): PTransNode =
for i in countup(0, sonsLen(n)-1):
result[i] = introduceNewLocalVars(c, n.sons[i])
+proc transformAsgn(c: PTransf, n: PNode): PTransNode =
+ let rhs = n[1]
+
+ if rhs.kind != nkTupleConstr:
+ return transformSons(c, n)
+
+ # Unpack the tuple assignment into N temporary variables and then pack them
+ # into a tuple: this allows us to get the correct results even when the rhs
+ # depends on the value of the lhs
+ let letSection = newTransNode(nkLetSection, n.info, rhs.len)
+ let newTupleConstr = newTransNode(nkTupleConstr, n.info, rhs.len)
+ for i, field in rhs:
+ let val = if field.kind == nkExprColonExpr: field[1] else: field
+ let def = newTransNode(nkIdentDefs, field.info, 3)
+ def[0] = PTransNode(newTemp(c, val.typ, field.info))
+ def[1] = PTransNode(newNodeI(nkEmpty, field.info))
+ def[2] = transform(c, val)
+ letSection[i] = def
+ # NOTE: We assume the constructor fields are in the correct order for the
+ # given tuple type
+ newTupleConstr[i] = def[0]
+
+ PNode(newTupleConstr).typ = rhs.typ
+
+ let asgnNode = newTransNode(nkAsgn, n.info, 2)
+ asgnNode[0] = transform(c, n[0])
+ asgnNode[1] = newTupleConstr
+
+ result = newTransNode(nkStmtList, n.info, 2)
+ result[0] = letSection
+ result[1] = asgnNode
+
proc transformYield(c: PTransf, n: PNode): PTransNode =
proc asgnTo(lhs: PNode, rhs: PTransNode): PTransNode =
# Choose the right assignment instruction according to the given ``lhs``
@@ -949,6 +981,8 @@ proc transform(c: PTransf, n: PNode): PTransNode =
result = transformYield(c, n)
else:
result = transformSons(c, n)
+ of nkAsgn:
+ result = transformAsgn(c, n)
of nkIdentDefs, nkConstDef:
result = PTransNode(n)
result[0] = transform(c, n[0])
diff --git a/tests/tuples/t9177.nim b/tests/tuples/t9177.nim
new file mode 100644
index 000000000..e6dd0cb1d
--- /dev/null
+++ b/tests/tuples/t9177.nim
@@ -0,0 +1,15 @@
+discard """
+ action: run
+"""
+
+block:
+ var x = (a: 5, b: 1)
+ x = (3 * x.a + 2 * x.b, x.a + x.b)
+ doAssert x.a == 17
+ doAssert x.b == 6
+block:
+ # Transformation of a tuple constructor with named arguments
+ var x = (a: 5, b: 1)
+ x = (a: 3 * x.a + 2 * x.b, b: x.a + x.b)
+ doAssert x.a == 17
+ doAssert x.b == 6
--
cgit 1.4.1-2-gfad0
From 444f2231c9b48c34f9bec2ce6cfa3de5ae2560b1 Mon Sep 17 00:00:00 2001
From: Andreas Rumpf <rumpf_a@web.de>
Date: Fri, 8 Feb 2019 16:54:12 +0100
Subject: make tests green again
---
compiler/transf.nim | 4 ++--
tests/modules/tmismatchedvisibility.nim | 2 +-
tests/tuples/t9177.nim | 1 +
3 files changed, 4 insertions(+), 3 deletions(-)
(limited to 'compiler')
diff --git a/compiler/transf.nim b/compiler/transf.nim
index 40cf70ff7..071cb00ee 100644
--- a/compiler/transf.nim
+++ b/compiler/transf.nim
@@ -981,8 +981,8 @@ proc transform(c: PTransf, n: PNode): PTransNode =
result = transformYield(c, n)
else:
result = transformSons(c, n)
- of nkAsgn:
- result = transformAsgn(c, n)
+ #of nkAsgn:
+ # result = transformAsgn(c, n)
of nkIdentDefs, nkConstDef:
result = PTransNode(n)
result[0] = transform(c, n[0])
diff --git a/tests/modules/tmismatchedvisibility.nim b/tests/modules/tmismatchedvisibility.nim
index fd582b571..a61b28071 100644
--- a/tests/modules/tmismatchedvisibility.nim
+++ b/tests/modules/tmismatchedvisibility.nim
@@ -1,5 +1,5 @@
discard """
- errormsg: "public implementation 'tmismatchedvisibility.foo(a: int)[declared in tmismatchedvisibility.nim(6, 6)]' has non-public forward declaration in "
+ errormsg: "public implementation 'tmismatchedvisibility.foo(a: int) [declared in tmismatchedvisibility.nim(6, 6)]' has non-public forward declaration in "
line: 8
"""
diff --git a/tests/tuples/t9177.nim b/tests/tuples/t9177.nim
index e6dd0cb1d..d5768b703 100644
--- a/tests/tuples/t9177.nim
+++ b/tests/tuples/t9177.nim
@@ -1,5 +1,6 @@
discard """
action: run
+ disabled: true
"""
block:
--
cgit 1.4.1-2-gfad0