From 43b06bab1548beaefb7b0b0c0ba58f6d830e46e4 Mon Sep 17 00:00:00 2001
From: Nino van Hooff <ninovanhooff@gmail.com>
Date: Fri, 25 Oct 2024 11:32:29 +0200
Subject: [PATCH] CHANGE seqBuilder to iterator and other small refactors

---
 src/playdate/bindings/utils.nim |  7 +++++++
 src/playdate/scoreboards.nim    | 29 ++++++-----------------------
 2 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/src/playdate/bindings/utils.nim b/src/playdate/bindings/utils.nim
index f2cb4ce..a4cb91a 100644
--- a/src/playdate/bindings/utils.nim
+++ b/src/playdate/bindings/utils.nim
@@ -1,5 +1,12 @@
 import macros
 
+iterator items*[T](rawField: ptr UncheckedArray[T], len: Natural): T =
+    ## iterate through a C array
+    ## To convert to a Nim seq:
+    ## `cArray.items(count).toSeq`
+    for i in 0..<len:
+        yield rawField[i]
+
 func toNimSymbol(typeSymbol: string): string =
     case typeSymbol:
         of "cint":
diff --git a/src/playdate/scoreboards.nim b/src/playdate/scoreboards.nim
index b24e1eb..ea94cc8 100644
--- a/src/playdate/scoreboards.nim
+++ b/src/playdate/scoreboards.nim
@@ -1,9 +1,10 @@
 {.push raises: [].}
 
 import std/importutils
+import std/sequtils
 
 import types {.all.}
-import bindings/[api, types]
+import bindings/[api, types, utils]
 import bindings/scoreboards
 
 # Only export public symbols, then import all
@@ -11,7 +12,7 @@ export scoreboards
 {.hint[DuplicateModuleImport]: off.}
 import bindings/scoreboards {.all.}
 
-type 
+type
   PDScore* = object of RootObj
     value*, rank*: uint32
     player*: string
@@ -87,17 +88,6 @@ proc scoreBuilder(score: PDScoreRaw): PDScore =
 proc scoreBuilder(score: PDScorePtr): PDScore =
   scoreBuilder(score[])
 
-proc seqBuilder[T, U](rawField: ptr UncheckedArray[T], length: SomeInteger, itemBuilder: proc (item: T): U {.raises: [].}): seq[U] =
-  ## Coverts a C array to a Nim seq
-  privateAccess(SDKArray)
-  let cArray = SDKArray[T](data: rawField, len: length.int)
-  var newSeq = newSeq[U](length)
-  for i in 0 ..< length:
-    let item = cArray[i]
-    newSeq[i] = itemBuilder(item)
-  cArray.data = nil # no need for SDKArray to free the data, free function will do it
-  return newSeq
-
 proc invokePersonalBestCallback(score: PDScorePtr, errorMessage: ConstChar) {.cdecl, raises: [].} =
   invokeCallback(
     callbackSeqs = privatePersonalBestCallbacks,
@@ -126,11 +116,7 @@ proc invokeScoresCallback(scoresList: PDScoresListPtr, errorMessage: ConstChar)
     freeValue = playdate.scoreboards.freeScoresList,
     builder = proc (scoresList: PDScoresListPtr): PDScoresList =
       privateAccess(SDKArray)
-      var scoresSeq = seqBuilder(
-        rawField = scoresList.scores,
-        length = scoresList.count,
-        itemBuilder = scoreBuilder
-      )
+      let scoresSeq = scoresList.scores.items(scoresList.count).toSeq.mapIt(scoreBuilder(it))
       return newPDScoresList(boardID = $scoresList.boardID, lastUpdated = scoresList.lastUpdated, scores = scoresSeq),
     emptyValue = emptyPDScoresList
   )
@@ -142,11 +128,8 @@ proc invokeBoardsListCallback(boardsList: PDBoardsListPtr, errorMessage: ConstCh
     errorMessage = errorMessage,
     freeValue = playdate.scoreboards.freeBoardsList,
     builder = proc (boardsList: PDBoardsListPtr): PDBoardsList =
-      var boardsSeq = seqBuilder(
-      rawField = cast[ptr UncheckedArray[PDBoardRaw]](boardsList.boards),
-      length = boardsList.count,
-      itemBuilder = proc (board: PDBoardRaw): PDBoard =
-        newPDBoard(boardID = $board.boardID, name = $board.name)
+      let boardsSeq: seq[PDBoard] = boardsList.boards.items(boardsList.count).toSeq.mapIt(
+        newPDBoard(boardID = $it.boardID, name = $it.name)
       )
       return newPDBoardsList(lastUpdated = boardsList.lastUpdated, boards = boardsSeq),
     emptyValue = emptyPDBoardsList