Local merge

test/benchopts

@@ -1,2 +0,0 @@
--version=Benchmark -inline -release -O -noboundscheck -I.. -I../src
-

test/d6502/base.d

@@ -1,10 +1,10 @@
-module test.base;
+module test.d6502.base;
 
 
 import std.algorithm, std.array, std.conv, std.exception, std.getopt,
        std.stdio, std.string;
 
-import test.cpu, test.opcodes;
+import test.d6502.cpu, test.d6502.opcodes;
 import cpu.data_d6502;
 
 
@@ -3414,7 +3414,7 @@ struct CheckOptions
                 op = op[2..$];
             if (isNumeric(op))
             {
-                int code = to!int(op, 16);
+                int code = parse!(int, string)(op, 16);
                 if (code >= 0x00 && code <= 0xFF)
                 {
                     codes6502 ~= [cast(ubyte)code];

test/d6502/benchopts

@@ -0,0 +1,2 @@
+-version=Benchmark -inline -release -O -noboundscheck -I../.. -I../../src
+

test/d6502/cpu.d

@@ -3,14 +3,14 @@
  * implementation, or that may be useful to any test which requires a
  * cpu (as opposed to testing the cpu itself).
  */
-module test.cpu;
+module test.d6502.cpu;
 
 
 import std.conv, std.exception, std.random, std.string, std.traits;
 
 public import cpu.d6502 : Cpu, is6502, is65C02;
 
-import test.base : strict, cumulative;
+import test.d6502.base : strict, cumulative;
 
 
 // True if T is the type of a cpu.

test/d6502/opcodes.d

@@ -1,7 +1,7 @@
-module test.opcodes;
+module test.d6502.opcodes;
 
 
-import test.cpu;
+import test.d6502.cpu;
 
 
 // 2-cycle opcodes which neither read nor write.

test/d6502/runtests.d

@@ -134,7 +134,8 @@ void runTest(OpDefs def, Tests test, string[] args)
             writeln("With strict=", s, " cumulative=", c);
             string cmdline = defStrings[def] ~ stStrings[s] ~ cmStrings[c] ~
                              fNames[test] ~ join(args, " ");
-            system("rdmd --force -I.. -I../src -version=RunTest " ~ cmdline);
+            system("rdmd --force -I../.. -I../../src -version=RunTest " ~
+                   cmdline);
         }
     }
 }

test/d6502/test_bus.d

@@ -1,6 +1,6 @@
 import std.stdio;
 
-import test.base, test.cpu;
+import test.d6502.base, test.d6502.cpu;
 
 
 void main(string[] args)

test/d6502/test_decimal.d

@@ -1,6 +1,6 @@
 import std.stdio;
 
-import test.base, test.cpu;
+import test.d6502.base, test.d6502.cpu;
 
 
 void testDecimalMode(T)()

test/d6502/test_func.d

@@ -1,6 +1,6 @@
 import std.stdio;
 
-import test.base, test.cpu;
+import test.d6502.base, test.d6502.cpu;
 
 
 void main(string[] args)

test/testopts

@@ -1,2 +0,0 @@
--I.. -I../src -g
-