fix(py): Enum(value) now may raise ValueError

Author: litlighilit

src/pylib/Lib/enum_impl/enumType.nim

@@ -2,14 +2,22 @@
 import std/[hashes, tables, strformat]
 import ../../pyerrors/simperr
 
-template GenPyEnumMeth*(Self, Value: typedesc; genObjMeth = true, nameError = NameError, Str = string){.dirty.} =
+template GenPyEnumInit*(Self, Value: typedesc; sym){.dirty.} =
+  bind `[]`
+  proc sym*(value: Self): Self = value
+  proc sym*(value: Value): Self =
+    `Self.names`.withValue value, name:
+      return `Self.member_map`[name[]]
+    raise newException(ValueError, repr(value) & " is not a valid " & $Self)
+
+template GenPyEnumMeth*(Self; Value: typedesc; genObjMeth = true, genInit = false, nameError = NameError, Str = string){.dirty.} =
   ## XXX: NIM-BUG: as `std/tables` is not working with `bind` once required at compile time,
   ##   `import std/tables` is a must before using this template.
   bind contains, `[]`
   bind hash, Table, Hash, withValue, `[]=`, `$`, items, len, fmt, formatValue
-
-  var `Self.names`{.genSym, compileTime.}: Table[Value, string]  ## self._name_
-  var `Self.member_map`{.genSym, compileTime.}: Table[Str, Self]  ## cls._member_map_
+  var `Self.names`{.compileTime.}: Table[Value, string]  ## self._name_
+  var `Self.member_map`{.compileTime.}: Table[Str, Self]  ## cls._member_map_
+  bind GenPyEnumInit
 
   using self: Self
   using cls: typedesc[Self]
@@ -38,6 +46,8 @@ template GenPyEnumMeth*(Self, Value: typedesc; genObjMeth = true, nameError = Na
     # XXX: Python here also need to handle property and class attribute
     `Self.member_map`[name] = self
   proc add_alias*(self; name: Str) = Self.add_member(name, self)
+  when genInit:
+    GenPyEnumInit(Self, Value, Self)
 
 
   # _simple_enum's convert_class's Enum / IntEnum / StrEnum branch

src/pylib/Lib/enum_impl/intEnum.nim

@@ -4,12 +4,12 @@ import ./enumType
 
 
 
-template GenIntEnumMeth*(Self: typedesc; Int = int){.dirty.} =
+template GenIntEnumMeth*(Self: typedesc; Int = int, genObjMeth = true, genInit = false){.dirty.} =
   bind GenPyEnumMeth
-  GenPyEnumMeth(Self, Int)
+  GenPyEnumMeth(Self, Int, genObjMeth, genInit)
   converter toInt*(self: Self): Int = self.Int
 
-template DeclIntEnumMeth*(Self; Int = int){.dirty.} =
+template DeclIntEnumMeth*(Self; Int = int, genObjMeth = true, genInit = false){.dirty.} =
   bind GenIntEnumMeth
   type Self = distinct Int
-  GenIntEnumMeth(Self, Int)
+  GenIntEnumMeth(Self, Int, genObjMeth, genInit)

src/pylib/Lib/signal_impl/enums.nim

@@ -2,7 +2,8 @@
 import std/tables
 import ./pylifecycle except SigInfo
 import ./pynsig
-import ../enum_impl/intEnum
+import ../enum_impl/[intEnum, enumType]
+import ./enums_decl
 
 # ITIMER*  (not enum)
 template Exp(sym) =
@@ -13,17 +14,20 @@ Exp ITIMER_REAL
 Exp ITIMER_VIRTUAL
 Exp ITIMER_PROF
 
+template genEnum(name) =
+  GenIntEnumMeth name
+  GenPyEnumInit(name, int, name)
+
 # SIG*
-DeclIntEnumMeth Signals
-export Signals
+genEnum Signals
 
-template add_enum[E](sym, val) =
-  let sym* = E.add_member(astToStr(sym), val)
+template add_enum(E, sym, val) =
+  let sym* = enums_decl.E.add_member(astToStr(sym), val)
 
 template add_sig(sym) =
   when declared(sym):
     when sym != DEF_SIG:
-      add_enum[Signals](sym, sym)
+      add_enum(Signals, sym, sym)
 
 when true:  # just convenient for code folding
   add_sig CTRL_C_EVENT
@@ -71,26 +75,26 @@ when true:  # just convenient for code folding
 
 
 # SIG_*
-DeclIntEnumMeth Handlers
-export Handlers
+genEnum Handlers
 
 template add_handler(sym) =
   when declared(sym):
-    add_enum[Handlers](sym, cast[int](sym))
+    add_enum(Handlers, sym, cast[int](sym))
 
 add_handler SIG_DFL
 add_handler SIG_IGN
 
 
 # Sigmasks
-DeclIntEnumMeth Sigmasks
-export Sigmasks
+genEnum Sigmasks
 
 template add_sigmask(sym) =
   when declared(sym):
-    add_enum[Sigmasks](sym, sym)
+    add_enum(Sigmasks, sym, sym)
 
 when not defined(windows):
   add_sigmask SIG_BLOCK
   add_sigmask SIG_UNBLOCK
   add_sigmask SIG_SETMASK
+
+export Signals, Handlers, Sigmasks

src/pylib/Lib/signal_impl/enums_decl.nim

@@ -0,0 +1,7 @@
+
+template decl(name) =
+  type name* = distinct int
+
+decl Signals
+decl Handlers
+decl Sigmasks