Updates to work under Nim 1.x

log_happy.nim

@@ -76,7 +76,7 @@ Expectations JSON definitions follow this format:
     let args = commandLineParams()
 
     var expectations: seq[Expectation] = @[]
-    var follow = false 
+    var follow = false
     var cmd = "NOCMD"
 
     if args.len == 0:
@@ -128,7 +128,7 @@ Expectations JSON definitions follow this format:
         except:
           exitErr "could not open output file in write mode (" & filename &
             "):\n\t" & getCurrentExceptionMsg()
-        
+
       elif arg.match(expPattern).isSome:
         var m = arg.match(expPattern).get().captures()
         expectations.add(Expectation(
@@ -148,7 +148,7 @@ Expectations JSON definitions follow this format:
       elif arg == "-f": follow = true
       elif arg == "--": cmd = ""
       else: exitErr "unrecognized argument: " & arg
-        
+
     if cmd == "NOCMD" and inStream.isNil:
       exitErr "no input file or command to execute."
 
@@ -161,7 +161,7 @@ Expectations JSON definitions follow this format:
 
     # Init ncurses
     let stdscr = initscr()
-    var height, width: int
+    var height, width: cint
     getmaxyx(stdscr, height, width)
 
     startColor()
@@ -230,7 +230,7 @@ Expectations JSON definitions follow this format:
 
           dispwin.wrefresh()
           firstPass = false
-              
+
         logwin.wprintw("\n" & line)
         logwin.wrefresh()
 

mise.toml

@@ -0,0 +1,2 @@
+[tools]
+nim = "1"

private/ncurses_ext.nim

@@ -1,21 +1,21 @@
 import ncurses
 export ncurses
 
-proc keypad*(win: ptr window, enable: bool): int {.cdecl, discardable, importc: "keypad", dynlib: libncurses.}
-proc scrollok*(win: ptr window, enable: bool): int {.cdecl, discardable, importc: "scrollok", dynlib: libncurses.}
-proc nodelay*(win: ptr window, enable: bool): int {.cdecl, discardable, importc: "nodelay", dynlib: libncurses.}
-proc nonl*(): int {.cdecl, discardable, importc: "nonl", dynlib: libncurses.}
+#proc keypad*(win: ptr window, enable: bool): int {.cdecl, discardable, importc: "keypad", dynlib: libncurses.}
+#proc scrollok*(win: ptr window, enable: bool): int {.cdecl, discardable, importc: "scrollok", dynlib: libncurses.}
+#proc nodelay*(win: ptr window, enable: bool): int {.cdecl, discardable, importc: "nodelay", dynlib: libncurses.}
+#proc nonl*(): int {.cdecl, discardable, importc: "nonl", dynlib: libncurses.}
 
 proc newwin*(num_rows, num_cols, begin_x, begin_y: int): ptr window {.cdecl, discardable, importc: "newwin", dynlib: libncurses.}
 proc delwin*(win: ptr window): int {.cdecl, discardable, importc: "delwin", dynlib: libncurses.}
 #proc newwin(num_rows, num_cols, begin_x, begin_y: int): ptr window {.cdecl, discardable, importc: "newwin", dynlib: libncurses.}
 
 #proc wgetch*(win: ptr window): int {.cdecl, discardable, importc: "wgetch", dynlib: libncurses.}
-proc wrefresh*(win: ptr window): int {.cdecl, discardable, importc: "wrefresh", dynlib: libncurses.}
+#proc wrefresh*(win: ptr window): int {.cdecl, discardable, importc: "wrefresh", dynlib: libncurses.}
 proc wclear*(win: ptr window): int {.cdecl, discardable, importc: "wclear", dynlib: libncurses.}
 proc mvwhline*(win: ptr window, rol, col: int, chType: char, n: int): int {.cdecl, discardable, importc: "whline", dynlib: libncurses.}
 proc wmove*(win: ptr window, rol, col: int): int {.cdecl, discardable, importc: "wmove", dynlib: libncurses.}
-proc wprintw*(win: ptr window, str: cstring): int {.cdecl, discardable, importc: "wprintw", dynlib: libncurses.}
+#proc wprintw*(win: ptr window, str: cstring): int {.cdecl, discardable, importc: "wprintw", dynlib: libncurses.}
 #proc mvwprintw*(win: ptr window, row, col: int, str: cstring): int {.cdecl, discardable, importc: "mvwprintw", dynlib: libncurses.}
 
 proc box*(win: ptr window, vert_border, horiz_border: char): int {.cdecl, discardable, importc: "box", dynlib: libncurses.}
@@ -35,5 +35,3 @@ const BLUE* = 4
 const MAGENTA* = 5
 const CYAN* = 6
 const WHITE* = 7
-
-