jyapayne/nimterop
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix enum size to cint

Browse source
This commit is contained in:
Ganesh Viswanathan 2020-04-15 12:47:30 -05:00
commit 6d08f6ed80
1 changed files with 27 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

47
nimterop/types.nim
View file

@ -22,14 +22,20 @@ type
va_list* {.importc, header:"<stdarg.h>".} = object va_list* {.importc, header:"<stdarg.h>".} = object
template enumOp*(op, typ, typout) = template enumOp*(op, typ, typout) =
proc op*(x: typ, y: int): typout {.borrow.} proc op*(x: typ, y: cint): typout {.borrow.}
proc op*(x: int, y: typ): typout {.borrow.} proc op*(x: cint, y: typ): typout {.borrow.}
proc op*(x, y: typ): typout {.borrow.} proc op*(x, y: typ): typout {.borrow.}
template defineEnum*(typ) = proc op*(x: typ, y: int): typout = op(x, y.cint)
type proc op*(x: int, y: typ): typout = op(x.cint, y)
typ* = distinct int
template defineEnum*(typ) =
# Create a `distinct cint` type for C enums since Nim enums
# need to be in order and cannot have duplicates.
type
typ* = distinct cint
# Enum operations allowed
enumOp(`+`, typ, typ) enumOp(`+`, typ, typ)
enumOp(`-`, typ, typ) enumOp(`-`, typ, typ)
enumOp(`*`, typ, typ) enumOp(`*`, typ, typ)
@ -39,29 +45,30 @@ template defineEnum*(typ) =
enumOp(`div`, typ, typ) enumOp(`div`, typ, typ)
enumOp(`mod`, typ, typ) enumOp(`mod`, typ, typ)
proc `shl`*(x: typ, y: int): typ {.borrow.} # These don't work with `enumOp()` for some reason
proc `shl`*(x: int, y: typ): typ {.borrow.} proc `shl`*(x: typ, y: cint): typ {.borrow.}
proc `shl`*(x: cint, y: typ): typ {.borrow.}
proc `shl`*(x, y: typ): typ {.borrow.} proc `shl`*(x, y: typ): typ {.borrow.}
proc `shr`*(x: typ, y: int): typ {.borrow.} proc `shr`*(x: typ, y: cint): typ {.borrow.}
proc `shr`*(x: int, y: typ): typ {.borrow.} proc `shr`*(x: cint, y: typ): typ {.borrow.}
proc `shr`*(x, y: typ): typ {.borrow.} proc `shr`*(x, y: typ): typ {.borrow.}
proc `or`*(x: typ, y: int): typ {.borrow.} proc `or`*(x: typ, y: cint): typ {.borrow.}
proc `or`*(x: int, y: typ): typ {.borrow.} proc `or`*(x: cint, y: typ): typ {.borrow.}
proc `or`*(x, y: typ): typ {.borrow.} proc `or`*(x, y: typ): typ {.borrow.}
proc `and`*(x: typ, y: int): typ {.borrow.} proc `and`*(x: typ, y: cint): typ {.borrow.}
proc `and`*(x: int, y: typ): typ {.borrow.} proc `and`*(x: cint, y: typ): typ {.borrow.}
proc `and`*(x, y: typ): typ {.borrow.} proc `and`*(x, y: typ): typ {.borrow.}
proc `xor`*(x: typ, y: int): typ {.borrow.} proc `xor`*(x: typ, y: cint): typ {.borrow.}
proc `xor`*(x: int, y: typ): typ {.borrow.} proc `xor`*(x: cint, y: typ): typ {.borrow.}
proc `xor`*(x, y: typ): typ {.borrow.} proc `xor`*(x, y: typ): typ {.borrow.}
proc `/`(x, y: typ): typ = proc `/`*(x, y: typ): typ =
return (x.float / y.float).int.typ return (x.float / y.float).cint.typ
proc `/`*(x: typ, y: int): typ = `/`(x, y.typ) proc `/`*(x: typ, y: cint): typ = `/`(x, y.typ)
proc `/`*(x: int, y: typ): typ = `/`(x.typ, y) proc `/`*(x: cint, y: typ): typ = `/`(x.typ, y)
proc `$` *(x: typ): string {.borrow.} proc `$`*(x: typ): string {.borrow.}