diff options
| author | Ganesh Viswanathan <dev@genotrance.com> | 2018-09-14 18:44:54 -0500 |
|---|---|---|
| committer | Ganesh Viswanathan <dev@genotrance.com> | 2018-09-14 18:44:54 -0500 |
| commit | 31860f560e855e3a6269a25f57e4ca7c8a2ef950 (patch) | |
| tree | 12d73b08c275e6539d152d7b8d076935672e7a23 /compiler/parser.nim | |
| parent | 71ce2ddf838824dec9ca2d59490f69671cda5143 (diff) | |
| parent | b9dc486db15bb1b4b6f3cef7626733b904d377f7 (diff) | |
| download | Nim-31860f560e855e3a6269a25f57e4ca7c8a2ef950.tar.gz | |
Merge remote-tracking branch 'upstream/devel' into test-6434
Diffstat (limited to 'compiler/parser.nim')
| -rw-r--r-- | compiler/parser.nim | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/compiler/parser.nim b/compiler/parser.nim index 9f1b947f6..7667d3a0e 100644 --- a/compiler/parser.nim +++ b/compiler/parser.nim @@ -27,7 +27,8 @@ when isMainModule: outp.close import - llstream, lexer, idents, strutils, ast, astalgo, msgs, options, lineinfos + llstream, lexer, idents, strutils, ast, astalgo, msgs, options, lineinfos, + pathutils when defined(nimpretty2): import layouter @@ -114,7 +115,7 @@ proc openParser*(p: var TParser, fileIdx: FileIndex, inputStream: PLLStream, p.strongSpaces = strongSpaces p.emptyNode = newNode(nkEmpty) -proc openParser*(p: var TParser, filename: string, inputStream: PLLStream, +proc openParser*(p: var TParser, filename: AbsoluteFile, inputStream: PLLStream, cache: IdentCache; config: ConfigRef; strongSpaces=false) = openParser(p, fileInfoIdx(config, filename), inputStream, cache, config, strongSpaces) @@ -2238,7 +2239,7 @@ proc parseString*(s: string; cache: IdentCache; config: ConfigRef; # XXX for now the builtin 'parseStmt/Expr' functions do not know about strong # spaces... parser.lex.errorHandler = errorHandler - openParser(parser, filename, stream, cache, config, false) + openParser(parser, AbsoluteFile filename, stream, cache, config, false) result = parser.parseAll closeParser(parser) |