Compile with styleCheck:usages

much better

24 files changed, 67 insertions, 67 deletions

diff --git a/src/bindings/libregexp.nim b/src/bindings/libregexp.nim
index c26111fd..85e7c1ca 100644
--- a/src/bindings/libregexp.nim
+++ b/src/bindings/libregexp.nim
@@ -6,7 +6,7 @@ const
   LRE_FLAG_UTF16* = 1 shl 4
   LRE_FLAG_STICKY* = 1 shl 5
 
-{.passC: "-Ilib/".}
+{.passc: "-Ilib/".}
 
 {.push header: "quickjs/libregexp.h", importc.}
 proc lre_compile*(plen: ptr cint, error_msg: cstring, error_msg_size: cint,
diff --git a/src/bindings/libunicode.nim b/src/bindings/libunicode.nim
index 84163a7e..cb041e50 100644
--- a/src/bindings/libunicode.nim
+++ b/src/bindings/libunicode.nim
@@ -11,7 +11,7 @@ type
   UnicodeNormalizationEnum* {.size: sizeof(cint).} = enum
     UNICODE_NFC, UNICODE_NFD, UNICODE_NKFC, UNICODE_NKFD
 
-{.passC: "-Ilib/".}
+{.passc: "-Ilib/".}
 
 {.push header: "quickjs/libunicode.h", importc.}
 
diff --git a/src/bindings/quickjs.nim b/src/bindings/quickjs.nim
index e4a29029..a2cf431e 100644
--- a/src/bindings/quickjs.nim
+++ b/src/bindings/quickjs.nim
@@ -2,8 +2,8 @@ import bindings/constcharp
 
 const qjsheader = "quickjs/quickjs.h"
 
-{.passC: "-Ilib/".}
-{.passL: "-Llib/ -lquickjs -lm -lpthread".}
+{.passc: "-Ilib/".}
+{.passl: "-Llib/ -lquickjs -lm -lpthread".}
 
 const                         ##  all tags with a reference count are negative
   JS_TAG_FIRST* = -10           ##  first negative tag
@@ -170,7 +170,7 @@ type
     cproto*: JSCFunctionEnum
     cfunc*: JSCFunctionType
 
-  JSCFunctionListEntryGetset = object
+  JSCFunctionListEntryGetSet = object
     get*: JSCFunctionType
     set*: JSCFunctionType
 
@@ -179,12 +179,12 @@ type
     base: cint
 
   JSCFunctionListEntryPropList = object
-    tab: ptr JSCfunctionListEntry
+    tab: ptr JSCFunctionListEntry
     len: cint
 
   JSCFunctionListEntryU* {.union.} = object
     `func`* {.importc: "func".}: JSCFunctionListEntryFunc
-    getset: JSCFunctionListEntryGetset
+    getset: JSCFunctionListEntryGetSet
     alias: JSCFunctionListEntryAlias
     prop_list: JSCFunctionListEntryPropList
     str: cstring
@@ -213,7 +213,7 @@ type
     JS_CLASS_ARRAY
     JS_CLASS_ERROR
 
-converter toBool*(js: JS_BOOl): bool {.inline.} =
+converter toBool*(js: JS_BOOL): bool {.inline.} =
   cast[cint](js) != 0
 
 converter toJSBool*(b: bool): JS_BOOL {.inline.} =
diff --git a/src/bindings/zlib.nim b/src/bindings/zlib.nim
index 10a2c560..e090bc71 100644
--- a/src/bindings/zlib.nim
+++ b/src/bindings/zlib.nim
@@ -6,7 +6,7 @@ const zlib = (func(): string =
 when zlib == "":
   error("zlib not found")
 
-{.passL: zlib.}
+{.passl: zlib.}
 
 const
   Z_NO_FLUSH* = cint(0)
diff --git a/src/css/cssparser.nim b/src/css/cssparser.nim
index a825e94d..c63a7422 100644
--- a/src/css/cssparser.nim
+++ b/src/css/cssparser.nim
@@ -643,7 +643,7 @@ proc consumeDeclaration(state: var CSSParseState): Option[CSSDeclaration] =
 proc consumeListOfDeclarations(state: var CSSParseState): seq[CSSParsedItem] =
   while state.has():
     let t = state.consume()
-    if t == CSS_wHITESPACE_TOKEN or t == CSS_SEMICOLON_TOKEN:
+    if t == CSS_WHITESPACE_TOKEN or t == CSS_SEMICOLON_TOKEN:
       continue
     elif t == CSS_AT_KEYWORD_TOKEN:
       state.reconsume()
@@ -666,7 +666,7 @@ proc consumeListOfDeclarations(state: var CSSParseState): seq[CSSParsedItem] =
 proc consumeListOfDeclarations2(state: var CSSParseState): seq[CSSDeclaration] =
   while state.has():
     let t = state.consume()
-    if t == CSS_wHITESPACE_TOKEN or t == CSS_SEMICOLON_TOKEN:
+    if t == CSS_WHITESPACE_TOKEN or t == CSS_SEMICOLON_TOKEN:
       continue
     elif t == CSS_AT_KEYWORD_TOKEN:
       state.reconsume()
@@ -1001,4 +1001,4 @@ proc parseAnB*(cvals: seq[CSSComponentValue]): (Option[CSSAnB], int) =
 proc parseCSS*(inputStream: Stream): CSSRawStylesheet =
   if inputStream.atEnd():
     return CSSRawStylesheet()
-  return inputstream.parseStylesheet()
+  return inputStream.parseStylesheet()
diff --git a/src/css/values.nim b/src/css/values.nim
index bd6bc549..db2f4475 100644
--- a/src/css/values.nim
+++ b/src/css/values.nim
@@ -68,7 +68,7 @@ type
     WHITESPACE_PRE_WRAP
 
   CSSFontStyle* = enum
-    FONTSTYLE_NORMAL, FONTSTYLE_ITALIC, FONTSTYLE_OBLIQUE
+    FONT_STYLE_NORMAL, FONT_STYLE_ITALIC, FONT_STYLE_OBLIQUE
 
   CSSPosition* = enum
     POSITION_STATIC, POSITION_RELATIVE, POSITION_ABSOLUTE, POSITION_FIXED,
@@ -186,7 +186,7 @@ type
       content*: seq[CSSContent]
     of VALUE_QUOTES:
       quotes*: CSSQuotes
-    of VALUE_WHITESPACE:
+    of VALUE_WHITE_SPACE:
       whitespace*: CSSWhitespace
     of VALUE_INTEGER:
       integer*: int
@@ -811,9 +811,9 @@ func cssDisplay(cval: CSSComponentValue): Opt[CSSDisplay] =
 
 func cssFontStyle(cval: CSSComponentValue): Opt[CSSFontStyle] =
   const FontStyleMap = {
-    "normal": FONTSTYLE_NORMAL,
-    "italic": FONTSTYLE_ITALIC,
-    "oblique": FONTSTYLE_OBLIQUE
+    "normal": FONT_STYLE_NORMAL,
+    "italic": FONT_STYLE_ITALIC,
+    "oblique": FONT_STYLE_OBLIQUE
   }
   return cssIdent(FontStyleMap, cval)
 
diff --git a/src/display/term.nim b/src/display/term.nim
index 05d54f98..8e0f9544 100644
--- a/src/display/term.nim
+++ b/src/display/term.nim
@@ -262,7 +262,7 @@ proc correctContrast(term: Terminal, bgcolor, fgcolor: CellColor): CellColor =
           fgY = 255
     let newrgb = YUV(cast[uint8](fgY), fgcolor.U, fgcolor.V)
     case term.colormode
-    of TRUECOLOR:
+    of TRUE_COLOR:
       return cellColor(newrgb)
     of ANSI:
       return approximateANSIColor(newrgb, term.defaultForeground)
@@ -318,7 +318,7 @@ proc processFormat*(term: Terminal, format: var Format, cellf: Format): string =
   if cellf.fgcolor != format.fgcolor:
     var color = cellf.fgcolor
     if color.rgb:
-      assert term.colormode == TRUECOLOR
+      assert term.colormode == TRUE_COLOR
       let rgb = color.rgbcolor
       result &= SGR(38, 2, rgb.r, rgb.g, rgb.b)
     elif color == defaultColor:
@@ -328,13 +328,13 @@ proc processFormat*(term: Terminal, format: var Format, cellf: Format): string =
       if n < 8:
         result &= SGR(30 + n)
       else:
-        assert term.colormode in {TRUECOLOR, EIGHT_BIT}
+        assert term.colormode in {TRUE_COLOR, EIGHT_BIT}
         result &= SGR(38, 5, n)
 
   if cellf.bgcolor != format.bgcolor:
     var color = cellf.bgcolor
     if color.rgb:
-      assert term.colormode == TRUECOLOR
+      assert term.colormode == TRUE_COLOR
       let rgb = color.rgbcolor
       result &= SGR(48, 2, rgb.r, rgb.g, rgb.b)
     elif color == defaultColor:
@@ -344,7 +344,7 @@ proc processFormat*(term: Terminal, format: var Format, cellf: Format): string =
       if n < 8:
         result &= SGR(40 + n)
       else:
-        assert term.colormode in {TRUECOLOR, EIGHT_BIT}
+        assert term.colormode in {TRUE_COLOR, EIGHT_BIT}
         result &= SGR(48, 5, n)
 
   for flag in FormatFlags:
diff --git a/src/html/chadombuilder.nim b/src/html/chadombuilder.nim
index 2580e608..06d411dc 100644
--- a/src/html/chadombuilder.nim
+++ b/src/html/chadombuilder.nim
@@ -180,7 +180,7 @@ proc newChaDOMBuilder(url: URL, window: Window, isFragment = false):
     finish: finish,
     restart: restart,
     setQuirksMode: setQuirksMode,
-    setCharacterSet: setCharacterset,
+    setCharacterSet: setCharacterSet,
     elementPopped: elementPopped,
     getTemplateContent: getTemplateContent,
     getTagType: getTagType,
diff --git a/src/html/dom.nim b/src/html/dom.nim
index 44613b90..e411c069 100644
--- a/src/html/dom.nim
+++ b/src/html/dom.nim
@@ -223,7 +223,7 @@ type
     checked* {.jsget.}: bool
     xcoord*: int
     ycoord*: int
-    file*: Option[Url]
+    file*: Option[URL]
 
   HTMLAnchorElement* = ref object of HTMLElement
     relList {.jsget.}: DOMTokenList
@@ -2024,7 +2024,7 @@ func href0[T: HTMLAnchorElement|HTMLAreaElement](element: T): string =
 func href(base: HTMLBaseElement): string {.jsfget.} =
   if base.attrb("href"):
     #TODO with fallback base url
-    let url = parseUrl(base.attr("href"))
+    let url = parseURL(base.attr("href"))
     if url.isSome:
       return $url.get
 
@@ -2611,14 +2611,14 @@ proc adopt(document: Document, node: Node) =
 proc resetElement*(element: Element) =
   case element.tagType
   of TAG_INPUT:
-    let input = HTMLInputELement(element)
+    let input = HTMLInputElement(element)
     case input.inputType
     of INPUT_SEARCH, INPUT_TEXT, INPUT_PASSWORD:
       input.value = input.attr("value")
     of INPUT_CHECKBOX, INPUT_RADIO:
       input.checked = input.attrb("checked")
     of INPUT_FILE:
-      input.file = none(Url)
+      input.file = none(URL)
     else: discard
     input.invalid = true
   of TAG_SELECT:
@@ -3123,7 +3123,7 @@ proc prepare*(element: HTMLScriptElement) =
       return
   let cs = getCharset(element.attr("charset"))
   let encoding = if cs != CHARSET_UNKNOWN: cs else: element.document.charset
-  let classicCORS = element.crossorigin
+  let classicCORS = element.crossOrigin
   var options = ScriptOptions(
     nonce: element.internalNonce,
     integrity: element.attr("integrity"),
@@ -3387,7 +3387,7 @@ proc jsReflectGet(ctx: JSContext, this: JSValue, magic: cint): JSValue {.cdecl.}
   of REFLECT_STR:
     let x = toJS(ctx, element.attr(entry.attrname))
     return x
-  of REFLECT_BOOl:
+  of REFLECT_BOOL:
     return toJS(ctx, element.attrb(entry.attrname))
   of REFLECT_LONG:
     return toJS(ctx, element.attrl(entry.attrname).get(entry.i))
diff --git a/src/img/png.nim b/src/img/png.nim
index bde2cecb..fdf02197 100644
--- a/src/img/png.nim
+++ b/src/img/png.nim
@@ -54,7 +54,7 @@ proc writeIHDR(writer: var PNGWriter, width, height: uint32,
     bitDepth: uint8, colorType: PNGColorType,
     compressionMethod, filterMethod, interlaceMethod: uint8) =
   writer.writeStr(PNGSignature)
-  var ihdr {.noInit.}: array[13, uint8]
+  var ihdr {.noinit.}: array[13, uint8]
   var pw = pngInt(width)
   var ph = pngInt(height)
   copyMem(addr ihdr[0], addr pw[0], 4)
@@ -304,7 +304,7 @@ proc writepxs(reader: var PNGReader, crow: var openArray[RGBAColor]) =
       j = j mod 8
       crow[x] = rgba(n, n, n, 255u8)
   of TRUECOLOR:
-    let step = int(reader.bitdepth) div 8
+    let step = int(reader.bitDepth) div 8
     var i = 0
     for x in 0 ..< crow.len:
       let r = reader.uprow[i]
diff --git a/src/io/serialize.nim b/src/io/serialize.nim
index 1a7d0f62..4a1a810b 100644
--- a/src/io/serialize.nim
+++ b/src/io/serialize.nim
@@ -32,9 +32,9 @@ proc swrite*(stream: Stream, b: bool)
 proc sread*(stream: Stream, b: var bool)
 func slen*(b: bool): int
 
-proc swrite*(stream: Stream, url: Url)
-proc sread*(stream: Stream, url: var Url)
-func slen*(url: Url): int
+proc swrite*(stream: Stream, url: URL)
+proc sread*(stream: Stream, url: var URL)
+func slen*(url: URL): int
 
 proc swrite*(stream: Stream, tup: tuple)
 proc sread*(stream: Stream, tup: var tuple)
diff --git a/src/js/fromjs.nim b/src/js/fromjs.nim
index bddaa2e1..2ffdb9e2 100644
--- a/src/js/fromjs.nim
+++ b/src/js/fromjs.nim
@@ -226,7 +226,7 @@ proc fromJSSeq[T](ctx: JSContext, val: JSValue): JSResult[seq[T]] =
       return err()
     defer: JS_FreeValue(ctx, valueVal)
     let genericRes = fromJS[typeof(s[0])](ctx, valueVal)
-    if genericRes.isnone: # exception
+    if genericRes.isNone: # exception
       return err()
     s.add(genericRes.get)
   return ok(s)
diff --git a/src/js/javascript.nim b/src/js/javascript.nim
index 73fd5850..ac438e1b 100644
--- a/src/js/javascript.nim
+++ b/src/js/javascript.nim
@@ -103,7 +103,7 @@ type
     PROPERTY_NAMES = "js_prop_names"
     FINALIZER = "js_fin"
 
-var runtimes {.threadVar.}: seq[JSRuntime]
+var runtimes {.threadvar.}: seq[JSRuntime]
 
 proc newJSRuntime*(): JSRuntime =
   let rt = JS_NewRuntime()
diff --git a/src/js/module.nim b/src/js/module.nim
index 70755ebd..fe080f13 100644
--- a/src/js/module.nim
+++ b/src/js/module.nim
@@ -4,7 +4,7 @@ import js/javascript
 import js/tojs
 
 proc setImportMeta(ctx: JSContext, funcVal: JSValue, isMain: bool) =
-  let m = cast[JSModuleDef](JS_VALUE_GET_PTR(func_val))
+  let m = cast[JSModuleDef](JS_VALUE_GET_PTR(funcVal))
   let moduleNameAtom = JS_GetModuleName(ctx, m)
   let moduleName = JS_AtomToCString(ctx, moduleNameAtom)
   let metaObj = JS_GetImportMeta(ctx, m)
diff --git a/src/loader/cgi.nim b/src/loader/cgi.nim
index 467e2087..4b61399e 100644
--- a/src/loader/cgi.nim
+++ b/src/loader/cgi.nim
@@ -37,7 +37,7 @@ proc setupEnv(cmd, scriptName, pathInfo, requestURI: string, request: Request,
   putEnv("SCRIPT_NAME", scriptName)
   putEnv("SCRIPT_FILENAME", cmd)
   putEnv("REQUEST_URI", requestURI)
-  putEnv("REQUEST_METHOD", $request.httpmethod)
+  putEnv("REQUEST_METHOD", $request.httpMethod)
   var headers = ""
   for k, v in request.headers:
     headers &= k & ": " & v & "\r\n"
@@ -48,7 +48,7 @@ proc setupEnv(cmd, scriptName, pathInfo, requestURI: string, request: Request,
     putEnv("PATH_INFO", pathInfo)
   if url.query.isSome:
     putEnv("QUERY_STRING", url.query.get)
-  if request.httpmethod == HTTP_POST:
+  if request.httpMethod == HTTP_POST:
     if request.multipart.isSome:
       putEnv("CONTENT_TYPE", request.multipart.get.getContentType())
     else:
diff --git a/src/loader/loader.nim b/src/loader/loader.nim
index 44d6034b..72f30cbd 100644
--- a/src/loader/loader.nim
+++ b/src/loader/loader.nim
@@ -146,7 +146,7 @@ proc loadResource(ctx: LoaderContext, request: Request, handle: LoaderHandle) =
         ctx.handleMap[fd] = handle
     else:
       prevurl = request.url
-      case ctx.config.urimethodmap.findAndRewrite(request.url)
+      case ctx.config.uriMethodMap.findAndRewrite(request.url)
       of URI_RESULT_SUCCESS:
         inc tries
         redo = true
@@ -168,7 +168,7 @@ proc onLoad(ctx: LoaderContext, stream: SocketStream) =
     stream.close()
   else:
     let handle = newLoaderHandle(stream, request.canredir)
-    for k, v in ctx.config.defaultHeaders.table:
+    for k, v in ctx.config.defaultheaders.table:
       if k notin request.headers.table:
         request.headers.table[k] = v
     if ctx.config.cookiejar != nil and ctx.config.cookiejar.cookies.len > 0:
@@ -272,7 +272,7 @@ proc initLoaderContext(fd: cint, config: LoaderConfig): LoaderContext =
 
 proc runFileLoader*(fd: cint, config: LoaderConfig) =
   var ctx = initLoaderContext(fd, config)
-  var buffer {.noInit.}: array[16384, uint8]
+  var buffer {.noinit.}: array[16384, uint8]
   while ctx.alive:
     let events = ctx.selector.select(-1)
     var unreg: seq[int]
@@ -344,17 +344,17 @@ proc applyHeaders(loader: FileLoader, request: Request, response: Response) =
   if "Location" in response.headers.table:
     if response.status in 301u16..303u16 or response.status in 307u16..308u16:
       let location = response.headers.table["Location"][0]
-      let url = parseUrl(location, option(request.url))
+      let url = parseURL(location, option(request.url))
       if url.isSome:
         if (response.status == 303 and
-            request.httpmethod notin {HTTP_GET, HTTP_HEAD}) or
+            request.httpMethod notin {HTTP_GET, HTTP_HEAD}) or
             (response.status == 301 or response.status == 302 and
-            request.httpmethod == HTTP_POST):
+            request.httpMethod == HTTP_POST):
           response.redirect = newRequest(url.get, HTTP_GET,
             mode = request.mode, credentialsMode = request.credentialsMode,
             destination = request.destination)
         else:
-          response.redirect = newRequest(url.get, request.httpmethod,
+          response.redirect = newRequest(url.get, request.httpMethod,
             body = request.body, multipart = request.multipart,
             mode = request.mode, credentialsMode = request.credentialsMode,
             destination = request.destination)
@@ -490,7 +490,7 @@ proc onError*(loader: FileLoader, fd: int) =
   loader.ongoing.withValue(fd, buffer):
     let response = buffer[].response
     when defined(debug):
-      var lbuf {.noInit.}: array[BufferSize, char]
+      var lbuf {.noinit.}: array[BufferSize, char]
       if not response.body.atEnd():
         let n = response.body.readData(addr lbuf[0], lbuf.len)
         assert n == 0
diff --git a/src/loader/request.nim b/src/loader/request.nim
index aea5bd46..521362bc 100644
--- a/src/loader/request.nim
+++ b/src/loader/request.nim
@@ -69,8 +69,8 @@ type
 type
   Request* = ref RequestObj
   RequestObj* = object
-    httpmethod*: HttpMethod
-    url*: Url
+    httpMethod*: HttpMethod
+    url*: URL
     headers* {.jsget.}: Headers
     body*: Opt[string]
     multipart*: Opt[FormData]
@@ -158,14 +158,14 @@ proc newReadableStream*(isource: Stream): ReadableStream =
   if len != 0:
     isource.readStr(len, result.buf)
 
-func newRequest*(url: URL, httpmethod = HTTP_GET, headers = newHeaders(),
+func newRequest*(url: URL, httpMethod = HTTP_GET, headers = newHeaders(),
     body = opt(string), multipart = opt(FormData), mode = RequestMode.NO_CORS,
     credentialsMode = CredentialsMode.SAME_ORIGIN,
     destination = RequestDestination.NO_DESTINATION, proxy: URL = nil,
     referrer: URL = nil, canredir = false): Request =
   return Request(
     url: url,
-    httpmethod: httpmethod,
+    httpMethod: httpMethod,
     headers: headers,
     body: body,
     multipart: multipart,
@@ -176,7 +176,7 @@ func newRequest*(url: URL, httpmethod = HTTP_GET, headers = newHeaders(),
     proxy: proxy
   )
 
-func newRequest*(url: URL, httpmethod = HTTP_GET,
+func newRequest*(url: URL, httpMethod = HTTP_GET,
     headers: seq[(string, string)] = @[], body = opt(string),
     multipart = opt(FormData), mode = RequestMode.NO_CORS, proxy: URL = nil,
     canredir = false):
@@ -185,7 +185,7 @@ func newRequest*(url: URL, httpmethod = HTTP_GET,
   for pair in headers:
     let (k, v) = pair
     hl.table[k] = @[v]
-  return newRequest(url, httpmethod, hl, body, multipart, mode, proxy = proxy)
+  return newRequest(url, httpMethod, hl, body, multipart, mode, proxy = proxy)
 
 func createPotentialCORSRequest*(url: URL, destination: RequestDestination, cors: CORSAttribute, fallbackFlag = false): Request =
   var mode = if cors == NO_CORS:
@@ -312,7 +312,7 @@ func newRequest*[T: string|Request](ctx: JSContext, resource: T,
     proxyUrl = init.proxyUrl
   return ok(Request(
     url: url,
-    httpmethod: httpmethod,
+    httpMethod: httpMethod,
     headers: headers,
     body: body,
     multipart: multipart,
diff --git a/src/local/client.nim b/src/local/client.nim
index 56fa5c42..d8608503 100644
--- a/src/local/client.nim
+++ b/src/local/client.nim
@@ -227,7 +227,7 @@ proc handleCommandInput(client: Client, c: char): EmptyPromise =
   client.pager.inputBuffer &= c
   let action = getNormalAction(client.config, client.pager.inputBuffer)
   let p = client.evalAction(action, client.pager.precnum)
-  if not client.feedNext:
+  if not client.feednext:
     client.pager.precnum = 0
     client.pager.notnum = false
     client.handlePagerEvents()
@@ -262,10 +262,10 @@ proc input(client: Client): EmptyPromise =
           if edit.write(client.pager.inputBuffer, client.pager.term.cs):
             client.pager.inputBuffer = ""
           else:
-            client.feedNext = true
+            client.feednext = true
         elif not client.feednext:
           discard client.evalAction(action, 0)
-        if not client.feedNext:
+        if not client.feednext:
           client.pager.updateReadLine()
     else:
       p = client.handleCommandInput(c)
diff --git a/src/local/pager.nim b/src/local/pager.nim
index 8c8fa249..bdb7ec72 100644
--- a/src/local/pager.nim
+++ b/src/local/pager.nim
@@ -665,7 +665,7 @@ proc applySiteconf(pager: Pager, url: var URL): BufferConfig =
     if sc.cookie.isSome:
       if sc.cookie.get:
         # host/url might have changed by now
-        let jarid = sc.share_cookiejar.get(url.host)
+        let jarid = sc.share_cookie_jar.get(url.host)
         if jarid notin pager.cookiejars:
           pager.cookiejars[jarid] = newCookieJar(url,
             sc.third_party_cookie)
@@ -697,7 +697,7 @@ proc gotoURL(pager: Pager, request: Request, prevurl = none(URL),
     request.referer = referrer.source.location
   var bufferconfig = pager.applySiteconf(request.url)
   if prevurl.isnone or not prevurl.get.equals(request.url, true) or
-      request.url.hash == "" or request.httpmethod != HTTP_GET:
+      request.url.hash == "" or request.httpMethod != HTTP_GET:
     # Basically, we want to reload the page *only* when
     # a) we force a reload (by setting prevurl to none)
     # b) or the new URL isn't just the old URL + an anchor
@@ -1116,7 +1116,7 @@ proc checkMailcap(pager: Pager, container: Container): (EmptyPromise, bool) =
   if entry != nil:
     let tmpdir = pager.tmpdir
     let ext = container.location.pathname.afterLast('.')
-    let tempfile = getTempfile(tmpdir, ext)
+    let tempfile = getTempFile(tmpdir, ext)
     let outpath = if entry.nametemplate != "":
       unquoteCommand(entry.nametemplate, contentType, tempfile, url, cs)
     else:
diff --git a/src/server/buffer.nim b/src/server/buffer.nim
index 329e6512..02abb267 100644
--- a/src/server/buffer.nim
+++ b/src/server/buffer.nim
@@ -315,7 +315,7 @@ func getClickable(styledNode: StyledNode): Element =
   while styledNode != nil:
     if styledNode.isClickable():
       return Element(styledNode.node)
-    styledNode = stylednode.parent
+    styledNode = styledNode.parent
 
 proc submitForm(form: HTMLFormElement, submitter: Element): Option[Request]
 
@@ -1157,7 +1157,7 @@ proc onload(buffer: Buffer) =
   of LOADING_PAGE:
     discard
   let op = buffer.sstream.getPosition()
-  var s {.noInit.}: array[BufferSize, uint8]
+  var s {.noinit.}: array[BufferSize, uint8]
   try:
     buffer.sstream.setPosition(op + buffer.available)
     let n = buffer.istream.readData(addr s[0], buffer.readbufsize)
@@ -1232,7 +1232,7 @@ proc serializePlainTextFormData(kvs: seq[(string, string)]): string =
 
 # https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#form-submission-algorithm
 proc submitForm(form: HTMLFormElement, submitter: Element): Option[Request] =
-  if form.constructingEntryList:
+  if form.constructingentrylist:
     return
   let entrylist = form.constructEntryList(submitter).get(@[])
 
diff --git a/src/server/forkserver.nim b/src/server/forkserver.nim
index 79fa2ed1..13eb2936 100644
--- a/src/server/forkserver.nim
+++ b/src/server/forkserver.nim
@@ -56,7 +56,7 @@ proc loadForkServerConfig*(forkserver: ForkServer, config: Config) =
   forkserver.ostream.swrite(config.getForkServerConfig())
   forkserver.ostream.flush()
 
-proc removeChild*(forkserver: Forkserver, pid: Pid) =
+proc removeChild*(forkserver: ForkServer, pid: Pid) =
   forkserver.ostream.swrite(REMOVE_CHILD)
   forkserver.ostream.swrite(pid)
   forkserver.ostream.flush()
diff --git a/src/types/cookie.nim b/src/types/cookie.nim
index 872e97dd..93daf2a3 100644
--- a/src/types/cookie.nim
+++ b/src/types/cookie.nim
@@ -164,7 +164,7 @@ func cookieDomainMatches(cookieDomain: string, url: URL): bool =
     cookieDomain
   return host.endsWith(cookieDomain)
 
-proc add*(cookiejar: CookieJar, cookie: Cookie) =
+proc add*(cookieJar: CookieJar, cookie: Cookie) =
   var i = -1
   for j in 0 ..< cookieJar.cookies.len:
     let old = cookieJar.cookies[j]
diff --git a/src/types/formdata.nim b/src/types/formdata.nim
index b1957998..02a08d15 100644
--- a/src/types/formdata.nim
+++ b/src/types/formdata.nim
@@ -76,7 +76,7 @@ proc writeEntry*(stream: Stream, entry: FormDataEntry, boundary: string) =
     if blob.isfile:
       let fs = newFileStream(WebFile(blob).path)
       if fs != nil:
-        var buf {.noInit.}: array[4096, uint8]
+        var buf {.noinit.}: array[4096, uint8]
         while true:
           let n = fs.readData(addr buf[0], 4096)
           stream.writeData(addr buf[0], n)
diff --git a/src/utils/endians.nim b/src/utils/endians.nim
index ea34efa7..e716ba8b 100644
--- a/src/utils/endians.nim
+++ b/src/utils/endians.nim
@@ -24,7 +24,7 @@ else:
       (u shl 24)
 
 proc fromBytesBEu32*(x: openArray[uint8]): uint32 {.inline.} =
-  var u {.noInit.}: uint32
+  var u {.noinit.}: uint32
   copyMem(addr u, unsafeAddr x[0], sizeof(uint32))
   when system.cpuEndian == littleEndian:
     return swap(u)