M minpkg/lib/min_gui.nim → minpkg/lib/min_gui.nim

@@ -13,6 +13,11 @@ 
 proc window(i: In, v: MinValue): var Fenster =
     return WINDOWS[i.dget(v, "ref").intVal]
 
+proc close(i: In, v: MinValue) =
+    i.window(v).close()
+    let r = i.dget(v, "ref").intVal
+    WINDOWS.delete(r)
+
 proc gui_module*(i: In) =
     let def = i.define()
 
@@ -43,13 +48,13 @@ WINDOWS.add window
         i.push win
 
     def.symbol("loop") do (i: In):
-        var vals = i.expect("dict:window")
-        i.push i.window(vals[0]).loop.newVal
+        var vals = i.expect("quot", "dict:window")
+        while i.window(vals[1]).loop:
+            i.dequote vals[0]
 
     def.symbol("close") do (i: In):
         var vals = i.expect("dict:window")
-        i.window(vals[0]).close()
-        WINDOWS.delete(vals[0].intVal)
+        i.close(vals[0])
 
     def.symbol("pixel") do (i: In):
         var vals = i.expect("quot", "dict:window")

M tests/global.min → tests/global.min

@@ -819,6 +819,25 @@ ((1 2 "test") ("test" "a" true 1) difference (2) ==) test.assert
 
   ((1 2 "test") ("test" "a" true 1) symmetric-difference (true "a" 2) ==) test.assert
 
+  (
+    0 :x
+    0 :y
+    0 :t
+    (x 100 <)
+      (
+        0 @y
+        (y 200 <)
+          (
+            y succ @y
+            t succ @t
+          )
+        while
+        x succ @x
+      )
+    while
+    x y t + + 20300 ==
+  ) test.assert
+
   test.report
   ;; Tidy up
   stack.clear