update

Signed-off-by: George Lemon <georgelemon@protonmail.com>

Author: georgelemon

src/vancode/interpreter/ast.nim

@@ -173,7 +173,7 @@ proc add*(node, child: Node): Node {.discardable.} =
   node.children.add(child)
   result = node
 
-proc add*(node: Node, children: openarray[Node]): Node {.discardable.} =
+proc add*(node: Node, children: openArray[Node]): Node {.discardable.} =
   node.children.add(children)
   result = node
 
@@ -190,13 +190,16 @@ proc hash*(node: Node): Hash =
     of nkIdent: h = h !& hash(node.ident)
     else:
       h = h !& hash(node.len)
-      h = h !& hash(node.children)
+      for child in node.children:  # guard nil children (e.g. nkInfix operator slot)
+        if child != nil:
+          h = h !& hash(child)
   result = h
 
 proc `$`*(node: Node): string =
   ## Stringify a node. This only supports leaf nodes, for trees,
-  ## use ``treeRepr``.
-  assert node.kind in LeafNodes, "only leaf nodes can be `$`'ed. Got " & $node.kind
+  ## use `treeRepr`.
+  assert node.kind in LeafNodes,
+    "only leaf nodes can be `$`'ed. Got " & $node.kind
   result =
     case node.kind
     of nkBool: $node.boolVal

src/vancode/interpreter/codegen.nim

@@ -68,7 +68,7 @@ type
 
   CodeGen* {.acyclic.} = ref object
     ## a code generator for a module or proc.
-    includePath: Option[string]
+    includeBasePath: Option[string]
       ## the base path for including partials
     script: Script
       # the script all procs go into
@@ -1547,7 +1547,9 @@ proc genProc*(node: Node, isInstantiation = false): Sym {.codegen.} =
     # add the proc into the script
     gen.script.procs.add(theProc)
     if sym.procExport:
-      # export the proc if needed (exported procs need to be in procsExport for the runtime to find them, but they also need to be in procs for the compiler to compile them, so we add them to both)
+      # export the proc if needed (exported procs need to be in procsExport
+      # for the runtime to find them, but they also need to be in procs for
+      # the compiler to compile them, so we add them to both)
       gen.script.procsExport.add(theProc)
 
     # compile the proc's body
@@ -2328,13 +2330,13 @@ proc genImport*(node: Node) {.codegen.} =
 
       # generate the module's script based
       # on the parsed module AST program
-      moduleGen.genScript(astProgram, gen.includePath)
+      moduleGen.genScript(astProgram, gen.includeBasePath)
 
       # once the module is generated, we can load it
       # into the current module
       if not gen.module.load(moduleGen.module, fromOtherModule = true):
         node.warn(WarnModuleAlreadyImported % pathNode.stringVal)
-      
+
       # add the module to the current script's modules
       gen.script.scripts[importChunk.file] = moduleGen.script
 
@@ -2343,13 +2345,13 @@ proc genImport*(node: Node) {.codegen.} =
       gen.chunk.emit(gen.chunk.getString(importChunk.file))
 
     of nkInclude:
-      if gen.includePath.isSome:
-        # if the include path is set,
-        # we can use it to resolve the module
-        path = absolutePath(gen.includePath.get() / path)
+      if gen.includeBasePath.isSome:
+        # if the include path is set, we can use it to resolve the module
+        path = absolutePath(gen.includeBasePath.get() / path)
 
       # resolve the module's path
       let aFile = absolutePath(gen.module.src.get())
+      
       try:
         gen.resolver.resolveFile(aFile, path)
       except ResolverError as e:
@@ -2429,7 +2431,7 @@ proc genBlock*(node: Node, isStmt: bool): Sym {.codegen.} =
 proc genScript*(program: Ast, includePath: Option[string],
                   emitHalt: static bool = true) {.codegen.} =
   ## Generates the code for a full script.
-  gen.includePath = includePath
+  gen.includeBasePath = includePath
   for node in program.nodes:
     gen.genStmt(node)
   when emitHalt == true:

src/vancode/interpreter/sym.nim

@@ -137,7 +137,7 @@ type
       of ttyHtmlElement: discard
       of ttyPointer:
         pointerTarget*: Sym       ## The type this pointer points to (type info only)
-      else: discard # other types don't have any special fields
+      else: discard               # other types don't have any special fields
     of skHtmlType:
       tag*, innerText*: string    ## the tag of the HTML element (e.g., "div", "span", etc.)
       isVoidElement*: bool        ## whether this HTML element is a void element or not (e.g., "img", "br", etc.)

src/vancode/manager/remote.nim

@@ -6,8 +6,6 @@
 
 import std/[tables, httpcore, httpclient, os, strutils, base64]
 import pkg/openparser/dotenv
-
-from std/os import existsEnv, getEnv
 export base64
 
 type