restructure

dub.sdl

@@ -5,3 +5,10 @@ copyright "Copyright © 2025, tanya"
 license "MPL-2.0"
 dependency "commandr" version="~>1.1.0"
 dependency "taggedalgebraic" version="~>0.11.23"
+targetType "executable"
+buildRequirements "requireBoundsCheck" "requireContracts"
+
+configuration "jlox" {
+	sourcePaths "src/jlox"
+}
+

src/jlox/expr.d

@@ -1,11 +1,13 @@
+module jlox.expr;
+
 import std.conv;
 import std.stdio;
 import std.meta : AliasSeq;
 
 import taggedalgebraic;
 
-import token;
+import jlox.token;
-import tokentype;
+import jlox.tokentype;
 
 abstract class Expr{
 	interface Visitor(R){

src/jlox/main.d

@@ -1,3 +1,5 @@
+module jlox.main;
+
 import std.stdio;
 import std.file;
 import std.conv;
@@ -5,9 +7,9 @@ import std.exception;
 
 import commandr;
 
-import token;
+import jlox.token;
-import tokentype;
+import jlox.tokentype;
-import scanner;
+import jlox.scanner;
 
 static bool hadError = false;
 
@@ -45,7 +47,7 @@ void runPrompt(){
 	writeln();
 }
 
-int main(string[] argv){
+version(unittest) {} else int main(string[] argv){
 	auto args = new Program("lox")
 		.add(new Argument("path").optional.acceptsFiles)
 		.parse(argv);

src/jlox/scanner.d

@@ -1,9 +1,11 @@
+module jlox.scanner;
+
 import std.ascii;
 import std.conv;
 
-import token;
+import jlox.token;
-import tokentype;
+import jlox.tokentype;
-import main : error, report;
+import jlox.main : error, report;
 
 private bool isAlpha_(dchar c)    => c.isAlpha    || c == '_';
 private bool isAlphaNum_(dchar c) => c.isAlphaNum || c == '_';

src/jlox/token.d

@@ -1,8 +1,10 @@
+module jlox.token;
+
 import std.conv;
 
 import taggedalgebraic;
 
-import tokentype;
+import jlox.tokentype;
 
 struct TokenValue{
 	string str;

src/jlox/tokentype.d

@@ -1,3 +1,4 @@
+module jlox.tokentype;
 
 enum TokenType {
 	// Single-character tokens.