diff options
| author | Miguel <leu-gim@moy-server.ru> | 2014-01-26 05:37:18 +0400 |
|---|---|---|
| committer | Miguel <leu-gim@moy-server.ru> | 2014-01-26 05:37:18 +0400 |
| commit | a8b4e3c764dd967e1ac90305a574c4cd5e0d019b (patch) | |
| tree | 9165419d8557b493bf65a3de04f248ae6f2288b9 /compiler/c2nim/cpp.nim | |
| parent | 4396270fc7c447fa7ce9478a6bf9682ba7c496a7 (diff) | |
| parent | 5d712e0d3f9f5b8e486720c8bedd749656b527d8 (diff) | |
| download | Nim-a8b4e3c764dd967e1ac90305a574c4cd5e0d019b.tar.gz | |
Merge branch 'devel' of git://github.com/Araq/Nimrod
Diffstat (limited to 'compiler/c2nim/cpp.nim')
| -rw-r--r-- | compiler/c2nim/cpp.nim | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/compiler/c2nim/cpp.nim b/compiler/c2nim/cpp.nim index 2ce64e59b..1707b75db 100644 --- a/compiler/c2nim/cpp.nim +++ b/compiler/c2nim/cpp.nim @@ -226,7 +226,7 @@ proc skipUntilElifElseEndif(p: var TParser): TEndifMarker = proc parseIfdef(p: var TParser): PNode = getTok(p) # skip #ifdef - ExpectIdent(p) + expectIdent(p) case p.tok.s of "__cplusplus": skipUntilEndif(p) @@ -245,7 +245,7 @@ proc parseIfdef(p: var TParser): PNode = proc parseIfndef(p: var TParser): PNode = result = ast.emptyNode getTok(p) # skip #ifndef - ExpectIdent(p) + expectIdent(p) if p.tok.s == c2nimSymbol: skipLine(p) case skipUntilElifElseEndif(p) @@ -282,11 +282,11 @@ proc parseIfDir(p: var TParser): PNode = proc parsePegLit(p: var TParser): TPeg = var col = getColumn(p.lex) + 2 getTok(p) - if p.tok.xkind != pxStrLit: ExpectIdent(p) + if p.tok.xkind != pxStrLit: expectIdent(p) try: result = parsePeg( pattern = if p.tok.xkind == pxStrLit: p.tok.s else: escapePeg(p.tok.s), - filename = p.lex.fileIdx.ToFilename, + filename = p.lex.fileIdx.toFilename, line = p.lex.linenumber, col = col) getTok(p) @@ -295,7 +295,7 @@ proc parsePegLit(p: var TParser): TPeg = proc parseMangleDir(p: var TParser) = var pattern = parsePegLit(p) - if p.tok.xkind != pxStrLit: ExpectIdent(p) + if p.tok.xkind != pxStrLit: expectIdent(p) p.options.mangleRules.add((pattern, p.tok.s)) getTok(p) eatNewLine(p, nil) @@ -326,7 +326,7 @@ proc parseDir(p: var TParser): PNode = of "dynlib", "header", "prefix", "suffix", "class": var key = p.tok.s getTok(p) - if p.tok.xkind != pxStrLit: ExpectIdent(p) + if p.tok.xkind != pxStrLit: expectIdent(p) discard setOption(p.options, key, p.tok.s) getTok(p) eatNewLine(p, nil) |