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

bugfix: c2nim and pas2nim work again

Browse source
This commit is contained in:
Araq 2012-09-26 02:22:22 +02:00
commit ca447be43e
3 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compiler/c2nim/cparse.nim
View file

@ -923,8 +923,9 @@ proc declaration(p: var TParser): PNode =
addSon(pragmas, newIdentNodeP("cdecl", p)) addSon(pragmas, newIdentNodeP("cdecl", p))
elif pfStdcall in p.options.flags: elif pfStdcall in p.options.flags:
addSon(pragmas, newIdentNodeP("stdcall", p)) addSon(pragmas, newIdentNodeP("stdcall", p))
addSon(result, exportSym(p, name, origName), ast.emptyNode) # no generics # no pattern, no exceptions:
addSon(result, params, pragmas) addSon(result, exportSym(p, name, origName), ast.emptyNode, ast.emptyNode)
addSon(result, params, pragmas, ast.emptyNode) # no exceptions
case p.tok.xkind case p.tok.xkind
of pxSemicolon: of pxSemicolon:
getTok(p) getTok(p)

2
compiler/nversion.nim
View file

@ -15,7 +15,7 @@ const
defaultAsmMarkerSymbol* = '!' defaultAsmMarkerSymbol* = '!'
VersionMajor* = 0 VersionMajor* = 0
VersionMinor* = 9 VersionMinor* = 9
VersionPatch* = 0 VersionPatch* = 1
VersionAsString* = $VersionMajor & "." & $VersionMinor & "." & $VersionPatch VersionAsString* = $VersionMajor & "." & $VersionMinor & "." & $VersionPatch
RodFileVersion* = "1210" # modify this if the rod-format changes! RodFileVersion* = "1210" # modify this if the rod-format changes!

5
compiler/pas2nim/pasparse.nim
View file

@ -1346,10 +1346,13 @@ proc parseRoutine(p: var TParser): PNode =
skipCom(p, result) skipCom(p, result)
expectIdent(p) expectIdent(p)
addSon(result, identVis(p)) addSon(result, identVis(p))
addSon(result, ast.emptyNode) # generic parameters # patterns, generic parameters:
addSon(result, ast.emptyNode)
addSon(result, ast.emptyNode)
addSon(result, parseParamList(p)) addSon(result, parseParamList(p))
opt(p, pxSemicolon) opt(p, pxSemicolon)
addSon(result, parseRoutineSpecifiers(p, noBody)) addSon(result, parseRoutineSpecifiers(p, noBody))
addSon(result, ast.emptyNode)
if (p.section == seInterface) or noBody: if (p.section == seInterface) or noBody:
addSon(result, ast.emptyNode) addSon(result, ast.emptyNode)
else: else: