Skip to content

[1286] 升级内置 Goldfish Scheme 到 v18.11.32 并移除 njson - #4526

Merged
da-liii merged 3 commits into
mainfrom
da/1286/goldfish
Sep 8, 2026
Merged

[1286] 升级内置 Goldfish Scheme 到 v18.11.32 并移除 njson#4526
da-liii merged 3 commits into
mainfrom
da/1286/goldfish

Conversation

@da-liii

@da-liii da-liii commented Sep 8, 2026

Copy link
Copy Markdown
Contributor

What

  • 覆盖式同步 TeXmacs/plugins/goldfish/src/goldfish/{scheme,liii,srfi}/)到上游 v18.11.32,与上游逐文件一致
  • 随上游移除 (liii njson)(goldfish#996):删除 liii_njson.cppgoldfish/liii/njson.scm3rdparty/json-schema-validator/
  • 最后一个 njson 使用点 TeXmacs/tests/0205.scm(chat 持久化集成测试)迁移到 (liii json)file->njsonstring->jsonnjson-refjson-refnjson-array->listvector->list 兼容分支,删除全部 njson-free 调用
  • 删除 njson 专属测试 TeXmacs/tests/0251.scmTeXmacs/tests/tmu/200_21_njson.tmu
  • xmake/goldfish.luaxmake/vars.lua 去掉 njson 相关源文件与 include 路径
  • vendored 文件保持上游原格式,未按 gf fmt 重排

Why

与 1252(v18.11.31)相同的覆盖式对齐上游 tag 约定。上游 v18.11.32 已移除 (liii njson),mogan 保持一致,避免维护上游已废弃的 JSON 双实现及其 schema 校验依赖。progs 侧迁移已由 #4520/#4521/#4523/#4524(1281–1285)完成,本分支收尾。

上游 v18.11.31..v18.11.32 主要内容:环形结构防御(list-sorted?、subprocess 参数/env、set! load-path、json-drop 回调造环)、边界修复(substring/cursors 越界、iota_list 溢出 UB、g_http-post files 类型检查、g_listdir 防越界)、类型检查补齐(hash-table-ref/default、update!、delete-duplicates)等。

验证

  • 与上游 v18.11.32 逐文件 diff -rq 一致;全仓 grep njson 无残留
  • xmake b goldfishxmake b stem 通过
  • GUI 验证按惯例由 reviewer 手动做

🤖 Generated with Claude Code

da-liii and others added 3 commits September 8, 2026 16:37
- 覆盖式同步 src/ 与 goldfish/{scheme,liii,srfi}/ 到上游 v18.11.32
- 随上游移除 (liii njson):删除 liii_njson.cpp、njson.scm 及 3rdparty/json-schema-validator
- 0205.scm 迁移到 (liii json),删除 0251 集成测试与 njson tmu
- xmake 去掉 njson 相关源文件与 include 路径

Co-Authored-By: Claude <noreply@anthropic.com>
s7 会把模块内对 C++ glue 函数的引用静态绑定到 glue 本身,qt-chat-tab-
restore-session 间谍必须先于 chat-list.scm 加载定义才能被模块内调用看到。

Co-Authored-By: Claude <noreply@anthropic.com>
@da-liii
da-liii merged commit 69af5c8 into main Sep 8, 2026
6 checks passed
@da-liii
da-liii deleted the da/1286/goldfish branch September 8, 2026 11:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant