From c2ade9061b12e841d3a27b29acfaa51452bb780a Mon Sep 17 00:00:00 2001 From: Pierre Tachoire Date: Fri, 5 Jan 2024 11:04:17 +0100 Subject: [PATCH] move window from nav to html --- src/apiweb.zig | 2 -- src/browser/browser.zig | 2 +- src/html/html.zig | 2 ++ src/{nav => html}/window.zig | 0 src/main_wpt.zig | 1 - src/nav/nav.zig | 7 ------- 6 files changed, 3 insertions(+), 11 deletions(-) rename src/{nav => html}/window.zig (100%) delete mode 100644 src/nav/nav.zig diff --git a/src/apiweb.zig b/src/apiweb.zig index 32831909..08f4c3f5 100644 --- a/src/apiweb.zig +++ b/src/apiweb.zig @@ -4,7 +4,6 @@ const Console = @import("jsruntime").Console; const DOM = @import("dom/dom.zig"); const HTML = @import("html/html.zig"); -const nav = @import("nav/nav.zig"); pub const HTMLDocument = @import("html/document.zig").HTMLDocument; @@ -13,5 +12,4 @@ pub const Interfaces = generate.Tuple(.{ Console, DOM.Interfaces, HTML.Interfaces, - nav.Interfaces, }); diff --git a/src/browser/browser.zig b/src/browser/browser.zig index d52845fa..2111e290 100644 --- a/src/browser/browser.zig +++ b/src/browser/browser.zig @@ -12,7 +12,7 @@ const TPL = jsruntime.TPL; const apiweb = @import("../apiweb.zig"); const apis = jsruntime.compile(apiweb.Interfaces); -const Window = @import("../nav/window.zig").Window; +const Window = @import("../html/window.zig").Window; const Walker = @import("../dom/html_collection.zig").WalkerDepthFirst; const FetchResult = std.http.Client.FetchResult; diff --git a/src/html/html.zig b/src/html/html.zig index a77e2cea..90d96f2b 100644 --- a/src/html/html.zig +++ b/src/html/html.zig @@ -2,10 +2,12 @@ const generate = @import("../generate.zig"); const HTMLDocument = @import("document.zig").HTMLDocument; const HTMLElem = @import("elements.zig"); +const Window = @import("window.zig").Window; pub const Interfaces = generate.Tuple(.{ HTMLDocument, HTMLElem.HTMLElement, HTMLElem.HTMLMediaElement, HTMLElem.Interfaces, + Window, }); diff --git a/src/nav/window.zig b/src/html/window.zig similarity index 100% rename from src/nav/window.zig rename to src/html/window.zig diff --git a/src/main_wpt.zig b/src/main_wpt.zig index e252ad52..4d4dde57 100644 --- a/src/main_wpt.zig +++ b/src/main_wpt.zig @@ -7,7 +7,6 @@ const FileLoader = @import("wpt/fileloader.zig").FileLoader; const wpt = @import("wpt/run.zig"); const apiweb = @import("apiweb.zig"); -const nav = @import("nav/nav.zig"); const HTMLElem = @import("html/elements.zig"); const wpt_dir = "tests/wpt"; diff --git a/src/nav/nav.zig b/src/nav/nav.zig deleted file mode 100644 index 9aa96f3a..00000000 --- a/src/nav/nav.zig +++ /dev/null @@ -1,7 +0,0 @@ -const generate = @import("../generate.zig"); - -const Window = @import("window.zig").Window; - -pub const Interfaces = generate.Tuple(.{ - Window, -});