diff options
| author | Araq <rumpf_a@web.de> | 2012-09-26 02:22:22 +0200 |
|---|---|---|
| committer | Araq <rumpf_a@web.de> | 2012-09-26 02:22:22 +0200 |
| commit | ca447be43ea6fd0537c4c74bb653fb2abbfb0177 (patch) | |
| tree | ebcceedb361d5b26c5328ee57cdac45fd8f2e88a /compiler | |
| parent | 92b0d640180c02489061eada2cb585f05e61eebc (diff) | |
| download | Nim-ca447be43ea6fd0537c4c74bb653fb2abbfb0177.tar.gz | |
bugfix: c2nim and pas2nim work again
Diffstat (limited to 'compiler')
| -rwxr-xr-x | compiler/c2nim/cparse.nim | 5 | ||||
| -rwxr-xr-x | compiler/nversion.nim | 2 | ||||
| -rwxr-xr-x | compiler/pas2nim/pasparse.nim | 5 |
3 files changed, 8 insertions, 4 deletions
diff --git a/compiler/c2nim/cparse.nim b/compiler/c2nim/cparse.nim index 5715e1089..cb023411d 100755 --- a/compiler/c2nim/cparse.nim +++ b/compiler/c2nim/cparse.nim @@ -923,8 +923,9 @@ proc declaration(p: var TParser): PNode = addSon(pragmas, newIdentNodeP("cdecl", p)) elif pfStdcall in p.options.flags: addSon(pragmas, newIdentNodeP("stdcall", p)) - addSon(result, exportSym(p, name, origName), ast.emptyNode) # no generics - addSon(result, params, pragmas) + # no pattern, no exceptions: + addSon(result, exportSym(p, name, origName), ast.emptyNode, ast.emptyNode) + addSon(result, params, pragmas, ast.emptyNode) # no exceptions case p.tok.xkind of pxSemicolon: getTok(p) diff --git a/compiler/nversion.nim b/compiler/nversion.nim index 9d1e5406d..d60a7a445 100755 --- a/compiler/nversion.nim +++ b/compiler/nversion.nim @@ -15,7 +15,7 @@ const defaultAsmMarkerSymbol* = '!' VersionMajor* = 0 VersionMinor* = 9 - VersionPatch* = 0 + VersionPatch* = 1 VersionAsString* = $VersionMajor & "." & $VersionMinor & "." & $VersionPatch RodFileVersion* = "1210" # modify this if the rod-format changes! diff --git a/compiler/pas2nim/pasparse.nim b/compiler/pas2nim/pasparse.nim index da716c621..61d57dec3 100755 --- a/compiler/pas2nim/pasparse.nim +++ b/compiler/pas2nim/pasparse.nim @@ -1346,10 +1346,13 @@ proc parseRoutine(p: var TParser): PNode = skipCom(p, result) expectIdent(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)) opt(p, pxSemicolon) addSon(result, parseRoutineSpecifiers(p, noBody)) + addSon(result, ast.emptyNode) if (p.section == seInterface) or noBody: addSon(result, ast.emptyNode) else: |