fix(py): os.stat_result [] returns int while getattr returns float for st_?time(fixes #35)

Author: litlighilit

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

@@ -1,7 +1,6 @@
 
 import ../common
-
-const DWin = defined(windows)
+import std/macros
 
 type Time64 = int64
 
@@ -44,57 +43,91 @@ when DWin:
   {.pop.}
 else:
   import std/posix
-  
-  template toTime(x): untyped = x.tv_sec
-  template st_atime*(s: Stat): untyped = Time64 toTime s.st_atim
-  template st_mtime*(s: Stat): untyped = Time64 toTime s.st_mtim
-  template st_ctime*(s: Stat): untyped = Time64 toTime s.st_ctim
-
-const statHasMore = defined(linux)  # XXX: this check is not suitable.
-when statHasMore:
-  type
-    stat_result* = tuple[
-      st_mode: Mode, st_ino: Ino, st_dev: Dev, st_nlink: Nlink,
-      st_uid: Uid, st_gid: Gid, st_size: Off,
-      st_atime, st_mtime, st_ctime: Time64,
-
-      st_blocks: Blkcnt,
-      st_blksize: Blksize,
-      st_rdev: Dev,
-      # st_flags
-    ]  ## Python's `os.stat_result` (a NamedTuple)
-else:
-  type
-    stat_result* = tuple[
-      st_mode: Mode, st_ino: Ino, st_dev: Dev, st_nlink: Nlink,
-      st_uid: Uid, st_gid: Gid, st_size: Off,
-      st_atime, st_mtime, st_ctime: Time64,
-    ]  ## Python's `os.stat_result` (a NamedTuple)
 
-import std/macros
+type
+  stat_result* = ref object
+    data*: Stat ## inner, used by `getattr` of `stat_result`
+
+macro genTimeGetter(amc: static[char]) =
+  result = newStmtList()
+  let s_st_xtim = "st_" & amc & "tim"
+  template get(attr: string): NimNode =
+    newDotExpr(x, ident(attr))
+  let
+    xtim = ident s_st_xtim
+    xtime = ident(s_st_xtim & 'e')
+  let
+    xtime_ns = ident(s_st_xtim & "e_ns")
+  result = quote do:
+    func `xtime`*(self: stat_result): float =
+      when compiles(self.data.`xtim`):
+        self.data.`xtim`.tv_sec.float + self.data.`xtim`.tv_nsec/1_000_000_000
+      else:
+        self.data.`xtime`.float
+    func `xtime_ns`*(self: stat_result): BiggestInt{.pysince(3,3).} =
+      when compiles(self.data.`xtim`):
+        self.data.`xtim`.tv_sec.BiggestInt * 1_000_000_000 +
+        self.data.`xtim`.tv_nsec.BiggestInt
+      else:
+        self.data.`xtime`.BiggestInt * 1_000_000_000
 
-macro to_result(s: Stat): stat_result =
-  var templ: stat_result
-  result = nnkTupleConstr.newNimNode
-  for kStr, _ in templ.fieldPairs:
-    let k = ident kStr
-    result.add newColonExpr(k, newDotExpr(s, k))
-    #  `k`: `s`.`k`
-
-proc statFor(st: var Stat, path: int|PathLike) =
-  let ret =
-    when path is int:
-      fstat(path.cint, st)
-    else:
-      when DWin:
-        wstat( newWideCString(path.fspath), st)
+genTimeGetter 'a'
+genTimeGetter 'm'
+genTimeGetter 'c'
+
+{.experimental: "dotOperators".}
+template `.`*(self: stat_result; attr): untyped =
+  ## as Python's `__getattr__`
+  self.data.attr
+
+const visible_size = 10
+
+func getitem(self: stat_result, i: int): BiggestInt =
+  # this proc was once generated by macro
+  case i
+  of 0: result = BiggestInt self.data.st_ino
+  of 1: result = BiggestInt self.data.st_mode
+  of 2: result = BiggestInt self.data.st_nlink
+  of 3: result = BiggestInt self.data.st_uid
+  of 4: result = BiggestInt self.data.st_gid
+  of 5: result = BiggestInt self.data.st_dev
+  of 6: result = BiggestInt self.data.st_size
+  of 7: result = BiggestInt self.data.st_atime
+  of 8: result = BiggestInt self.data.st_mtime
+  of 9: result = BiggestInt self.data.st_ctime
+  else:
+    raise newException(IndexDefect, "tuple index out of range")
+
+func `[]`*(self: stat_result, i: int): BiggestInt =
+  self.getitem(if i < 0: visible_size + i else: i)
+
+func to_result(s: sink Stat): stat_result =
+  result = stat_result(data: s)
+
+when defined(js):
+  proc statFor(st: var Stat, path: int|PathLike) =
+    catchJsErrAndRaise:
+      st =
+        when path is int:
+          fstatSync(path.cint)
+        else:
+          statSync cstring $path
+
+else:
+  proc statFor(st: var Stat, path: int|PathLike) =
+    let ret =
+      when path is int:
+        fstat(path.cint, st)
+      else:
+        when DWin:
+          wstat( newWideCString(path.fspath), st)
+        else:
+          stat(cstring path.fspath, st)
+    if ret != 0.cint:
+      when path is int:
+        raiseErrno($path)
       else:
-        stat(cstring path.fspath, st)
-  if ret != 0.cint:
-    when path is int:
-      raiseErrno($path)
-    else:
-      path.raiseErrnoWithPath()
+        path.raiseErrnoWithPath()
 
 template statAttr*(path: PathLike|int, attr: untyped): untyped =
   ## stat(`path`).`attr`