From 9feba7f7c78a5ed9e35b6cfd78824e383da232f3 Mon Sep 17 00:00:00 2001
From: rmkaplan <69548581+rmkaplan@users.noreply.github.com>
Date: Mon, 12 May 2025 12:15:47 -0700
Subject: [PATCH] JSON-GET indexes arrays with integer attributes (#2140)

---
 lispusers/JSON      |  26 ++++++++++++++++++--------
 lispusers/JSON.LCOM | Bin 3532 -> 3631 bytes
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/lispusers/JSON b/lispusers/JSON
index 32498ae4..e77047ca 100644
--- a/lispusers/JSON
+++ b/lispusers/JSON
@@ -1,12 +1,12 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "13-May-2024 22:37:13" {WMEDLEY}<lispusers>JSON.;36
 9198   
+
(FILECREATED " 7-May-2025 13:57:04" {WMEDLEY}<lispusers>JSON.;38
 9891   
 
       :EDIT-BY rmk
 
       :CHANGES-TO (FNS JSON-GET)
 
-      :PREVIOUS-DATE "13-May-2024 19:23:02" {WMEDLEY}<lispusers>JSON.;33)
+      :PREVIOUS-DATE "13-May-2024 22:37:13" {WMEDLEY}<lispusers>JSON.;36)
 
 
 (PRETTYCOMPRINT JSONCOMS)
@@ -177,14 +177,24 @@
          NIL])
 
 (JSON-GET

-  [LAMBDA (OBJECT ATTRIBUTES)
                                (* ; "Edited 13-May-2024 22:35 by rmk")


+  [LAMBDA (OBJECT ATTRIBUTES)
                                (* ; "Edited  7-May-2025 13:56 by rmk")


+                                                             (* ; "Edited 13-May-2024 22:35 by rmk")


                                                              (* ; "Edited 30-Apr-2024 14:26 by rmk")

 
     (* ;; "Returns the value at the end of a chain of ATTRIBUTES in OBJECT")

 
-    (for
 A (OBJ _ OBJECT) inside
 ATTRIBUTES do
 (if
 (EQ 'OBJECT (CAR (LISTP OBJ)))
-                                                   then
 [SETQ OBJ (CADR (ASSOC A (CDR OBJ]
-                                                 else
 (RETURN NIL)) finally
 (RETURN OBJ])
+    (for
 A (OBJ _ OBJECT) inside
 ATTRIBUTES do
 (SELECTQ (CAR (LISTP OBJ))
+                                                   (OBJECT [SETQ OBJ (CADR (ASSOC A (CDR OBJ])
+                                                   (ARRAY (CL:UNLESS (AND (FIXP A)
+                                                                          (IGEQ A 0))
+                                                                 (ERROR A 
+                                                                        " cannot index a JSON array")
+                                                                 )
+
+                                                          (* ;; "ADD1 because zero-origin")

+
+                                                          [SETQ OBJ (CAR (NTH OBJ (ADD1 A])
+                                                   (RETURN NIL)) finally
 (RETURN OBJ])
 )
 (DECLARE%: EVAL@COMPILE DONTCOPY 
 (DECLARE%: EVAL@COMPILE 
@@ -201,7 +211,7 @@
 )
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (559 8839 (JSON-PARSE 569 . 915) (JSON-VALUE 917 . 1286) (JSON-SKIP 1288 . 1562) (
+  (FILEMAP (NIL (559 9532 (JSON-PARSE 569 . 915) (JSON-VALUE 917 . 1286) (JSON-SKIP 1288 . 1562) (
 JSON-STRING 1564 . 2362) (JSON-ARRAY 2364 . 3502) (JSON-OBJECT 3504 . 4961) (JSON-AVPAIR 4963 . 5405) 
-(JSON-NUMBER 5407 . 6921) (JSON-ATOM 6923 . 8230) (JSON-GET 8232 . 8837)))))
+(JSON-NUMBER 5407 . 6921) (JSON-ATOM 6923 . 8230) (JSON-GET 8232 . 9530)))))
 STOP
diff --git a/lispusers/JSON.LCOM b/lispusers/JSON.LCOM
index 1b0cc52b72e9f20644ba81aad56a2d6fa9b52b5e..2a705ef07e052c9a8c4358c234b0b4b5a37e3812 100644
GIT binary patch
delta 312
zcmX>jy<TQQxQK$eu5V(cu91O}se+-gm8rRvfyu;dT}cZ~1ui88GlZlOP}11S*ks~H
zjUZ%kJv}`og_OjS)D)~5ObnDXxis87eO#S`TpdGPT@;kCSvh$Qqb!?+f~AF};bcEX
zx5>(kYMXa4KH_2wn>?3CramQ|0SG?K-0$VVB*w(JW5ZpDz?Pd{DaHy@_h)&1ob8nl
zQo{uz_Ir3`-vG0KN;ffRSQseyg?K2K8z{I21^EX79b{sr;20F-7^z@nso?MA<?0*)
q6jU%X1-dRdF)uH_L?JUTCAC5!QNb(N-;Z4(v8X7qQfcxXo(}+vx>EQ6

delta 200
zcmZ24b4GeXxQL;#u5V(cu91O}iGq=lm9e>%q4C6QT}d-d1ui8NNdqfWBP&zOi5oR+
zkj3@%^pq4*5=&B3uxK#0GB8on<kE2S^l^0#a&-)Gb(!48Xu_&sX=rIN*^kkU!_d;o
z2&l?v@*GB4M&r%97$0#lYE7QYBcq(o00bYly!P^75@TZAvEd$rpQjI(hLMGWzmu1%
Ma|qDb$@aV-0E%fdBme*a