diff options
author | John Hodge (Mutabah) <acessdev@gmail.com> | 2016-12-25 17:19:27 +1100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-25 17:19:27 +1100 |
commit | 753a2f44cc4c00b952cddae2ceed066ebb18a470 (patch) | |
tree | ed4bbff4be39c44c57164641f4ed32b5ad4675f0 /src/expand/include.cpp | |
parent | d12a8a886caf2e0edf33c1af831b1df990d2c892 (diff) | |
parent | 0c14c734fa32014fd24297ccdbed927016185ffd (diff) | |
download | mrust-753a2f44cc4c00b952cddae2ceed066ebb18a470.tar.gz |
Merge pull request #11 from ubsan/whitespace-fix
No more tears!
Diffstat (limited to 'src/expand/include.cpp')
-rw-r--r-- | src/expand/include.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/expand/include.cpp b/src/expand/include.cpp index 83a2aa03..6b1a5508 100644 --- a/src/expand/include.cpp +++ b/src/expand/include.cpp @@ -22,7 +22,7 @@ namespace { return base_path + path; } else { - + auto slash = base_path.find_last_of('/'); if( slash == ::std::string::npos ) { @@ -48,17 +48,17 @@ class CIncludeExpander: { if( ident != "" ) ERROR(sp, E0000, "include! doesn't take an ident"); - + Token tok; auto lex = TTStream(tt); - + // TODO: Parse+expand GET_CHECK_TOK(tok, lex, TOK_STRING); auto path = mv$(tok.str()); GET_CHECK_TOK(tok, lex, TOK_EOF); - + ::std::string file_path = get_path_relative_to(mod.m_file_info.path, mv$(path)); - + return box$( Lexer(file_path) ); } }; |