mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2026-07-20 07:51:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

address the comments

Browse Source
This commit is contained in:
narimiran
2019-08-27 14:49:32 +02:00
parent def6234903
commit 329e169e96
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
compiler/sem.nim
View File

@@ -444,6 +444,7 @@ proc semAfterMacroCall(c: PContext, call, macroResult: PNode,
const
errMissingGenericParamsForTemplate = "'$1' has unspecified generic parameters"
errFloatToString = "cannot convert '$1' to '$2'"
proc semMacroExpr(c: PContext, n, nOrig: PNode, sym: PSym,
flags: TExprFlags = {}): PNode =

7
compiler/semexprs.nim
View File

@@ -514,11 +514,8 @@ proc changeType(c: PContext; n: PNode, newType: PType, check: bool) =
localError(c.config, n.info, "cannot convert " & $value &
" to " & typeToString(newType))
of nkFloatLit..nkFloat64Lit:
if check:
echo newType.kind
if not floatRangeCheck(n.floatVal, newType):
localError(c.config, n.info, "cannot convert " & $n.floatVal &
" to " & typeToString(newType))
if check and not floatRangeCheck(n.floatVal, newType):
localError(c.config, n.info, errFloatToString % [$n.floatVal, typeToString(newType)])
else: discard
n.typ = newType

3
compiler/semstmts.nim
View File

@@ -293,8 +293,7 @@ proc fitRemoveHiddenConv(c: PContext, typ: PType, n: PNode): PNode =
result.info = n.info
result.typ = typ
if not floatRangeCheck(result.floatVal, typ):
localError(c.config, n.info, "cannot convert " & $result.floatVal &
" to " & typeToString(typ))
localError(c.config, n.info, errFloatToString % [$n.floatVal, typeToString(typ)])
else:
changeType(c, r1, typ, check=true)
result = r1