From a21c16d7e5c475fd814781067eea7a0ed4f724ea Mon Sep 17 00:00:00 2001 From: nazrin Date: Mon, 2 Jun 2025 02:12:43 +0000 Subject: [PATCH] Moved util.d to src/common/ --- dub.sdl | 2 +- src/{jlox => common}/util.d | 2 +- src/jlox/environment.d | 2 +- src/jlox/expr.d | 2 +- src/jlox/loxfunction.d | 2 +- src/jlox/parser.d | 2 +- src/jlox/stmt.d | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) rename src/{jlox => common}/util.d (85%) diff --git a/dub.sdl b/dub.sdl index 5808c6a..58a534e 100644 --- a/dub.sdl +++ b/dub.sdl @@ -11,6 +11,6 @@ buildRequirements "requireBoundsCheck" "requireContracts" versions "LoxConcatNonStrings" "LoxExtraNativeFuncs" configuration "jlox" { - sourcePaths "src/jlox" + sourcePaths "src/jlox" "src/common" } diff --git a/src/jlox/util.d b/src/common/util.d similarity index 85% rename from src/jlox/util.d rename to src/common/util.d index 0a650cd..14e0917 100644 --- a/src/jlox/util.d +++ b/src/common/util.d @@ -1,4 +1,4 @@ -module jlox.util; +module common.util; template defaultCtor(){ this(Args...)(auto ref Args args){ diff --git a/src/jlox/environment.d b/src/jlox/environment.d index 8cd3c38..06023dc 100644 --- a/src/jlox/environment.d +++ b/src/jlox/environment.d @@ -2,7 +2,7 @@ module jlox.environment; import jlox.token; import jlox.interpreter; -import jlox.util; +import common.util; class Environment{ Environment enclosing; diff --git a/src/jlox/expr.d b/src/jlox/expr.d index e942d4d..2aea4b1 100644 --- a/src/jlox/expr.d +++ b/src/jlox/expr.d @@ -8,7 +8,7 @@ import taggedalgebraic; import jlox.token; import jlox.tokentype; -import jlox.util; +import common.util; abstract class Expr{ interface Visitor(R){ diff --git a/src/jlox/loxfunction.d b/src/jlox/loxfunction.d index 16c5878..85bbb32 100644 --- a/src/jlox/loxfunction.d +++ b/src/jlox/loxfunction.d @@ -6,7 +6,7 @@ import jlox.token; import jlox.stmt; import jlox.interpreter; import jlox.environment; -import jlox.util; +import common.util; class LoxFunction : LoxCallable{ private Stmt.Function declaration; diff --git a/src/jlox/parser.d b/src/jlox/parser.d index 4f88207..6ebc002 100644 --- a/src/jlox/parser.d +++ b/src/jlox/parser.d @@ -4,7 +4,7 @@ import std.stdio; import jlox.token; import jlox.tokentype; -import jlox.util; +import common.util; import jlox.expr; import jlox.main; import jlox.stmt; diff --git a/src/jlox/stmt.d b/src/jlox/stmt.d index 8310bd6..ad701c8 100644 --- a/src/jlox/stmt.d +++ b/src/jlox/stmt.d @@ -6,7 +6,7 @@ import std.meta : AliasSeq; import jlox.token; import jlox.tokentype; -import jlox.util; +import common.util; import jlox.expr; abstract class Stmt{