feat(lang): implement RFC-LANG-0002 unified semantics (breaking)
One Markdown-to-program mapping, no version selector or legacy mapper. Frontend/runtime: - resolve @exec/@knowledge heading declarations with nearest-ancestor inheritance; only an Exec H2 is callable; add UnitKind::Knowledge and sem.* diagnostics (mode marker, unit name, exec-without-function, payload nesting/empty, syntax, control stack, params position, version directive, inferred-signature lint) - extract Strong/Emph/inline Code as one-statement carriers, refuse nested carriers, and honour heading segment boundaries so an if/while cannot be closed across a heading - lower if/else/while/end to the existing Branch/Loop/Return IR with a compile-time control stack; keep payload-relative source spans through expression parsing and rewrite them onto the file - accept params(...) only as the first direct Exec H2 payload; keep the existing free-variable inference and named-only rule for inferred signatures; fix duplicate-mode/else/end and Knowledge-body inertness - reject marqdo_semantics/syntax front matter directives Data and tests: - migrate stdlib/**/*.mq.md, regenerate stdlib.json digest - migrate examples and the full semantics/negative/runtime corpus to the only current syntax; expected values/runtime codes preserved - migrate Rust-embedded .mq.md fixtures, init template, CLI help and security-lane fixtures Verified: cargo fmt --check, cargo clippy -D warnings and cargo test --workspace --locked (green).
This commit is contained in:
1 parent
49835424ee
commit
e029853e32
375 files changed
+6591
-4790
No files matched your search
@@ -1,6 +1,6 @@
|
||||
# 数学
|
||||
# @knowledge 数学
|
||||
|
||||
## 阶乘
|
||||
## @exec 阶乘
|
||||
|
||||
定义:
|
||||
|
||||
@@ -8,12 +8,18 @@ $$
|
||||
n! = \begin{cases}1,& n\le1\\n(n-1)!,& n>1\end{cases}
|
||||
$$
|
||||
|
||||
1. `n <= 1`,递归终点。
|
||||
`if n <= 1`
|
||||
|
||||
*1*
|
||||
递归终点,返回 1。
|
||||
|
||||
2. `n > 1`,计算更小的问题。
|
||||
`return 1`
|
||||
|
||||
**结果 = n * 阶乘(n=n-1)**
|
||||
`else`
|
||||
|
||||
*结果*
|
||||
计算更小的问题。
|
||||
|
||||
`结果 = n * 阶乘(n=n-1)`
|
||||
|
||||
`return 结果`
|
||||
|
||||
`end`
|
||||
@@ -1,7 +1,7 @@
|
||||
## main
|
||||
## @exec main
|
||||
|
||||
**问候 = "你好,Marqdo"**
|
||||
`问候 = "你好,Marqdo"`
|
||||
|
||||
> 打印(问候)
|
||||
> **打印(问候)**
|
||||
|
||||
*问候*
|
||||
`return 问候`
|
||||
@@ -1,11 +1,11 @@
|
||||
## main
|
||||
## @exec main
|
||||
|
||||
### 代码
|
||||
`结果 = foreign.call(ref("#代码"), {})`
|
||||
|
||||
> **打印(结果)**
|
||||
|
||||
### @knowledge 代码
|
||||
|
||||
```mocklang
|
||||
ignored by the mock provider
|
||||
```
|
||||
|
||||
**结果 = foreign.call(ref("#代码"), {})**
|
||||
|
||||
> 打印(结果)
|
||||
+5
-5
@@ -1,15 +1,15 @@
|
||||
# 数学
|
||||
# @knowledge 数学
|
||||
|
||||
## 圆面积公式
|
||||
## @knowledge 圆面积公式
|
||||
|
||||
$$
|
||||
A = \pi r^2
|
||||
$$
|
||||
|
||||
## 计算圆面积
|
||||
## @exec 计算圆面积
|
||||
|
||||
依据[圆面积公式](#圆面积公式)代入半径。
|
||||
|
||||
**面积 = math.eval(ref("#圆面积公式"), {"r": 4}, target="A")**
|
||||
`面积 = math.eval(ref("#圆面积公式"), {"r": 4}, target="A")`
|
||||
|
||||
*面积*
|
||||
`return 面积`
|
||||
@@ -1,14 +1,14 @@
|
||||
## main
|
||||
## @exec main
|
||||
|
||||
此函数演示“可引用的存储区域”与普通 Markdown 叙述并存。
|
||||
区域按 64 KiB 逻辑页增长,副本共享同一区域身份。
|
||||
|
||||
**区域 = memory.new(1, 4)**
|
||||
`区域 = memory.new(1, 4)`
|
||||
|
||||
**`区域[8] = 42`**
|
||||
`区域[8] = 42`
|
||||
|
||||
**另一个名字 = 区域**
|
||||
`另一个名字 = 区域`
|
||||
|
||||
**`另一个名字[9] = 99`**
|
||||
`另一个名字[9] = 99`
|
||||
|
||||
*区域[8] + 区域[9]*
|
||||
`return 区域[8] + 区域[9]`
|
||||
@@ -1,10 +1,10 @@
|
||||
## 圆面积
|
||||
## @exec 圆面积
|
||||
|
||||
`(r: Number)`
|
||||
`params(r: Number)`
|
||||
|
||||
*math.eval(ref("#公式"), {"r": r}, target="A")*
|
||||
`return math.eval(ref("#公式"), {"r": r}, target="A")`
|
||||
|
||||
### 公式
|
||||
### @knowledge 公式
|
||||
|
||||
$$
|
||||
A = \pi r^2
|
||||
|
||||
@@ -3,8 +3,8 @@ import:
|
||||
geometry: "./geometry.mq.md"
|
||||
---
|
||||
|
||||
## main
|
||||
## @exec main
|
||||
|
||||
**面积 = geometry.圆面积(r=2)**
|
||||
`面积 = geometry.圆面积(r=2)`
|
||||
|
||||
> 打印(面积)
|
||||
> **打印(面积)**
|
||||
@@ -4,12 +4,12 @@ import:
|
||||
geometry_v2: "@geometry_v2"
|
||||
---
|
||||
|
||||
## main
|
||||
## @exec main
|
||||
|
||||
**一 = geometry_v1.area()**
|
||||
`一 = geometry_v1.area()`
|
||||
|
||||
**二 = geometry_v2.area()**
|
||||
`二 = geometry_v2.area()`
|
||||
|
||||
> 打印(一)
|
||||
> **打印(一)**
|
||||
|
||||
> 打印(二)
|
||||
> **打印(二)**
|
||||
@@ -4,24 +4,24 @@ root:
|
||||
package: root:multi-version@0.1.0
|
||||
manifest_digest: 959bfcdd1f8174365e43a2690d80bb61ea2b7c9ca5e1476abc582600551a0d40
|
||||
packages:
|
||||
- instance_id: dep:geometry@1.0.0#76cb510d5f6ef15845a648ddf20749bc5a87bbce04008f4666cf9ac9ea14f643
|
||||
- instance_id: dep:geometry@1.0.0#d856df8a5cc47974ec256d3c939d8a1e206d82126111d2ffe1b959fcc29a4311
|
||||
name: geometry
|
||||
version: 1.0.0
|
||||
source:
|
||||
kind: path
|
||||
path: packages/geometry-v1
|
||||
content_digest: 76cb510d5f6ef15845a648ddf20749bc5a87bbce04008f4666cf9ac9ea14f643
|
||||
content_digest: d856df8a5cc47974ec256d3c939d8a1e206d82126111d2ffe1b959fcc29a4311
|
||||
manifest_digest: 3049840e18aefb2766c62406db0545cb9cc100d9d12b1dd9585e6ecb358c321a
|
||||
dependencies: {}
|
||||
- instance_id: dep:geometry@2.0.0#f364164e6b6927e85bd9e4c360de575ee7bef2b3e8bd30180cab04052ceaff29
|
||||
- instance_id: dep:geometry@2.0.0#7c625a31b3f95a1fba38f0d87afd95554937b6c2ae261e8c9208637d76e5389d
|
||||
name: geometry
|
||||
version: 2.0.0
|
||||
source:
|
||||
kind: path
|
||||
path: packages/geometry-v2
|
||||
content_digest: f364164e6b6927e85bd9e4c360de575ee7bef2b3e8bd30180cab04052ceaff29
|
||||
content_digest: 7c625a31b3f95a1fba38f0d87afd95554937b6c2ae261e8c9208637d76e5389d
|
||||
manifest_digest: b206f83f82af59995a6bda82a36627d98deb709cfac36c684ced1531f4afba2a
|
||||
dependencies: {}
|
||||
root_dependencies:
|
||||
geometry_v1: dep:geometry@1.0.0#76cb510d5f6ef15845a648ddf20749bc5a87bbce04008f4666cf9ac9ea14f643
|
||||
geometry_v2: dep:geometry@2.0.0#f364164e6b6927e85bd9e4c360de575ee7bef2b3e8bd30180cab04052ceaff29
|
||||
geometry_v1: dep:geometry@1.0.0#d856df8a5cc47974ec256d3c939d8a1e206d82126111d2ffe1b959fcc29a4311
|
||||
geometry_v2: dep:geometry@2.0.0#7c625a31b3f95a1fba38f0d87afd95554937b6c2ae261e8c9208637d76e5389d
|
||||
@@ -1,3 +1,3 @@
|
||||
## area
|
||||
## @exec area
|
||||
|
||||
*1*
|
||||
`return 1`
|
||||
@@ -1,3 +1,3 @@
|
||||
## area
|
||||
## @exec area
|
||||
|
||||
*2*
|
||||
`return 2`
|
||||
@@ -125,11 +125,11 @@ are callable through the namespace that prefixes their export names. Plugin
|
||||
calls take **named arguments only** in this build:
|
||||
|
||||
```markdown
|
||||
## main
|
||||
## @exec main
|
||||
|
||||
**结果 = solver.add(a=20, b=22)**
|
||||
`结果 = solver.add(a=20, b=22)`
|
||||
|
||||
> 打印(结果)
|
||||
> **打印(结果)**
|
||||
```
|
||||
|
||||
```sh
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
## main
|
||||
## @exec main
|
||||
|
||||
**结果 = solver.add(a=20, b=22)**
|
||||
`结果 = solver.add(a=20, b=22)`
|
||||
|
||||
> 打印(结果)
|
||||
> **打印(结果)**
|
||||
@@ -1,9 +1,9 @@
|
||||
## main
|
||||
## @exec main
|
||||
|
||||
**和 = solver.add(a=20, b=22)**
|
||||
`和 = solver.add(a=20, b=22)`
|
||||
|
||||
**相反数 = solver.neg(a=7)**
|
||||
`相反数 = solver.neg(a=7)`
|
||||
|
||||
> 打印(和)
|
||||
> **打印(和)**
|
||||
|
||||
> 打印(相反数)
|
||||
> **打印(相反数)**
|
||||
@@ -1,4 +1,4 @@
|
||||
## Python 校验
|
||||
## @knowledge Python 校验
|
||||
|
||||
```python
|
||||
import json, math, sys
|
||||
@@ -9,8 +9,8 @@ area = math.pi * r ** 2
|
||||
print(json.dumps({"type": "map", "entries": {"area": {"type": "float", "value": area}}}))
|
||||
```
|
||||
|
||||
## main
|
||||
## @exec main
|
||||
|
||||
**结果 = foreign.call(ref("#python-校验"), {"r": 3})**
|
||||
`结果 = foreign.call(ref("#python-校验"), {"r": 3})`
|
||||
|
||||
> 打印(结果.area)
|
||||
> **打印(结果.area)**
|
||||
@@ -1,6 +1,6 @@
|
||||
# 参考
|
||||
# @knowledge 参考
|
||||
|
||||
## 牛顿第二定律
|
||||
## @knowledge 牛顿第二定律
|
||||
|
||||
$$
|
||||
F = m a
|
||||
@@ -8,8 +8,8 @@ $$
|
||||
|
||||
参见[圆面积](./math.mq.md#计算圆面积)(这是静态引用,不会执行)。
|
||||
|
||||
## 计算作用力
|
||||
## @exec 计算作用力
|
||||
|
||||
**力 = math.eval(ref("#牛顿第二定律"), {"m": 2, "a": 3}, target="F")**
|
||||
`力 = math.eval(ref("#牛顿第二定律"), {"m": 2, "a": 3}, target="F")`
|
||||
|
||||
*力*
|
||||
`return 力`
|
||||
@@ -3,8 +3,8 @@ import:
|
||||
io: "std:io"
|
||||
---
|
||||
|
||||
## main
|
||||
## @exec main
|
||||
|
||||
> io.写值(["bundle", 1, 2.5])
|
||||
> **io.写值(["bundle", 1, 2.5])**
|
||||
|
||||
*None*
|
||||
`return None`
|
||||
Reference in new issue
Block a user