diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/html/chadombuilder.nim | 2 | ||||
| -rw-r--r-- | src/js/base64.nim | 2 | ||||
| -rw-r--r-- | src/js/encoding.nim | 2 | ||||
| -rw-r--r-- | src/server/buffer.nim | 2 | ||||
| -rw-r--r-- | src/version.nim | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/src/html/chadombuilder.nim b/src/html/chadombuilder.nim index 446972cf..afa0362d 100644 --- a/src/html/chadombuilder.nim +++ b/src/html/chadombuilder.nim @@ -372,7 +372,7 @@ proc parseFromString(ctx: JSContext; parser: DOMParser; str, t: string): builder.finish() return ok(builder.document) of "text/xml", "application/xml", "application/xhtml+xml", "image/svg+xml": - return err(newInternalError("XML parsing is not supported yet")) + return errInternalError("XML parsing is not supported yet") else: return errTypeError("Invalid mime type") diff --git a/src/js/base64.nim b/src/js/base64.nim index b6941ef6..c44fb5f6 100644 --- a/src/js/base64.nim +++ b/src/js/base64.nim @@ -12,7 +12,7 @@ proc atob*(data: string): DOMResult[NarrowString] = # Note: the actual atob implementation (atob0) is in twtstr. let r = atob0(data) if r.isNone: - return err(newDOMException(r.error, "InvalidCharacterError")) + return errDOMException(r.error, "InvalidCharacterError") return ok(NarrowString(r.get)) const AMap = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/" diff --git a/src/js/encoding.nim b/src/js/encoding.nim index 6c32ee3c..e17fc652 100644 --- a/src/js/encoding.nim +++ b/src/js/encoding.nim @@ -29,7 +29,7 @@ func newJSTextDecoder(label = "utf-8", options = TextDecoderOptions()): JSResult[JSTextDecoder] {.jsctor.} = let encoding = getCharset(label) if encoding in {CHARSET_UNKNOWN, CHARSET_REPLACEMENT}: - return err(newRangeError("Invalid encoding label")) + return errRangeError("Invalid encoding label") return ok(JSTextDecoder( ignoreBOM: options.ignoreBOM, fatal: options.fatal, diff --git a/src/server/buffer.nim b/src/server/buffer.nim index 9cf14217..df0cb0ae 100644 --- a/src/server/buffer.nim +++ b/src/server/buffer.nim @@ -1081,7 +1081,7 @@ proc dispatchEvent(buffer: Buffer; ctype, jsName: string; elem: Element): let ctx = buffer.window.jsctx let event = newEvent(ctx, ctype, elem) var jsEvent = ctx.toJS(event) - let jsNameAtom = JS_NewAtomLen(ctx, jsName, csize_t(jsName.len)) + let jsNameAtom = JS_NewAtomLen(ctx, cstring(jsName), csize_t(jsName.len)) for a in elem.branch: event.currentTarget = a var stop = false diff --git a/src/version.nim b/src/version.nim index f3851e25..1e4a80c0 100644 --- a/src/version.nim +++ b/src/version.nim @@ -16,7 +16,7 @@ macro tryImport(x: untyped; name: static string) = macro checkVersion(xs: static string; major, minor, patch: int) = let x = ident(xs & "Version") quote do: - when `x`.Major < `major` or `x`.Minor < `minor` or `x`.Patch < `patch`: + when (`x`.Major, `x`.Minor, `x`.Patch) < (`major`, `minor`, `patch`): var es = $`major` & "." & $`minor` & "." & $`patch` var gs = $`x`.Major & "." & $`x`.Minor & "." & $`x`.Patch error("Version of " & `xs` & " too low (expected " & es & ", got " & @@ -29,4 +29,4 @@ tryImport monoucha/version, "monoucha" static: checkVersion("chagashi", 0, 5, 2) checkVersion("chame", 1, 0, 0) - checkVersion("monoucha", 0, 1, 1) + checkVersion("monoucha", 0, 2, 0) |