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

styleCheck: Fix error for sugar and std/with (#16176)

Browse source 
With this commit, we no longer see an error if we pass
`--styleCheck:error` when compiling a file that contains `import sugar`
or `import std/with`.

The problem was that those modules (and only those modules) import
`std/private/underscored_calls`, which contained a styleCheck issue:
its spelling of `nnkArgList` didn't match the `nnkArglist` spelling in
`macros.nim`.

This commit fixes the issue by renaming `nnkArgList` to `nnkArglist`
repo-wide. The other way around would be a breaking change for code that
used `nnkArglist` and `--styleCheck:error`.

Fixes: #16174
This commit is contained in:
ee7 2020-12-02 20:48:16 +01:00 • committed by GitHub
commit 629b22e3d5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
doc/manual_experimental.rst
View file

@ -1250,7 +1250,7 @@ all the arguments, but also the matched operators in reverse polish notation:
echo x + y * z - x echo x + y * z - x
This passes the expression ``x + y * z - x`` to the ``optM`` macro as This passes the expression ``x + y * z - x`` to the ``optM`` macro as
an ``nnkArgList`` node containing:: an ``nnkArglist`` node containing::
Arglist Arglist
Sym "x" Sym "x"

2
lib/std/private/underscored_calls.nim
View file

@ -39,7 +39,7 @@ proc underscoredCall(n, arg0: NimNode): NimNode =
result.add arg0 result.add arg0
proc underscoredCalls*(result, calls, arg0: NimNode) = proc underscoredCalls*(result, calls, arg0: NimNode) =
expectKind calls, {nnkArgList, nnkStmtList, nnkStmtListExpr} expectKind calls, {nnkArglist, nnkStmtList, nnkStmtListExpr}
for call in calls: for call in calls:
if call.kind in {nnkStmtList, nnkStmtListExpr}: if call.kind in {nnkStmtList, nnkStmtListExpr}:

2
tests/astspec/tastspec.nim
View file

@ -929,7 +929,7 @@ static:
(x & y & z) is string (x & y & z) is string
ast.peelOff({nnkStmtList, nnkTypeSection}).matchAst: ast.peelOff({nnkStmtList, nnkTypeSection}).matchAst:
of nnkTypeDef(_, _, nnkTypeClassTy(nnkArgList, _, _, nnkStmtList)): of nnkTypeDef(_, _, nnkTypeClassTy(nnkArglist, _, _, nnkStmtList)):
# note this isn't nnkConceptTy! # note this isn't nnkConceptTy!
echo "ok" echo "ok"