import within when (#1158)

Author: Araq

src/nifler/bridge.nim

@@ -116,6 +116,7 @@ type
     b, deps: Builder
     portablePaths: bool
     depsEnabled, lineInfoEnabled: bool
+    inWhen: int
 
 proc absLineInfo(i: TLineInfo; c: var TranslationContext) =
   var fp = toFullPath(c.conf, i.fileIndex)
@@ -175,7 +176,7 @@ proc splitIdentDefName(n: PNode): IdentDefName =
   else:
     result.name = n
 
-proc toNif*(n, parent: PNode; c: var TranslationContext; allowEmpty = false) 
+proc toNif*(n, parent: PNode; c: var TranslationContext; allowEmpty = false)
 
 proc toVarTuple(v: PNode, n: PNode; c: var TranslationContext) =
   c.b.addTree(UnpacktupL)
@@ -621,7 +622,16 @@ proc toNif*(n, parent: PNode; c: var TranslationContext; allowEmpty = false) =
       let oldDepsEnabled = c.depsEnabled
       swap c.b, c.deps
       c.depsEnabled = false
-      toNif(n, nil, c)
+
+      relLineInfo(n, nil, c)
+      c.b.addTree(nodeKindTranslation(n.kind))
+      if c.inWhen > 0:
+        # mark it as a conditional dependency:
+        c.b.addKeyw "when"
+      for i in 0..<n.len:
+        toNif(n[i], nil, c)
+      c.b.endTree()
+
       c.depsEnabled = oldDepsEnabled
       swap c.b, c.deps
       c.lineInfoEnabled = oldLineInfoEnabled
@@ -650,6 +660,14 @@ proc toNif*(n, parent: PNode; c: var TranslationContext; allowEmpty = false) =
     for i in 0..<n.len:
       toNif(n[i], n, c)
     c.b.endTree()
+  of nkWhenStmt:
+    inc c.inWhen
+    relLineInfo(n, parent, c)
+    c.b.addTree(nodeKindTranslation(n.kind))
+    for i in 0..<n.len:
+      toNif(n[i], n, c)
+    c.b.endTree()
+    dec c.inWhen
   else:
     relLineInfo(n, parent, c)
     c.b.addTree(nodeKindTranslation(n.kind))

src/nimony/deps.nim

@@ -138,6 +138,8 @@ proc processImport(c: var DepContext; it: var Cursor; current: Node) =
   var x = it
   skip it
   inc x # skip the `import`
+  # ignore conditional imports:
+  if x.stmtKind == WhenS: return
   while x.kind != ParRi:
     if x.kind == ParLe and x.exprKind == PragmaxX:
       inc x
@@ -163,6 +165,8 @@ proc processSingleImport(c: var DepContext; it: var Cursor; current: Node) =
   var x = it
   skip it
   inc x # skip the tag
+  # ignore conditional imports:
+  if x.stmtKind == WhenS: return
   var files: seq[ImportedFilename] = @[]
   var hasError = false
   filenameVal(x, files, hasError, allowAs = true)
@@ -196,12 +200,15 @@ proc processDeps(c: var DepContext; n: Cursor; current: Node) =
     while n.kind != ParRi:
       processDep c, n, current
 
-proc execNifler(c: var DepContext; input, output: string) =
-  if not c.forceRebuild and semos.fileExists(output) and semos.fileExists(input) and
-      getLastModificationTime(output) > getLastModificationTime(input):
+proc execNifler(c: var DepContext; f: FilePair) =
+  let output = c.config.parsedFile(f)
+  let depsFile = c.config.depsFile(f)
+  if not c.forceRebuild and semos.fileExists(output) and
+      semos.fileExists(f.nimFile) and getLastModificationTime(output) > getLastModificationTime(f.nimFile) and
+      semos.fileExists(depsFile) and getLastModificationTime(depsFile) > getLastModificationTime(f.nimFile):
     discard "nothing to do"
   else:
-    let cmd = quoteShell(c.nifler) & " --portablePaths --deps parse " & quoteShell(input) & " " &
+    let cmd = quoteShell(c.nifler) & " --portablePaths --deps parse " & quoteShell(f.nimFile) & " " &
       quoteShell(output)
     exec cmd
 
@@ -210,13 +217,13 @@ proc importSystem(c: var DepContext; current: Node) =
   current.deps.add p
   if not c.processedModules.containsOrIncl(p.modname):
     #echo "NIFLING ", p.nimFile, " -> ", c.config.parsedFile(p)
-    execNifler c, p.nimFile, c.config.parsedFile(p)
+    execNifler c, p
     var imported = Node(files: @[p], id: c.nodes.len, parent: current.id, isSystem: true)
     c.nodes.add imported
     parseDeps c, p, imported
 
 proc parseDeps(c: var DepContext; p: FilePair; current: Node) =
-  execNifler c, p.nimFile, c.config.parsedFile(p)
+  execNifler c, p
 
   let depsFile = if c.isGeneratingFinal: c.config.deps2File(p) else: c.config.depsFile(p)
   var stream = nifstreams.open(depsFile)
@@ -405,40 +412,7 @@ proc generateFrontendBuildFile(c: DepContext; commandLineArgs: string): string =
           if arg.len > 0:
             b.addStrLit arg
       b.addStrLit "m"
-      b.withTree "input":
-        b.addIntLit 0  # main parsed file
-      b.withTree "output":
-        b.addIntLit 0  # semmed file output
-      b.withTree "output":
-        b.addIntLit 1  # index file output
-
-    # Command for nimsem with system flag
-    b.withTree "cmd":
-      b.addSymbolDef "nimsem_system"
-      b.addStrLit c.nimsem
-      if commandLineArgs.len > 0:
-        for arg in commandLineArgs.split(' '):
-          if arg.len > 0:
-            b.addStrLit arg
-      b.addStrLit "--isSystem"
-      b.addStrLit "m"
-      b.withTree "input":
-        b.addIntLit 0  # main parsed file
-      b.withTree "output":
-        b.addIntLit 0  # semmed file output
-      b.withTree "output":
-        b.addIntLit 1  # index file output
-
-    # Command for nimsem with main flag
-    b.withTree "cmd":
-      b.addSymbolDef "nimsem_main"
-      b.addStrLit c.nimsem
-      if commandLineArgs.len > 0:
-        for arg in commandLineArgs.split(' '):
-          if arg.len > 0:
-            b.addStrLit arg
-      b.addStrLit "--isMain"
-      b.addStrLit "m"
+      b.addKeyw "args"
       b.withTree "input":
         b.addIntLit 0  # main parsed file
       b.withTree "output":
@@ -451,12 +425,12 @@ proc generateFrontendBuildFile(c: DepContext; commandLineArgs: string): string =
     for v in c.nodes:
       b.withTree "do":
         # Choose the right command based on flags
-        if v.isSystem:
-          b.addIdent "nimsem_system"
-        elif i == 0:  # first node is main
-          b.addIdent "nimsem_main"
-        else:
-          b.addIdent "nimsem"
+        b.addIdent "nimsem"
+        b.withTree "args":
+          if v.isSystem:
+            b.addStrLit "--isSystem"
+          elif i == 0:  # first node is main
+            b.addStrLit "--isMain"
 
         # Input: parsed file
         var seenDeps = initHashSet[string]()

src/nimony/nimony.nim

@@ -200,6 +200,7 @@ proc handleCmdLine() =
     requiresTool "nimsem", "src/nimony/nimsem.nim", fullRebuild
     requiresTool "hexer", "src/hexer/hexer.nim", fullRebuild
     requiresTool "nifc", "src/nifc/nifc.nim", fullRebuild
+    requiresTool "nifmake", "src/nifmake/nifmake.nim", fullRebuild
     # compile full project modules
     buildGraph config, args[0], forceRebuild, silentMake,
       commandLineArgs, commandLineArgsNifc, moduleFlags, (if doRun: DoRun else: DoCompile),

src/nimony/sem.nim

@@ -2104,7 +2104,9 @@ proc semWhen(c: var SemContext; it: var Item) =
   of SemcheckSignatures, SemcheckBodies:
     discard
 
+  inc c.inWhen
   semWhenImpl(c, it, NormalWhen)
+  dec c.inWhen
 
 proc semCaseOfValue(c: var SemContext; it: var Item; selectorType: TypeCursor;
                     seen: var seq[(xint, xint)]) =

src/nimony/semdata.nim

@@ -94,6 +94,7 @@ type
     usedTypevars*: int
     phase*: SemPhase
     canSelfExec*: bool
+    inWhen*: int
     templateInstCounter*: int
     commandLineArgs*: string # for IC we make nimony `exec` itself. Thus it is important
                              # to forward command line args properly.

src/nimony/semimport.nim

@@ -51,7 +51,7 @@ proc importSingleFile(c: var SemContext; f1: ImportedFilename; origin: string;
   result = SymId(0)
   if not c.processedModules.contains(suffix):
     c.meta.importedFiles.add f2
-    if c.canSelfExec and needsRecompile(f2, suffixToNif suffix):
+    if (c.canSelfExec or c.inWhen > 0) and needsRecompile(f2, suffixToNif suffix):
       selfExec c, f2, (if f1.isSystem: " --isSystem" else: "")
 
     let moduleName = pool.strings.getOrIncl(f1.name)

src/nimony/semos.nim

@@ -274,7 +274,9 @@ proc getFile*(info: PackedLineInfo): string =
     result = ""
 
 proc selfExec*(c: var SemContext; file: string; moreArgs: string) =
-  exec os.getAppFilename() & c.commandLineArgs & moreArgs & " --ischild m " & quoteShell(file)
+  let nimonyExe = findTool("nimony")
+  exec quoteShell(nimonyExe) & c.commandLineArgs & moreArgs & " --ischild m " & quoteShell(file)
+  #exec os.getAppFilename() & c.commandLineArgs & moreArgs & " --ischild m " & quoteShell(file)
 
 # ------------------ plugin handling --------------------------