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

patch required for c2nim

Browse source
This commit is contained in:
Araq 2015-01-07 02:41:08 +01:00
commit 417eb3e026
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
compiler/renderer.nim
View file

@ -46,12 +46,13 @@ proc getNextTok*(r: var TSrcGen, kind: var TTokType, literal: var string)
# determines how long the subtree will likely be, the second # determines how long the subtree will likely be, the second
# phase appends to a buffer that will be the output. # phase appends to a buffer that will be the output.
proc isKeyword*(s: string): bool = proc isKeyword*(i: PIdent): bool =
var i = getIdent(s)
if (i.id >= ord(tokKeywordLow) - ord(tkSymbol)) and if (i.id >= ord(tokKeywordLow) - ord(tkSymbol)) and
(i.id <= ord(tokKeywordHigh) - ord(tkSymbol)): (i.id <= ord(tokKeywordHigh) - ord(tkSymbol)):
result = true result = true
proc isKeyword*(s: string): bool = isKeyword(getIdent(s))
proc renderDefinitionName*(s: PSym, noQuotes = false): string = proc renderDefinitionName*(s: PSym, noQuotes = false): string =
## Returns the definition name of the symbol. ## Returns the definition name of the symbol.
## ##
@ -59,7 +60,7 @@ proc renderDefinitionName*(s: PSym, noQuotes = false): string =
## happen if the name happens to be a keyword or the first character is not ## happen if the name happens to be a keyword or the first character is not
## part of the SymStartChars set. ## part of the SymStartChars set.
let x = s.name.s let x = s.name.s
if noQuotes or (x[0] in SymStartChars and not renderer.isKeyword(x)): if noQuotes or (x[0] in SymStartChars and not renderer.isKeyword(s.name)):
result = x result = x
else: else:
result = '`' & x & '`' result = '`' & x & '`'