diff options
| author | bptato <nincsnevem662@gmail.com> | 2024-10-27 21:49:13 +0100 |
|---|---|---|
| committer | bptato <nincsnevem662@gmail.com> | 2024-10-27 21:49:13 +0100 |
| commit | f7e0e02b89709b8d6592b3d570d8916a07ae2b79 (patch) | |
| tree | 6f2de3d777b5d9a4d536a567d77dd667a04adf77 | |
| parent | a3aec669d0efb3ef94fee8b6a5f8283ba2d8b383 (diff) | |
| download | chawan-f7e0e02b89709b8d6592b3d570d8916a07ae2b79.tar.gz | |
Clean up forward declarations a bit
| -rw-r--r-- | src/css/cascade.nim | 5 | ||||
| -rw-r--r-- | src/css/match.nim | 4 | ||||
| -rw-r--r-- | src/html/catom.nim | 13 | ||||
| -rw-r--r-- | src/html/chadombuilder.nim | 4 | ||||
| -rw-r--r-- | src/html/dom.nim | 94 | ||||
| -rw-r--r-- | src/html/env.nim | 6 | ||||
| -rw-r--r-- | src/html/event.nim | 8 | ||||
| -rw-r--r-- | src/html/script.nim | 4 | ||||
| -rw-r--r-- | src/html/xmlhttprequest.nim | 2 |
9 files changed, 72 insertions, 68 deletions
diff --git a/src/css/cascade.nim b/src/css/cascade.nim index dea481db..5f2c7472 100644 --- a/src/css/cascade.nim +++ b/src/css/cascade.nim @@ -76,8 +76,6 @@ func applies*(mqlist: MediaQueryList; window: Window): bool = return true return false -appliesFwdDecl = applies - type ToSorts = array[PseudoElem, seq[(int, CSSRuleDef)]] @@ -577,3 +575,6 @@ proc applyStylesheets*(document: Document; uass, userss: CSSStylesheet; let uass = uass.applyMediaQuery(document.window) let userss = userss.applyMediaQuery(document.window) return document.applyRules(uass, userss, previousStyled) + +# Forward declaration hack +appliesImpl = applies diff --git a/src/css/match.nim b/src/css/match.nim index fe9e7054..05c9f742 100644 --- a/src/css/match.nim +++ b/src/css/match.nim @@ -244,14 +244,14 @@ func selectorsMatch*[T: Element|StyledNode](elem: T; cxsel: ComplexSelector; return elem.complexSelectorMatches(cxsel, felem) # Forward declaration hack -doqsa = proc(node: Node; q: string): seq[Element] = +querySelectorAllImpl = proc(node: Node; q: string): seq[Element] = result = @[] let selectors = parseSelectors(q, node.document.factory) for element in node.elements: if element.selectorsMatch(selectors): result.add(element) -doqs = proc(node: Node; q: string): Element = +querySelectorImpl = proc(node: Node; q: string): Element = let selectors = parseSelectors(q, node.document.factory) for element in node.elements: if element.selectorsMatch(selectors): diff --git a/src/html/catom.nim b/src/html/catom.nim index 93fbafcb..c0263d95 100644 --- a/src/html/catom.nim +++ b/src/html/catom.nim @@ -198,29 +198,30 @@ func toStaticAtom*(factory: CAtomFactory; atom: CAtom): StaticAtom = return StaticAtom(i) return atUnknown -var getFactory*: proc(ctx: JSContext): CAtomFactory {.nimcall, noSideEffect, +# Forward declaration hack +var getFactoryImpl*: proc(ctx: JSContext): CAtomFactory {.nimcall, noSideEffect, raises: [].} proc toAtom*(ctx: JSContext; atom: StaticAtom): CAtom = - return ctx.getFactory().toAtom(atom) + return ctx.getFactoryImpl().toAtom(atom) proc toStaticAtom*(ctx: JSContext; atom: CAtom): StaticAtom = - return ctx.getFactory().toStaticAtom(atom) + return ctx.getFactoryImpl().toStaticAtom(atom) proc fromJS*(ctx: JSContext; val: JSValue; res: var CAtom): Opt[void] = var s: string ?ctx.fromJS(val, s) - res = ctx.getFactory().toAtom(s) + res = ctx.getFactoryImpl().toAtom(s) return ok() proc fromJS*(ctx: JSContext; val: JSAtom; res: var CAtom): Opt[void] = var s: string ?ctx.fromJS(val, s) - res = ctx.getFactory().toAtom(s) + res = ctx.getFactoryImpl().toAtom(s) return ok() proc toJS*(ctx: JSContext; atom: CAtom): JSValue = - return ctx.toJS(ctx.getFactory().toStr(atom)) + return ctx.toJS(ctx.getFactoryImpl().toStr(atom)) proc toJS*(ctx: JSContext; atom: StaticAtom): JSValue = return ctx.toJS($atom) diff --git a/src/html/chadombuilder.nim b/src/html/chadombuilder.nim index 7b8c2102..42c74bf7 100644 --- a/src/html/chadombuilder.nim +++ b/src/html/chadombuilder.nim @@ -365,8 +365,8 @@ proc parseFromString*(ctx: JSContext; parser: DOMParser; str, t: string): return errTypeError("Invalid mime type") # Forward declaration hack -domParseHTMLFragment = parseHTMLFragment -domParseDocumentWriteChunk = parseDocumentWriteChunk +parseHTMLFragmentImpl = parseHTMLFragment +parseDocumentWriteChunkImpl = parseDocumentWriteChunk proc addHTMLModule*(ctx: JSContext) = ctx.registerType(DOMParser) diff --git a/src/html/dom.nim b/src/html/dom.nim index c40bd344..08607f65 100644 --- a/src/html/dom.nim +++ b/src/html/dom.nim @@ -474,17 +474,19 @@ proc setInvalid*(element: Element) # Forward declaration hacks # set in css/cascade -var appliesFwdDecl*: proc(mqlist: MediaQueryList; window: Window): bool +var appliesImpl*: proc(mqlist: MediaQueryList; window: Window): bool {.nimcall, noSideEffect.} # set in css/match -var doqsa*: proc (node: Node; q: string): seq[Element] {.nimcall.} = nil -var doqs*: proc (node: Node; q: string): Element {.nimcall.} = nil +var querySelectorAllImpl*: proc (node: Node; q: string): seq[Element] + {.nimcall.} = nil +var querySelectorImpl*: proc (node: Node; q: string): Element + {.nimcall.} = nil # set in html/chadombuilder -var domParseHTMLFragment*: proc(element: Element; s: string): seq[Node] +var parseHTMLFragmentImpl*: proc(element: Element; s: string): seq[Node] {.nimcall.} -var domParseDocumentWriteChunk*: proc(wrapper: RootRef) {.nimcall.} +var parseDocumentWriteChunkImpl*: proc(wrapper: RootRef) {.nimcall.} # set in html/env -var windowFetch*: proc(window: Window; input: JSValue; +var fetchImpl*: proc(window: Window; input: JSValue; init = RequestInit(window: JS_UNDEFINED)): JSResult[FetchPromise] {.nimcall.} = nil @@ -2068,7 +2070,7 @@ proc write(ctx: JSContext; document: Document; args: varargs[JSValue]): text &= s buffer.data &= text if document.parserBlockingScript == nil: - domParseDocumentWriteChunk(document.parser) + parseDocumentWriteChunkImpl(document.parser) return ok() func findFirst*(document: Document; tagType: TagType): HTMLElement = @@ -2590,40 +2592,6 @@ func findAutoFocus*(document: Document): Element = return child return nil -# Forward declaration hack -isDefaultPassive = func(target: EventTarget): bool = - if target of Window: - return true - if not (target of Node): - return false - let node = Node(target) - return EventTarget(node.document) == target or - EventTarget(node.document.documentElement) == target or - EventTarget(node.document.body) == target - -getParent = proc(ctx: JSContext; eventTarget: EventTarget; event: Event): - EventTarget = - if eventTarget of Node: - if eventTarget of Document: - if event.ctype == ctx.toAtom(satLoad): - return nil - # if no browsing context, then window will be nil anyway - return Document(eventTarget).window - return Node(eventTarget).parentNode - return nil - -getFactory = proc(ctx: JSContext): CAtomFactory = - return ctx.getGlobal().factory - -windowConsoleError = proc(ctx: JSContext; ss: varargs[string]) = - ctx.getGlobal().console.error(ss) - -getAPIBaseURLImpl = func(ctx: JSContext): URL = - let window = ctx.getWindow() - if window == nil or window.document == nil: - return nil - return window.document.baseURL - proc fireEvent*(window: Window; name: StaticAtom; target: EventTarget) = let event = newEvent(window.toAtom(name), target) discard window.jsctx.dispatch(target, event) @@ -3138,7 +3106,7 @@ proc loadResource(window: Window; link: HTMLLinkElement) = if media != "": let cvals = parseComponentValues(media) let media = parseMediaQueryList(cvals) - applies = media.appliesFwdDecl(window) + applies = media.appliesImpl(window) let p = window.loader.fetch( newRequest(url) ).then(proc(res: JSResult[Response]): Promise[JSResult[string]] = @@ -4043,7 +4011,7 @@ proc fetchSingleModule(element: HTMLScriptElement; url: URL; #TODO performFetch let ctx = window.jsctx let v = ctx.toJS(request) - let p = window.windowFetch(v) + let p = window.fetchImpl(v) JS_FreeValue(ctx, v) if p.isSome: p.get.then(proc(res: JSResult[Response]) = @@ -4455,10 +4423,10 @@ func isSameNode(node, other: Node): bool {.jsfunc.} = return node == other proc querySelectorAll(node: Node; q: string): seq[Element] {.jsfunc.} = - return doqsa(node, q) + return node.querySelectorAllImpl(q) proc querySelector(node: Node; q: string): Element {.jsfunc.} = - return doqs(node, q) + return node.querySelectorImpl(q) const (ReflectTable, TagReflectMap, ReflectAllStartIndex) = (func(): ( seq[ReflectEntry], @@ -4657,7 +4625,7 @@ proc toBlob(ctx: JSContext; this: HTMLCanvasElement; callback: JSValue; # https://w3c.github.io/DOM-Parsing/#dfn-fragment-parsing-algorithm proc fragmentParsingAlgorithm*(element: Element; s: string): DocumentFragment = #TODO xml - let newChildren = domParseHTMLFragment(element, s) + let newChildren = parseHTMLFragmentImpl(element, s) let fragment = element.document.newDocumentFragment() for child in newChildren: fragment.append(child) @@ -4796,3 +4764,37 @@ proc addDOMModule*(ctx: JSContext) = ctx.registerType(TextMetrics) ctx.registerType(CSSStyleDeclaration) ctx.registerElements(nodeCID) + +# Forward declaration hack +isDefaultPassiveImpl = func(target: EventTarget): bool = + if target of Window: + return true + if not (target of Node): + return false + let node = Node(target) + return EventTarget(node.document) == target or + EventTarget(node.document.documentElement) == target or + EventTarget(node.document.body) == target + +getParentImpl = proc(ctx: JSContext; eventTarget: EventTarget; event: Event): + EventTarget = + if eventTarget of Node: + if eventTarget of Document: + if event.ctype == ctx.toAtom(satLoad): + return nil + # if no browsing context, then window will be nil anyway + return Document(eventTarget).window + return Node(eventTarget).parentNode + return nil + +getFactoryImpl = proc(ctx: JSContext): CAtomFactory = + return ctx.getGlobal().factory + +errorImpl = proc(ctx: JSContext; ss: varargs[string]) = + ctx.getGlobal().console.error(ss) + +getAPIBaseURLImpl = func(ctx: JSContext): URL = + let window = ctx.getWindow() + if window == nil or window.document == nil: + return nil + return window.document.baseURL diff --git a/src/html/env.nim b/src/html/env.nim index d550430d..8678bdcc 100644 --- a/src/html/env.nim +++ b/src/html/env.nim @@ -173,9 +173,6 @@ proc fetch(window: Window; input: JSValue; return ok(newResolvedPromise(JSResult[Response].err(err))) return ok(window.loader.fetch(input.request)) -# Forward declaration hack -windowFetch = fetch - proc setTimeout(window: Window; handler: JSValue; timeout = 0i32; args: varargs[JSValue]): int32 {.jsfunc.} = return window.timeouts.setTimeout(ttTimeout, handler, timeout, args) @@ -344,3 +341,6 @@ proc newWindow*(scripting, images, styling: bool; attrs: WindowAttributes; if scripting: window.addScripting() return window + +# Forward declaration hack +fetchImpl = fetch diff --git a/src/html/event.nim b/src/html/event.nim index 732af7bc..247a88a4 100644 --- a/src/html/event.nim +++ b/src/html/event.nim @@ -66,9 +66,9 @@ jsDestructor(CustomEvent) jsDestructor(EventTarget) # Forward declaration hack -var isDefaultPassive*: proc(target: EventTarget): bool {.nimcall, +var isDefaultPassiveImpl*: proc(target: EventTarget): bool {.nimcall, noSideEffect.} = nil -var getParent*: proc(ctx: JSContext; target: EventTarget; event: Event): +var getParentImpl*: proc(ctx: JSContext; target: EventTarget; event: Event): EventTarget {.nimcall.} type @@ -187,7 +187,7 @@ proc defaultPassiveValue(ctx: JSContext; ctype: CAtom; const check = [satTouchstart, satTouchmove, satWheel, satMousewheel] if ctx.toStaticAtom(ctype) in check: return true - return eventTarget.isDefaultPassive() + return eventTarget.isDefaultPassiveImpl() proc findEventListener(eventTarget: EventTarget; ctype: CAtom; callback: EventListenerCallback; capture: bool): int = @@ -321,7 +321,7 @@ proc dispatch*(ctx: JSContext; target: EventTarget; event: Event): bool = var target = target while target != nil and not stop: ctx.dispatchEvent0(event, target, stop, canceled) - target = ctx.getParent(target, event) + target = ctx.getParentImpl(target, event) event.flags.excl(efDispatch) return canceled diff --git a/src/html/script.nim b/src/html/script.nim index 1cc80c5d..00b1e982 100644 --- a/src/html/script.nim +++ b/src/html/script.nim @@ -79,7 +79,7 @@ type # Forward declaration hack # set in html/dom -var windowConsoleError*: proc(ctx: JSContext; ss: varargs[string]) {.nimcall.} +var errorImpl*: proc(ctx: JSContext; ss: varargs[string]) {.nimcall.} proc find*(moduleMap: ModuleMap; url: URL; moduleType: string): int = let surl = $url @@ -134,4 +134,4 @@ proc newJSModuleScript*(ctx: JSContext; source: string; baseURL: URL; ) proc logException*(ctx: JSContext) = - windowConsoleError(ctx, ctx.getExceptionMsg()) + ctx.errorImpl(ctx.getExceptionMsg()) diff --git a/src/html/xmlhttprequest.nim b/src/html/xmlhttprequest.nim index 67123904..c1677bbd 100644 --- a/src/html/xmlhttprequest.nim +++ b/src/html/xmlhttprequest.nim @@ -309,7 +309,7 @@ proc send(ctx: JSContext; this: XMLHttpRequest; body = JS_NULL): JSResult[void] if xhrfSync notin this.flags: # async window.fireProgressEvent(this, satLoadstart, 0, 0) let v = ctx.toJS(jsRequest) - let p = window.windowFetch(v) + let p = window.fetchImpl(v) JS_FreeValue(ctx, v) if p.isNone: return err(p.error) |