jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rename: stmt -> typed and expr -> untyped (#15989)

Browse source 
* stmt -> typed

* expr -> untyped

* minor
This commit is contained in:
flywind 2020-11-16 22:19:26 +08:00 • committed by GitHub
commit 4213f7a6c9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/ast.nim
View file

@ -1804,7 +1804,7 @@ proc isAtom*(n: PNode): bool {.inline.} =
result = n.kind >= nkNone and n.kind <= nkNilLit result = n.kind >= nkNone and n.kind <= nkNilLit
proc isEmptyType*(t: PType): bool {.inline.} = proc isEmptyType*(t: PType): bool {.inline.} =
## 'void' and 'stmt' types are often equivalent to 'nil' these days: ## 'void' and 'typed' types are often equivalent to 'nil' these days:
result = t == nil or t.kind in {tyVoid, tyTyped} result = t == nil or t.kind in {tyVoid, tyTyped}
proc makeStmtList*(n: PNode): PNode = proc makeStmtList*(n: PNode): PNode =

2
compiler/semtypes.nim
View file

@ -1315,7 +1315,7 @@ proc semProcTypeNode(c: PContext, n, genericParams: PNode,
"' is only valid for macros and templates") "' is only valid for macros and templates")
# 'auto' as a return type does not imply a generic: # 'auto' as a return type does not imply a generic:
elif r.kind == tyAnything: elif r.kind == tyAnything:
# 'p(): auto' and 'p(): expr' are equivalent, but the rest of the # 'p(): auto' and 'p(): untyped' are equivalent, but the rest of the
# compiler is hardly aware of 'auto': # compiler is hardly aware of 'auto':
r = newTypeS(tyUntyped, c) r = newTypeS(tyUntyped, c)
elif r.kind == tyStatic: elif r.kind == tyStatic:

4
compiler/sigmatch.nim
View file

@ -1240,8 +1240,8 @@ proc typeRel(c: var TCandidate, f, aOrig: PType,
if result < isGeneric: result = isNone if result < isGeneric: result = isNone
else: discard else: discard
of tyOpenArray, tyVarargs: of tyOpenArray, tyVarargs:
# varargs[expr] is special too but handled earlier. So we only need to # varargs[untyped] is special too but handled earlier. So we only need to
# handle varargs[stmt] which is the same as varargs[typed]: # handle varargs[typed]:
if f.kind == tyVarargs: if f.kind == tyVarargs:
if tfVarargs in a.flags: if tfVarargs in a.flags:
return typeRel(c, f.base, a.lastSon, flags) return typeRel(c, f.base, a.lastSon, flags)