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

Add casting back for cast_expression. Disable cast test on Nim < 1.0.0

Browse source
This commit is contained in:
Joey Yakimowich-Payne 2020-04-20 13:38:27 -06:00
commit ac646a9fea
2 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nimterop/exprparser.nim
View file

@ -258,7 +258,7 @@ proc processParenthesizedExpr(exprParser: ExprParser, node: TSNode, typeofNode:
result.add(exprParser.processTSNode(node[i], typeofNode)) result.add(exprParser.processTSNode(node[i], typeofNode))
proc processCastExpression(exprParser: ExprParser, node: TSNode, typeofNode: var PNode): PNode = proc processCastExpression(exprParser: ExprParser, node: TSNode, typeofNode: var PNode): PNode =
result = nkCall.newTree( result = nkCast.newTree(
exprParser.processTSNode(node[0], typeofNode), exprParser.processTSNode(node[0], typeofNode),
exprParser.processTSNode(node[1], typeofNode) exprParser.processTSNode(node[1], typeofNode)
) )

9
tests/tast2.nim
View file

@ -3,11 +3,16 @@ import macros, os, sets, strutils
import nimterop/[cimport] import nimterop/[cimport]
static: static:
# Skip casting on lower nim compilers because
# the VM does not support it
when (NimMajor, NimMinor, NimPatch) < (1, 0, 0):
cSkipSymbol @["CASTEXPR"]
cDebug() cDebug()
const const
path = currentSourcePath.parentDir() / "include" / "tast2.h" path = currentSourcePath.parentDir() / "include" / "tast2.h"
when defined(HEADER): when defined(HEADER):
cDefine("HEADER") cDefine("HEADER")
const const
@ -118,7 +123,9 @@ assert BINEXPR == 5
assert BOOL == true assert BOOL == true
assert MATHEXPR == -99 assert MATHEXPR == -99
assert ANDEXPR == 96 assert ANDEXPR == 96
assert CASTEXPR == 34.chr
when (NimMajor, NimMinor, NimPatch) >= (1, 0, 0):
assert CASTEXPR == 34.chr
assert TRICKYSTR == "N\x1C\nfoo\x00\'\"\c\v\a\b\e\f\t\\\\?bar" assert TRICKYSTR == "N\x1C\nfoo\x00\'\"\c\v\a\b\e\f\t\\\\?bar"
assert NULLCHAR == '\0' assert NULLCHAR == '\0'