refact(Lib/os_impl): dedup MS_WINDOWS, InJs

Author: litlighilit

src/pylib/Lib/os_impl/common.nim

@@ -1,5 +1,7 @@
 
-import ../../pyerrors/[oserr, simperr]
+import ./private/defined_macros
+export InJs
+import ../../pyerrors/[oserr, simperr, rterr]
 when defined(js):
   import ../../pyerrors/jsoserr
   export jsoserr
@@ -13,6 +15,6 @@ import ../../pybytes/[bytesimpl, bytesbltins]
 import ../../version
 export version
 
-export io_abc, oserr, simperr, strimpl, strbltins.repr, bytesimpl, bytesbltins.repr
+export io_abc, oserr, simperr, rterr, strimpl, strbltins.repr, bytesimpl, bytesbltins.repr
 export noneType
 

src/pylib/Lib/os_impl/inheritable.nim

@@ -1,12 +1,9 @@
 
 # XXX: this shall work `when defined(freertos) or defined(zephyr)`
 #  but is is meaningful?
-import ./private/[platform_utils, iph_utils]
+import ./private/[platform_utils, iph_utils, defined_macros]
 import ../../pyerrors/oserr
 
-const
-  MS_WINDOWS = defined(windows)
-
 when MS_WINDOWS:
   import std/winlean
   from std/os import raiseOSError

src/pylib/Lib/os_impl/path.nim

@@ -48,7 +48,7 @@ psExp normpath, normalizedPath
 func relpath*[T](p: PathLike[T], start=curdir): T =
   mapPathLike[T] relativePath($p, $start)
 
-when defined(js):
+when InJS:
   export getatime, getmtime, getctime
 else:
   template expFRetTAsF(nam, nimProc){.dirty.} =

src/pylib/Lib/os_impl/posix_like/lseek.nim

@@ -1,5 +1,5 @@
 
-import ../private/iph_utils
+import ../private/[iph_utils, defined_macros]
 import ./errnoHandle
 const weirdTarget = defined(js) or defined(nimscript)
 when not weirdTarget:

src/pylib/Lib/os_impl/private/defined_macros.nim

@@ -0,0 +1,8 @@
+
+const MS_WINDOWS* = defined(windows)
+when not defined(js):
+  const ms_windows* = MS_WINDOWS
+else:
+  import ../../sys_impl/genplatform
+  let ms_windows* = getPlatform() == "win32"
+const InJs* = defined(js)

src/pylib/Lib/os_impl/randoms.nim

@@ -8,7 +8,7 @@ else:
 
 import ../../nimpatch/newUninit
 import ../../pyconfig/bootstrap_hash
-
+import ./private/defined_macros
 #[
 ## | Targets              | Implementation        | set errno
 ## | :---                 | ----:                 | :---
@@ -33,7 +33,7 @@ import ../../pyconfig/bootstrap_hash
 ## .. _/dev/urandom: https://en.wikipedia.org/wiki//dev/random
 ]#
 
-const mayUseDevUrandom = not defined(js) and not defined(windows)
+const mayUseDevUrandom = not defined(js) and not MS_WINDOWS
 when mayUseDevUrandom:
   import ../errno_impl/errnoUtils
   {.define: ImportErrnoUtils.}

src/pylib/Lib/os_impl/waits.nim

@@ -3,13 +3,13 @@ import ../resource_impl/types
 from ./common import raiseErrno
 import ./util/handle_signal
 import ./private/platform_utils
-const DWin = defined(windows)
-when DWin:
+import ./private/defined_macros
+when MS_WINDOWS:
   import ../../private/iph_utils  # with_Py_SUPPRESS_IPH
 else:
   from std/posix import Pid
 
-when DWin:
+when MS_WINDOWS:
   type Res = int
   type WAIT_TYPE = cint
   proc cwait(termstat: var cint, pid: cint, options: cint): Res{.importc: "_cwait", header: "<process.h>".}
@@ -38,7 +38,7 @@ else:
   template decl_STATUS_INIT(status; val: cint = 0) =
     var status: WAIT_TYPE = val
 
-when not DWin and not defined(js) and not defined(nimscript):
+when not MS_WINDOWS and not defined(js) and not defined(nimscript):
   template genW(name){.dirty.} =
     proc name(status: WAIT_TYPE): cint{.importc, header: "<sys/wait.h>".}
     proc name*(status: int): bool =
@@ -79,7 +79,7 @@ when declared(c_waitpid):
     waitX_impl[Res](res, status, c_waitpid(pid, status, options))
     (res.int, handle_status(status))
 
-when not DWin:
+when not MS_WINDOWS:
   proc wait(status: var WAIT_TYPE): Res{.importc, header: "<sys/wait.h>".}
   proc wait*(): tuple[pid: int, status: int]{.platformNoJs.} =
     var res: Pid
@@ -116,7 +116,7 @@ when not DWin:
     wait_helper(res, WAIT_STATUS_INT(status), ru)
 
 proc waitstatus_to_exitcode*(status: int): int{.platformNoJs.} =
-  when not defined(windows):
+  when not MS_WINDOWS:
     decl_STATUS_INIT(wait_status, status.cint)
     var exitcode: cint
     if bool WIFEXITED(wait_status):

src/pylib/private/iph_utils.nim

@@ -4,7 +4,7 @@
 CPython/Include/internal/pycore_fileutils.h
 ]##
 
-const MS_WINDOWS* = defined(windows)
+const MS_WINDOWS = defined(windows)
 
 when MS_WINDOWS and defined(vcc):
   let MSC_VER{.importc: "_MSC_VER", nodecl.}: cint

src/pylib/pyerrors/oserr.nim

@@ -8,7 +8,7 @@ when defined(windows):
 else:
   import std/posix
 
-const InJs* = defined(js)
+const InJs = defined(js)
 when InJs:
   import ./jsoserr