Fix linter errors

This commit is contained in:
Eduard Staniloiu 2022-02-10 16:29:29 +02:00 committed by Albert24GG
parent f79fcf54fb
commit fc8aef9ebd
1 changed files with 7 additions and 5 deletions

View File

@ -22,6 +22,7 @@ import dmd.identifier;
import core.memory; import core.memory;
import std.stdio; import std.stdio;
import std.file; import std.file;
import std.conv : to;
extern(C++) class ImportVisitor(AST) : ParseTimeTransitiveVisitor!AST extern(C++) class ImportVisitor(AST) : ParseTimeTransitiveVisitor!AST
{ {
@ -34,7 +35,7 @@ extern(C++) class ImportVisitor(AST) : ParseTimeTransitiveVisitor!AST
override void visit(AST.Import imp) override void visit(AST.Import imp)
{ {
import std.conv; import std.conv : to;
string s; string s;
foreach (const pid; imp.packages) foreach (const pid; imp.packages)
@ -56,7 +57,8 @@ private void visitFile(bool usingStdin, string fileName, RedBlackTree!string imp
auto id = Identifier.idPool(fileName); auto id = Identifier.idPool(fileName);
auto m = new ASTBase.Module(&(fileName.dup)[0], id, false, false); auto m = new ASTBase.Module(&(fileName.dup)[0], id, false, false);
auto input = readText(fileName); ubyte[] bytes = usingStdin ? readStdin() : readFile(fileName);
auto input = cast(char[]) bytes;
scope p = new Parser!ASTBase(m, input, false); scope p = new Parser!ASTBase(m, input, false);
p.nextToken(); p.nextToken();
@ -127,9 +129,8 @@ void printImports(bool usingStdin, string[] args, string[] importPaths, bool rec
unittest unittest
{ {
import std.stdio; import std.stdio : File;
import std.file; import std.file : exists, remove;
import core.stdc.stdio;
auto deleteme = "test.txt"; auto deleteme = "test.txt";
File file = File(deleteme, "w"); File file = File(deleteme, "w");
@ -156,5 +157,6 @@ unittest
expected.insert("std.fish"); expected.insert("std.fish");
expected.insert("std.file"); expected.insert("std.file");
expected.insert("std.experimental.dragon"); expected.insert("std.experimental.dragon");
assert(expected == importedFiles); assert(expected == importedFiles);
} }