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

=> supports pragmas & names (+ changed behavior) (#14200)

Browse source 
* => supports pragmas & names (+ changed behavior)

(x, y: int) is now parsed as (x: int, y: int) instead of
(x: auto, y: int) inside => and ->.

* fix pragma check

* fixes, use since & LHS of -> supports pragmas
This commit is contained in:
hlaaftana 2020-05-03 11:22:49 +03:00 • committed by GitHub
commit 3e060cfb0a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 96 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/pure/htmlgen.nim
View file

@ -64,7 +64,7 @@ proc getIdent(e: NimNode): string {.compileTime.} =
result = getIdent(e[0])
for i in 1 .. e.len-1:
result.add getIdent(e[i])
else: error("cannot extract identifier from node: " & toStrLit(e).strVal)
else: error("cannot extract identifier from node: " & toStrLit(e).strVal, e)
proc delete[T](s: var seq[T], attr: T): bool =
var idx = find(s, attr)
@ -96,14 +96,14 @@ proc xmlCheckedTag*(argsList: NimNode, tag: string, optAttr = "", reqAttr = "",
result.add(argsList[i][1])
result.add(newStrLitNode("\""))
else:
error("invalid attribute for '" & tag & "' element: " & name)
error("invalid attribute for '" & tag & "' element: " & name, argsList[i])
# check each required attribute exists:
if req.len > 0:
error(req[0] & " attribute for '" & tag & "' element expected")
error(req[0] & " attribute for '" & tag & "' element expected", argsList)
if isLeaf:
for i in 0 ..< argsList.len:
if argsList[i].kind != nnkExprEqExpr:
error("element " & tag & " cannot be nested")
error("element " & tag & " cannot be nested", argsList[i])
result.add(newStrLitNode(" />"))
else:
result.add(newStrLitNode(">"))