From b8e31c0bbb37eac36add398acb50982ba0fbd051 Mon Sep 17 00:00:00 2001 From: Nick Sabalausky Date: Thu, 1 Aug 2013 22:10:55 -0400 Subject: [PATCH] Fixed for 32-bit. --- ctags.d | 3 ++- main.d | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ctags.d b/ctags.d index 97fab6e..773b475 100644 --- a/ctags.d +++ b/ctags.d @@ -12,6 +12,7 @@ import std.algorithm; import std.range; import std.stdio; import std.array; +import std.conv; void doNothing(string, int, int, string) {} @@ -21,7 +22,7 @@ void printCtags(File output, string[] fileNames) foreach (fileName; fileNames) { File f = File(fileName); - auto bytes = uninitializedArray!(ubyte[])(f.size); + auto bytes = uninitializedArray!(ubyte[])(to!size_t(f.size)); f.rawRead(bytes); LexerConfig config; auto tokens = byToken(bytes, config); diff --git a/main.d b/main.d index 92ee9e8..a3d90b4 100644 --- a/main.d +++ b/main.d @@ -74,7 +74,7 @@ int main(string[] args) config.iterStyle = IterationStyle.everything; config.tokenStyle = TokenStyle.source; File f = args.length == 1 ? stdin : File(args[1]); - ubyte[] buffer = uninitializedArray!(ubyte[])(f.size); + ubyte[] buffer = uninitializedArray!(ubyte[])(to!size_t(f.size)); highlighter.highlight(byToken(f.rawRead(buffer), config), args.length == 1 ? "stdin" : args[1]); return 0; @@ -97,7 +97,7 @@ int main(string[] args) bool usingStdin = args.length == 3; config.fileName = usingStdin ? "stdin" : args[1]; File f = usingStdin ? stdin : File(args[1]); - auto bytes = usingStdin ? cast(ubyte[]) [] : uninitializedArray!(ubyte[])(f.size); + auto bytes = usingStdin ? cast(ubyte[]) [] : uninitializedArray!(ubyte[])(to!size_t(f.size)); f.rawRead(bytes); auto tokens = byToken(bytes, config); @@ -107,7 +107,7 @@ int main(string[] args) } else if (tokenCount) { - printTokenCount(stdout, tokens, f.size); + printTokenCount(stdout, tokens, to!size_t(f.size)); } else if (syntaxCheck) {