diff --git a/crates/cli/src/analysis.rs b/crates/cli/src/analysis.rs index b092cb5..106adf4 100644 --- a/crates/cli/src/analysis.rs +++ b/crates/cli/src/analysis.rs @@ -199,6 +199,7 @@ fn units_json(module: &Module) -> Vec { UnitKind::Root => "root", UnitKind::Namespace => "namespace", UnitKind::Function => "function", + UnitKind::Knowledge => "knowledge", UnitKind::Section => "section", }; json!({ diff --git a/crates/cli/src/commands/init.rs b/crates/cli/src/commands/init.rs index 3aaf10a..3a46603 100644 --- a/crates/cli/src/commands/init.rs +++ b/crates/cli/src/commands/init.rs @@ -42,4 +42,5 @@ pub fn init(dir: Option<&Path>) -> i32 { 0 } -const INIT_TEMPLATE: &str = "## main\n\n**问候 = \"你好,Marqdo\"**\n\n> 打印(问候)\n\n*问候*\n"; +const INIT_TEMPLATE: &str = + "## @exec main\n\n`问候 = \"你好,Marqdo\"`\n\n`打印(问候)`\n\n`return 问候`\n"; diff --git a/crates/cli/src/main.rs b/crates/cli/src/main.rs index 80ba95a..8f5b63d 100644 --- a/crates/cli/src/main.rs +++ b/crates/cli/src/main.rs @@ -23,7 +23,7 @@ use clap::{Args, Parser, Subcommand}; name = "marqdo", version, about = "Markdown-native programming language (independent Rust interpreter)", - long_about = "Marqdo executes Markdown documents whose AST structures carry program meaning. `check` and `inspect` never execute project code; `run` and `call` execute through the capability host." + long_about = "Marqdo executes .mq.md documents: headings declare @exec/@knowledge modes, Strong/Emph/inline Code carry one statement each, and if/else/while/end/return/params decide control flow. `check` and `inspect` never execute project code; `run` and `call` execute through the capability host." )] struct Cli { #[command(subcommand)] diff --git a/crates/cli/src/stdlib.rs b/crates/cli/src/stdlib.rs index 8e5801a..3b397db 100644 --- a/crates/cli/src/stdlib.rs +++ b/crates/cli/src/stdlib.rs @@ -258,7 +258,7 @@ mod tests { std::fs::copy(entry.path(), dir.path().join(entry.file_name())).unwrap(); } } - std::fs::write(dir.path().join("io.mq.md"), "## tampered\n").unwrap(); + std::fs::write(dir.path().join("io.mq.md"), "## @knowledge tampered\n").unwrap(); let error = StdlibBundle::load(dir.path()).unwrap_err(); assert!(error.contains("digest mismatch"), "{error}"); } diff --git a/crates/cli/tests/analysis_trace.rs b/crates/cli/tests/analysis_trace.rs index 5b125bf..af322fc 100644 --- a/crates/cli/tests/analysis_trace.rs +++ b/crates/cli/tests/analysis_trace.rs @@ -49,21 +49,21 @@ fn write(dir: &Path, name: &str, source: &str) -> PathBuf { path } -const PROGRAM: &str = r#"# 数学 +const PROGRAM: &str = r#"# @knowledge 数学 -## 加一 +## @exec 加一 -`(n)` +`params(n)` -*n + 1* +`return n + 1` -## main +## @exec main -**结果 = 加一(41)** +`结果 = 加一(41)` -> 打印("secret-value") +`打印("secret-value")` -*结果* +`return 结果` "#; #[test] @@ -143,7 +143,7 @@ fn analysis_is_deterministic_and_has_stable_semantic_nodes() { fn analysis_v2_identity_is_location_independent() { let first = TempDir::new("analysis-identity-a"); let second = TempDir::new("analysis-identity-b"); - let source = "## main\n\n**x = 1**\n\n*x*\n"; + let source = "## @exec main\n\n`x = 1`\n\n`return x`\n"; for dir in [&first, &second] { write( dir.path(), @@ -184,7 +184,8 @@ fn analysis_v2_identity_is_location_independent() { #[test] fn analysis_v2_projects_memory_place_targets_additively() { let dir = TempDir::new("analysis-place"); - let source = "## main\n\n**内存 = memory.new(1, 2)**\n\n**`内存[0] = 7`**\n\n*内存[0]*\n"; + let source = + "## @exec main\n\n`内存 = memory.new(1, 2)`\n\n`内存[0] = 7`\n\n`return 内存[0]`\n"; write(dir.path(), "index.mq.md", source); let target = dir.path().join("analysis.json"); let output = cli( @@ -212,9 +213,9 @@ fn analysis_v2_projects_memory_place_targets_additively() { #[test] fn analysis_v2_projects_addressable_formula_and_code_resources() { let dir = TempDir::new("analysis-resources"); - let source = r#"## calc + let source = r#"## @exec calc -`(x)` +`params(x)` $$A = x + 1$$ @@ -222,7 +223,7 @@ $$A = x + 1$$ print(1) ``` -*x* +`return x` "#; write( dir.path(), @@ -275,7 +276,7 @@ fn trace_v2_budget_truncates_long_loops_without_failing_the_run() { write( dir.path(), "index.mq.md", - "## main\n\n**i = 0**\n\n- `i < 500`\n\n **i = i + 1**\n\n*i*\n", + "## @exec main\n\n`i = 0`\n\n`while i < 500`\n\n`i = i + 1`\n\n`end`\n\n`return i`\n", ); let trace_path = dir.path().join("trace.json"); let output = cli( @@ -318,7 +319,7 @@ fn trace_v2_budget_truncates_long_loops_without_failing_the_run() { #[test] fn failed_check_removes_stale_analysis() { let dir = TempDir::new("analysis-error"); - write(dir.path(), "bad.mq.md", "## main\n\n1. 没有条件\n"); + write(dir.path(), "bad.mq.md", "## @exec main\n\n`return x +`\n"); let target = dir.path().join("analysis.json"); std::fs::write(&target, "stale").unwrap(); let output = cli( @@ -376,7 +377,7 @@ fn trace_records_calls_effects_and_status_without_secrets() { } // Error runs still write a terminal trace. - write(dir.path(), "bad.mq.md", "## main\n\n**x = 1 // 0**\n"); + write(dir.path(), "bad.mq.md", "## @exec main\n\n`x = 1 // 0`\n"); let error_trace = dir.path().join("error-trace.json"); let output = cli( dir.path(), diff --git a/crates/cli/tests/http_over_tcp.rs b/crates/cli/tests/http_over_tcp.rs index 92644b0..496651f 100644 --- a/crates/cli/tests/http_over_tcp.rs +++ b/crates/cli/tests/http_over_tcp.rs @@ -50,39 +50,41 @@ import: 编码: "std:text" --- -## main +## @exec main -**流 = resource.open("tcp", "{address}", ["read", "write"])** +`流 = resource.open("tcp", "{address}", ["read", "write"])` -**请求 = http.构建请求("GET", "/", [["Host", "example.test"]], "")** +`请求 = http.构建请求("GET", "/", [["Host", "example.test"]], "")` -**请求内存 = memory.new(1, 1)** +`请求内存 = memory.new(1, 1)` -**请求长度 = 编码.utf8编码(请求, 请求内存, 0)** +`请求长度 = 编码.utf8编码(请求, 请求内存, 0)` -**写入 = resource.write(流, 请求内存, 0, 请求长度)** +`写入 = resource.write(流, 请求内存, 0, 请求长度)` -**接收 = memory.new(1, 1)** +`接收 = memory.new(1, 1)` -**读出 = resource.read(流, 接收, 0, 4096)** +`读出 = resource.read(流, 接收, 0, 4096)` -**数量 = 读出.value.count** +`数量 = 读出.value.count` -**响应文本 = ""** +`响应文本 = ""` -**下标 = 0** +`下标 = 0` -- `下标 < 数量` +`while 下标 < 数量` - **响应文本 = 响应文本 + text.from_codepoint(接收[下标])** +`响应文本 = 响应文本 + text.from_codepoint(接收[下标])` - **下标 = 下标 + 1** +`下标 = 下标 + 1` -**关闭 = resource.close(流)** +`end` -**响应 = http.解析响应(响应文本)** +`关闭 = resource.close(流)` -*[写入.ok, 读出.ok, 响应.状态, 响应.头["Content-Type"], 响应.体, 关闭.ok]* +`响应 = http.解析响应(响应文本)` + +`return [写入.ok, 读出.ok, 响应.状态, 响应.头["Content-Type"], 响应.体, 关闭.ok]` "# ); std::fs::write(dir.path().join("index.mq.md"), program).unwrap(); diff --git a/crates/cli/tests/integration_cli.rs b/crates/cli/tests/integration_cli.rs index cb36396..131cc92 100644 --- a/crates/cli/tests/integration_cli.rs +++ b/crates/cli/tests/integration_cli.rs @@ -170,9 +170,12 @@ fn init_creates_a_runnable_project() { #[test] fn check_exit_codes_and_diagnostics() { let dir = TempDir::new("check"); - dir.write("good.mq.md", "## main\n\n*1 + 1*\n"); - dir.write("bad.mq.md", "## f\n\n**a *b* c**\n"); - dir.write("warning.mq.md", "**x = 1**\n\n## main\n\n*1*\n"); + dir.write("good.mq.md", "## @exec main\n\n`return 1 + 1`\n"); + dir.write("bad.mq.md", "## @exec f\n\n**a *b* c**\n"); + dir.write( + "warning.mq.md", + "**x = 1**\n\n## @exec main\n\n`return 1`\n", + ); let good = cli(dir.path(), &["check", "good.mq.md"]); assert_exit(&good, 0, "clean document"); @@ -181,7 +184,7 @@ fn check_exit_codes_and_diagnostics() { let bad = cli(dir.path(), &["check", "bad.mq.md"]); assert_exit(&bad, 1, "invalid executable shape is a hard error"); let bad_stderr = stderr_text(&bad); - assert!(bad_stderr.contains("error[markdown.invalid_construct]")); + assert!(bad_stderr.contains("error[sem.payload_nested]")); assert!(bad_stderr.contains("check failed")); assert!(stdout_text(&bad).is_empty()); @@ -192,20 +195,37 @@ fn check_exit_codes_and_diagnostics() { assert_eq!(value["success"], false); assert_eq!(value["errors"], 1); let diagnostics = value["diagnostics"].as_array().expect("diagnostics array"); - assert_eq!(diagnostics.len(), 1); - assert_eq!(diagnostics[0]["code"], "markdown.invalid_construct"); - assert_eq!(diagnostics[0]["severity"], "error"); - assert_eq!(diagnostics[0]["line"], 3); + let nested = diagnostics + .iter() + .find(|diagnostic| diagnostic["code"] == "sem.payload_nested") + .expect("sem.payload_nested diagnostic"); + assert_eq!(nested["severity"], "error"); + assert_eq!(nested["line"], 3); + assert!( + diagnostics + .iter() + .all(|diagnostic| diagnostic["severity"] == "error" + || diagnostic["code"] == "sem.inferred_signature"), + "the fixture may carry the inferred-signature warning but no other diagnostic" + ); assert!(stderr_text(&bad_json).is_empty()); - let warning = cli(dir.path(), &["check", "warning.mq.md"]); - assert_exit(&warning, 0, "a warning does not fail check"); - assert!(stdout_text(&warning).contains("checked 1 module(s): ok")); - assert!(stderr_text(&warning).contains("warning[markdown.inert_executable]")); - let warning_json = cli(dir.path(), &["check", "warning.mq.md", "--json"]); - let value = json_stdout(&warning_json); + // RFC-LANG-0002: a Strong at the Knowledge root is inert prose, not an + // executable shape. There is no `markdown.inert_executable` warning; the + // pre-RFC frontend still emits it, so this assertion is expected red until + // the frontend migration lands. + let inert = cli(dir.path(), &["check", "warning.mq.md"]); + assert_exit(&inert, 0, "inert Knowledge prose does not fail check"); + assert!(stdout_text(&inert).contains("checked 1 module(s): ok")); + assert!(!stderr_text(&inert).contains("warning[")); + let inert_json = cli(dir.path(), &["check", "warning.mq.md", "--json"]); + let value = json_stdout(&inert_json); assert_eq!(value["success"], true); - assert_eq!(value["diagnostics"][0]["severity"], "warning"); + assert_eq!( + value["diagnostics"].as_array().map(Vec::len), + Some(0), + "inert Knowledge prose emits no diagnostic under RFC-LANG-0002" + ); let missing = cli(dir.path(), &["check", "missing.mq.md"]); assert_exit(&missing, 2, "missing file is a usage/IO error"); @@ -217,7 +237,7 @@ fn run_json_embeds_program_stdout() { let dir = TempDir::new("run-json"); dir.write( "print.mq.md", - "## main\n\n> 打印(\"你好\")\n\n> 打印(42)\n\n*None*\n", + "## @exec main\n\n`打印(\"你好\")`\n\n`打印(42)`\n\n`return None`\n", ); let output = cli(dir.path(), &["run", "print.mq.md", "--json"]); assert_exit(&output, 0, "run --json must succeed"); @@ -240,11 +260,11 @@ fn run_json_embeds_program_stdout() { #[test] fn run_refuses_documents_with_compile_errors() { let dir = TempDir::new("run-errors"); - dir.write("bad.mq.md", "## f\n\n**a *b* c**\n"); + dir.write("bad.mq.md", "## @exec f\n\n**a *b* c**\n"); let output = cli(dir.path(), &["run", "bad.mq.md"]); assert_exit(&output, 1, "compile errors must prevent execution"); let stderr = stderr_text(&output); - assert!(stderr.contains("markdown.invalid_construct")); + assert!(stderr.contains("sem.payload_nested")); assert!(stderr.contains("refusing to run")); assert!(stdout_text(&output).is_empty()); } @@ -501,7 +521,7 @@ fn inspect_outputs_ast_units_signatures_ir_and_refs() { let dir = TempDir::new("refs"); dir.write( "broken.mq.md", - "## main\n\n见[断链](#不存在的标题)。\n\n*1*\n", + "## @exec main\n\n见[断链](#不存在的标题)。\n\n`return 1`\n", ); let broken = cli(dir.path(), &["inspect", "broken.mq.md", "--refs", "--json"]); assert_exit(&broken, 0, "inspect --refs never executes the document"); @@ -515,7 +535,7 @@ fn inspect_outputs_ast_units_signatures_ir_and_refs() { #[test] fn fmt_normalises_line_endings_and_trailing_newlines() { let dir = TempDir::new("fmt"); - dir.write("doc.mq.md", "## main\r\n\r\n*1*\r\n\r\n\r\n"); + dir.write("doc.mq.md", "## @exec main\r\n\r\n`return 1`\r\n\r\n\r\n"); let before = cli(dir.path(), &["fmt", "--check", "doc.mq.md"]); assert_exit(&before, 1, "unformatted document is detected"); assert!(stderr_text(&before).contains("is not formatted")); @@ -523,7 +543,7 @@ fn fmt_normalises_line_endings_and_trailing_newlines() { let format = cli(dir.path(), &["fmt", "doc.mq.md"]); assert_exit(&format, 0, "fmt must rewrite the document"); let formatted = dir.read("doc.mq.md"); - assert_eq!(formatted, "## main\n\n*1*\n"); + assert_eq!(formatted, "## @exec main\n\n`return 1`\n"); assert!(!formatted.contains('\r')); let after = cli(dir.path(), &["fmt", "--check", "doc.mq.md"]); @@ -535,11 +555,11 @@ fn multi_module_imports_and_cycles() { let dir = TempDir::new("modules"); dir.write( "geometry.mq.md", - "## 圆面积\n\n`(r: Number)`\n\n*math.eval(ref(\"#公式\"), {\"r\": r}, target=\"A\")*\n\n### 公式\n\n$$\nA = \\pi r^2\n$$\n", + "## @exec 圆面积\n\n`params(r: Number)`\n\n`return math.eval(ref(\"#公式\"), {\"r\": r}, target=\"A\")`\n\n### @knowledge 公式\n\n$$\nA = \\pi r^2\n$$\n", ); dir.write( "index.mq.md", - "---\nimport:\n geometry: \"./geometry.mq.md\"\n---\n\n## main\n\n**面积 = geometry.圆面积(r=2)**\n\n> 打印(面积)\n", + "---\nimport:\n geometry: \"./geometry.mq.md\"\n---\n\n## @exec main\n\n`面积 = geometry.圆面积(r=2)`\n\n`打印(面积)`\n", ); let run = cli(dir.path(), &["run", "index.mq.md"]); assert_exit(&run, 0, "multi-module import must run"); @@ -552,11 +572,11 @@ fn multi_module_imports_and_cycles() { let cycle = TempDir::new("cycle"); cycle.write( "a.mq.md", - "---\nimport:\n b: \"./b.mq.md\"\n---\n\n## main\n\n*1*\n", + "---\nimport:\n b: \"./b.mq.md\"\n---\n\n## @exec main\n\n`return 1`\n", ); cycle.write( "b.mq.md", - "---\nimport:\n a: \"./a.mq.md\"\n---\n\n## f\n\n*1*\n", + "---\nimport:\n a: \"./a.mq.md\"\n---\n\n## @exec f\n\n`return 1`\n", ); let output = cli(cycle.path(), &["check", "a.mq.md"]); assert_exit(&output, 1, "import cycle is an error"); @@ -568,7 +588,7 @@ fn multi_module_imports_and_cycles() { let missing = TempDir::new("missing-import"); missing.write( "index.mq.md", - "---\nimport:\n gone: \"./gone.mq.md\"\n---\n\n## main\n\n*1*\n", + "---\nimport:\n gone: \"./gone.mq.md\"\n---\n\n## @exec main\n\n`return 1`\n", ); let output = cli(missing.path(), &["check", "index.mq.md"]); assert_exit(&output, 1, "missing import target is an error"); @@ -582,8 +602,8 @@ fn lock_and_sync_locked_detect_dependency_tampering() { "marqdo.yaml", "project:\n name: locktest\n version: 0.1.0\ndependencies:\n dep:\n path: \"./dep\"\n", ); - dir.write("index.mq.md", "## main\n\n*1*\n"); - dir.write("dep/index.mq.md", "## main\n\n*1*\n"); + dir.write("index.mq.md", "## @exec main\n\n`return 1`\n"); + dir.write("dep/index.mq.md", "## @exec main\n\n`return 1`\n"); let lock = cli(dir.path(), &["lock"]); assert_exit(&lock, 0, "lock must succeed"); @@ -596,7 +616,7 @@ fn lock_and_sync_locked_detect_dependency_tampering() { assert!(stdout_text(&sync).contains("synchronized 1 package(s)")); // Tamper with the dependency contents: `sync --locked` must fail. - dir.write("dep/index.mq.md", "## main\n\n*2*\n"); + dir.write("dep/index.mq.md", "## @exec main\n\n`return 2`\n"); let tampered = cli(dir.path(), &["sync", "--locked"]); assert_exit(&tampered, 1, "tampered dependency must fail sync --locked"); assert!(stderr_text(&tampered).contains("lockfile is out of date")); @@ -711,7 +731,7 @@ fn plugin_inspect_and_explicit_trusted_invocation() { let dir = TempDir::new("plugin-run"); dir.write( "doc.mq.md", - "## main\n\n**结果 = solver.add(a=20, b=22)**\n\n> 打印(结果)\n", + "## @exec main\n\n`结果 = solver.add(a=20, b=22)`\n\n`打印(结果)`\n", ); let plugin_path = plugin_dir.to_str().unwrap(); let doc = dir.path().join("doc.mq.md"); @@ -756,7 +776,7 @@ fn plugin_inspect_and_explicit_trusted_invocation() { // Unknown plugin namespace is a hard runtime symbol error. dir.write( "unknown.mq.md", - "## main\n\n**结果 = other.add(a=1, b=1)**\n", + "## @exec main\n\n`结果 = other.add(a=1, b=1)`\n", ); let unknown = cli( dir.path(), @@ -775,7 +795,7 @@ fn plugin_inspect_and_explicit_trusted_invocation() { // The export signature requires both named arguments: with a declared // plugin manifest this is rejected statically, before any library load. - dir.write("args.mq.md", "## main\n\n**结果 = solver.add(a=1)**\n"); + dir.write("args.mq.md", "## @exec main\n\n`结果 = solver.add(a=1)`\n"); let bad_args = cli( dir.path(), &[ @@ -798,11 +818,11 @@ fn runtime_error_in_imported_module_reports_that_module() { let dir = TempDir::new("cross-module-error"); dir.write( "index.mq.md", - "---\nimport:\n physics: \"./physics.mq.md\"\n---\n\n## main\n\n> 打印(physics.boom())\n", + "---\nimport:\n physics: \"./physics.mq.md\"\n---\n\n## @exec main\n\n`打印(physics.boom())`\n", ); dir.write( "physics.mq.md", - "## boom\n\n说明文字。\n\n**x = 1 / 0**\n\n*x*\n", + "## @exec boom\n\n说明文字。\n\n`x = 1 / 0`\n\n`return x`\n", ); let output = cli(dir.path(), &["run", "index.mq.md", "--json"]); @@ -957,7 +977,7 @@ fn plugin_abi_major_mismatch_is_rejected_before_execution() { let dir = TempDir::new("plugin-abi-run"); dir.write( "doc.mq.md", - "## main\n\n**结果 = solver.add(a=20, b=22)**\n\n> 打印(结果)\n", + "## @exec main\n\n`结果 = solver.add(a=20, b=22)`\n\n`打印(结果)`\n", ); let output = cli( dir.path(), @@ -1019,7 +1039,7 @@ fn check_never_spawns_a_foreign_kernel() { ); dir.write( "doc.mq.md", - "## 代码\n\n```mocklang\nignored\n```\n\n## main\n\n**值 = foreign.call(ref(\"#代码\"), {})**\n\n> 打印(值)\n", + "## @knowledge 代码\n\n```mocklang\nignored\n```\n\n## @exec main\n\n`值 = foreign.call(ref(\"#代码\"), {})`\n\n`打印(值)`\n", ); let checked = cli(dir.path(), &["check", "doc.mq.md"]); @@ -1051,7 +1071,7 @@ fn power_branch_loop_and_inert_code_end_to_end() { let dir = TempDir::new("power"); dir.write( "branch.mq.md", - "## main\n\n**n = 2**\n\n1. `n ** 2 == 4`,正确分支。\n\n > print(\"乘方正确\")\n\n2. `n ** 2 != 4`,另一分支。\n\n > print(\"乘方错误\")\n", + "## @exec main\n\n`n = 2`\n\n`if n ** 2 == 4`\n\n`print(\"乘方正确\")`\n\n`else`\n\n`if n ** 2 != 4`\n\n`print(\"乘方错误\")`\n\n`end`\n\n`end`\n", ); let branch = cli(dir.path(), &["run", "branch.mq.md", "--json"]); assert_exit(&branch, 0, "power branch run"); @@ -1062,7 +1082,7 @@ fn power_branch_loop_and_inert_code_end_to_end() { dir.write( "loop.mq.md", - "## main\n\n**n = 0**\n\n**limit = 100**\n\n- `n ** 2 < limit`\n\n **n = n + 1**\n\n*n*\n", + "## @exec main\n\n`n = 0`\n\n`limit = 100`\n\n`while n ** 2 < limit`\n\n`n = n + 1`\n\n`end`\n\n`return n`\n", ); let looped = cli(dir.path(), &["run", "loop.mq.md", "--json"]); assert_exit(&looped, 0, "power loop run"); @@ -1074,7 +1094,7 @@ fn power_branch_loop_and_inert_code_end_to_end() { // diagnostics and never changes the returned value. dir.write( "inert.mq.md", - "## main\n\n```text\n**n = 2 ** 3**\n```\n\n正文里的 `2 ** 3` 不执行。\n\n**x = 1**\n\n*x*\n", + "## @exec main\n\n```text\n**n = 2 ** 3**\n```\n\n`x = 1`\n\n`return x`\n\n### @knowledge 说明\n\n正文里的 `2 ** 3` 不执行。\n", ); let inert = cli(dir.path(), &["run", "inert.mq.md", "--json"]); assert_exit(&inert, 0, "inert code run"); @@ -1085,7 +1105,7 @@ fn power_branch_loop_and_inert_code_end_to_end() { #[test] fn condition_parse_diagnostic_points_inside_the_code_span() { let dir = TempDir::new("condition-span"); - let source = "## main\n\n**n = 2**\n\n1. `n ** 2 ==`\n\n > print(1)\n"; + let source = "## @exec main\n\n`n = 2`\n\n`if n ** 2 ==`\n\n`print(1)`\n\n`end`\n"; dir.write("bad.mq.md", source); let output = cli(dir.path(), &["check", "bad.mq.md", "--json"]); assert_exit(&output, 1, "condition parse error"); @@ -1094,12 +1114,11 @@ fn condition_parse_diagnostic_points_inside_the_code_span() { .as_array() .expect("diagnostics array") .iter() - .find(|diagnostic| diagnostic["code"] == "expr.parse") - .expect("expr.parse diagnostic"); + .find(|diagnostic| diagnostic["code"] == "sem.syntax") + .expect("sem.syntax diagnostic"); assert_eq!(diagnostic["line"], 5); - // 1-based column 14 is the closing backtick: the empty end-of-input span - // must not be shifted by the delimiter. - assert_eq!(diagnostic["column"], 14); - let line = source.lines().nth(4).expect("line 5"); - assert_eq!(&line[13..14], "`"); + // The payload span is mapped onto the file; it must point inside the + // carrier rather than at the heading or a delimiter. + let column = diagnostic["column"].as_u64().expect("column"); + assert!((11..=14).contains(&column), "unexpected column {column}"); } diff --git a/crates/cli/tests/p2_closure.rs b/crates/cli/tests/p2_closure.rs index ebf4313..c6d17ae 100644 --- a/crates/cli/tests/p2_closure.rs +++ b/crates/cli/tests/p2_closure.rs @@ -129,7 +129,7 @@ fn foreign_and_plugin_shortcuts_are_unavailable_in_the_pure_lane() { let foreign = dir.path().join("foreign.mq.md"); std::fs::write( &foreign, - "## 代码\n\n```python\nprint(1)\n```\n\n## main\n\n*foreign.call(ref(\"#代码\"), None)*\n", + "## @knowledge 代码\n\n```python\nprint(1)\n```\n\n## @exec main\n\n`return foreign.call(ref(\"#代码\"), None)`\n", ) .unwrap(); let output = Command::new(env!("CARGO_BIN_EXE_marqdo")) @@ -145,7 +145,7 @@ fn foreign_and_plugin_shortcuts_are_unavailable_in_the_pure_lane() { let plugin = dir.path().join("plugin.mq.md"); std::fs::write( &plugin, - "## main\n\n> plugin.invoke(\"missing.export\", {})\n\n*None*\n", + "## @exec main\n\n`plugin.invoke(\"missing.export\", {})`\n\n`return None`\n", ) .unwrap(); let output = Command::new(env!("CARGO_BIN_EXE_marqdo")) diff --git a/crates/cli/tests/package_env.rs b/crates/cli/tests/package_env.rs index 1d017bb..26d00f7 100644 --- a/crates/cli/tests/package_env.rs +++ b/crates/cli/tests/package_env.rs @@ -82,20 +82,23 @@ fn transitive_path_dependency_resolves_from_its_own_manifest() { ); write( &root.join("deps/a/index.mq.md"), - "---\nimport:\n b: \"@b\"\n---\n\n## outer\n\n*b.inner()*\n", + "---\nimport:\n b: \"@b\"\n---\n\n## @exec outer\n\n`return b.inner()`\n", ); write( &root.join("deps/a/b/marqdo.yaml"), "project:\n name: b\n version: 0.1.0\n", ); - write(&root.join("deps/a/b/index.mq.md"), "## inner\n\n*42*\n"); + write( + &root.join("deps/a/b/index.mq.md"), + "## @exec inner\n\n`return 42`\n", + ); write( &root.join("marqdo.yaml"), "project:\n name: root\n version: 0.1.0\ndependencies:\n a:\n path: ./deps/a\n", ); write( &root.join("index.mq.md"), - "---\nimport:\n a: \"@a\"\n---\n\n## main\n\n> 打印(a.outer())\n", + "---\nimport:\n a: \"@a\"\n---\n\n## @exec main\n\n`打印(a.outer())`\n", ); let lock = cli(root, &["lock"]); assert_eq!( @@ -133,7 +136,7 @@ fn pinned_git_dependency_locks_syncs_and_runs() { &dep.join("marqdo.yaml"), "project:\n name: remote\n version: 0.3.0\n", ); - write(&dep.join("index.mq.md"), "## hello\n\n*7*\n"); + write(&dep.join("index.mq.md"), "## @exec hello\n\n`return 7`\n"); git(&dep, &["init", "-q"]); git(&dep, &["add", "."]); git(&dep, &["commit", "-q", "-m", "initial"]); @@ -156,7 +159,7 @@ fn pinned_git_dependency_locks_syncs_and_runs() { ); write( &root.join("index.mq.md"), - "---\nimport:\n remote: \"@remote\"\n---\n\n## main\n\n> 打印(remote.hello())\n", + "---\nimport:\n remote: \"@remote\"\n---\n\n## @exec main\n\n`打印(remote.hello())`\n", ); let lock = cli(&root, &["lock"]); @@ -206,7 +209,7 @@ fn check_does_not_fetch_a_missing_git_revision() { ); write( &root.join("index.mq.md"), - "---\nimport:\n remote: \"@remote\"\n---\n\n## main\n\n*1*\n", + "---\nimport:\n remote: \"@remote\"\n---\n\n## @exec main\n\n`return 1`\n", ); let output = cli(root, &["check", "index.mq.md"]); assert_eq!(output.status.code(), Some(1)); @@ -223,10 +226,13 @@ fn run_and_check_require_a_lock_when_dependencies_exist() { &root.join("marqdo.yaml"), "project:\n name: root\n version: 0.1.0\ndependencies:\n dep:\n path: ./dep\n", ); - write(&root.join("dep/index.mq.md"), "## value\n\n*1*\n"); + write( + &root.join("dep/index.mq.md"), + "## @exec value\n\n`return 1`\n", + ); write( &root.join("index.mq.md"), - "---\nimport:\n dep: \"@dep\"\n---\n\n## main\n\n*1*\n", + "---\nimport:\n dep: \"@dep\"\n---\n\n## @exec main\n\n`return 1`\n", ); for command in ["check", "run"] { let output = cli(root, &[command, "index.mq.md"]); @@ -244,14 +250,20 @@ fn sync_is_strict_and_never_rewrites_the_lock() { &root.join("marqdo.yaml"), "project:\n name: root\n version: 0.1.0\ndependencies:\n dep:\n path: ./dep\n", ); - write(&root.join("dep/index.mq.md"), "## value\n\n*1*\n"); - write(&root.join("index.mq.md"), "## main\n\n*1*\n"); + write( + &root.join("dep/index.mq.md"), + "## @exec value\n\n`return 1`\n", + ); + write(&root.join("index.mq.md"), "## @exec main\n\n`return 1`\n"); let lock = cli(root, &["lock"]); assert_eq!(lock.status.code(), Some(0)); let original = std::fs::read(root.join("marqdo.lock")).unwrap(); - write(&root.join("dep/index.mq.md"), "## value\n\n*2*\n"); + write( + &root.join("dep/index.mq.md"), + "## @exec value\n\n`return 2`\n", + ); let stale = cli(root, &["sync"]); assert_eq!(stale.status.code(), Some(1), "plain sync must be strict"); let stderr = String::from_utf8_lossy(&stale.stderr); @@ -285,13 +297,19 @@ fn lock_records_transitive_closure_and_sync_materializes_it() { &root.join("deps/a/marqdo.yaml"), "project:\n name: a\n version: 0.1.0\ndependencies:\n b:\n path: ./b\n", ); - write(&root.join("deps/a/index.mq.md"), "## a\n\n*1*\n"); + write( + &root.join("deps/a/index.mq.md"), + "## @exec a\n\n`return 1`\n", + ); write( &root.join("deps/a/b/marqdo.yaml"), "project:\n name: b\n version: 0.1.0\n", ); - write(&root.join("deps/a/b/index.mq.md"), "## b\n\n*2*\n"); - write(&root.join("index.mq.md"), "## main\n\n*1*\n"); + write( + &root.join("deps/a/b/index.mq.md"), + "## @exec b\n\n`return 2`\n", + ); + write(&root.join("index.mq.md"), "## @exec main\n\n`return 1`\n"); let lock = cli(root, &["lock"]); assert_eq!(lock.status.code(), Some(0)); @@ -326,10 +344,13 @@ fn deleted_lock_edge_fails_check_and_run() { &root.join("marqdo.yaml"), "project:\n name: root\n version: 0.1.0\ndependencies:\n dep:\n path: ./dep\n", ); - write(&root.join("dep/index.mq.md"), "## value\n\n*1*\n"); + write( + &root.join("dep/index.mq.md"), + "## @exec value\n\n`return 1`\n", + ); write( &root.join("index.mq.md"), - "---\nimport:\n dep: \"@dep\"\n---\n\n## main\n\n*1*\n", + "---\nimport:\n dep: \"@dep\"\n---\n\n## @exec main\n\n`return 1`\n", ); assert_eq!(cli(root, &["lock"]).status.code(), Some(0)); let lock = std::fs::read_to_string(root.join("marqdo.lock")).unwrap(); @@ -362,10 +383,13 @@ fn tampered_path_dependency_content_is_rejected_by_locked_sync() { &root.join("dep/marqdo.yaml"), "project:\n name: dep\n version: 0.1.0\n", ); - write(&root.join("dep/index.mq.md"), "## value\n\n*1*\n"); + write( + &root.join("dep/index.mq.md"), + "## @exec value\n\n`return 1`\n", + ); write( &root.join("index.mq.md"), - "---\nimport:\n dep: \"@dep\"\n---\n\n## main\n\n*1*\n", + "---\nimport:\n dep: \"@dep\"\n---\n\n## @exec main\n\n`return 1`\n", ); assert_eq!(cli(root, &["lock"]).status.code(), Some(0)); let lock_before = std::fs::read(root.join("marqdo.lock")).unwrap(); @@ -375,7 +399,10 @@ fn tampered_path_dependency_content_is_rejected_by_locked_sync() { // Content change after the lock is a tamper/staleness signal. `run` and // `check` must never silently accept it, re-lock, or materialize a new // environment. - write(&root.join("dep/index.mq.md"), "## value\n\n*2*\n"); + write( + &root.join("dep/index.mq.md"), + "## @exec value\n\n`return 2`\n", + ); for args in [ vec!["sync", "--locked"], vec!["run", "index.mq.md"], diff --git a/crates/cli/tests/plugin_worker.rs b/crates/cli/tests/plugin_worker.rs index 142a770..5ebbb28 100644 --- a/crates/cli/tests/plugin_worker.rs +++ b/crates/cli/tests/plugin_worker.rs @@ -112,7 +112,7 @@ fn write_manifest(dir: &Path, sha: &str) { .unwrap(); std::fs::write( dir.join("doc.mq.md"), - "## main\n\n**结果 = solver.add(a=20, b=22)**\n\n> 打印(结果)\n", + "## @exec main\n\n`结果 = solver.add(a=20, b=22)`\n\n`打印(结果)`\n", ) .unwrap(); } @@ -227,7 +227,7 @@ fn write_capability_manifest(dir: &Path, sha: &str) { .unwrap(); std::fs::write( dir.join("doc.mq.md"), - "## main\n\n**结果 = capability.read()**\n\n> 打印(结果)\n", + "## @exec main\n\n`结果 = capability.read()`\n\n`打印(结果)`\n", ) .unwrap(); std::fs::create_dir_all(dir.join("data")).unwrap(); diff --git a/crates/cli/tests/print_routing.rs b/crates/cli/tests/print_routing.rs index e420b02..67405d9 100644 --- a/crates/cli/tests/print_routing.rs +++ b/crates/cli/tests/print_routing.rs @@ -44,7 +44,7 @@ fn print_is_routed_through_the_stdlib_and_not_hostop_print() { write( dir.path(), "index.mq.md", - "## main\n\n> 打印([\"x\", 1])\n\n*None*\n", + "## @exec main\n\n`打印([\"x\", 1])`\n\n`return None`\n", ); let trace = dir.path().join("trace.json"); let output = cli( @@ -84,11 +84,11 @@ fn print_is_routed_through_the_stdlib_and_not_hostop_print() { #[test] fn stdlib_print_modules_are_injected_only_when_print_is_used() { let dir = TempDir::new("lazy"); - write(dir.path(), "plain.mq.md", "## main\n\n*1*\n"); + write(dir.path(), "plain.mq.md", "## @exec main\n\n`return 1`\n"); write( dir.path(), "prints.mq.md", - "## main\n\n> 打印(1)\n\n*None*\n", + "## @exec main\n\n`打印(1)`\n\n`return None`\n", ); for (file, expected_stdlib) in [("plain.mq.md", false), ("prints.mq.md", true)] { let target = dir.path().join(format!("{file}.json")); diff --git a/crates/cli/tests/properties.rs b/crates/cli/tests/properties.rs index 9cb17ba..e9ad322 100644 --- a/crates/cli/tests/properties.rs +++ b/crates/cli/tests/properties.rs @@ -29,39 +29,45 @@ struct Base { const BASES: &[Base] = &[ Base { name: "factorial", - source: r##"# 数学 + source: r##"# @knowledge 数学 -## 阶乘 +## @exec 阶乘 计算阶乘的叙述一。 -1. `n <= 1` +`if n <= 1` - 递归终点叙述。 +递归终点叙述。 - *1* +`return 1` -2. `n > 1` +`else` - 递归步骤叙述。 +`if n > 1` - **结果 = n * 阶乘(n=n-1)** +递归步骤叙述。 - *结果* +`结果 = n * 阶乘(n=n-1)` + +`return 结果` + +`end` + +`end` "##, narration: &["计算阶乘的叙述一。", "递归终点叙述。", "递归步骤叙述。"], }, Base { name: "explicit-signature", - source: r##"## 圆面积 + source: r##"## @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 @@ -71,117 +77,133 @@ $$ }, Base { name: "countdown-loop", - source: r##"## 倒计时 + source: r##"## @exec 倒计时 循环叙述。 -**n = 3** +`n = 3` -- `n > 0` +`while n > 0` - 循环体叙述。 +循环体叙述。 - > 打印(n) +`打印(n)` - **n = n - 1** +`n = n - 1` -*n* +`end` + +`return n` "##, narration: &["循环叙述。", "循环体叙述。"], }, Base { name: "branch-classification", - source: r##"## 分类 + source: r##"## @exec 分类 背景叙述。 -**结果 = 0** +`结果 = 0` -1. `n < 0` +`if n < 0` - 负数分支叙述。 +负数分支叙述。 - **结果 = -1** +`结果 = -1` -2. `n >= 0` +`else` - 非负分支叙述。 +`if n >= 0` - **结果 = 1** +非负分支叙述。 -*结果* +`结果 = 1` + +`end` + +`end` + +`return 结果` "##, narration: &["背景叙述。", "负数分支叙述。", "非负分支叙述。"], }, Base { name: "call-and-print", - source: r##"## 问候 + source: r##"## @exec 问候 说明为什么这样写。 -> 打印("你好") +`打印("你好")` -**问候 = "你好,Marqdo"** +`问候 = "你好,Marqdo"` 再补充一句叙述。 -*问候* +`return 问候` "##, narration: &["说明为什么这样写。", "再补充一句叙述。"], }, Base { name: "inline-prose-in-executable-paragraph", - source: r##"## 加一 + source: r##"## @exec 加一 这是行内叙述 **结果 = 1 + 1** 后面继续叙述。 -*结果* +`return 结果` "##, narration: &["这是行内叙述 ", " 后面继续叙述。"], }, Base { name: "nested-control-flow", - source: r##"## 嵌套 + source: r##"## @exec 嵌套 说明嵌套结构。 -**total = 0** +`total = 0` -1. `n > 0` +`if n > 0` - **m = 3** +`m = 3` - - `m > 0` +`while m > 0` - **total = total + m** +`total = total + m` - **m = m - 1** +`m = m - 1` -2. `n <= 0` +`end` - **total = 0** +`else` -*total* +`if n <= 0` + +`total = 0` + +`end` + +`end` + +`return total` "##, narration: &["说明嵌套结构。"], }, Base { name: "two-namespaces", - source: r##"# 数学 + source: r##"# @knowledge 数学 命名空间叙述。 -## 平方 +## @exec 平方 -**结果 = n * n** +`结果 = n * n` -*结果* +`return 结果` -# 文本 +# @knowledge 文本 -## 长度 +## @exec 长度 -*长度(s)* +`return 长度(s)` "##, narration: &["命名空间叙述。"], }, @@ -265,7 +287,7 @@ fn insert_prose_after_headings(source: &str) -> String { while next < lines.len() && lines[next].trim().is_empty() { next += 1; } - let signature = next < lines.len() && lines[next].trim_start().starts_with("`("); + let signature = next < lines.len() && lines[next].trim_start().starts_with("`params("); if signature { while index + 1 < lines.len() && lines[index + 1].trim().is_empty() { index += 1; diff --git a/crates/cli/tests/resource_streams.rs b/crates/cli/tests/resource_streams.rs index c315fe3..b444523 100644 --- a/crates/cli/tests/resource_streams.rs +++ b/crates/cli/tests/resource_streams.rs @@ -56,21 +56,21 @@ fn write_file(path: &Path, contents: &str) { std::fs::write(path, contents).unwrap(); } -const READER: &str = r#"## main +const READER: &str = r#"## @exec main -**内存 = memory.new(1, 1)** +`内存 = memory.new(1, 1)` -**流 = resource.open("file", "data.txt", ["read"])** +`流 = resource.open("file", "data.txt", ["read"])` -**第一次 = resource.read(流, 内存, 0, 2)** +`第一次 = resource.read(流, 内存, 0, 2)` -**第二次 = resource.read(流, 内存, 2, 4)** +`第二次 = resource.read(流, 内存, 2, 4)` -**第三次 = resource.read(流, 内存, 6, 1)** +`第三次 = resource.read(流, 内存, 6, 1)` -**关闭 = resource.close(流)** +`关闭 = resource.close(流)` -*[第一次.value.count, 第一次.value.eof, 第二次.value.count, 第二次.value.eof, 第三次.value.count, 第三次.value.eof, 内存[0], 内存[1], 内存[2], 内存[3], 内存[4], 内存[5], 关闭.ok]* +`return [第一次.value.count, 第一次.value.eof, 第二次.value.count, 第二次.value.eof, 第三次.value.count, 第三次.value.eof, 内存[0], 内存[1], 内存[2], 内存[3], 内存[4], 内存[5], 关闭.ok]` "#; #[test] @@ -110,29 +110,29 @@ fn project_file_stream_reads_chunks_into_memory() { assert_eq!(values[12]["value"], true); } -const WRITER: &str = r#"## main +const WRITER: &str = r#"## @exec main -**内存 = memory.new(1, 1)** +`内存 = memory.new(1, 1)` -**`内存[0] = 65`** +`内存[0] = 65` -**`内存[1] = 66`** +`内存[1] = 66` -**`内存[2] = 67`** +`内存[2] = 67` -**写 = resource.open("file", "out.bin", ["write"])** +`写 = resource.open("file", "out.bin", ["write"])` -**写入 = resource.write(写, 内存, 0, 3)** +`写入 = resource.write(写, 内存, 0, 3)` -**关闭写 = resource.close(写)** +`关闭写 = resource.close(写)` -**读 = resource.open("file", "out.bin", ["read"])** +`读 = resource.open("file", "out.bin", ["read"])` -**读出 = resource.read(读, 内存, 0, 3)** +`读出 = resource.read(读, 内存, 0, 3)` -**关闭读 = resource.close(读)** +`关闭读 = resource.close(读)` -*[写入.value.count, 关闭写.ok, 读出.value.count, 读出.value.eof, 内存[0], 内存[1], 内存[2], 关闭读.ok]* +`return [写入.value.count, 关闭写.ok, 读出.value.count, 读出.value.eof, 内存[0], 内存[1], 内存[2], 关闭读.ok]` "#; #[test] @@ -171,39 +171,43 @@ fn project_file_stream_writes_on_close_then_reads_back() { assert_eq!(std::fs::read(dir.path().join("out.bin")).unwrap(), b"ABC"); } -const COPY: &str = r#"## main +const COPY: &str = r#"## @exec main -**输入 = resource.open("file", "data.txt", ["read"])** +`输入 = resource.open("file", "data.txt", ["read"])` -**输出 = resource.open("file", "out.bin", ["write"])** +`输出 = resource.open("file", "out.bin", ["write"])` -**内存 = memory.new(1, 1)** +`内存 = memory.new(1, 1)` -**总数 = 0** +`总数 = 0` -**继续 = true** +`继续 = true` -- `继续` +`while 继续` - **块 = resource.read(输入, 内存, 0, 16)** +`块 = resource.read(输入, 内存, 0, 16)` - 1. `块.ok` +`if 块.ok` - > resource.write(输出, 内存, 0, 块.value.count) +`resource.write(输出, 内存, 0, 块.value.count)` - **总数 = 总数 + 块.value.count** +`总数 = 总数 + 块.value.count` - **继续 = not 块.value.eof** +`继续 = not 块.value.eof` - 2. `true` +`else` - **继续 = false** +`继续 = false` -**关闭读 = resource.close(输入)** +`end` -**关闭写 = resource.close(输出)** +`end` -*[总数, 关闭读.ok, 关闭写.ok]* +`关闭读 = resource.close(输入)` + +`关闭写 = resource.close(输出)` + +`return [总数, 关闭读.ok, 关闭写.ok]` "#; #[test] @@ -257,27 +261,27 @@ fn tcp_stream_round_trips_through_mqmd_with_a_network_grant() { let dir = TempDir::new("tcp"); let program = format!( - r#"## main + r#"## @exec main -**内存 = memory.new(1, 1)** +`内存 = memory.new(1, 1)` -**`内存[0] = 112`** +`内存[0] = 112` -**`内存[1] = 105`** +`内存[1] = 105` -**`内存[2] = 110`** +`内存[2] = 110` -**`内存[3] = 103`** +`内存[3] = 103` -**流 = resource.open("tcp", "{address}", ["read", "write"])** +`流 = resource.open("tcp", "{address}", ["read", "write"])` -**写入 = resource.write(流, 内存, 0, 4)** +`写入 = resource.write(流, 内存, 0, 4)` -**读出 = resource.read(流, 内存, 0, 4)** +`读出 = resource.read(流, 内存, 0, 4)` -**关闭 = resource.close(流)** +`关闭 = resource.close(流)` -*[写入.value.count, 读出.value.count, 内存[0], 内存[1], 内存[2], 内存[3], 关闭.ok]* +`return [写入.value.count, 读出.value.count, 内存[0], 内存[1], 内存[2], 内存[3], 关闭.ok]` "# ); write_file(&dir.path().join("index.mq.md"), &program); @@ -315,19 +319,19 @@ fn file_stream_requires_a_read_grant() { assert_eq!(report["error"]["code"], "permission.denied"); } -const STDIN_READER: &str = r#"## main +const STDIN_READER: &str = r#"## @exec main -**输入 = resource.open("stdio", "stdin", ["read"])** +`输入 = resource.open("stdio", "stdin", ["read"])` -**内存 = memory.new(1, 1)** +`内存 = memory.new(1, 1)` -**第一 = resource.read(输入, 内存, 0, 2)** +`第一 = resource.read(输入, 内存, 0, 2)` -**第二 = resource.read(输入, 内存, 2, 8)** +`第二 = resource.read(输入, 内存, 2, 8)` -**第三 = resource.read(输入, 内存, 0, 1)** +`第三 = resource.read(输入, 内存, 0, 1)` -*[第一.value.count, 第一.value.eof, 第二.value.count, 第二.value.eof, 第三.value.eof, 内存[0], 内存[1], 内存[2], 内存[3]]* +`return [第一.value.count, 第一.value.eof, 第二.value.count, 第二.value.eof, 第三.value.eof, 内存[0], 内存[1], 内存[2], 内存[3]]` "#; #[test] @@ -354,35 +358,35 @@ fn piped_stdin_is_chunked_and_reaches_eof() { } } -const STDERR_WRITER: &str = r#"## main +const STDERR_WRITER: &str = r#"## @exec main -**错误 = resource.open("stdio", "stderr", ["write"])** +`错误 = resource.open("stdio", "stderr", ["write"])` -**输出 = resource.open("stdio", "stdout", ["write"])** +`输出 = resource.open("stdio", "stdout", ["write"])` -**内存 = memory.new(1, 1)** +`内存 = memory.new(1, 1)` -**`内存[0] = 101`** +`内存[0] = 101` -**`内存[1] = 114`** +`内存[1] = 114` -**`内存[2] = 114`** +`内存[2] = 114` -**写错误 = resource.write(错误, 内存, 0, 3)** +`写错误 = resource.write(错误, 内存, 0, 3)` -**`内存[0] = 111`** +`内存[0] = 111` -**`内存[1] = 117`** +`内存[1] = 117` -**`内存[2] = 116`** +`内存[2] = 116` -**写输出 = resource.write(输出, 内存, 0, 3)** +`写输出 = resource.write(输出, 内存, 0, 3)` -**关闭错误 = resource.close(错误)** +`关闭错误 = resource.close(错误)` -**关闭输出 = resource.close(输出)** +`关闭输出 = resource.close(输出)` -*[写错误.value.count, 写输出.value.count, 关闭错误.ok, 关闭输出.ok]* +`return [写错误.value.count, 写输出.value.count, 关闭错误.ok, 关闭输出.ok]` "#; #[test] @@ -412,17 +416,17 @@ import: console: "std:io/console" --- -## main +## @exec main -**第一 = console.读取行()** +`第一 = console.读取行()` -**第二 = console.读取行()** +`第二 = console.读取行()` -**第三 = console.读取行()** +`第三 = console.读取行()` -**输出 = console.打印(第一.value + "|" + 第二.value)** +`输出 = console.打印(第一.value + "|" + 第二.value)` -*[第一.ok, 第二.ok, 第三.ok, 第三.code, 输出.ok]* +`return [第一.ok, 第二.ok, 第三.ok, 第三.code, 输出.ok]` "#; #[test] diff --git a/crates/cli/tests/stdlib_bundle.rs b/crates/cli/tests/stdlib_bundle.rs index 55e8666..65f2bc9 100644 --- a/crates/cli/tests/stdlib_bundle.rs +++ b/crates/cli/tests/stdlib_bundle.rs @@ -71,11 +71,11 @@ import: io: "std:io" --- -## main +## @exec main -> io.写值(["bundle", 1, 2.5]) +`io.写值(["bundle", 1, 2.5])` -*None* +`return None` "#; #[test] @@ -154,7 +154,7 @@ fn tampered_bundle_is_rejected_before_module_loading() { let dir = TempDir::new("tamper"); let bundle = dir.path().join("stdlib"); copy_stdlib(&stdlib_dir(), &bundle); - std::fs::write(bundle.join("io.mq.md"), "## tampered\n").unwrap(); + std::fs::write(bundle.join("io.mq.md"), "## @knowledge tampered\n").unwrap(); write_project(dir.path(), IMPORT_IO); let output = run(dir.path(), &bundle, &["run", "index.mq.md"]); assert!(!output.status.success()); diff --git a/crates/marqdo-frontend/src/analyze.rs b/crates/marqdo-frontend/src/analyze.rs index 6c4073f..665f865 100644 --- a/crates/marqdo-frontend/src/analyze.rs +++ b/crates/marqdo-frontend/src/analyze.rs @@ -57,25 +57,45 @@ pub fn analyze_source(module_id: &str, source: &str) -> AnalysisResult { ) .with_hint("front matter must be valid YAML between `---` delimiters"), ), - Ok(_) => match frontmatter.imports() { - Ok(mapping) => { - for (alias, target) in mapping { - imports.push(ImportDecl { - alias, - target, - span: frontmatter.span, - }); + Ok(_) => { + for key in ["marqdo_semantics", "syntax"] { + if frontmatter.has_key(key) { + diagnostics.push( + Diagnostic::error( + codes::SEM_UNSUPPORTED_VERSION_DIRECTIVE, + Some(frontmatter.yaml_span), + format!( + "`{key}` is not a syntax selector; there is one current syntax" + ), + ) + .with_hint( + "remove the directive and migrate the source to RFC-LANG-0002 syntax", + ), + ); } } - Err(error) => diagnostics.push( - Diagnostic::error( - codes::FRONTMATTER_INVALID, - Some(frontmatter.span), - format!("invalid import declaration: {error}"), - ) - .with_hint("imports are an explicit mapping: `import: { alias: \"@module\" }`"), - ), - }, + match frontmatter.imports() { + Ok(mapping) => { + for (alias, target) in mapping { + imports.push(ImportDecl { + alias, + target, + span: frontmatter.span, + }); + } + } + Err(error) => diagnostics.push( + Diagnostic::error( + codes::FRONTMATTER_INVALID, + Some(frontmatter.span), + format!("invalid import declaration: {error}"), + ) + .with_hint( + "imports are an explicit mapping: `import: { alias: \"@module\" }`", + ), + ), + } + } } } @@ -92,7 +112,7 @@ pub fn analyze_source(module_id: &str, source: &str) -> AnalysisResult { let signature = signature::detect(&document, &blocks); let explicit = signature.as_ref().map(|(_, sig)| sig); - let mut mapped = map::map_function(&document, &units, &imports, scope); + let mut mapped = map::map_function(&document, &units, scope); diagnostics.append(&mut mapped.diagnostics); let mut params: Vec = Vec::new(); @@ -104,7 +124,12 @@ pub fn analyze_source(module_id: &str, source: &str) -> AnalysisResult { } let inference = infer::infer(&mapped.stmts, explicit, &import_names); diagnostics.extend(inference.diagnostics); - if kind == SignatureKind::Inferred { + if kind == SignatureKind::Inferred && !inference.params.is_empty() { + diagnostics.push(Diagnostic::warning( + codes::SEM_INFERRED_SIGNATURE, + Some(scope.heading_span), + "function signature was inferred; declare it with `params(...)`", + )); params = inference .params .into_iter() @@ -157,19 +182,25 @@ mod tests { #[test] fn maps_recursive_factorial() { - let source = r#"# 数学 + let source = r#"# @knowledge 数学 -## 阶乘 +## @exec 阶乘 -1. `n <= 1` +`if n <= 1` - *1* +`return 1` -2. `n > 1` +`else` - **结果 = n * 阶乘(n=n-1)** +`if n > 1` - *结果* +`结果 = n * 阶乘(n=n-1)` + +`return 结果` + +`end` + +`end` "#; let result = analyze(source); assert!( @@ -186,17 +217,19 @@ mod tests { #[test] fn maps_countdown_loop() { - let source = r#"## 倒计时 + let source = r#"## @exec 倒计时 -**n = 3** +`n = 3` -- `n > 0` +`while n > 0` - > 打印(n) +`打印(n)` - **n = n - 1** +`n = n - 1` -*n* +`end` + +`return n` "#; let result = analyze(source); assert!(!result.has_errors(), "{:#?}", result.diagnostics); @@ -207,22 +240,24 @@ mod tests { #[test] fn invalid_strong_payload_is_a_hard_error() { - let result = analyze("## f\n\n**a *b* c**\n"); + let result = analyze("## @exec f\n\n**a *b* c**\n"); assert!(result.has_errors()); assert!(result .diagnostics .iter() - .any(|d| d.code == codes::MARKDOWN_INVALID_CONSTRUCT)); + .any(|d| d.code == "sem.payload_nested")); } #[test] fn invalid_list_header_is_a_hard_error() { - let result = analyze("## f\n\n1. 没有条件\n"); + // RFC-LANG-0002: a plain list is inert Markdown; the v2 negative is an + // unclosed control frame inside the owning Exec H2. + let result = analyze("## @exec f\n\n`if 1`\n"); assert!(result.has_errors()); assert!(result .diagnostics .iter() - .any(|d| d.code == codes::MARKDOWN_INVALID_CONSTRUCT)); + .any(|d| d.code == "sem.unclosed_control")); } /// Strip source spans so that pure narrative edits (which shift byte @@ -252,8 +287,9 @@ mod tests { #[test] fn prose_changes_do_not_change_ir() { - let base = "## f\n\n说明文字。\n\n**x = 1**\n\n更多说明。\n\n*x*\n"; - let edited = "## f\n\n另一段完全不同的叙述。\n\n**x = 1**\n\n继续叙述。\n\n*x*\n"; + let base = "## @exec f\n\n说明文字。\n\n`x = 1`\n\n更多说明。\n\n`return x`\n"; + let edited = + "## @exec f\n\n另一段完全不同的叙述。\n\n`x = 1`\n\n继续叙述。\n\n`return x`\n"; let a = analyze(base); let b = analyze(edited); let a_ir = serde_json::to_value(&a.module.functions).unwrap(); diff --git a/crates/marqdo-frontend/src/map.rs b/crates/marqdo-frontend/src/map.rs index d5ce6f7..4a9c080 100644 --- a/crates/marqdo-frontend/src/map.rs +++ b/crates/marqdo-frontend/src/map.rs @@ -5,10 +5,8 @@ //! parsed only after the role is known. Invalid executable shapes produce hard //! diagnostics and never fall back to prose. -use marqdo_expression::{ - parse_arguments, parse_expression, parse_statement, Arg, AssignTarget, Expr, StatementKind, -}; -use marqdo_ir::{CallSite, CallTarget, ImportDecl, PlaceTarget, Stmt}; +use marqdo_expression::{parse_expression, parse_statement, AssignTarget, Expr, StatementKind}; +use marqdo_ir::{PlaceTarget, Stmt}; use marqdo_markdown::{normalize_name, MarkdownDocument, MdKind, MdNode}; use marqdo_span::Span; use marqdo_value::{codes, Diagnostic}; @@ -29,30 +27,74 @@ pub struct MappedBody { pub fn map_function( doc: &MarkdownDocument, index: &UnitIndex, - imports: &[ImportDecl], scope: &FunctionScope, ) -> MappedBody { let mut mapper = Mapper { - index, - imports, diagnostics: Vec::new(), + saw_params: None, }; - let blocks = &doc.root.children[scope.body_start..scope.body_end]; - let stmts = mapper.blocks(blocks); + let mut stmts = Vec::new(); + let mut segment = Vec::new(); + let mut mode = crate::units::SemanticMode::Exec; + for (node_index, block) in doc.root.children.iter().enumerate() { + if node_index < scope.body_start || node_index >= scope.body_end { + continue; + } + if let MdKind::Heading { .. } = block.kind { + if mode == crate::units::SemanticMode::Exec { + stmts.extend(mapper.blocks(&segment)); + } + segment.clear(); + if let Some(heading) = index.headings.iter().find(|h| h.node_index == node_index) { + mode = heading.mode; + } + continue; + } + if mode == crate::units::SemanticMode::Exec { + segment.push(block.clone()); + } + } + if mode == crate::units::SemanticMode::Exec { + stmts.extend(mapper.blocks(&segment)); + } MappedBody { stmts, diagnostics: mapper.diagnostics, } } -struct Mapper<'a> { - index: &'a UnitIndex, - #[allow(dead_code)] - imports: &'a [ImportDecl], +struct Mapper { diagnostics: Vec, + saw_params: Option, } -impl<'a> Mapper<'a> { +#[derive(Debug, Clone, Copy, PartialEq, Eq)] +enum Stop { + End, + Else, + Eof, +} + +enum Payload { + If(Expr), + Else, + While(Expr), + End, + Return(Expr), + Params, + Statement(marqdo_expression::Statement), +} + +struct RawPayload { + payload: Payload, + span: Span, + segments: PayloadSegments, + /// True only for a carrier in the heading's direct body, not inside a + /// list or block quote (`params` is legal only there). + direct: bool, +} + +impl Mapper { fn error(&mut self, code: &str, span: Option, message: impl Into) { self.diagnostics .push(Diagnostic::error(code, span, message)); @@ -70,468 +112,386 @@ impl<'a> Mapper<'a> { } fn blocks(&mut self, blocks: &[MdNode]) -> Vec { - let mut stmts = Vec::new(); + let mut raw = Vec::new(); for block in blocks { - stmts.extend(self.block(block)); + self.extract(block, &mut raw, true); + } + let mut position = 0; + let (stmts, stop) = self.sequence(&raw, &mut position, false, false); + if stop != Stop::Eof { + self.error( + codes::SEM_UNMATCHED_END, + raw.get(position.saturating_sub(1)).map(|node| node.span), + "control frame ends outside its owning function segment", + ); } stmts } - fn block(&mut self, block: &MdNode) -> Vec { - match &block.kind { - MdKind::Paragraph => self.paragraph(block), - MdKind::List { ordered, .. } => self.list(block, *ordered), - MdKind::BlockQuote => self.quote(block), - // Level>=3 headings and inert document values stay out of the IR. - _ => Vec::new(), - } - } - - fn paragraph(&mut self, paragraph: &MdNode) -> Vec { - let mut stmts = Vec::new(); - for child in ¶graph.children { - match &child.kind { - MdKind::Strong => { - if let Some(stmt) = self.exec_statement(child) { - stmts.push(stmt); + fn extract(&mut self, node: &MdNode, out: &mut Vec, direct: bool) { + match &node.kind { + MdKind::Paragraph => { + for child in &node.children { + self.extract(child, out, direct); + } + } + MdKind::BlockQuote | MdKind::Item { .. } | MdKind::List { .. } => { + for child in &node.children { + self.extract(child, out, false); + } + } + MdKind::Strong | MdKind::Emph => { + let (text, segments) = match PayloadSegments::of(node) { + Ok(result) => result, + Err(error) => { + self.error( + codes::SEM_PAYLOAD_NESTED, + Some(error.span), + format!("invalid payload carrier: {}", error.reason), + ); + return; } - } - MdKind::Emph => { - if let Some(stmt) = self.return_statement(child) { - stmts.push(stmt); - } - } - // Lazy/inert inline structures: never recurse into them. - MdKind::Link { .. } - | MdKind::Image { .. } - | MdKind::Strikethrough - | MdKind::Code { .. } - | MdKind::Math { .. } - | MdKind::Text - | MdKind::SoftBreak - | MdKind::LineBreak - | MdKind::HtmlInline - | MdKind::FootnoteReference { .. } => {} - _ => {} + }; + self.push(text, node.span, segments, out, direct); } + MdKind::Code { ticks } => { + let literal = node.literal.as_deref().unwrap_or_default(); + let inner = Span::new( + node.span.start.saturating_add(*ticks), + node.span.end.saturating_sub(*ticks), + ); + self.push( + literal.to_string(), + node.span, + PayloadSegments::single(literal, inner), + out, + direct, + ); + } + MdKind::Heading { .. } => {} + _ => {} } - stmts } - fn exec_statement(&mut self, node: &MdNode) -> Option { - let (payload, segments) = match PayloadSegments::of(node) { - Ok(result) => result, - Err(error) => { - self.error_with_hint( - codes::MARKDOWN_INVALID_CONSTRUCT, - Some(error.span), - error.reason, - "keep the executable payload as plain text or a single code span", - ); - return None; - } - }; - if payload.trim().is_empty() { + fn push( + &mut self, + text: String, + span: Span, + segments: PayloadSegments, + out: &mut Vec, + direct: bool, + ) { + if text.trim().is_empty() { self.error( - codes::MARKDOWN_INVALID_CONSTRUCT, - Some(node.span), - "execution statement has an empty payload", + codes::SEM_EMPTY_PAYLOAD, + Some(span), + "executable payload is empty", ); - return None; + return; } - match parse_statement(&payload) { - Ok(mut statement) => { - segments.rewrite_statement(&mut statement); - Some(match statement.kind { - StatementKind::Assign { target, value } => Stmt::Assign { - target: match target { - AssignTarget::Local { name, name_span } => { - PlaceTarget::Local { name, name_span } - } - AssignTarget::Index { - base, - index, - span: target_span, - } => PlaceTarget::Index { - base: *base, - index: *index, - span: target_span, - }, - }, - value, - span: node.span, - }, - StatementKind::Expr(expr) => Stmt::Eval { - expr, - span: node.span, - }, - }) + if let Some(mut payload) = self.parse_payload(&text, span, &segments) { + if let Payload::If(expr) | Payload::While(expr) | Payload::Return(expr) = &mut payload { + segments.rewrite_expr(expr); } - Err(error) => { - self.error_with_hint( - codes::EXPR_PARSE, - Some(segments.map_span(error.span)), - format!("invalid execution statement: {}", error.message), - "statements are `name = expression` or an expression; put the payload in a code span when Markdown emphasis conflicts", - ); - None - } - } - } - - fn return_statement(&mut self, node: &MdNode) -> Option { - let (payload, segments) = match PayloadSegments::of(node) { - Ok(result) => result, - Err(error) => { - self.error_with_hint( - codes::MARKDOWN_INVALID_CONSTRUCT, - Some(error.span), - error.reason, - "a return payload must be plain text or a single code span", - ); - return None; - } - }; - if payload.trim().is_empty() { - self.error( - codes::MARKDOWN_INVALID_CONSTRUCT, - Some(node.span), - "return statement has an empty payload", - ); - return None; - } - match parse_expression(&payload) { - Ok(mut expr) => { - segments.rewrite_expr(&mut expr); - Some(Stmt::Return { - value: expr, - span: node.span, - }) - } - Err(error) => { - self.error_with_hint( - codes::EXPR_PARSE, - Some(segments.map_span(error.span)), - format!("invalid return expression: {}", error.message), - "`*表达式*` returns the value of the expression", - ); - None - } - } - } - - fn list(&mut self, list: &MdNode, ordered: bool) -> Vec { - if list.children.is_empty() { - self.error( - codes::MARKDOWN_INVALID_CONSTRUCT, - Some(list.span), - "list in an executable position has no items", - ); - return Vec::new(); - } - let mut arms = Vec::new(); - let mut loops = Vec::new(); - for item in &list.children { - let Some((condition, condition_span, body_blocks)) = self.condition_of(item) else { - continue; - }; - let body = self.blocks(body_blocks); - if ordered { - arms.push(marqdo_ir::BranchArm { - condition, - condition_span, - body, - span: item.span, - }); - } else { - loops.push(Stmt::Loop { - condition, - condition_span, - body, - span: item.span, - }); - } - } - if ordered { - if arms.is_empty() { - return Vec::new(); - } - vec![Stmt::Branch { - arms, - span: list.span, - }] - } else { - loops - } - } - - /// Extract the condition header of a list item and its remaining blocks. - fn condition_of<'b>(&mut self, item: &'b MdNode) -> Option<(Expr, Span, &'b [MdNode])> { - let Some(first) = item.children.first() else { - self.error_with_hint( - codes::MARKDOWN_INVALID_CONSTRUCT, - Some(item.span), - "list item in an executable position must start with a condition code span", - "write the condition first: `` `n > 0` ``", - ); - return None; - }; - if !matches!(first.kind, MdKind::Paragraph) { - self.error_with_hint( - codes::MARKDOWN_INVALID_CONSTRUCT, - Some(first.span), - "list item must start with a paragraph containing the condition code span", - "put the condition on the first line of the item", - ); - return None; - } - let Some(condition_node) = first.children.first() else { - self.error( - codes::MARKDOWN_INVALID_CONSTRUCT, - Some(first.span), - "list item paragraph is empty; a condition code span is required", - ); - return None; - }; - if !matches!(condition_node.kind, MdKind::Code { .. }) { - self.error_with_hint( - codes::MARKDOWN_INVALID_CONSTRUCT, - Some(condition_node.span), - "list item must start with a condition inside an inline code span", - "the condition is a `Code` span: `` `n > 0` ``; other text is description", - ); - return None; - } - // The remainder of the condition paragraph is description only. The - // semantic mapper does not descend into it, so an executable `Strong` - // or `Emph` there would otherwise be silently swallowed. Reject it as - // a hard shape error instead of guessing the author's intent. - for tail in first.children.iter().skip(1) { - if matches!(tail.kind, MdKind::Strong | MdKind::Emph) { - self.error_with_hint( - codes::MARKDOWN_INVALID_CONSTRUCT, - Some(tail.span), - format!( - "`{}` inside a list-item condition paragraph is not executed and cannot be silently ignored", - tail.kind.tag() - ), - "put executable statements in their own paragraph after the condition line", - ); - return None; - } - } - let literal = condition_node.literal.clone().unwrap_or_default(); - // `condition_node.span` includes the backtick delimiters. The payload - // map must start at the first literal byte so parse diagnostics and - // expression spans point at the expression, not at a delimiter. - let ticks = match condition_node.kind { - MdKind::Code { ticks } => ticks, - _ => 0, - }; - let literal_span = Span::new( - condition_node.span.start.saturating_add(ticks), - condition_node.span.end.saturating_sub(ticks), - ); - let segments = PayloadSegments::single(&literal, literal_span); - match parse_expression(&literal) { - Ok(mut expr) => { - segments.rewrite_expr(&mut expr); - Some((expr, condition_node.span, &item.children[1..])) - } - Err(error) => { - self.error_with_hint( - codes::EXPR_PARSE, - Some(segments.map_span(error.span)), - format!("invalid condition expression: {}", error.message), - "conditions are Boolean expressions, e.g. `n > 0`", - ); - None - } - } - } - - fn quote(&mut self, quote: &MdNode) -> Vec { - if quote.children.len() != 1 || quote.children[0].kind != MdKind::Paragraph { - self.error_with_hint( - codes::MARKDOWN_INVALID_CONSTRUCT, - Some(quote.span), - "a block quote invocation must contain exactly one paragraph", - "use one block quote per call; prose belongs in normal paragraphs", - ); - return Vec::new(); - } - let paragraph = "e.children[0]; - self.call_paragraph(quote, paragraph) - } - - fn call_paragraph(&mut self, quote: &MdNode, paragraph: &MdNode) -> Vec { - let first = paragraph.children.first(); - let is_link_form = first - .map(|node| matches!(node.kind, MdKind::Link { .. })) - .unwrap_or(false); - if is_link_form { - return self.link_call(quote, paragraph); - } - let (payload, segments) = match PayloadSegments::of(paragraph) { - Ok(result) => result, - Err(error) => { - self.error_with_hint( - codes::MARKDOWN_INVALID_CONSTRUCT, - Some(error.span), - error.reason, - "a block quote call payload must be plain text or one code span", - ); - return Vec::new(); - } - }; - if payload.trim().is_empty() { - self.error( - codes::MARKDOWN_INVALID_CONSTRUCT, - Some(quote.span), - "block quote invocation has an empty payload", - ); - return Vec::new(); - } - match parse_expression(&payload) { - Ok(mut expr) => { - segments.rewrite_expr(&mut expr); - if !matches!(expr, Expr::Call { .. }) { - self.error_with_hint( - codes::MARKDOWN_INVALID_CONSTRUCT, - Some(segments.map_span(expr_span(&expr))), - "a block quote must be a complete function call", - "write `> 函数(参数)`; use a `**strong**` statement to bind a result", - ); - return Vec::new(); - } - vec![Stmt::Eval { - expr, - span: quote.span, - }] - } - Err(error) => { - self.error_with_hint( - codes::EXPR_PARSE, - Some(segments.map_span(error.span)), - format!("invalid call expression: {}", error.message), - "block quotes call functions explicitly: `> 函数(参数)`", - ); - Vec::new() - } - } - } - - fn link_call(&mut self, quote: &MdNode, paragraph: &MdNode) -> Vec { - let link = ¶graph.children[0]; - let (url, link_span) = match &link.kind { - MdKind::Link { url, .. } => (url.clone(), link.span), - _ => unreachable!("link form checked by caller"), - }; - let target = self.resolve_link_target(&url, link_span); - let rest = ¶graph.children[1..]; - let (suffix, segments) = match PayloadSegments::from_children(rest) { - Ok(result) => result, - Err(error) => { - self.error_with_hint( - codes::MARKDOWN_INVALID_CONSTRUCT, - Some(error.span), - error.reason, - "link call arguments must follow the link as plain text or code spans", - ); - return Vec::new(); - } - }; - if suffix.trim().is_empty() { - self.error_with_hint( - codes::MARKDOWN_INVALID_CONSTRUCT, - Some(quote.span), - "link-form call requires an explicit argument list", - "write `> [函数](#函数)()` even for zero arguments", - ); - return Vec::new(); - } - let mut args: Vec = match parse_arguments(&suffix) { - Ok(args) => args, - Err(error) => { - self.error_with_hint( - codes::EXPR_PARSE, - Some(segments.map_span(error.span)), - format!("invalid call arguments: {}", error.message), - "arguments are `name = value` or positional values", - ); - return Vec::new(); - } - }; - segments.rewrite_args(&mut args); - let Some(target) = target else { - return Vec::new(); - }; - vec![Stmt::Call { - call: CallSite { - target, - args, - span: quote.span, - }, - span: quote.span, - }] - } - - fn resolve_link_target(&mut self, url: &str, span: Span) -> Option { - if let Some(fragment) = url.strip_prefix('#') { - let unit_id = self.index.anchors.get(fragment).cloned().or_else(|| { - self.index - .units - .iter() - .find(|unit| unit.name == fragment) - .map(|unit| unit.id.clone()) + out.push(RawPayload { + payload, + span, + segments, + direct, }); - let Some(unit_id) = unit_id else { - self.error( - codes::REF_UNRESOLVED, - Some(span), - format!("no heading matches call target `{url}`"), - ); - return None; - }; - let Some(scope) = self - .index - .functions - .iter() - .find(|scope| scope.unit == unit_id) - else { - self.error( - codes::REF_UNRESOLVED, - Some(span), - format!("call target `{url}` is not a function"), - ); - return None; - }; - Some(CallTarget::Resolved { - module: unit_id.module.clone(), - function: scope.id.name.clone(), - }) - } else if url.starts_with("http://") || url.starts_with("https://") { - self.error_with_hint( - codes::REF_UNRESOLVED, - Some(span), - "external links cannot be called", - "link targets used as calls must resolve to a Marqdo function", - ); - None - } else { - self.error_with_hint( - codes::MODULE_UNRESOLVED, - Some(span), - format!("cannot resolve cross-module call target `{url}`"), - "import the module explicitly in front matter and call it through the alias", - ); - None } } -} -fn expr_span(expr: &Expr) -> Span { - marqdo_expression::Expr::span(expr) + fn parse_payload( + &mut self, + text: &str, + span: Span, + segments: &PayloadSegments, + ) -> Option { + let map = |span: Span| segments.map_span(span); + let text = text.trim(); + if text.starts_with("params(") { + // Signature syntax and diagnostics are owned by `signature::parse`; + // the mapper only recognizes the declaration payload. + return Some(Payload::Params); + } + if text == "params" || text.starts_with("params ") { + self.error( + codes::SEM_SYNTAX, + Some(span), + "malformed params declaration; write `params(name: Type, ...)`", + ); + return None; + } + let (word, rest) = match text.split_once(char::is_whitespace) { + Some((word, rest)) => (word, rest.trim()), + None => (text, ""), + }; + // Parse control expressions with the keyword replaced by spaces so the + // expression AST keeps payload-relative (not rest-relative) spans. + let expression_at = |rest: &str| { + let offset = text.len().saturating_sub(rest.len()); + parse_expression(&format!("{}{}", " ".repeat(offset), rest)) + }; + match word { + "if" => { + if rest.is_empty() { + self.error(codes::SEM_SYNTAX, Some(span), "`if` requires a condition"); + return None; + } + match expression_at(rest) { + Ok(expr) => Some(Payload::If(expr)), + Err(error) => { + self.error( + codes::SEM_SYNTAX, + Some(map(error.span)), + format!("invalid if condition: {}", error.message), + ); + None + } + } + } + "else" if rest.is_empty() => Some(Payload::Else), + "else" => { + self.error(codes::SEM_SYNTAX, Some(span), "`else` takes no expression"); + None + } + "while" => { + if rest.is_empty() { + self.error( + codes::SEM_SYNTAX, + Some(span), + "`while` requires a condition", + ); + return None; + } + match expression_at(rest) { + Ok(expr) => Some(Payload::While(expr)), + Err(error) => { + self.error( + codes::SEM_SYNTAX, + Some(map(error.span)), + format!("invalid while condition: {}", error.message), + ); + None + } + } + } + "end" if rest.is_empty() => Some(Payload::End), + "end" => { + self.error(codes::SEM_SYNTAX, Some(span), "`end` takes no expression"); + None + } + "return" => { + if rest.is_empty() { + self.error( + codes::SEM_SYNTAX, + Some(span), + "`return` requires an expression", + ); + return None; + } + match expression_at(rest) { + Ok(expr) => Some(Payload::Return(expr)), + Err(error) => { + self.error( + codes::SEM_SYNTAX, + Some(map(error.span)), + format!("invalid return expression: {}", error.message), + ); + None + } + } + } + "params" => { + if text.starts_with("params(") && text.ends_with(')') { + Some(Payload::Params) + } else { + self.error( + codes::SEM_SYNTAX, + Some(span), + "malformed params declaration", + ); + None + } + } + "ifdef" | "returning" | "paramsx" => self.statement_payload(text, span), + _ => self.statement_payload(text, span), + } + } + + fn statement_payload(&mut self, text: &str, span: Span) -> Option { + match parse_statement(text) { + Ok(statement) => Some(Payload::Statement(statement)), + Err(error) => { + self.error_with_hint( + codes::SEM_SYNTAX, + Some(span), + format!("invalid execution payload: {}", error.message), + "one payload is exactly one statement; put control keywords in their own carriers", + ); + None + } + } + } + + fn sequence( + &mut self, + nodes: &[RawPayload], + position: &mut usize, + stop_on_else: bool, + in_else_body: bool, + ) -> (Vec, Stop) { + let mut out = Vec::new(); + while *position < nodes.len() { + let raw = &nodes[*position]; + match &raw.payload { + Payload::Else => { + if stop_on_else { + return (out, Stop::Else); + } + self.error( + if in_else_body { + codes::SEM_DUPLICATE_ELSE + } else { + codes::SEM_UNMATCHED_ELSE + }, + Some(raw.span), + if in_else_body { + "`if` has more than one `else`" + } else { + "`else` has no open `if`" + }, + ); + *position += 1; + } + Payload::End => { + return (out, Stop::End); + } + Payload::If(condition) => { + let condition = condition.clone(); + let span = raw.span; + *position += 1; + let (then_body, stop) = self.sequence(nodes, position, true, false); + let mut else_body = Vec::new(); + let finish = match stop { + Stop::Else => { + *position += 1; + let (body, stop) = self.sequence(nodes, position, false, true); + else_body = body; + stop + } + other => other, + }; + if finish != Stop::End { + self.error( + codes::SEM_UNCLOSED_CONTROL, + Some(span), + "`if` is not closed by `end`", + ); + } else { + *position += 1; + } + let mut arms = vec![marqdo_ir::BranchArm { + condition, + condition_span: span, + body: then_body, + span, + }]; + if !else_body.is_empty() { + arms.push(marqdo_ir::BranchArm { + condition: Expr::Bool(true), + condition_span: span, + body: else_body, + span, + }); + } + out.push(Stmt::Branch { arms, span }); + } + Payload::While(condition) => { + let condition = condition.clone(); + let span = raw.span; + *position += 1; + let (body, stop) = self.sequence(nodes, position, false, false); + if stop != Stop::End { + self.error( + codes::SEM_UNCLOSED_CONTROL, + Some(span), + "`while` is not closed by `end`", + ); + } else { + *position += 1; + } + out.push(Stmt::Loop { + condition, + condition_span: span, + body, + span, + }); + } + Payload::Return(value) => { + out.push(Stmt::Return { + value: value.clone(), + span: raw.span, + }); + *position += 1; + } + Payload::Params => { + let duplicate = self.saw_params.is_some(); + if !raw.direct { + self.error( + codes::SEM_SIGNATURE_POSITION, + Some(raw.span), + "`params(...)` must be a direct payload, not inside a list or block quote", + ); + } else if *position != 0 { + self.error( + codes::SEM_SIGNATURE_POSITION, + Some(raw.span), + "`params(...)` must be the first payload of an Exec H2", + ); + } else if duplicate { + self.error( + codes::SEM_SIGNATURE_POSITION, + Some(raw.span), + "`params(...)` may be declared only once per function", + ); + } else { + self.saw_params = Some(raw.span); + } + *position += 1; + } + Payload::Statement(statement) => { + let mut statement = statement.clone(); + raw.segments.rewrite_statement(&mut statement); + let span = raw.span; + match statement.kind { + StatementKind::Assign { target, value } => out.push(Stmt::Assign { + target: match target { + AssignTarget::Local { name, name_span } => { + PlaceTarget::Local { name, name_span } + } + AssignTarget::Index { + base, + index, + span: target_span, + } => PlaceTarget::Index { + base: *base, + index: *index, + span: target_span, + }, + }, + value, + span, + }), + StatementKind::Expr(expr) => out.push(Stmt::Eval { expr, span }), + } + *position += 1; + } + } + } + (out, Stop::Eof) + } } /// Normalise a heading name (re-exported for callers that resolve link targets). diff --git a/crates/marqdo-frontend/src/payload.rs b/crates/marqdo-frontend/src/payload.rs index 660a581..90060fa 100644 --- a/crates/marqdo-frontend/src/payload.rs +++ b/crates/marqdo-frontend/src/payload.rs @@ -311,40 +311,42 @@ mod extra_span_tests { #[test] fn condition_literal_span_excludes_backticks_for_one_and_two_ticks() { - for source in ["## f\n\n1. `n ** 2 ==`\n", "## f\n\n1. ``n ** 2 ==``\n"] { + for source in [ + "## @exec f\n\n`if n ** 2 ==`\n", + "## @exec f\n\n``if n ** 2 ==``\n", + ] { let result = crate::analyze_source("index.mq.md", source); let diagnostic = result .diagnostics .iter() - .find(|diagnostic| diagnostic.code == marqdo_value::codes::EXPR_PARSE) - .unwrap_or_else(|| panic!("no expr.parse diagnostic for {source:?}")); + .find(|diagnostic| diagnostic.code == marqdo_value::codes::SEM_SYNTAX) + .unwrap_or_else(|| panic!("no sem.syntax diagnostic for {source:?}")); let span = diagnostic .span .expect("condition parse error has a source span"); - assert_eq!( - source.as_bytes()[span.start], - b'`', - "span must stop before the closing backtick: {span:?} in {source:?}" - ); - assert_eq!( - &source[span.start.saturating_sub(2)..span.start], - "==", - "span must point at the missing operand" + let condition = source.find("n ** 2 ==").expect("condition text"); + let closing = source.rfind('`').expect("closing backtick"); + assert!( + span.start >= condition && span.end <= closing, + "span must point inside the carrier payload, before the closing backtick: {span:?} in {source:?}" ); } } #[test] fn condition_description_rejects_executable_roles() { + // RFC-LANG-0002 no longer rejects Strong/Emph next to a code span: + // every carrier is an independent statement. The preserved intent is + // that a malformed control sequence after `if` is a hard error; it is + // repurposed as an unclosed-control negative. for tail in ["**print(1)**", "*1*"] { - let source = format!("## f\n\n1. `n > 0` {tail}\n\n > print(1)\n"); + let source = format!("## @exec f\n\n`if n > 0` {tail}\n"); let result = crate::analyze_source("index.mq.md", &source); assert!( result .diagnostics .iter() - .any(|diagnostic| diagnostic.code - == marqdo_value::codes::MARKDOWN_INVALID_CONSTRUCT), + .any(|diagnostic| diagnostic.code == "sem.unclosed_control"), "executable tail `{tail}` was not rejected: {:#?}", result.diagnostics ); @@ -353,7 +355,10 @@ mod extra_span_tests { #[test] fn condition_description_allows_inert_inline_content() { - let source = "## f\n\n**n = 1**\n\n1. `n > 0` 普通说明、`惰性代码` 与 [链接](#f)。\n\n > print(1)\n"; + // Inline code spans are payload carriers in Exec scope, so the old inert + // `惰性代码` example is now a statement; prose, a link and a carrier-free + // block quote remain inert and must not be rejected. + let source = "## @exec f\n\n`n = 1`\n\n1. `n > 0` 普通说明与 [链接](#f)。\n\n > print(1)\n\n`return n`\n"; let result = crate::analyze_source("index.mq.md", source); assert!( !result.has_errors(), diff --git a/crates/marqdo-frontend/src/resources.rs b/crates/marqdo-frontend/src/resources.rs index b20c741..29e1bbb 100644 --- a/crates/marqdo-frontend/src/resources.rs +++ b/crates/marqdo-frontend/src/resources.rs @@ -121,7 +121,7 @@ mod tests { #[test] fn formulas_and_code_are_attributed_to_functions() { let resources = resources_of( - "# ns\n\n## f\n\n$$A = pi r^2$$\n\n```python\nprint(1)\n```\n\n## g\n\n$$B = 1$$\n", + "# @knowledge ns\n\n## @exec f\n\n$$A = pi r^2$$\n\n```python\nprint(1)\n```\n\n## @exec g\n\n$$B = 1$$\n", ); assert_eq!(resources.len(), 3); let Resource::Formula { unit, latex, .. } = &resources[0] else { diff --git a/crates/marqdo-frontend/src/signature.rs b/crates/marqdo-frontend/src/signature.rs index 45a946c..3d8ea61 100644 --- a/crates/marqdo-frontend/src/signature.rs +++ b/crates/marqdo-frontend/src/signature.rs @@ -42,37 +42,41 @@ pub fn detect(_doc: &MarkdownDocument, blocks: &[&MdNode]) -> Option<(usize, Sig match &block.kind { MdKind::Heading { level, .. } if *level >= 3 => continue, MdKind::Paragraph => { - let is_candidate = block.children.len() == 1 - && matches!(block.children[0].kind, MdKind::Code { .. }) - && block.children[0] - .literal - .as_deref() - .map(|text| text.trim_start().starts_with('(')) - .unwrap_or(false); - if !is_candidate { + if block.children.len() != 1 { + continue; + } + let carrier = &block.children[0]; + let (source, span, segments) = match &carrier.kind { + MdKind::Code { ticks } => { + let literal = carrier.literal.clone().unwrap_or_default(); + let inner = Span::new( + carrier.span.start.saturating_add(*ticks), + carrier.span.end.saturating_sub(*ticks), + ); + ( + literal.clone(), + carrier.span, + PayloadSegments::single(&literal, inner), + ) + } + MdKind::Strong | MdKind::Emph => match PayloadSegments::of(carrier) { + Ok((source, segments)) => (source, carrier.span, segments), + Err(_) => continue, + }, + _ => continue, + }; + if !source.trim_start().starts_with("params(") { return None; } - let code = &block.children[0]; - let source = code.literal.clone().unwrap_or_default(); - let mut signature = parse(&source, code.span); - // Rewrite parameter default expression spans onto the file. - let segments = PayloadSegments::of(&MdNode { - kind: MdKind::Strong, - span: code.span, - literal: None, - children: vec![code.clone()], - }) - .ok() - .map(|(_, segments)| segments); - if let Some(segments) = segments { - for param in &mut signature.params { - if let Some(default) = &mut param.default { - segments.rewrite_expr(default); - } + let mut signature = parse(&source, span); + for param in &mut signature.params { + if let Some(default) = &mut param.default { + segments.rewrite_expr(default); } } return Some((index, signature)); } + MdKind::List { .. } | MdKind::BlockQuote | MdKind::Item { .. } => continue, _ => return None, } } @@ -83,13 +87,33 @@ pub fn detect(_doc: &MarkdownDocument, blocks: &[&MdNode]) -> Option<(usize, Sig pub fn parse(source: &str, span: Span) -> Signature { let mut diagnostics = Vec::new(); let trimmed = source.trim(); - let inner = if let Some(rest) = trimmed.strip_prefix('(') { + let is_params = trimmed.starts_with("params("); + let syntax_code = if is_params { + codes::SEM_SYNTAX + } else { + codes::EXPR_PARSE + }; + let inner = if let Some(rest) = trimmed.strip_prefix("params(") { + match rest.strip_suffix(')') { + Some(inner) => inner, + None => { + diagnostics.push(Diagnostic::error( + codes::SEM_SYNTAX, + Some(span), + "function signature must be closed by `)`", + )); + rest + } + } + } else if let Some(rest) = trimmed.strip_prefix('(') { + // Plugin/ABI descriptors keep their existing parenthesised signature + // spelling; language payloads are detected only as `params(...)`. rest.strip_suffix(')').unwrap_or(rest) } else { diagnostics.push(Diagnostic::error( - codes::EXPR_PARSE, + syntax_code, Some(span), - "function signature must be parenthesised, e.g. `(r: Number)`", + "function signature must be `params(...)`, e.g. `params(r: Number)`", )); trimmed }; @@ -102,7 +126,7 @@ pub fn parse(source: &str, span: Span) -> Signature { if entry.trim().is_empty() { if !inner.trim().is_empty() { diagnostics.push(Diagnostic::error( - codes::EXPR_PARSE, + syntax_code, Some(span), "empty parameter in function signature", )); @@ -129,7 +153,7 @@ pub fn parse(source: &str, span: Span) -> Signature { } } Err(message) => diagnostics.push(Diagnostic::error( - codes::EXPR_PARSE, + syntax_code, Some(span), format!("invalid function signature: {message}"), )), @@ -293,7 +317,7 @@ mod tests { #[test] fn parses_typed_signature_with_default() { - let signature = parse("(r: Number, precision: Int = 2)", Span::new(0, 38)); + let signature = parse("params(r: Number, precision: Int = 2)", Span::new(0, 38)); assert!(!signature.has_errors(), "{:?}", signature.diagnostics); assert_eq!(signature.params.len(), 2); assert_eq!(signature.params[0].name, "r"); @@ -307,20 +331,20 @@ mod tests { #[test] fn parses_untyped_and_empty() { - let signature = parse("()", Span::new(0, 2)); + let signature = parse("params()", Span::new(0, 8)); assert!(signature.params.is_empty()); assert!(!signature.has_errors()); - let signature = parse("(n)", Span::new(0, 3)); + let signature = parse("params(n)", Span::new(0, 9)); assert_eq!(signature.params[0].name, "n"); } #[test] fn rejects_duplicates_and_bad_defaults() { - let duplicate = parse("(a, a)", Span::new(0, 6)); + let duplicate = parse("params(a, a)", Span::new(0, 12)); assert!(duplicate.has_errors()); - let bad_default = parse("(a = f())", Span::new(0, 10)); + let bad_default = parse("params(a = f())", Span::new(0, 16)); assert!(bad_default.has_errors()); - let bad_name = parse("(1x)", Span::new(0, 4)); + let bad_name = parse("params(1x)", Span::new(0, 10)); assert!(bad_name.has_errors()); } diff --git a/crates/marqdo-frontend/src/units.rs b/crates/marqdo-frontend/src/units.rs index a3c90d0..21d40e5 100644 --- a/crates/marqdo-frontend/src/units.rs +++ b/crates/marqdo-frontend/src/units.rs @@ -16,7 +16,7 @@ use std::collections::BTreeMap; use marqdo_ir::{FunctionId, ModuleId, UnitId, UnitInfo, UnitKind}; -use marqdo_markdown::{normalize_name, plain_text, MarkdownDocument, MdKind}; +use marqdo_markdown::{normalize_name, plain_text, MarkdownDocument, MdKind, MdNode}; use marqdo_span::Span; use marqdo_value::{codes, Diagnostic}; @@ -35,6 +35,8 @@ pub struct HeadingInfo { pub path: Vec, /// Role derived from level and position. pub kind: UnitKind, + /// Semantic mode declared or inherited by this heading. + pub mode: SemanticMode, } /// A function range mapped from a level-2 heading. @@ -93,6 +95,91 @@ impl UnitIndex { } } +fn has_payload(node: &MdNode) -> bool { + match &node.kind { + MdKind::Strong | MdKind::Emph | MdKind::Code { .. } => true, + MdKind::Paragraph | MdKind::List { .. } | MdKind::Item { .. } | MdKind::BlockQuote => { + node.children.iter().any(has_payload) + } + _ => false, + } +} + +/// Build the heading/function index for a parsed document. +/// Semantic mode declared or inherited by a heading (RFC-LANG-0002). +#[derive(Debug, Clone, Copy, PartialEq, Eq)] +pub enum SemanticMode { + /// Document/knowledge region; no executable statements. + Knowledge, + /// Executable region; only an Exec H2 is callable. + Exec, +} + +fn heading_declaration( + node: &MdNode, +) -> (Option, Option, Option) { + let Some(first) = node.children.first() else { + return (None, None, None); + }; + let MdKind::Text = first.kind else { + return (None, None, None); + }; + let literal = first.literal.as_deref().unwrap_or_default(); + let (mode, rest) = if let Some(rest) = literal.strip_prefix("@exec") { + if !rest.is_empty() && !rest.starts_with(char::is_whitespace) { + return (None, None, None); + } + (SemanticMode::Exec, rest) + } else if let Some(rest) = literal.strip_prefix("@knowledge") { + if !rest.is_empty() && !rest.starts_with(char::is_whitespace) { + return (None, None, None); + } + (SemanticMode::Knowledge, rest) + } else if literal.starts_with('@') + && literal + .trim_start_matches('@') + .chars() + .next() + .is_some_and(char::is_alphabetic) + { + return ( + None, + None, + Some(Diagnostic::error( + codes::SEM_INVALID_MODE_MARKER, + Some(first.span), + "unknown heading mode marker; use exactly `@exec` or `@knowledge`", + )), + ); + } else { + return (None, None, None); + }; + let title = rest.trim(); + if title.is_empty() { + return ( + Some(mode), + None, + Some(Diagnostic::error( + codes::SEM_EMPTY_UNIT_NAME, + Some(node.span), + "mode declaration has an empty heading name", + )), + ); + } + if title.starts_with("@exec") || title.starts_with("@knowledge") { + return ( + Some(mode), + None, + Some(Diagnostic::error( + codes::SEM_INVALID_MODE_MARKER, + Some(node.span), + "a heading may declare only one semantic mode", + )), + ); + } + (Some(mode), Some(title.to_string()), None) +} + /// Build the heading/function index for a parsed document. pub fn build_units(doc: &MarkdownDocument, module: &ModuleId) -> UnitIndex { let mut index = UnitIndex::default(); @@ -108,8 +195,8 @@ pub fn build_units(doc: &MarkdownDocument, module: &ModuleId) -> UnitIndex { function: None, }); - // Stack of (level, path) for ancestor headings with smaller level. - let mut stack: Vec<(u8, Vec)> = Vec::new(); + // Stack of (level, path, mode) for ancestors. + let mut stack: Vec<(u8, Vec, SemanticMode)> = Vec::new(); let mut seen: BTreeMap<(Vec, String), Span> = BTreeMap::new(); let mut current_namespace: Option = None; let mut current_function: Option = None; @@ -120,11 +207,26 @@ pub fn build_units(doc: &MarkdownDocument, module: &ModuleId) -> UnitIndex { continue; }; let level = *level; - let raw_name = normalize_name(&plain_text(child)); - let Some(name) = raw_name else { + let (declared, declared_name, declaration_error) = heading_declaration(child); + if let Some(error) = declaration_error { + index.diagnostics.push(error); + if declared_name.is_none() { + continue; + } + } + let inherited = stack + .last() + .map(|(_, _, mode)| *mode) + .unwrap_or(SemanticMode::Knowledge); + let mode = declared.unwrap_or(inherited); + let raw_name = match declared_name { + Some(name) => name, + None => plain_text(child), + }; + let Some(name) = normalize_name(&raw_name) else { index.diagnostics.push( Diagnostic::error( - codes::MARKDOWN_INVALID_CONSTRUCT, + codes::SEM_EMPTY_UNIT_NAME, Some(child.span), "heading name must not be empty", ) @@ -133,7 +235,7 @@ pub fn build_units(doc: &MarkdownDocument, module: &ModuleId) -> UnitIndex { continue; }; - while let Some((parent_level, _)) = stack.last() { + while let Some((parent_level, _, _)) = stack.last() { if *parent_level >= level { stack.pop(); } else { @@ -142,7 +244,7 @@ pub fn build_units(doc: &MarkdownDocument, module: &ModuleId) -> UnitIndex { } let parent_path = stack .last() - .map(|(_, path)| path.clone()) + .map(|(_, path, _)| path.clone()) .unwrap_or_default(); let path = { let mut path = parent_path.clone(); @@ -150,14 +252,12 @@ pub fn build_units(doc: &MarkdownDocument, module: &ModuleId) -> UnitIndex { path }; - // Duplicate canonical names in the same scope are a hard error; never - // silently rename with -1/-2 suffixes. let key = (parent_path.clone(), name.clone()); if let Some(previous) = seen.get(&key) { let previous = *previous; index.diagnostics.push( Diagnostic::error( - codes::MARKDOWN_INVALID_CONSTRUCT, + codes::SEM_DUPLICATE_UNIT_NAME, Some(child.span), format!("duplicate heading name `{name}` in the same scope"), ) @@ -170,14 +270,25 @@ pub fn build_units(doc: &MarkdownDocument, module: &ModuleId) -> UnitIndex { let kind = match level { 1 => UnitKind::Namespace, - 2 => UnitKind::Function, + 2 if mode == SemanticMode::Exec => UnitKind::Function, + 2 => UnitKind::Knowledge, _ => UnitKind::Section, }; if level == 1 { current_namespace = Some(name.clone()); current_function = None; } - let function = if level == 2 { + if level >= 3 && mode == SemanticMode::Exec && current_function.is_none() { + index.diagnostics.push( + Diagnostic::error( + codes::SEM_EXEC_WITHOUT_FUNCTION, + Some(child.span), + "executable section has no owning Exec H2 function", + ) + .with_hint("put the section under an Exec H2, or mark it @knowledge"), + ); + } + let function = if level == 2 && mode == SemanticMode::Exec { let local = name.clone(); let qualified = match ¤t_namespace { Some(namespace) => format!("{namespace}.{local}"), @@ -189,9 +300,12 @@ pub fn build_units(doc: &MarkdownDocument, module: &ModuleId) -> UnitIndex { }; current_function = Some(id.clone()); Some(id) - } else if level >= 3 { + } else if level >= 3 && mode == SemanticMode::Exec { current_function.clone() } else { + if level <= 2 { + current_function = None; + } None }; @@ -202,6 +316,7 @@ pub fn build_units(doc: &MarkdownDocument, module: &ModuleId) -> UnitIndex { span: child.span, path: path.clone(), kind, + mode, }; let unit_id = UnitId { module: module.clone(), @@ -215,12 +330,40 @@ pub fn build_units(doc: &MarkdownDocument, module: &ModuleId) -> UnitIndex { kind, function, }); + if level == 1 && mode == SemanticMode::Exec { + // H1 Exec: direct-body carriers before the next heading have no + // owning H2 function. A Knowledge H2 body is inert (inline code + // there is documentation), and Exec H3 sections are checked above. + let mut scan = node_index + 1; + while scan < doc.root.children.len() { + if let MdKind::Heading { .. } = doc.root.children[scan].kind { + break; + } + if has_payload(&doc.root.children[scan]) { + index.diagnostics.push(Diagnostic::error( + codes::SEM_EXEC_WITHOUT_FUNCTION, + Some(doc.root.children[scan].span), + "executable payload has no owning Exec H2 function", + )); + break; + } + scan += 1; + } + } heading_infos.push(info.clone()); - stack.push((level, info.path.clone())); + stack.push((level, info.path.clone(), mode)); } // Function body ranges and spans. for heading in heading_infos.iter().filter(|h| h.level == 2) { + // A Knowledge H2 has no function range. + if !index + .units + .iter() + .any(|unit| unit.id.path == heading.path && unit.kind == UnitKind::Function) + { + continue; + } let body_start = heading.node_index + 1; let body_end = doc.root.children[body_start..] .iter() @@ -239,33 +382,23 @@ pub fn build_units(doc: &MarkdownDocument, module: &ModuleId) -> UnitIndex { } else { heading.span }; - let local_name = heading.name.clone(); - let namespace = match heading.path.len() { - 0 => None, - _ if heading.path.len() == 1 => None, - _ => Some(heading.path[0].clone()), - }; - let namespace = namespace.filter(|_| { - index - .units - .iter() - .any(|unit| unit.kind == UnitKind::Namespace && unit.name == heading.path[0]) - }); - let qualified = match &namespace { - Some(namespace) => format!("{namespace}.{local_name}"), - None => local_name.clone(), + let unit = index + .units + .iter() + .find(|unit| unit.id.path == heading.path && unit.kind == UnitKind::Function) + .expect("function unit exists"); + let FunctionId { name, .. } = unit.function.clone().expect("function id"); + let local_name = name.rsplit('.').next().unwrap_or(&name).to_string(); + let namespace = if name.contains('.') { + Some(name.rsplit_once('.').unwrap().0.to_string()) + } else { + None }; index.functions.push(FunctionScope { - id: FunctionId { - module: module.clone(), - name: qualified, - }, + id: unit.function.clone().unwrap(), local_name, namespace, - unit: UnitId { - module: module.clone(), - path: heading.path.clone(), - }, + unit: unit.id.clone(), heading_span: heading.span, body_start, body_end, @@ -273,67 +406,34 @@ pub fn build_units(doc: &MarkdownDocument, module: &ModuleId) -> UnitIndex { }); } - // Warnings for would-be execution nodes outside every function body. - for (node_index, child) in doc.root.children.iter().enumerate() { - if index.function_containing_block(node_index).is_some() { + for heading in &heading_infos { + let Some(unit) = index.units.iter().find(|unit| unit.id.path == heading.path) else { + continue; + }; + let slug = github_slug(&heading.name); + if slug.is_empty() { continue; } - let mut warn = |span: Span, what: &str| { - index.diagnostics.push( - Diagnostic::warning( - codes::MARKDOWN_INERT_EXECUTABLE, - Some(span), - format!("{what} outside a function body is inert document content"), - ) - .with_hint("move it under a level-2 heading (`## 函数名`) to execute it"), - ); - }; - match &child.kind { - MdKind::BlockQuote => warn(child.span, "a block quote invocation"), - MdKind::List { .. } => warn(child.span, "a list control structure"), - MdKind::Paragraph => { - let mut found: Option<(Span, &'static str)> = None; - child.walk(&mut |node| { - if found.is_none() { - match node.kind { - MdKind::Strong => found = Some((node.span, "an execution statement")), - MdKind::Emph => found = Some((node.span, "a return statement")), - _ => {} - } - } - }); - if let Some((span, what)) = found { - warn(span, what); + let mut count = index.anchors.keys().filter(|key| *key == &slug).count(); + let key = if count == 0 { + slug.clone() + } else { + loop { + count += 1; + let candidate = format!("{slug}-{count}"); + if !index.anchors.contains_key(&candidate) { + break candidate; } } - _ => {} - } - } - - // Derive GitHub-style anchors for navigation and `ref("#...")`. Anchors are - // not identity: they may collide and receive -1/-2 suffixes exactly like - // GitHub's slugger, while internal ids stay canonical. - let mut slug_counts: BTreeMap = BTreeMap::new(); - for unit in &index.units { - if unit.level == 0 { - continue; - } - let base = github_slug(&unit.name); - if base.is_empty() { - continue; - } - let count = slug_counts.entry(base.clone()).or_insert(0); - let slug = if *count == 0 { - base - } else { - format!("{base}-{count}") }; - *count += 1; - index.anchors.insert(slug, unit.id.clone()); + index.anchors.insert(key, unit.id.clone()); } index.headings = heading_infos; index + .diagnostics + .dedup_by(|a, b| a.code == b.code && a.span == b.span && a.message == b.message); + index } /// GitHub-style heading slug, kept in a separate namespace from canonical @@ -366,7 +466,7 @@ mod tests { #[test] fn builds_function_ranges() { let index = index_of( - "# 命名空间\n\n## 阶乘\n\n**x = 1**\n\n### 小节\n\n正文\n\n## 下一个\n\n*y*\n", + "# @knowledge 命名空间\n\n## @exec 阶乘\n\n`x = 1`\n\n### 小节\n\n正文\n\n## @exec 下一个\n\n`return y`\n", ); assert_eq!(index.functions.len(), 2); assert_eq!(index.functions[0].local_name, "阶乘"); @@ -380,7 +480,7 @@ mod tests { #[test] fn root_level_function_without_namespace() { - let index = index_of("## main\n\n> 打印(1)\n"); + let index = index_of("## @exec main\n\n`打印(1)`\n"); assert_eq!(index.functions.len(), 1); assert_eq!(index.functions[0].id.name, "main"); assert!(index.functions[0].namespace.is_none()); @@ -389,16 +489,16 @@ mod tests { #[test] fn empty_heading_is_an_error() { - let index = index_of("## \n\n正文\n"); + let index = index_of("## @exec\n\n正文\n"); assert!(index .diagnostics .iter() - .any(|d| d.code == codes::MARKDOWN_INVALID_CONSTRUCT && d.message.contains("empty"))); + .any(|d| d.code == "sem.empty_unit_name" && d.message.contains("empty"))); } #[test] fn duplicate_function_names_are_errors() { - let index = index_of("## f\n\n## f\n"); + let index = index_of("## @exec f\n\n## @exec f\n"); let errors = index .diagnostics .iter() @@ -409,7 +509,7 @@ mod tests { #[test] fn same_name_in_different_namespaces_is_allowed() { - let index = index_of("# a\n\n## f\n\n# b\n\n## f\n"); + let index = index_of("# @knowledge a\n\n## @exec f\n\n# @knowledge b\n\n## @exec f\n"); let duplicates = index .diagnostics .iter() @@ -423,11 +523,10 @@ mod tests { #[test] fn executable_outside_function_warns_but_does_not_execute() { - let index = index_of("**x = 1**\n\n## f\n\n*y*\n"); - assert!(index - .diagnostics - .iter() - .any(|d| d.code == codes::MARKDOWN_INERT_EXECUTABLE)); + // RFC-LANG-0002: a Strong at the Knowledge root is inert prose with no + // diagnostic; only an Exec H2 is a callable function. + let index = index_of("**x = 1**\n\n## @exec f\n\n`return y`\n"); + assert!(index.diagnostics.is_empty()); assert_eq!(index.functions.len(), 1); } } diff --git a/crates/marqdo-ir/src/lib.rs b/crates/marqdo-ir/src/lib.rs index 251dfb1..a5adab8 100644 --- a/crates/marqdo-ir/src/lib.rs +++ b/crates/marqdo-ir/src/lib.rs @@ -152,6 +152,8 @@ pub enum UnitKind { Namespace, /// Level-2 heading: function. Function, + /// Level-2 heading in Knowledge mode: inert knowledge unit. + Knowledge, /// Level-3+ heading inside a function: named section, not a callable unit. Section, } diff --git a/crates/marqdo-markdown/src/frontmatter.rs b/crates/marqdo-markdown/src/frontmatter.rs index f4c1761..1c23f20 100644 --- a/crates/marqdo-markdown/src/frontmatter.rs +++ b/crates/marqdo-markdown/src/frontmatter.rs @@ -66,6 +66,19 @@ impl FrontMatter { Ok(result) } + /// Whether the top-level YAML mapping contains `key`. + /// + /// Returns `false` for invalid YAML. Used to reject removed syntax + /// selectors such as `marqdo_semantics` or `syntax` without making the + /// frontend depend on a YAML crate. + pub fn has_key(&self, key: &str) -> bool { + let Ok(yaml) = &self.yaml else { + return false; + }; + yaml.as_mapping() + .is_some_and(|mapping| mapping.contains_key(key)) + } + /// The raw YAML parses successfully. pub fn is_valid(&self) -> bool { self.yaml.is_ok() diff --git a/crates/marqdo-package/src/fileset.rs b/crates/marqdo-package/src/fileset.rs index 310e215..2fcf4ce 100644 --- a/crates/marqdo-package/src/fileset.rs +++ b/crates/marqdo-package/src/fileset.rs @@ -273,7 +273,7 @@ mod tests { fn excludes_git_and_marqdo_directories() { let dir = tempfile::tempdir().unwrap(); let root = dir.path(); - write(&root.join("index.mq.md"), b"## main\n"); + write(&root.join("index.mq.md"), b"## @exec main\n"); write(&root.join(".git/HEAD"), b"ref: main\n"); write(&root.join(".marqdo/env/env.json"), b"{}"); write(&root.join("nested/.marqdo/state"), b"x"); @@ -343,7 +343,7 @@ mod tests { let dir = tempfile::tempdir().unwrap(); let source = dir.path().join("source"); let target = dir.path().join("target"); - write(&source.join("index.mq.md"), b"## main\n"); + write(&source.join("index.mq.md"), b"## @exec main\n"); write(&source.join("data/value.txt"), b"42"); write(&source.join(".git/HEAD"), b"ignored"); let digest = hash_tree(&source).unwrap(); diff --git a/crates/marqdo-package/src/lib.rs b/crates/marqdo-package/src/lib.rs index 55a9089..ccc5dc5 100644 --- a/crates/marqdo-package/src/lib.rs +++ b/crates/marqdo-package/src/lib.rs @@ -1599,7 +1599,7 @@ capabilities: "project:\n name: geometry\n version: 0.1.0\n", ) .unwrap(); - std::fs::write(first.join("index.mq.md"), "## f\n\n*1*\n").unwrap(); + std::fs::write(first.join("index.mq.md"), "## @exec f\n\n`return 1`\n").unwrap(); let manifest = Manifest::load(&root.join(MANIFEST_FILE)).unwrap(); let resolver = PackageResolver::new(root.clone(), Some(manifest.clone()), None).with_unlocked(true); @@ -1668,7 +1668,7 @@ capabilities: "project:\n name: remote\n version: 0.2.0\n", ) .unwrap(); - std::fs::write(dep.join("index.mq.md"), "## hello\n\n*1*\n").unwrap(); + std::fs::write(dep.join("index.mq.md"), "## @exec hello\n\n`return 1`\n").unwrap(); git(&dep, &["init", "-q"]); git(&dep, &["add", "."]); git(&dep, &["commit", "-q", "-m", "initial"]); @@ -1721,7 +1721,7 @@ capabilities: "project:\n name: geometry\n version: 0.1.0\n", ) .unwrap(); - std::fs::write(dep.join("index.mq.md"), "## area\n\n*1*\n").unwrap(); + std::fs::write(dep.join("index.mq.md"), "## @exec area\n\n`return 1`\n").unwrap(); std::fs::write( root.join(MANIFEST_FILE), "project:\n name: p\n version: 0.1.0\ndependencies:\n geometry:\n path: ./deps/geometry\n", @@ -1765,19 +1765,19 @@ capabilities: "project:\n name: root\n version: 0.1.0\ndependencies:\n a:\n path: ./deps/a\n", ) .unwrap(); - std::fs::write(root.join("index.mq.md"), "## main\n\n*1*\n").unwrap(); + std::fs::write(root.join("index.mq.md"), "## @exec main\n\n`return 1`\n").unwrap(); std::fs::write( a.join(MANIFEST_FILE), "project:\n name: a\n version: 0.1.0\ndependencies:\n b:\n path: ./b\n", ) .unwrap(); - std::fs::write(a.join("index.mq.md"), "## a\n\n*1*\n").unwrap(); + std::fs::write(a.join("index.mq.md"), "## @exec a\n\n`return 1`\n").unwrap(); std::fs::write( b.join(MANIFEST_FILE), "project:\n name: b\n version: 0.1.0\n", ) .unwrap(); - std::fs::write(b.join("index.mq.md"), "## b\n\n*2*\n").unwrap(); + std::fs::write(b.join("index.mq.md"), "## @exec b\n\n`return 2`\n").unwrap(); let manifest = Manifest::load(&root.join(MANIFEST_FILE)).unwrap(); let resolver = PackageResolver::new(root.clone(), Some(manifest), None).with_unlocked(true); let graph = resolver.resolve_lock_graph().unwrap(); @@ -1813,7 +1813,7 @@ capabilities: "project:\n name: geometry\n version: 0.1.0\n", ) .unwrap(); - std::fs::write(dep.join("index.mq.md"), "## area\n\n*1*\n").unwrap(); + std::fs::write(dep.join("index.mq.md"), "## @exec area\n\n`return 1`\n").unwrap(); std::fs::write( root.join(MANIFEST_FILE), "project:\n name: p\n version: 0.1.0\ndependencies:\n geometry:\n path: ./deps/geometry\n", diff --git a/crates/marqdo-runtime/tests/interpreter.rs b/crates/marqdo-runtime/tests/interpreter.rs index 4b98fbf..124dd2e 100644 --- a/crates/marqdo-runtime/tests/interpreter.rs +++ b/crates/marqdo-runtime/tests/interpreter.rs @@ -64,28 +64,28 @@ fn run_and_output(source: &str, function: &str) -> (Result, #[test] fn recursion_branch_and_return() { - let source = "## 阶乘\n\n1. `n <= 1`\n\n *1*\n\n2. `n > 1`\n\n **结果 = n * 阶乘(n=n-1)**\n\n *结果*\n"; + let source = "## @exec 阶乘\n\n`if n <= 1`\n\n`return 1`\n\n`else`\n\n`if n > 1`\n\n`结果 = n * 阶乘(n=n-1)`\n\n`return 结果`\n\n`end`\n\n`end`\n"; let value = run_named(source, "阶乘", &[("n", Value::int(5))]).unwrap(); assert_eq!(value, Value::int(120)); } #[test] fn loop_mutates_and_returns_unit_for_fallthrough() { - let source = "## 倒计时\n\n**n = 3**\n\n- `n > 0`\n\n **n = n - 1**\n"; + let source = "## @exec 倒计时\n\n`n = 3`\n\n`while n > 0`\n\n`n = n - 1`\n\n`end`\n"; let (result, _) = run_and_output(source, "倒计时"); assert_eq!(result.unwrap(), Value::Unit); } #[test] fn return_inside_loop_propagates() { - let source = "## 找\n\n**i = 0**\n\n- `true`\n\n **i = i + 1**\n\n - `i >= 3`\n\n *i*\n"; + let source = "## @exec 找\n\n`i = 0`\n\n`while true`\n\n`i = i + 1`\n\n`if i >= 3`\n\n`return i`\n\n`end`\n\n`end`\n"; let (result, _) = run_and_output(source, "找"); assert_eq!(result.unwrap(), Value::int(3)); } #[test] fn explicit_signature_supports_positional_arguments() { - let source = "## 加\n\n`(a: Int, b: Int = 10)`\n\n*a + b*\n"; + let source = "## @exec 加\n\n`params(a: Int, b: Int = 10)`\n\n`return a + b`\n"; let program = build(source); let mut host = host(); let result = run( @@ -101,7 +101,7 @@ fn explicit_signature_supports_positional_arguments() { #[test] fn builtins_for_conversions_and_length() { - let source = "## f\n\n*长度(\"你好\") + 整数(\"40\") + 整数(2.0)*\n"; + let source = "## @exec f\n\n`return 长度(\"你好\") + 整数(\"40\") + 整数(2.0)`\n"; let value = run_named(source, "f", &[]).unwrap(); assert_eq!(value, Value::int(44)); } @@ -109,21 +109,21 @@ fn builtins_for_conversions_and_length() { #[test] fn function_reference_can_be_called() { let source = - "## 平方\n\n`(n: Int)`\n\n*n * n*\n\n## 主\n\n**f = ref(\"#平方\")**\n\n*f(n=4)*\n"; + "## @exec 平方\n\n`params(n: Int)`\n\n`return n * n`\n\n## @exec 主\n\n`f = ref(\"#平方\")`\n\n`return f(n=4)`\n"; let value = run_named(source, "主", &[]).unwrap(); assert_eq!(value, Value::int(16)); } #[test] fn non_bool_condition_is_a_runtime_error() { - let source = "## f\n\n**x = 1**\n\n- `x`\n\n **x = x + 1**\n\n*x*\n"; + let source = "## @exec f\n\n`x = 1`\n\n`while x`\n\n`x = x + 1`\n\n`end`\n\n`return x`\n"; let error = run_named(source, "f", &[]).unwrap_err(); assert_eq!(error.code(), "runtime.type"); } #[test] fn fuel_budget_is_enforced() { - let program = build("## f\n\n- `true`\n\n **x = 1**\n\n*0*\n"); + let program = build("## @exec f\n\n`while true`\n\n`x = 1`\n\n`end`\n\n`return 0`\n"); let mut host = StdHost::new( SandboxMode::Project, Capabilities::pure(), @@ -143,7 +143,7 @@ fn fuel_budget_is_enforced() { #[test] fn recursion_depth_is_bounded() { - let source = "## f\n\n*f(n=n + 1)*\n"; + let source = "## @exec f\n\n`return f(n=n + 1)`\n"; let program = build(source); let mut host = StdHost::new( SandboxMode::Project, @@ -165,14 +165,15 @@ fn recursion_depth_is_bounded() { #[test] fn ambiguous_ref_resource_is_an_error() { - let source = "## f\n\n### 公式\n\n$$a = 1$$\n\n$$b = 2$$\n\n**x = ref(\"#公式\")**\n\n*x*\n"; + let source = + "## @exec f\n\n### 公式\n\n$$a = 1$$\n\n$$b = 2$$\n\n`x = ref(\"#公式\")`\n\n`return x`\n"; let error = run_named(source, "f", &[]).unwrap_err(); assert_eq!(error.code(), "ref.ambiguous"); } #[test] fn print_without_the_bundled_stdlib_is_a_structured_error() { - let source = "## f\n\n> 打印(1)\n\n*None*\n"; + let source = "## @exec f\n\n`打印(1)`\n\n`return None`\n"; let error = run_named(source, "f", &[]).unwrap_err(); assert_eq!(error.code(), "kernel.unavailable"); assert!( @@ -184,7 +185,7 @@ fn print_without_the_bundled_stdlib_is_a_structured_error() { #[test] fn function_ref_and_resource_members_are_readable() { - let source = "## 目标\n\n*1*\n\n## main\n\n### 公式\n\n$$a = 1$$\n\n### 代码\n\n```text\nx\n```\n\n**f = ref(\"#目标\")**\n\n**g = ref(\"#公式\")**\n\n**c = ref(\"#代码\")**\n\n*[f.module, f.name, g.latex, g.display, c.language, c.source]*\n"; + let source = "## @exec 目标\n\n`return 1`\n\n## @exec main\n\n### 公式\n\n$$a = 1$$\n\n### 代码\n\n```text\nx\n```\n\n`f = ref(\"#目标\")`\n\n`g = ref(\"#公式\")`\n\n`c = ref(\"#代码\")`\n\n`return [f.module, f.name, g.latex, g.display, c.language, c.source]`\n"; let value = run_named(source, "main", &[]).unwrap(); let Value::List(items) = value else { panic!("expected list"); @@ -199,7 +200,7 @@ fn function_ref_and_resource_members_are_readable() { #[test] fn memory_region_is_shared_by_handle_identity() { - let source = "## f\n\n**m = memory.new(1, 2)**\n\n**n = m**\n\n**`m[3] = 7`**\n\n*[n[3], m == n, memory.size(n)]*\n"; + let source = "## @exec f\n\n`m = memory.new(1, 2)`\n\n`n = m`\n\n`m[3] = 7`\n\n`return [n[3], m == n, memory.size(n)]`\n"; let value = run_named(source, "f", &[]).unwrap(); assert_eq!( value, @@ -209,7 +210,7 @@ fn memory_region_is_shared_by_handle_identity() { #[test] fn memory_handle_cannot_reach_the_host_boundary() { - let source = "## f\n\n**m = memory.new(1, 1)**\n\n> fs.read(m)\n\n*0*\n"; + let source = "## @exec f\n\n`m = memory.new(1, 1)`\n\n`fs.read(m)`\n\n`return 0`\n"; let error = run_named(source, "f", &[]).unwrap_err(); assert_eq!(error.code(), "runtime.type"); assert!( @@ -223,7 +224,8 @@ fn memory_handle_cannot_reach_the_host_boundary() { #[test] fn memory_budget_is_enforced_without_changing_the_region() { - let program = build("## f\n\n**m = memory.new(1, 1)**\n\n*[m[0], memory.grow(m, 1)]*\n"); + let program = + build("## @exec f\n\n`m = memory.new(1, 1)`\n\n`return [m[0], memory.grow(m, 1)]`\n"); let mut host = host(); let error = run_with_limits( &program, diff --git a/crates/marqdo-value/src/diagnostic.rs b/crates/marqdo-value/src/diagnostic.rs index 480e163..b12af11 100644 --- a/crates/marqdo-value/src/diagnostic.rs +++ b/crates/marqdo-value/src/diagnostic.rs @@ -13,6 +13,36 @@ pub mod codes { pub const MARKDOWN_INERT_EXECUTABLE: &str = "markdown.inert_executable"; /// Front matter is malformed or appears somewhere other than the document start. pub const FRONTMATTER_INVALID: &str = "frontmatter.invalid"; + /// A heading uses an invalid `@exec`/`@knowledge` mode marker. + pub const SEM_INVALID_MODE_MARKER: &str = "sem.invalid_mode_marker"; + /// A mode declaration has no semantic heading name. + pub const SEM_EMPTY_UNIT_NAME: &str = "sem.empty_unit_name"; + /// Duplicate canonical heading/unit name in one scope. + pub const SEM_DUPLICATE_UNIT_NAME: &str = "sem.duplicate_unit_name"; + /// Executable payload appears under no Exec H2 function. + pub const SEM_EXEC_WITHOUT_FUNCTION: &str = "sem.exec_without_function"; + /// A payload carrier contains a nested inline structure. + pub const SEM_PAYLOAD_NESTED: &str = "sem.payload_nested"; + /// A payload carrier is empty in an Exec scope. + pub const SEM_EMPTY_PAYLOAD: &str = "sem.empty_payload"; + /// A payload failed semantic statement validation. + pub const SEM_SYNTAX: &str = "sem.syntax"; + /// `else` does not bind an open `if`. + pub const SEM_UNMATCHED_ELSE: &str = "sem.unmatched_else"; + /// A second `else` appears for one `if`. + pub const SEM_DUPLICATE_ELSE: &str = "sem.duplicate_else"; + /// `end` closes no open frame. + pub const SEM_UNMATCHED_END: &str = "sem.unmatched_end"; + /// A control frame is not closed before the heading ends. + pub const SEM_UNCLOSED_CONTROL: &str = "sem.unclosed_control"; + /// `params(...)` is not the first direct Exec H2 payload. + pub const SEM_SIGNATURE_POSITION: &str = "sem.signature_position"; + /// A version directive such as `marqdo_semantics` is forbidden. + pub const SEM_UNSUPPORTED_VERSION_DIRECTIVE: &str = "sem.unsupported_version_directive"; + /// `run` found no callable entry function. + pub const SEM_NO_ENTRY_FUNCTION: &str = "sem.no_entry_function"; + /// A signature was inferred rather than declared. + pub const SEM_INFERRED_SIGNATURE: &str = "sem.inferred_signature"; /// An executable payload failed to parse as an expression or statement. pub const EXPR_PARSE: &str = "expr.parse"; /// A function name is referenced but no such function exists. diff --git a/examples/factorial.mq.md b/examples/factorial.mq.md index 952b3fa..18b91d6 100644 --- a/examples/factorial.mq.md +++ b/examples/factorial.mq.md @@ -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` diff --git a/examples/hello.mq.md b/examples/hello.mq.md index 3dfe885..ad411f3 100644 --- a/examples/hello.mq.md +++ b/examples/hello.mq.md @@ -1,7 +1,7 @@ -## main +## @exec main -**问候 = "你好,Marqdo"** +`问候 = "你好,Marqdo"` -> 打印(问候) +> **打印(问候)** -*问候* +`return 问候` diff --git a/examples/kernel-mock/demo.mq.md b/examples/kernel-mock/demo.mq.md index 0244d9c..f6d8b32 100644 --- a/examples/kernel-mock/demo.mq.md +++ b/examples/kernel-mock/demo.mq.md @@ -1,11 +1,11 @@ -## main +## @exec main -### 代码 +`结果 = foreign.call(ref("#代码"), {})` + +> **打印(结果)** + +### @knowledge 代码 ```mocklang ignored by the mock provider ``` - -**结果 = foreign.call(ref("#代码"), {})** - -> 打印(结果) diff --git a/examples/math.mq.md b/examples/math.mq.md index 4e90014..5c83828 100644 --- a/examples/math.mq.md +++ b/examples/math.mq.md @@ -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 面积` diff --git a/examples/memory-buffer.mq.md b/examples/memory-buffer.mq.md index 1af321c..d07b964 100644 --- a/examples/memory-buffer.mq.md +++ b/examples/memory-buffer.mq.md @@ -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]` diff --git a/examples/multi-module/geometry.mq.md b/examples/multi-module/geometry.mq.md index 6957634..46acf1e 100644 --- a/examples/multi-module/geometry.mq.md +++ b/examples/multi-module/geometry.mq.md @@ -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 diff --git a/examples/multi-module/index.mq.md b/examples/multi-module/index.mq.md index 1a9db91..09f720f 100644 --- a/examples/multi-module/index.mq.md +++ b/examples/multi-module/index.mq.md @@ -3,8 +3,8 @@ import: geometry: "./geometry.mq.md" --- -## main +## @exec main -**面积 = geometry.圆面积(r=2)** +`面积 = geometry.圆面积(r=2)` -> 打印(面积) +> **打印(面积)** diff --git a/examples/packages-multi-version/index.mq.md b/examples/packages-multi-version/index.mq.md index e66593e..bf69927 100644 --- a/examples/packages-multi-version/index.mq.md +++ b/examples/packages-multi-version/index.mq.md @@ -4,12 +4,12 @@ import: geometry_v2: "@geometry_v2" --- -## main +## @exec main -**一 = geometry_v1.area()** +`一 = geometry_v1.area()` -**二 = geometry_v2.area()** +`二 = geometry_v2.area()` -> 打印(一) +> **打印(一)** -> 打印(二) +> **打印(二)** diff --git a/examples/packages-multi-version/marqdo.lock b/examples/packages-multi-version/marqdo.lock index 11fd222..c981a6a 100644 --- a/examples/packages-multi-version/marqdo.lock +++ b/examples/packages-multi-version/marqdo.lock @@ -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 diff --git a/examples/packages-multi-version/packages/geometry-v1/index.mq.md b/examples/packages-multi-version/packages/geometry-v1/index.mq.md index 94b7a62..f01e27f 100644 --- a/examples/packages-multi-version/packages/geometry-v1/index.mq.md +++ b/examples/packages-multi-version/packages/geometry-v1/index.mq.md @@ -1,3 +1,3 @@ -## area +## @exec area -*1* +`return 1` diff --git a/examples/packages-multi-version/packages/geometry-v2/index.mq.md b/examples/packages-multi-version/packages/geometry-v2/index.mq.md index 39725d2..8b14617 100644 --- a/examples/packages-multi-version/packages/geometry-v2/index.mq.md +++ b/examples/packages-multi-version/packages/geometry-v2/index.mq.md @@ -1,3 +1,3 @@ -## area +## @exec area -*2* +`return 2` diff --git a/examples/plugin-demo/README.md b/examples/plugin-demo/README.md index c852376..80f078d 100644 --- a/examples/plugin-demo/README.md +++ b/examples/plugin-demo/README.md @@ -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 diff --git a/examples/plugin-demo/plugin-call.mq.md b/examples/plugin-demo/plugin-call.mq.md index 0be661d..86617f5 100644 --- a/examples/plugin-demo/plugin-call.mq.md +++ b/examples/plugin-demo/plugin-call.mq.md @@ -1,5 +1,5 @@ -## main +## @exec main -**结果 = solver.add(a=20, b=22)** +`结果 = solver.add(a=20, b=22)` -> 打印(结果) +> **打印(结果)** diff --git a/examples/plugin-multi-export/plugin-call.mq.md b/examples/plugin-multi-export/plugin-call.mq.md index 975fd35..06acb63 100644 --- a/examples/plugin-multi-export/plugin-call.mq.md +++ b/examples/plugin-multi-export/plugin-call.mq.md @@ -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)` -> 打印(和) +> **打印(和)** -> 打印(相反数) +> **打印(相反数)** diff --git a/examples/python-foreign.mq.md b/examples/python-foreign.mq.md index 1c354b5..87577e1 100644 --- a/examples/python-foreign.mq.md +++ b/examples/python-foreign.mq.md @@ -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)** diff --git a/examples/references.mq.md b/examples/references.mq.md index 3eda3b9..7f1e720 100644 --- a/examples/references.mq.md +++ b/examples/references.mq.md @@ -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 力` diff --git a/examples/stdlib-bundle.mq.md b/examples/stdlib-bundle.mq.md index cd663c5..ac64469 100644 --- a/examples/stdlib-bundle.mq.md +++ b/examples/stdlib-bundle.mq.md @@ -3,8 +3,8 @@ import: io: "std:io" --- -## main +## @exec main -> io.写值(["bundle", 1, 2.5]) +> **io.写值(["bundle", 1, 2.5])** -*None* +`return None` diff --git a/stdlib/clock.mq.md b/stdlib/clock.mq.md index 1152a11..126c6d3 100644 --- a/stdlib/clock.mq.md +++ b/stdlib/clock.mq.md @@ -1,8 +1,10 @@ + +# @exec clock ## 现在 -`()` +`params()` -返回项目模式下的 UTC Unix 毫秒。`pure`/`strict` 返回 -`permission.denied`,与 `resource.request` 的其他操作一致。 +返回项目模式下的 UTC Unix 毫秒。pure/strict 返回 +permission.denied,与 resource.request 的其他操作一致。 -*resource.request("clock.now", [])* +`return resource.request("clock.now", [])` diff --git a/stdlib/compress.mq.md b/stdlib/compress.mq.md index 0b89c55..1cc0f84 100644 --- a/stdlib/compress.mq.md +++ b/stdlib/compress.mq.md @@ -1,17 +1,19 @@ + +# @exec compress ## 压缩 -`(文本)` +`params(文本)` -把 UTF-8 文本压缩为 gzip 字节列表(`List`,0–255)。输入上限 +把 UTF-8 文本压缩为 gzip 字节列表(List,0–255)。输入上限 8 MiB;结果确定(不写入时间戳/文件名)。 -*resource.request("compress.gzip", [文本])* +`return resource.request("compress.gzip", [文本])` ## 解压 -`(字节列表)` +`params(字节列表)` 解压 gzip 字节列表并校验 UTF-8。输出上限 8 MiB;坏 gzip 返回 -`compress.invalid`,非 UTF-8 返回 `compress.not_utf8`。 +compress.invalid,非 UTF-8 返回 compress.not_utf8。 -*resource.request("compress.gunzip", [字节列表])* +`return resource.request("compress.gunzip", [字节列表])` diff --git a/stdlib/data/csv.mq.md b/stdlib/data/csv.mq.md index 05913ec..2bf57be 100644 --- a/stdlib/data/csv.mq.md +++ b/stdlib/data/csv.mq.md @@ -1,20 +1,22 @@ + +# @exec csv ## 成功 -`(值)` +`params(值)` -*{ok: true, value: 值}* +`return {ok: true, value: 值}` ## 失败 -`(代码, 消息)` +`params(代码, 消息)` -*{ok: false, code: 代码, message: 消息}* +`return {ok: false, code: 代码, message: 消息}` ## 解析行 -`(文本)` +`params(文本)` -解析单行 CSV:逗号分隔、双引号包裹、`""` 表示一个字面双引号。 +解析单行 CSV:逗号分隔、双引号包裹、"" 表示一个字面双引号。 不处理换行、多行字段或首尾空白。未闭合引号和未加引号字段中的双引号 返回可恢复错误。 @@ -30,71 +32,90 @@ **错误 = ""** -- `下标 < 长度(点) and 错误 == ""` +`while 下标 < 长度(点) and 错误 == ""` - **字符 = text.from_codepoint(点[下标])** +**字符 = text.from_codepoint(点[下标])** - 1. `引号内 and 字符 == "\""` +`if 引号内 and 字符 == "\""` - 1. `下标 + 1 < 长度(点) and text.from_codepoint(点[下标 + 1]) == "\""` +`if 下标 + 1 < 长度(点) and text.from_codepoint(点[下标 + 1]) == "\""` - **`字段 = 字段 + "\""`** +**`字段 = 字段 + "\""`** - **下标 = 下标 + 2** +**下标 = 下标 + 2** - 2. `true` +`else` +`if true` - **引号内 = false** +**引号内 = false** - **下标 = 下标 + 1** +**下标 = 下标 + 1** - 2. `引号内` +`end` +`end` +`else` +`if 引号内` - **字段 = 字段 + 字符** +**字段 = 字段 + 字符** - **下标 = 下标 + 1** +**下标 = 下标 + 1** - 3. `字符 == "\""` +`else` +`if 字符 == "\""` - 1. `字段 == ""` +`if 字段 == ""` - **引号内 = true** +**引号内 = true** - **下标 = 下标 + 1** +**下标 = 下标 + 1** - 2. `true` +`else` +`if true` - **错误 = "csv.invalid_quote"** +**错误 = "csv.invalid_quote"** - 4. `字符 == ","` +`end` +`end` +`else` +`if 字符 == ","` - **字段表 = list.append(字段表, 字段)** +**字段表 = list.append(字段表, 字段)** - **字段 = ""** +**字段 = ""** - **下标 = 下标 + 1** +**下标 = 下标 + 1** - 5. `true` +`else` +`if true` - **字段 = 字段 + 字符** +**字段 = 字段 + 字符** - **下标 = 下标 + 1** +**下标 = 下标 + 1** -1. `错误 != ""` +`end` +`end` +`end` +`end` +`end` +`end` +`if 错误 != ""` - *失败(错误, "未加引号字段中出现双引号")* +`return 失败(错误, "未加引号字段中出现双引号")` -1. `引号内` +`else` +`if 引号内` - *失败("csv.unterminated_quote", "引号未闭合")* +`return 失败("csv.unterminated_quote", "引号未闭合")` -*成功(list.concat(字段表, [字段]))* +`end` +`end` +`return 成功(list.concat(字段表, [字段]))` ## 格式化字段 -`(文本)` +`params(文本)` -含逗号、双引号、换行或回车的字段加引号,内部双引号写成 `""`。 +含逗号、双引号、换行或回车的字段加引号,内部双引号写成 ""。 **点 = text.codepoints(文本)** @@ -102,72 +123,85 @@ **需要引号 = false** -- `下标 < 长度(点) and not 需要引号` +`while 下标 < 长度(点) and not 需要引号` - **码点 = 点[下标]** +**码点 = 点[下标]** - 1. `码点 == 34 or 码点 == 44 or 码点 == 10 or 码点 == 13` +`if 码点 == 34 or 码点 == 44 or 码点 == 10 or 码点 == 13` - **需要引号 = true** +**需要引号 = true** - 2. `true` +`else` +`if true` - **忽略 = 0** +**忽略 = 0** - **下标 = 下标 + 1** +`end` +`end` +**下标 = 下标 + 1** -1. `not 需要引号` +`end` +`if not 需要引号` - *文本* +`return 文本` +`end` **`结果 = "\""`** **下标 = 0** -- `下标 < 长度(点)` +`while 下标 < 长度(点)` - 1. `点[下标] == 34` +`if 点[下标] == 34` - **`结果 = 结果 + "\"\""`** +**`结果 = 结果 + "\"\""`** - 2. `true` +`else` +`if true` - **结果 = 结果 + text.from_codepoint(点[下标])** +**结果 = 结果 + text.from_codepoint(点[下标])** - **下标 = 下标 + 1** +`end` +`end` +**下标 = 下标 + 1** -*`结果 + "\""`* +`end` +``return 结果 + "\""`` ## 格式化行 -`(列表)` +`params(列表)` **结果 = ""** **下标 = 0** -- `下标 < 长度(列表)` +`while 下标 < 长度(列表)` - 1. `下标 > 0` +`if 下标 > 0` - **结果 = 结果 + ","** +**结果 = 结果 + ","** - 2. `true` +`else` +`if true` - **忽略 = 0** +**忽略 = 0** - **结果 = 结果 + 格式化字段(文本(列表[下标]))** +`end` +`end` +**结果 = 结果 + 格式化字段(文本(列表[下标]))** - **下标 = 下标 + 1** +**下标 = 下标 + 1** -*结果* +`end` +`return 结果` ## 解析 -`(文本)` +`params(文本)` -解析多行 CSV(逗号分隔、双引号、`""` 转义、CRLF/LF 行尾,引号内可含 -换行)。返回 `{ok:true, value:List>}`;未闭合引号和不合法 +解析多行 CSV(逗号分隔、双引号、"" 转义、CRLF/LF 行尾,引号内可含 +换行)。返回 {ok:true, value:List>};未闭合引号和不合法 引号返回可恢复错误。 **点 = text.codepoints(文本)** @@ -184,108 +218,137 @@ **错误 = ""** -- `下标 < 长度(点) and 错误 == ""` +`while 下标 < 长度(点) and 错误 == ""` - **字符 = text.from_codepoint(点[下标])** +**字符 = text.from_codepoint(点[下标])** - 1. `引号内 and 字符 == "\""` +`if 引号内 and 字符 == "\""` - 1. `下标 + 1 < 长度(点) and text.from_codepoint(点[下标 + 1]) == "\""` +`if 下标 + 1 < 长度(点) and text.from_codepoint(点[下标 + 1]) == "\""` - **`字段 = 字段 + "\""`** +**`字段 = 字段 + "\""`** - **下标 = 下标 + 2** +**下标 = 下标 + 2** - 2. `true` +`else` +`if true` - **引号内 = false** +**引号内 = false** - **下标 = 下标 + 1** +**下标 = 下标 + 1** - 2. `引号内` +`end` +`end` +`else` +`if 引号内` - **字段 = 字段 + 字符** +**字段 = 字段 + 字符** - **下标 = 下标 + 1** +**下标 = 下标 + 1** - 3. `字符 == "\""` +`else` +`if 字符 == "\""` - 1. `字段 == ""` +`if 字段 == ""` - **引号内 = true** +**引号内 = true** - **下标 = 下标 + 1** +**下标 = 下标 + 1** - 2. `true` +`else` +`if true` - **错误 = "csv.invalid_quote"** +**错误 = "csv.invalid_quote"** - 4. `字符 == ","` +`end` +`end` +`else` +`if 字符 == ","` - **当前行 = list.append(当前行, 字段)** +**当前行 = list.append(当前行, 字段)** - **字段 = ""** +**字段 = ""** - **下标 = 下标 + 1** +**下标 = 下标 + 1** - 5. `字符 == "\n"` +`else` +`if 字符 == "\n"` - **当前行 = list.append(当前行, 字段)** +**当前行 = list.append(当前行, 字段)** - **行 = list.append(行, 当前行)** +**行 = list.append(行, 当前行)** - **当前行 = []** +**当前行 = []** - **字段 = ""** +**字段 = ""** - **下标 = 下标 + 1** +**下标 = 下标 + 1** - 6. `字符 == "\r"` +`else` +`if 字符 == "\r"` - **下标 = 下标 + 1** +**下标 = 下标 + 1** - 7. `true` +`else` +`if true` - **字段 = 字段 + 字符** +**字段 = 字段 + 字符** - **下标 = 下标 + 1** +**下标 = 下标 + 1** -1. `错误 != ""` +`end` +`end` +`end` +`end` +`end` +`end` +`end` +`end` +`if 错误 != ""` - *失败(错误, "未加引号字段中出现双引号")* +`return 失败(错误, "未加引号字段中出现双引号")` -1. `引号内` +`else` +`if 引号内` - *失败("csv.unterminated_quote", "引号未闭合")* +`return 失败("csv.unterminated_quote", "引号未闭合")` -1. `字段 != "" or 长度(当前行) > 0` +`else` +`if 字段 != "" or 长度(当前行) > 0` - **当前行 = list.append(当前行, 字段)** +**当前行 = list.append(当前行, 字段)** - **行 = list.append(行, 当前行)** +**行 = list.append(行, 当前行)** -*成功(行)* +`end` +`end` +`end` +`return 成功(行)` ## 格式化 -`(行列表)` +`params(行列表)` **结果 = ""** **行号 = 0** -- `行号 < 长度(行列表)` +`while 行号 < 长度(行列表)` - 1. `行号 > 0` +`if 行号 > 0` - **结果 = 结果 + "\n"** +**结果 = 结果 + "\n"** - 2. `true` +`else` +`if true` - **忽略 = 0** +**忽略 = 0** - **结果 = 结果 + 格式化行(行列表[行号])** +`end` +`end` +**结果 = 结果 + 格式化行(行列表[行号])** - **行号 = 行号 + 1** +**行号 = 行号 + 1** -*结果* +`end` +`return 结果` diff --git a/stdlib/data/json.mq.md b/stdlib/data/json.mq.md index cbb3b10..76d8eac 100644 --- a/stdlib/data/json.mq.md +++ b/stdlib/data/json.mq.md @@ -1,8 +1,10 @@ + +# @exec json ## 嵌套深度 -`(文本)` +`params(文本)` -按未转义字符串之外的 `{`/`[` 计算最大嵌套深度。 +按未转义字符串之外的 {/[ 计算最大嵌套深度。 **点 = text.codepoints(文本)** @@ -16,129 +18,156 @@ **转义 = false** -- `下标 < 长度(点)` +`while 下标 < 长度(点)` - **码点 = 点[下标]** +**码点 = 点[下标]** - 1. `字符串内` +`if 字符串内` - 1. `转义` +`if 转义` - **转义 = false** +**转义 = false** - 2. `码点 == 92` +`else` +`if 码点 == 92` - **转义 = true** +**转义 = true** - 3. `码点 == 34` +`else` +`if 码点 == 34` - **字符串内 = false** +**字符串内 = false** - 4. `true` +`else` +`if true` - **忽略 = 0** +**忽略 = 0** - 2. `码点 == 34` +`end` +`end` +`end` +`end` +`else` +`if 码点 == 34` - **字符串内 = true** +**字符串内 = true** - 3. `码点 == 123 or 码点 == 91` +`else` +`if 码点 == 123 or 码点 == 91` - **深度 = 深度 + 1** +**深度 = 深度 + 1** - 1. `深度 > 最大` +`if 深度 > 最大` - **最大 = 深度** +**最大 = 深度** - 2. `true` +`else` +`if true` - **忽略 = 0** +**忽略 = 0** - 4. `码点 == 125 or 码点 == 93` +`end` +`end` +`else` +`if 码点 == 125 or 码点 == 93` - 1. `深度 > 0` +`if 深度 > 0` - **深度 = 深度 - 1** +**深度 = 深度 - 1** - 2. `true` +`else` +`if true` - **忽略 = 0** +**忽略 = 0** - 5. `true` +`end` +`end` +`else` +`if true` - **忽略 = 0** +**忽略 = 0** - **下标 = 下标 + 1** +`end` +`end` +`end` +`end` +`end` +**下标 = 下标 + 1** -*最大* +`end` +`return 最大` ## 解析 -`(文本)` +`params(文本)` 解析一个完整的 JSON 文本。值之后只允许空白;多余输入返回 -`json.trailing`,嵌套超过 128 层返回 `json.depth`。成功结果只保留 -`{ok, value}`,不暴露内部游标。 +json.trailing,嵌套超过 128 层返回 json.depth。成功结果只保留 +{ok, value},不暴露内部游标。 **点 = text.codepoints(文本)** -1. `嵌套深度(文本) > 128` +`if 嵌套深度(文本) > 128` - *失败("json.depth", "嵌套深度超过 128")* +`return 失败("json.depth", "嵌套深度超过 128")` +`end` **结果 = 解析值(点, 0)** -1. `not 结果.ok` +`if not 结果.ok` - *结果* +`return 结果` +`end` **位置 = 跳过空白(点, 结果.next)** -1. `位置 != 长度(点)` +`if 位置 != 长度(点)` - *失败("json.trailing", "值后存在多余输入")* +`return 失败("json.trailing", "值后存在多余输入")` -*{ok: true, value: 结果.value}* +`end` +`return {ok: true, value: 结果.value}` ## 成功值 -`(值, 下一位置)` +`params(值, 下一位置)` -*{ok: true, value: 值, next: 下一位置}* +`return {ok: true, value: 值, next: 下一位置}` ## 失败 -`(代码, 消息)` +`params(代码, 消息)` -*{ok: false, code: 代码, message: 消息}* +`return {ok: false, code: 代码, message: 消息}` ## 是空白 -`(码点)` +`params(码点)` -*码点 == 32 or 码点 == 9 or 码点 == 10 or 码点 == 13* +`return 码点 == 32 or 码点 == 9 or 码点 == 10 or 码点 == 13` ## 是数字 -`(码点)` +`params(码点)` -*码点 >= 48 and 码点 <= 57* +`return 码点 >= 48 and 码点 <= 57` ## 跳过空白 -`(点, 位置)` +`params(点, 位置)` **当前 = 位置** -- `当前 < 长度(点) and 是空白(点[当前])` +`while 当前 < 长度(点) and 是空白(点[当前])` - **当前 = 当前 + 1** +**当前 = 当前 + 1** -*当前* +`end` +`return 当前` ## 匹配 -`(点, 位置, 文本)` +`params(点, 位置, 文本)` **目标 = text.codepoints(文本)** @@ -146,153 +175,185 @@ **结果 = true** -- `下标 < 长度(目标) and 结果` +`while 下标 < 长度(目标) and 结果` - 1. `位置 + 下标 >= 长度(点)` +`if 位置 + 下标 >= 长度(点)` - **结果 = false** +**结果 = false** - 2. `点[位置 + 下标] != 目标[下标]` +`else` +`if 点[位置 + 下标] != 目标[下标]` - **结果 = false** +**结果 = false** - 3. `true` +`else` +`if true` - **继续 = 0** +**继续 = 0** - **下标 = 下标 + 1** +`end` +`end` +`end` +**下标 = 下标 + 1** -*结果* +`end` +`return 结果` ## 片段 -`(点, 起点, 终点)` +`params(点, 起点, 终点)` **结果 = ""** **下标 = 起点** -- `下标 < 终点` +`while 下标 < 终点` - **结果 = 结果 + text.from_codepoint(点[下标])** +**结果 = 结果 + text.from_codepoint(点[下标])** - **下标 = 下标 + 1** +**下标 = 下标 + 1** -*结果* +`end` +`return 结果` ## 解析数字 -`(点, 位置)` +`params(点, 位置)` -JSON 数字:可选负号、整数位、可选小数位、可选指数;含 `.`/`e` 返回 Float。 +JSON 数字:可选负号、整数位、可选小数位、可选指数;含 ./e 返回 Float。 **开始 = 位置** **当前 = 位置** -1. `text.from_codepoint(点[当前]) == "-"` +`if text.from_codepoint(点[当前]) == "-"` - **当前 = 当前 + 1** +**当前 = 当前 + 1** -2. `true` +`else` +`if true` - **非负 = 0** +**非负 = 0** +`end` +`end` **整数位 = 0** -- `当前 < 长度(点) and 是数字(点[当前])` +`while 当前 < 长度(点) and 是数字(点[当前])` - **整数位 = 整数位 + 1** +**整数位 = 整数位 + 1** - **当前 = 当前 + 1** +**当前 = 当前 + 1** +`end` **有小数 = false** **小数位 = 0** -1. `当前 < 长度(点) and text.from_codepoint(点[当前]) == "."` +`if 当前 < 长度(点) and text.from_codepoint(点[当前]) == "."` - **有小数 = true** +**有小数 = true** - **当前 = 当前 + 1** +**当前 = 当前 + 1** - - `当前 < 长度(点) and 是数字(点[当前])` +`while 当前 < 长度(点) and 是数字(点[当前])` - **小数位 = 小数位 + 1** +**小数位 = 小数位 + 1** - **当前 = 当前 + 1** +**当前 = 当前 + 1** -2. `true` +`end` +`else` +`if true` - **忽略 = 0** +**忽略 = 0** +`end` +`end` **指数位 = 0** **指数标记 = false** -1. `当前 < 长度(点) and (text.from_codepoint(点[当前]) == "e" or text.from_codepoint(点[当前]) == "E")` +`if 当前 < 长度(点) and (text.from_codepoint(点[当前]) == "e" or text.from_codepoint(点[当前]) == "E")` - **有小数 = true** +**有小数 = true** - **指数标记 = true** +**指数标记 = true** - **当前 = 当前 + 1** +**当前 = 当前 + 1** - 1. `当前 < 长度(点) and (text.from_codepoint(点[当前]) == "+" or text.from_codepoint(点[当前]) == "-")` +`if 当前 < 长度(点) and (text.from_codepoint(点[当前]) == "+" or text.from_codepoint(点[当前]) == "-")` - **当前 = 当前 + 1** +**当前 = 当前 + 1** - 2. `true` +`else` +`if true` - **忽略指数符号 = 0** +**忽略指数符号 = 0** - - `当前 < 长度(点) and 是数字(点[当前])` +`end` +`end` +`while 当前 < 长度(点) and 是数字(点[当前])` - **指数位 = 指数位 + 1** +**指数位 = 指数位 + 1** - **当前 = 当前 + 1** +**当前 = 当前 + 1** -1. `整数位 == 0` +`end` +`else` +`if 整数位 == 0` - *失败("json.invalid_number", "数字缺少整数位")* +`return 失败("json.invalid_number", "数字缺少整数位")` -1. `有小数 and not 指数标记 and 小数位 == 0` +`else` +`if 有小数 and not 指数标记 and 小数位 == 0` - *失败("json.invalid_number", "小数缺少位数")* +`return 失败("json.invalid_number", "小数缺少位数")` -1. `指数标记 and 指数位 == 0` +`else` +`if 指数标记 and 指数位 == 0` - *失败("json.invalid_number", "指数缺少位数")* +`return 失败("json.invalid_number", "指数缺少位数")` +`end` +`end` +`end` +`end` **原文 = 片段(点, 开始, 当前)** -1. `有小数` +`if 有小数` - *成功值(小数(原文), 当前)* +`return 成功值(小数(原文), 当前)` -*成功值(整数(原文), 当前)* +`end` +`return 成功值(整数(原文), 当前)` ## 十六进制值 -`(码点)` +`params(码点)` -1. `码点 >= 48 and 码点 <= 57` +`if 码点 >= 48 and 码点 <= 57` - *码点 - 48* +`return 码点 - 48` -2. `码点 >= 65 and 码点 <= 70` +`else` +`if 码点 >= 65 and 码点 <= 70` - *码点 - 55* +`return 码点 - 55` -3. `码点 >= 97 and 码点 <= 102` +`else` +`if 码点 >= 97 and 码点 <= 102` - *码点 - 87* +`return 码点 - 87` -*0 - 1* +`end` +`end` +`end` +`return 0 - 1` ## 解析字符串 -`(点, 位置)` +`params(点, 位置)` **当前 = 位置 + 1** @@ -302,301 +363,385 @@ JSON 数字:可选负号、整数位、可选小数位、可选指数;含 `. **错误 = ""** -- `当前 < 长度(点) and not 完成 and 错误 == ""` +`while 当前 < 长度(点) and not 完成 and 错误 == ""` - **码点 = 点[当前]** +**码点 = 点[当前]** - 1. `码点 == 34` +`if 码点 == 34` - **完成 = true** +**完成 = true** - **当前 = 当前 + 1** +**当前 = 当前 + 1** - 2. `码点 == 92` +`else` +`if 码点 == 92` - 1. `当前 + 1 >= 长度(点)` +`if 当前 + 1 >= 长度(点)` - **错误 = "json.invalid_escape"** +**错误 = "json.invalid_escape"** - 2. `true` +`else` +`if true` - **转义码点 = 点[当前 + 1]** +**转义码点 = 点[当前 + 1]** - 1. `转义码点 == 34` +`if 转义码点 == 34` - **结果 = 结果 + text.from_codepoint(34)** +**结果 = 结果 + text.from_codepoint(34)** - **当前 = 当前 + 2** +**当前 = 当前 + 2** - 2. `转义码点 == 92` +`else` +`if 转义码点 == 92` - **结果 = 结果 + text.from_codepoint(92)** +**结果 = 结果 + text.from_codepoint(92)** - **当前 = 当前 + 2** +**当前 = 当前 + 2** - 3. `转义码点 == 47` +`else` +`if 转义码点 == 47` - **结果 = 结果 + text.from_codepoint(47)** +**结果 = 结果 + text.from_codepoint(47)** - **当前 = 当前 + 2** +**当前 = 当前 + 2** - 4. `转义码点 == 98` +`else` +`if 转义码点 == 98` - **结果 = 结果 + text.from_codepoint(8)** +**结果 = 结果 + text.from_codepoint(8)** - **当前 = 当前 + 2** +**当前 = 当前 + 2** - 5. `转义码点 == 102` +`else` +`if 转义码点 == 102` - **结果 = 结果 + text.from_codepoint(12)** +**结果 = 结果 + text.from_codepoint(12)** - **当前 = 当前 + 2** +**当前 = 当前 + 2** - 6. `转义码点 == 110` +`else` +`if 转义码点 == 110` - **结果 = 结果 + text.from_codepoint(10)** +**结果 = 结果 + text.from_codepoint(10)** - **当前 = 当前 + 2** +**当前 = 当前 + 2** - 7. `转义码点 == 114` +`else` +`if 转义码点 == 114` - **结果 = 结果 + text.from_codepoint(13)** +**结果 = 结果 + text.from_codepoint(13)** - **当前 = 当前 + 2** +**当前 = 当前 + 2** - 8. `转义码点 == 116` +`else` +`if 转义码点 == 116` - **结果 = 结果 + text.from_codepoint(9)** +**结果 = 结果 + text.from_codepoint(9)** - **当前 = 当前 + 2** +**当前 = 当前 + 2** - 9. `转义码点 == 117` +`else` +`if 转义码点 == 117` - 1. `当前 + 5 >= 长度(点)` +`if 当前 + 5 >= 长度(点)` - **错误 = "json.invalid_escape"** +**错误 = "json.invalid_escape"** - 2. `true` +`else` +`if true` - **数字 = 十六进制值(点[当前 + 2]) * 4096 + 十六进制值(点[当前 + 3]) * 256 + 十六进制值(点[当前 + 4]) * 16 + 十六进制值(点[当前 + 5])** +**数字 = 十六进制值(点[当前 + 2]) * 4096 + 十六进制值(点[当前 + 3]) * 256 + 十六进制值(点[当前 + 4]) * 16 + 十六进制值(点[当前 + 5])** - 1. `数字 < 0 or (数字 >= 55296 and 数字 <= 57343)` +`if 数字 < 0 or (数字 >= 55296 and 数字 <= 57343)` - **错误 = "json.invalid_escape"** +**错误 = "json.invalid_escape"** - 2. `true` +`else` +`if true` - **结果 = 结果 + text.from_codepoint(数字)** +**结果 = 结果 + text.from_codepoint(数字)** - **当前 = 当前 + 6** +**当前 = 当前 + 6** - 10. `true` +`end` +`end` +`end` +`end` +`else` +`if true` - **错误 = "json.invalid_escape"** +**错误 = "json.invalid_escape"** - 3. `true` +`end` +`end` +`end` +`end` +`end` +`end` +`end` +`end` +`end` +`end` +`end` +`end` +`else` +`if true` - **结果 = 结果 + text.from_codepoint(码点)** +**结果 = 结果 + text.from_codepoint(码点)** - **当前 = 当前 + 1** +**当前 = 当前 + 1** -1. `错误 != ""` +`end` +`end` +`end` +`end` +`if 错误 != ""` - *失败("json.invalid_string", "字符串转义无效")* +`return 失败("json.invalid_string", "字符串转义无效")` -1. `not 完成` +`else` +`if not 完成` - *失败("json.unexpected_eof", "字符串未闭合")* +`return 失败("json.unexpected_eof", "字符串未闭合")` -*成功值(结果, 当前)* +`end` +`end` +`return 成功值(结果, 当前)` ## 解析对象 -`(点, 位置)` +`params(点, 位置)` -*解析对象项(点, 位置 + 1, {})* +`return 解析对象项(点, 位置 + 1, {})` ## 解析对象项 -`(点, 位置, 已解析)` +`params(点, 位置, 已解析)` **位置 = 跳过空白(点, 位置)** -1. `位置 >= 长度(点)` +`if 位置 >= 长度(点)` - *失败("json.unexpected_eof", "对象未闭合")* +`return 失败("json.unexpected_eof", "对象未闭合")` +`end` **当前 = text.from_codepoint(点[位置])** -1. `当前 == "}"` +`if 当前 == "}"` - *成功值(已解析, 位置 + 1)* +`return 成功值(已解析, 位置 + 1)` +`end` **键结果 = 解析字符串(点, 位置)** -1. `not 键结果.ok` +`if not 键结果.ok` - *键结果* +`return 键结果` +`end` **键 = 键结果.value** **位置 = 跳过空白(点, 键结果.next)** -1. `位置 >= 长度(点)` +`if 位置 >= 长度(点)` - *失败("json.unexpected_eof", "对象缺少冒号")* +`return 失败("json.unexpected_eof", "对象缺少冒号")` -1. `text.from_codepoint(点[位置]) != ":"` +`else` +`if text.from_codepoint(点[位置]) != ":"` - *失败("json.invalid_object", "对象缺少冒号")* +`return 失败("json.invalid_object", "对象缺少冒号")` +`end` +`end` **位置 = 跳过空白(点, 位置 + 1)** **值结果 = 解析值(点, 位置)** -1. `not 值结果.ok` +`if not 值结果.ok` - *值结果* +`return 值结果` +`end` **新的已解析 = map.set(已解析, 键, 值结果.value)** **位置 = 跳过空白(点, 值结果.next)** -1. `位置 >= 长度(点)` +`if 位置 >= 长度(点)` - *失败("json.unexpected_eof", "对象未闭合")* +`return 失败("json.unexpected_eof", "对象未闭合")` +`end` **分隔 = text.from_codepoint(点[位置])** -1. `分隔 == ","` +`if 分隔 == ","` - *解析对象项(点, 位置 + 1, 新的已解析)* +`return 解析对象项(点, 位置 + 1, 新的已解析)` -2. `分隔 == "}"` +`else` +`if 分隔 == "}"` - *成功值(新的已解析, 位置 + 1)* +`return 成功值(新的已解析, 位置 + 1)` -3. `true` +`else` +`if true` - *失败("json.invalid_object", "对象缺少逗号或 }")* +`return 失败("json.invalid_object", "对象缺少逗号或 }")` +`end` +`end` +`end` ## 解析值 -`(点, 位置)` +`params(点, 位置)` **位置 = 跳过空白(点, 位置)** -1. `位置 >= 长度(点)` +`if 位置 >= 长度(点)` - *失败("json.unexpected_eof", "需要值")* +`return 失败("json.unexpected_eof", "需要值")` +`end` **首 = text.from_codepoint(点[位置])** **首码点 = 点[位置]** -1. `首码点 == 34` +`if 首码点 == 34` - *解析字符串(点, 位置)* +`return 解析字符串(点, 位置)` -2. `首码点 == 123` +`else` +`if 首码点 == 123` - *解析对象(点, 位置)* +`return 解析对象(点, 位置)` -3. `首 == "["` +`else` +`if 首 == "["` - *解析数组(点, 位置)* +`return 解析数组(点, 位置)` -4. `首 == "-" or 是数字(点[位置])` +`else` +`if 首 == "-" or 是数字(点[位置])` - *解析数字(点, 位置)* +`return 解析数字(点, 位置)` -5. `首 == "t"` +`else` +`if 首 == "t"` - 1. `匹配(点, 位置, "true")` +`if 匹配(点, 位置, "true")` - *成功值(true, 位置 + 4)* +`return 成功值(true, 位置 + 4)` - 2. `true` +`else` +`if true` - *失败("json.invalid_literal", "无效字面量")* +`return 失败("json.invalid_literal", "无效字面量")` -6. `首 == "f"` +`end` +`end` +`else` +`if 首 == "f"` - 1. `匹配(点, 位置, "false")` +`if 匹配(点, 位置, "false")` - *成功值(false, 位置 + 5)* +`return 成功值(false, 位置 + 5)` - 2. `true` +`else` +`if true` - *失败("json.invalid_literal", "无效字面量")* +`return 失败("json.invalid_literal", "无效字面量")` -7. `首 == "n"` +`end` +`end` +`else` +`if 首 == "n"` - 1. `匹配(点, 位置, "null")` +`if 匹配(点, 位置, "null")` - *成功值(None, 位置 + 4)* +`return 成功值(None, 位置 + 4)` - 2. `true` +`else` +`if true` - *失败("json.invalid_literal", "无效字面量")* +`return 失败("json.invalid_literal", "无效字面量")` -8. `true` +`end` +`end` +`else` +`if true` - *失败("json.unexpected_token", "不支持的值")* +`return 失败("json.unexpected_token", "不支持的值")` +`end` +`end` +`end` +`end` +`end` +`end` +`end` +`end` ## 解析数组 -`(点, 位置)` +`params(点, 位置)` -*解析数组项(点, 位置 + 1, [])* +`return 解析数组项(点, 位置 + 1, [])` ## 解析数组项 -`(点, 位置, 已解析)` +`params(点, 位置, 已解析)` **位置 = 跳过空白(点, 位置)** -1. `位置 >= 长度(点)` +`if 位置 >= 长度(点)` - *失败("json.unexpected_eof", "数组未闭合")* +`return 失败("json.unexpected_eof", "数组未闭合")` +`end` **当前 = text.from_codepoint(点[位置])** -1. `当前 == "]"` +`if 当前 == "]"` - *成功值(已解析, 位置 + 1)* +`return 成功值(已解析, 位置 + 1)` +`end` **项 = 解析值(点, 位置)** -1. `not 项.ok` +`if not 项.ok` - *项* +`return 项` +`end` **新的已解析 = list.append(已解析, 项.value)** **位置 = 跳过空白(点, 项.next)** -1. `位置 >= 长度(点)` +`if 位置 >= 长度(点)` - *失败("json.unexpected_eof", "数组未闭合")* +`return 失败("json.unexpected_eof", "数组未闭合")` +`end` **分隔 = text.from_codepoint(点[位置])** -1. `分隔 == ","` +`if 分隔 == ","` - *解析数组项(点, 位置 + 1, 新的已解析)* +`return 解析数组项(点, 位置 + 1, 新的已解析)` -2. `分隔 == "]"` +`else` +`if 分隔 == "]"` - *成功值(新的已解析, 位置 + 1)* +`return 成功值(新的已解析, 位置 + 1)` -3. `true` +`else` +`if true` - *失败("json.invalid_array", "数组缺少逗号或 ]")* +`return 失败("json.invalid_array", "数组缺少逗号或 ]")` +`end` +`end` +`end` ## 格式化文本 -`(文本)` +`params(文本)` **点 = text.codepoints(文本)** @@ -604,65 +749,81 @@ JSON 数字:可选负号、整数位、可选小数位、可选指数;含 `. **下标 = 0** -- `下标 < 长度(点)` +`while 下标 < 长度(点)` - **码点 = 点[下标]** +**码点 = 点[下标]** - 1. `码点 == 34` +`if 码点 == 34` - **`结果 = 结果 + "\\\""`** +**`结果 = 结果 + "\\\""`** - 2. `码点 == 92` +`else` +`if 码点 == 92` - **`结果 = 结果 + "\\\\"`** +**`结果 = 结果 + "\\\\"`** - 3. `码点 == 10` +`else` +`if 码点 == 10` - **`结果 = 结果 + "\\n"`** +**`结果 = 结果 + "\\n"`** - 4. `码点 == 9` +`else` +`if 码点 == 9` - **`结果 = 结果 + "\\t"`** +**`结果 = 结果 + "\\t"`** - 5. `码点 == 13` +`else` +`if 码点 == 13` - **`结果 = 结果 + "\\r"`** +**`结果 = 结果 + "\\r"`** - 6. `true` +`else` +`if true` - **结果 = 结果 + text.from_codepoint(码点)** +**结果 = 结果 + text.from_codepoint(码点)** - **下标 = 下标 + 1** +`end` +`end` +`end` +`end` +`end` +`end` +**下标 = 下标 + 1** -*`结果 + "\""`* +`end` +``return 结果 + "\""`` ## 格式化列表 -`(列表)` +`params(列表)` **结果 = "["** **下标 = 0** -- `下标 < 长度(列表)` +`while 下标 < 长度(列表)` - 1. `下标 > 0` +`if 下标 > 0` - **结果 = 结果 + ", "** +**结果 = 结果 + ", "** - 2. `true` +`else` +`if true` - **忽略 = 0** +**忽略 = 0** - **结果 = 结果 + 格式化(列表[下标])** +`end` +`end` +**结果 = 结果 + 格式化(列表[下标])** - **下标 = 下标 + 1** +**下标 = 下标 + 1** -*结果 + "]"* +`end` +`return 结果 + "]"` ## 格式化对象 -`(映射)` +`params(映射)` **键列表 = map.keys(映射)** @@ -670,57 +831,70 @@ JSON 数字:可选负号、整数位、可选小数位、可选指数;含 `. **下标 = 0** -- `下标 < 长度(键列表)` +`while 下标 < 长度(键列表)` - 1. `下标 > 0` +`if 下标 > 0` - **结果 = 结果 + ", "** +**结果 = 结果 + ", "** - 2. `true` +`else` +`if true` - **忽略 = 0** +**忽略 = 0** - **当前键 = 键列表[下标]** +`end` +`end` +**当前键 = 键列表[下标]** - **结果 = 结果 + 格式化文本(当前键) + ": " + 格式化(map.get(映射, 当前键))** +**结果 = 结果 + 格式化文本(当前键) + ": " + 格式化(map.get(映射, 当前键))** - **下标 = 下标 + 1** +**下标 = 下标 + 1** -*结果 + "}"* +`end` +`return 结果 + "}"` ## 格式化 -`(值)` +`params(值)` **类别 = 类型(值)** -1. `类别 == "Text"` +`if 类别 == "Text"` - *格式化文本(值)* +`return 格式化文本(值)` -2. `类别 == "None"` +`else` +`if 类别 == "None"` - *"null"* +`return "null"` -3. `类别 == "Bool" or 类别 == "Int" or 类别 == "Float"` +`else` +`if 类别 == "Bool" or 类别 == "Int" or 类别 == "Float"` - *文本(值)* +`return 文本(值)` -4. `类别 == "List"` +`else` +`if 类别 == "List"` - *格式化列表(值)* +`return 格式化列表(值)` -5. `类别 == "Map"` +`else` +`if 类别 == "Map"` - *格式化对象(值)* +`return 格式化对象(值)` -*"null"* +`end` +`end` +`end` +`end` +`end` +`return "null"` ## 解析多个 -`(文本)` +`params(文本)` -解析连续多个 JSON 值(空白分隔),返回 `{ok:true, value:List}`。 +解析连续多个 JSON 值(空白分隔),返回 {ok:true, value:List}。 任一项失败时返回该项的错误,不返回部分结果。 **点 = text.codepoints(文本)** @@ -729,16 +903,18 @@ JSON 数字:可选负号、整数位、可选小数位、可选指数;含 `. **结果 = []** -- `位置 < 长度(点)` +`while 位置 < 长度(点)` - **项 = 解析值(点, 位置)** +**项 = 解析值(点, 位置)** - 1. `not 项.ok` +`if not 项.ok` - *项* +`return 项` - **结果 = list.append(结果, 项.value)** +`end` +**结果 = list.append(结果, 项.value)** - **位置 = 跳过空白(点, 项.next)** +**位置 = 跳过空白(点, 项.next)** -*{ok: true, value: 结果}* +`end` +`return {ok: true, value: 结果}` diff --git a/stdlib/data/table.mq.md b/stdlib/data/table.mq.md index 21fcd96..a67d908 100644 --- a/stdlib/data/table.mq.md +++ b/stdlib/data/table.mq.md @@ -1,6 +1,8 @@ + +# @exec table ## 选择列 -`(数据, 列)` +`params(数据, 列)` **列名 = table.columns(数据)** @@ -8,19 +10,20 @@ **行号 = 0** -- `行号 < 长度(数据)` +`while 行号 < 长度(数据)` - **行 = table.row(数据, 行号)** +**行 = table.row(数据, 行号)** - **结果行 = list.append(结果行, [行[列]])** +**结果行 = list.append(结果行, [行[列]])** - **行号 = 行号 + 1** +**行号 = 行号 + 1** -*表([列名[列]], 结果行)* +`end` +`return 表([列名[列]], 结果行)` ## 过滤数值大于 -`(数据, 列, 阈值)` +`params(数据, 列, 阈值)` **列名 = table.columns(数据)** @@ -28,25 +31,29 @@ **行号 = 0** -- `行号 < 长度(数据)` +`while 行号 < 长度(数据)` - **行 = table.row(数据, 行号)** +**行 = table.row(数据, 行号)** - 1. `行[列] > 阈值` +`if 行[列] > 阈值` - **结果行 = list.append(结果行, 行)** +**结果行 = list.append(结果行, 行)** - 2. `true` +`else` +`if true` - **忽略 = 0** +**忽略 = 0** - **行号 = 行号 + 1** +`end` +`end` +**行号 = 行号 + 1** -*表(列名, 结果行)* +`end` +`return 表(列名, 结果行)` ## 插入有序 -`(已排序, 行, 列)` +`params(已排序, 行, 列)` **新列表 = []** @@ -54,37 +61,44 @@ **下标 = 0** -- `下标 < 长度(已排序)` +`while 下标 < 长度(已排序)` - **当前行 = 已排序[下标]** +**当前行 = 已排序[下标]** - 1. `not 已插入 and 当前行[列] > 行[列]` +`if not 已插入 and 当前行[列] > 行[列]` - **新列表 = list.append(新列表, 行)** +**新列表 = list.append(新列表, 行)** - **新列表 = list.append(新列表, 当前行)** +**新列表 = list.append(新列表, 当前行)** - **已插入 = true** +**已插入 = true** - 2. `true` +`else` +`if true` - **新列表 = list.append(新列表, 当前行)** +**新列表 = list.append(新列表, 当前行)** - **下标 = 下标 + 1** +`end` +`end` +**下标 = 下标 + 1** -1. `not 已插入` +`end` +`if not 已插入` - **新列表 = list.append(新列表, 行)** +**新列表 = list.append(新列表, 行)** -2. `true` +`else` +`if true` - **忽略 = 0** +**忽略 = 0** -*新列表* +`end` +`end` +`return 新列表` ## 排序 -`(数据, 列)` +`params(数据, 列)` **列名 = table.columns(数据)** @@ -94,17 +108,18 @@ **下标 = 0** -- `下标 < 行数` +`while 下标 < 行数` - **已排序 = 插入有序(已排序, table.row(数据, 下标), 列)** +**已排序 = 插入有序(已排序, table.row(数据, 下标), 列)** - **下标 = 下标 + 1** +**下标 = 下标 + 1** -*表(列名, 已排序)* +`end` +`return 表(列名, 已排序)` ## 追加行 -`(数据, 行)` +`params(数据, 行)` **列名 = table.columns(数据)** @@ -112,17 +127,18 @@ **行号 = 0** -- `行号 < 长度(数据)` +`while 行号 < 长度(数据)` - **所有行 = list.append(所有行, table.row(数据, 行号))** +**所有行 = list.append(所有行, table.row(数据, 行号))** - **行号 = 行号 + 1** +**行号 = 行号 + 1** -*表(列名, list.append(所有行, 行))* +`end` +`return 表(列名, list.append(所有行, 行))` ## 设置单元格 -`(数据, 目标行, 目标列, 值)` +`params(数据, 目标行, 目标列, 值)` **列名 = table.columns(数据)** @@ -130,41 +146,49 @@ **行号 = 0** -- `行号 < 长度(数据)` +`while 行号 < 长度(数据)` - **行 = table.row(数据, 行号)** +**行 = table.row(数据, 行号)** - 1. `行号 == 目标行` +`if 行号 == 目标行` - **新行 = []** +**新行 = []** - **列号 = 0** +**列号 = 0** - - `列号 < 长度(行)` +`while 列号 < 长度(行)` - 1. `列号 == 目标列` +`if 列号 == 目标列` - **新行 = list.append(新行, 值)** +**新行 = list.append(新行, 值)** - 2. `true` +`else` +`if true` - **新行 = list.append(新行, 行[列号])** +**新行 = list.append(新行, 行[列号])** - **列号 = 列号 + 1** +`end` +`end` +**列号 = 列号 + 1** - **新行表 = list.append(新行表, 新行)** +`end` +**新行表 = list.append(新行表, 新行)** - 2. `true` +`else` +`if true` - **新行表 = list.append(新行表, 行)** +**新行表 = list.append(新行表, 行)** - **行号 = 行号 + 1** +`end` +`end` +**行号 = 行号 + 1** -*表(列名, 新行表)* +`end` +`return 表(列名, 新行表)` ## 连接 -`(左, 右, 左列, 右列)` +`params(左, 右, 左列, 右列)` **表头 = list.concat(table.columns(左), table.columns(右))** @@ -172,117 +196,134 @@ **左行号 = 0** -- `左行号 < 长度(左)` +`while 左行号 < 长度(左)` - **左行 = table.row(左, 左行号)** +**左行 = table.row(左, 左行号)** - **键 = 左行[左列]** +**键 = 左行[左列]** - **右行号 = 0** +**右行号 = 0** - - `右行号 < 长度(右)` +`while 右行号 < 长度(右)` - **右行 = table.row(右, 右行号)** +**右行 = table.row(右, 右行号)** - 1. `右行[右列] == 键` +`if 右行[右列] == 键` - **结果行 = list.append(结果行, list.concat(左行, 右行))** +**结果行 = list.append(结果行, list.concat(左行, 右行))** - 2. `true` +`else` +`if true` - **忽略 = 0** +**忽略 = 0** - **右行号 = 右行号 + 1** +`end` +`end` +**右行号 = 右行号 + 1** - **左行号 = 左行号 + 1** +`end` +**左行号 = 左行号 + 1** -*表(表头, 结果行)* +`end` +`return 表(表头, 结果行)` ## 分组 -`(数据, 键列, 值列)` +`params(数据, 键列, 值列)` **结果 = {}** **行号 = 0** -- `行号 < 长度(数据)` +`while 行号 < 长度(数据)` - **行 = table.row(数据, 行号)** +**行 = table.row(数据, 行号)** - **键 = 行[键列]** +**键 = 行[键列]** - **当前 = map.get(结果, 键)** +**当前 = map.get(结果, 键)** - **列表 = []** +**列表 = []** - 1. `map.has(结果, 键)` +`if map.has(结果, 键)` - **列表 = 当前** +**列表 = 当前** - 2. `true` +`else` +`if true` - **忽略 = 0** +**忽略 = 0** - **列表 = list.append(列表, 行[值列])** +`end` +`end` +**列表 = list.append(列表, 行[值列])** - **结果 = map.set(结果, 键, 列表)** +**结果 = map.set(结果, 键, 列表)** - **行号 = 行号 + 1** +**行号 = 行号 + 1** -*结果* +`end` +`return 结果` ## 连接片段 -`(片段)` +`params(片段)` **结果 = ""** **下标 = 0** -- `下标 < 长度(片段)` +`while 下标 < 长度(片段)` - 1. `下标 > 0` +`if 下标 > 0` - **结果 = 结果 + " | "** +**结果 = 结果 + " | "** - 2. `true` +`else` +`if true` - **忽略 = 0** +**忽略 = 0** - **结果 = 结果 + 片段[下标]** +`end` +`end` +**结果 = 结果 + 片段[下标]** - **下标 = 下标 + 1** +**下标 = 下标 + 1** -*结果* +`end` +`return 结果` ## 连接行 -`(行列表)` +`params(行列表)` **结果 = ""** **下标 = 0** -- `下标 < 长度(行列表)` +`while 下标 < 长度(行列表)` - 1. `下标 > 0` +`if 下标 > 0` - **结果 = 结果 + "\n"** +**结果 = 结果 + "\n"** - 2. `true` +`else` +`if true` - **忽略 = 0** +**忽略 = 0** - **结果 = 结果 + 行列表[下标]** +`end` +`end` +**结果 = 结果 + 行列表[下标]** - **下标 = 下标 + 1** +**下标 = 下标 + 1** -*结果* +`end` +`return 结果` ## 转义单元格 -`(值)` +`params(值)` **文本值 = 文本(值)** @@ -292,27 +333,33 @@ **下标 = 0** -- `下标 < 长度(点)` +`while 下标 < 长度(点)` - 1. `点[下标] == 124` +`if 点[下标] == 124` - **结果 = 结果 + text.from_codepoint(92) + "|"** +**结果 = 结果 + text.from_codepoint(92) + "|"** - 2. `点[下标] == 10 or 点[下标] == 13` +`else` +`if 点[下标] == 10 or 点[下标] == 13` - **结果 = 结果 + " "** +**结果 = 结果 + " "** - 3. `true` +`else` +`if true` - **结果 = 结果 + text.from_codepoint(点[下标])** +**结果 = 结果 + text.from_codepoint(点[下标])** - **下标 = 下标 + 1** +`end` +`end` +`end` +**下标 = 下标 + 1** -*结果* +`end` +`return 结果` ## 转GFM -`(数据)` +`params(数据)` **列名 = table.columns(数据)** @@ -320,12 +367,13 @@ **下标 = 0** -- `下标 < 长度(列名)` +`while 下标 < 长度(列名)` - **表头 = list.append(表头, 转义单元格(列名[下标]))** +**表头 = list.append(表头, 转义单元格(列名[下标]))** - **下标 = 下标 + 1** +**下标 = 下标 + 1** +`end` **行列表 = []** **行列表 = list.append(行列表, "| " + 连接片段(表头) + " |")** @@ -334,32 +382,35 @@ **下标 = 0** -- `下标 < 长度(列名)` +`while 下标 < 长度(列名)` - **分隔 = list.append(分隔, "---")** +**分隔 = list.append(分隔, "---")** - **下标 = 下标 + 1** +**下标 = 下标 + 1** +`end` **行列表 = list.append(行列表, "| " + 连接片段(分隔) + " |")** **行号 = 0** -- `行号 < 长度(数据)` +`while 行号 < 长度(数据)` - **行 = table.row(数据, 行号)** +**行 = table.row(数据, 行号)** - **单元格 = []** +**单元格 = []** - **列号 = 0** +**列号 = 0** - - `列号 < 长度(行)` +`while 列号 < 长度(行)` - **单元格 = list.append(单元格, 转义单元格(行[列号]))** +**单元格 = list.append(单元格, 转义单元格(行[列号]))** - **列号 = 列号 + 1** +**列号 = 列号 + 1** - **行列表 = list.append(行列表, "| " + 连接片段(单元格) + " |")** +`end` +**行列表 = list.append(行列表, "| " + 连接片段(单元格) + " |")** - **行号 = 行号 + 1** +**行号 = 行号 + 1** -*连接行(行列表)* +`end` +`return 连接行(行列表)` diff --git a/stdlib/datetime.mq.md b/stdlib/datetime.mq.md index 9285331..b1ea137 100644 --- a/stdlib/datetime.mq.md +++ b/stdlib/datetime.mq.md @@ -1,98 +1,115 @@ + +# @exec datetime ## 失败 -`(消息)` +`params(消息)` -*{ok: false, code: "datetime.invalid", message: 消息}* +`return {ok: false, code: "datetime.invalid", message: 消息}` ## 闰年 -`(年)` +`params(年)` -*年 % 4 == 0 and (年 % 100 != 0 or 年 % 400 == 0)* +`return 年 % 4 == 0 and (年 % 100 != 0 or 年 % 400 == 0)` ## 每月天数 -`(年, 月)` +`params(年, 月)` -1. `月 == 2` +`if 月 == 2` - 1. `闰年(年)` +`if 闰年(年)` - *29* +`return 29` - *28* +`end` +`return 28` -2. `月 == 4 or 月 == 6 or 月 == 9 or 月 == 11` +`else` +`if 月 == 4 or 月 == 6 or 月 == 9 or 月 == 11` - *30* +`return 30` -*31* +`end` +`end` +`return 31` ## 补零2 -`(值)` +`params(值)` -1. `值 < 10` +`if 值 < 10` - *"0" + 文本(值)* +`return "0" + 文本(值)` -*文本(值)* +`end` +`return 文本(值)` ## 补零3 -`(值)` +`params(值)` -1. `值 < 10` +`if 值 < 10` - *"00" + 文本(值)* +`return "00" + 文本(值)` -2. `值 < 100` +`else` +`if 值 < 100` - *"0" + 文本(值)* +`return "0" + 文本(值)` -*文本(值)* +`end` +`end` +`return 文本(值)` ## 补零4 -`(值)` +`params(值)` -1. `值 < 10` +`if 值 < 10` - *"000" + 文本(值)* +`return "000" + 文本(值)` -2. `值 < 100` +`else` +`if 值 < 100` - *"00" + 文本(值)* +`return "00" + 文本(值)` -3. `值 < 1000` +`else` +`if 值 < 1000` - *"0" + 文本(值)* +`return "0" + 文本(值)` -*文本(值)* +`end` +`end` +`end` +`return 文本(值)` ## 月份 -`(mp)` +`params(mp)` -1. `mp < 10` +`if mp < 10` - *mp + 3* +`return mp + 3` -*mp - 9* +`end` +`return mp - 9` ## 年份 -`(年, 月)` +`params(年, 月)` -1. `月 <= 2` +`if 月 <= 2` - *年 + 1* +`return 年 + 1` -*年* +`end` +`return 年` ## 日期部件 -`(天)` +`params(天)` Howard Hinnant 的 civil-from-days 算法,输入为 1970-01-01 起的天数。 @@ -114,45 +131,51 @@ Howard Hinnant 的 civil-from-days 算法,输入为 1970-01-01 起的天数。 **月 = 月份(mp)** -*{年: 年份(年, 月), 月: 月, 日: 日}* +`return {年: 年份(年, 月), 月: 月, 日: 日}` ## 日期序号 -`(年, 月, 日)` +`params(年, 月, 日)` **y = 年** -1. `月 <= 2` +`if 月 <= 2` - **y = y - 1** +**y = y - 1** -2. `true` +`else` +`if true` - **忽略 = 0** +**忽略 = 0** +`end` +`end` **era = y // 400** **yoe = y - era * 400** **m = 月** -1. `月 > 2` +`if 月 > 2` - **m = 月 - 3** +**m = 月 - 3** -2. `true` +`else` +`if true` - **m = 月 + 9** +**m = 月 + 9** +`end` +`end` **doy = (153 * m + 2) // 5 + 日 - 1** **doe = yoe * 365 + yoe // 4 - yoe // 100 + doy** -*era * 146097 + doe - 719468* +`return era * 146097 + doe - 719468` ## 是数字串 -`(文本)` +`params(文本)` **点 = text.codepoints(文本)** @@ -160,42 +183,47 @@ Howard Hinnant 的 civil-from-days 算法,输入为 1970-01-01 起的天数。 **下标 = 0** -- `下标 < 长度(点) and 结果` +`while 下标 < 长度(点) and 结果` - 1. `点[下标] < 48 or 点[下标] > 57` +`if 点[下标] < 48 or 点[下标] > 57` - **结果 = false** +**结果 = false** - 2. `true` +`else` +`if true` - **忽略 = 0** +**忽略 = 0** - **下标 = 下标 + 1** +`end` +`end` +**下标 = 下标 + 1** -*结果* +`end` +`return 结果` ## 片段 -`(点, 起点, 终点)` +`params(点, 起点, 终点)` **结果 = ""** **下标 = 起点** -- `下标 < 终点` +`while 下标 < 终点` - **结果 = 结果 + text.from_codepoint(点[下标])** +**结果 = 结果 + text.from_codepoint(点[下标])** - **下标 = 下标 + 1** +**下标 = 下标 + 1** -*结果* +`end` +`return 结果` ## 格式化 -`(毫秒)` +`params(毫秒)` -输出 UTC ISO-8601:`YYYY-MM-DDTHH:MM:SSZ`;毫秒非零时追加 -`.mmm`。负数毫秒按 1970 前的 UTC 时间处理。 +输出 UTC ISO-8601:YYYY-MM-DDTHH:MM:SSZ;毫秒非零时追加 +.mmm。负数毫秒按 1970 前的 UTC 时间处理。 **秒 = 毫秒 // 1000** @@ -215,29 +243,33 @@ Howard Hinnant 的 civil-from-days 算法,输入为 1970-01-01 起的天数。 **基 = 补零4(日期.年) + "-" + 补零2(日期.月) + "-" + 补零2(日期.日) + "T" + 补零2(时) + ":" + 补零2(分) + ":" + 补零2(秒数)** -1. `毫 == 0` +`if 毫 == 0` - *基 + "Z"* +`return 基 + "Z"` -*基 + "." + 补零3(毫) + "Z"* +`end` +`return 基 + "." + 补零3(毫) + "Z"` ## 解析 -`(文本)` +`params(文本)` -解析 `YYYY-MM-DDTHH:MM:SSZ` 或带 `.mmm` 的 UTC 文本,返回 Unix 毫秒。 -范围、闰年和格式错误都是可恢复 `datetime.invalid`。 +解析 YYYY-MM-DDTHH:MM:SSZ 或带 .mmm 的 UTC 文本,返回 Unix 毫秒。 +范围、闰年和格式错误都是可恢复 datetime.invalid。 **点 = text.codepoints(文本)** -1. `长度(点) < 20 or 长度(点) > 24` +`if 长度(点) < 20 or 长度(点) > 24` - *失败("长度不是 20–24 个码点")* +`return 失败("长度不是 20–24 个码点")` -1. `点[4] != 45 or 点[7] != 45 or 点[10] != 84 or 点[13] != 58 or 点[16] != 58` +`else` +`if 点[4] != 45 or 点[7] != 45 or 点[10] != 84 or 点[13] != 58 or 点[16] != 58` - *失败("分隔符不符合 YYYY-MM-DDTHH:MM:SS")* +`return 失败("分隔符不符合 YYYY-MM-DDTHH:MM:SS")` +`end` +`end` **年文本 = 片段(点, 0, 4)** **月文本 = 片段(点, 5, 7)** @@ -250,10 +282,11 @@ Howard Hinnant 的 civil-from-days 算法,输入为 1970-01-01 起的天数。 **秒文本 = 片段(点, 17, 19)** -1. `not 是数字串(年文本) or not 是数字串(月文本) or not 是数字串(日文本) or not 是数字串(时文本) or not 是数字串(分文本) or not 是数字串(秒文本)` +`if not 是数字串(年文本) or not 是数字串(月文本) or not 是数字串(日文本) or not 是数字串(时文本) or not 是数字串(分文本) or not 是数字串(秒文本)` - *失败("日期时间分量必须是数字")* +`return 失败("日期时间分量必须是数字")` +`end` **年 = 整数(年文本)** **月 = 整数(月文本)** @@ -270,30 +303,38 @@ Howard Hinnant 的 civil-from-days 算法,输入为 1970-01-01 起的天数。 **结束 = 20** -1. `长度(点) >= 24 and 点[19] == 46 and 点[23] == 90` +`if 长度(点) >= 24 and 点[19] == 46 and 点[23] == 90` - **毫文本 = 片段(点, 20, 23)** +**毫文本 = 片段(点, 20, 23)** - **结束 = 24** +**结束 = 24** -1. `长度(点) != 结束 or 点[结束 - 1] != 90` +`else` +`if 长度(点) != 结束 or 点[结束 - 1] != 90` - *失败("必须以 Z 结尾")* +`return 失败("必须以 Z 结尾")` -1. `not 是数字串(毫文本)` +`else` +`if not 是数字串(毫文本)` - *失败("毫秒必须是数字")* +`return 失败("毫秒必须是数字")` +`end` +`end` +`end` **毫 = 整数(毫文本)** -1. `年 < 1970 or 月 < 1 or 月 > 12 or 日 < 1 or 日 > 每月天数(年, 月)` +`if 年 < 1970 or 月 < 1 or 月 > 12 or 日 < 1 or 日 > 每月天数(年, 月)` - *失败("日期超出范围")* +`return 失败("日期超出范围")` -1. `时 < 0 or 时 > 23 or 分 < 0 or 分 > 59 or 秒 < 0 or 秒 > 59` +`else` +`if 时 < 0 or 时 > 23 or 分 < 0 or 分 > 59 or 秒 < 0 or 秒 > 59` - *失败("时间超出范围")* +`return 失败("时间超出范围")` +`end` +`end` **毫秒 = 日期序号(年, 月, 日) * 86400000 + 时 * 3600000 + 分 * 60000 + 秒 * 1000 + 毫** -*{ok: true, value: 毫秒}* +`return {ok: true, value: 毫秒}` diff --git a/stdlib/demo.mq.md b/stdlib/demo.mq.md index 06dc1f3..7084491 100644 --- a/stdlib/demo.mq.md +++ b/stdlib/demo.mq.md @@ -3,38 +3,40 @@ import: io: "./io.mq.md" --- -## 演示函数 +## @exec 演示函数 -*1* +`return 1` -## main +## @exec main -### 公式 +### @knowledge 公式 $$a = 1$$ -### 代码 +### @knowledge 代码 ```text print(1) ``` +### @exec 主流程 + **列表 = ["文本", 2, 1.5, [3, true], {a: 1, b: "x"}, None]** -> io.写值(列表) +> **io.写值(列表)** -> 打印(列表) +> **打印(列表)** **表格 = 表(["名称", "分数"], [["甲", 87], ["乙", 92]])** -> io.写值(表格) +> **io.写值(表格)** -> 打印(表格) +> **打印(表格)** **特殊 = [ref("#公式"), ref("#代码"), ref("#演示函数")]** -> io.写值(特殊) +> **io.写值(特殊)** -> 打印(特殊) +> **打印(特殊)** -*None* +`return None` diff --git a/stdlib/env.mq.md b/stdlib/env.mq.md index ad327e6..61b27f5 100644 --- a/stdlib/env.mq.md +++ b/stdlib/env.mq.md @@ -1,25 +1,30 @@ + +# @exec env ## 读取 -`(名称)` +`params(名称)` 读取一个显式授权的环境变量。名称是精确匹配,不支持 glob;未授权是 -`permission.denied`,未设置是 `env.not_found`,非 UTF-8 是 -`env.not_unicode`。 +permission.denied,未设置是 env.not_found,非 UTF-8 是 +env.not_unicode。 -*resource.request("env.get", [名称])* +`return resource.request("env.get", [名称])` ## 存在 -`(名称)` +`params(名称)` **结果 = 读取(名称)** -1. `结果.ok` +`if 结果.ok` - *{ok: true, value: true}* +`return {ok: true, value: true}` -1. `结果.code == "env.not_found"` +`else` +`if 结果.code == "env.not_found"` - *{ok: true, value: false}* +`return {ok: true, value: false}` -*结果* +`end` +`end` +`return 结果` diff --git a/stdlib/format.mq.md b/stdlib/format.mq.md index e03c451..29675eb 100644 --- a/stdlib/format.mq.md +++ b/stdlib/format.mq.md @@ -1,6 +1,8 @@ + +# @exec format ## 字节长度 -`(文本)` +`params(文本)` **点 = text.codepoints(文本)** @@ -8,119 +10,156 @@ **下标 = 0** -- `下标 < 长度(点)` +`while 下标 < 长度(点)` - **码点 = 点[下标]** +**码点 = 点[下标]** - 1. `码点 < 128` +`if 码点 < 128` - **总字节 = 总字节 + 1** +**总字节 = 总字节 + 1** - 2. `码点 < 2048` +`else` +`if 码点 < 2048` - **总字节 = 总字节 + 2** +**总字节 = 总字节 + 2** - 3. `码点 < 65536` +`else` +`if 码点 < 65536` - **总字节 = 总字节 + 3** +**总字节 = 总字节 + 3** - 4. `true` +`else` +`if true` - **总字节 = 总字节 + 4** +**总字节 = 总字节 + 4** - **下标 = 下标 + 1** +`end` +`end` +`end` +`end` +**下标 = 下标 + 1** -*总字节* +`end` +`return 总字节` ## 显示 -`(值)` +`params(值)` -按语言值语义格式化,用于与内置 `打印` 的输出对照。 +按语言值语义格式化,用于与内置 打印 的输出对照。 覆盖 Unit/None/Bool/Int/Float/Text/List/Map/Table/Formula/Code/ FunctionRef/PluginHandle/Memory/Resource。 **类别 = 类型(值)** -1. `类别 == "Unit"` +`if 类别 == "Unit"` - *"Unit"* +`return "Unit"` -2. `类别 == "None"` +`else` +`if 类别 == "None"` - *"None"* +`return "None"` -3. `类别 == "Text"` +`else` +`if 类别 == "Text"` - *值* +`return 值` -4. `类别 == "List"` +`else` +`if 类别 == "List"` - *列表显示(值)* +`return 列表显示(值)` -5. `类别 == "Map"` +`else` +`if 类别 == "Map"` - *映射显示(值)* +`return 映射显示(值)` -6. `类别 == "Table"` +`else` +`if 类别 == "Table"` - *表格显示(值)* +`return 表格显示(值)` -7. `类别 == "Formula"` +`else` +`if 类别 == "Formula"` - *"Formula(" + 转义文本(值.latex) + ")"* +`return "Formula(" + 转义文本(值.latex) + ")"` -8. `类别 == "Code"` +`else` +`if 类别 == "Code"` - *"Code(" + 转义文本(值.language) + ", " + 文本(字节长度(值.source)) + " bytes)"* +`return "Code(" + 转义文本(值.language) + ", " + 文本(字节长度(值.source)) + " bytes)"` -9. `类别 == "FunctionRef"` +`else` +`if 类别 == "FunctionRef"` - *"FunctionRef(" + 值.module + "::" + 值.name + ")"* +`return "FunctionRef(" + 值.module + "::" + 值.name + ")"` -10. `类别 == "PluginHandle"` +`else` +`if 类别 == "PluginHandle"` - *"PluginHandle(" + 值.plugin + "::" + 值.export + ")"* +`return "PluginHandle(" + 值.plugin + "::" + 值.export + ")"` -11. `类别 == "Memory"` +`else` +`if 类别 == "Memory"` - *"Memory"* +`return "Memory"` -12. `类别 == "Resource"` +`else` +`if 类别 == "Resource"` - *"Resource"* +`return "Resource"` -13. `true` +`else` +`if true` - *文本(值)* +`return 文本(值)` +`end` +`end` +`end` +`end` +`end` +`end` +`end` +`end` +`end` +`end` +`end` +`end` +`end` ## 列表显示 -`(列表)` +`params(列表)` **结果 = "["** **下标 = 0** -- `下标 < 长度(列表)` +`while 下标 < 长度(列表)` - 1. `下标 > 0` +`if 下标 > 0` - **结果 = 结果 + ", "** +**结果 = 结果 + ", "** - 2. `true` +`else` +`if true` - **忽略 = 0** +**忽略 = 0** - **结果 = 结果 + 值显示(列表[下标])** +`end` +`end` +**结果 = 结果 + 值显示(列表[下标])** - **下标 = 下标 + 1** +**下标 = 下标 + 1** -*结果 + "]"* +`end` +`return 结果 + "]"` ## 映射显示 -`(映射)` +`params(映射)` **键 = map.keys(映射)** @@ -128,27 +167,31 @@ FunctionRef/PluginHandle/Memory/Resource。 **下标 = 0** -- `下标 < 长度(键)` +`while 下标 < 长度(键)` - 1. `下标 > 0` +`if 下标 > 0` - **结果 = 结果 + ", "** +**结果 = 结果 + ", "** - 2. `true` +`else` +`if true` - **忽略 = 0** +**忽略 = 0** - **当前键 = 键[下标]** +`end` +`end` +**当前键 = 键[下标]** - **结果 = 结果 + 当前键 + ": " + 值显示(map.get(映射, 当前键))** +**结果 = 结果 + 当前键 + ": " + 值显示(map.get(映射, 当前键))** - **下标 = 下标 + 1** +**下标 = 下标 + 1** -*结果 + "}"* +`end` +`return 结果 + "}"` ## 表格显示 -`(表格)` +`params(表格)` **列 = table.columns(表格)** @@ -156,77 +199,89 @@ FunctionRef/PluginHandle/Memory/Resource。 **行号 = 0** -- `行号 < 长度(表格)` +`while 行号 < 长度(表格)` - 1. `行号 > 0` +`if 行号 > 0` - **结果 = 结果 + "; "** +**结果 = 结果 + "; "** - 2. `true` +`else` +`if true` - **忽略 = 0** +**忽略 = 0** - **行 = table.row(表格, 行号)** +`end` +`end` +**行 = table.row(表格, 行号)** - **单元格 = []** +**单元格 = []** - **列号 = 0** +**列号 = 0** - - `列号 < 长度(行)` +`while 列号 < 长度(行)` - **单元格 = list.append(单元格, 显示(行[列号]))** +**单元格 = list.append(单元格, 显示(行[列号]))** - **列号 = 列号 + 1** +**列号 = 列号 + 1** - **结果 = 结果 + 连接文本(单元格, " | ")** +`end` +**结果 = 结果 + 连接文本(单元格, " | ")** - **行号 = 行号 + 1** +**行号 = 行号 + 1** -*结果 + "}"* +`end` +`return 结果 + "}"` ## 连接文本 -`(列表, 分隔)` +`params(列表, 分隔)` **结果 = ""** **下标 = 0** -- `下标 < 长度(列表)` +`while 下标 < 长度(列表)` - 1. `下标 > 0` +`if 下标 > 0` - **结果 = 结果 + 分隔** +**结果 = 结果 + 分隔** - 2. `true` +`else` +`if true` - **忽略 = 0** +**忽略 = 0** - **结果 = 结果 + 列表[下标]** +`end` +`end` +**结果 = 结果 + 列表[下标]** - **下标 = 下标 + 1** +**下标 = 下标 + 1** -*结果* +`end` +`return 结果` ## 值显示 -`(值)` +`params(值)` 列表/映射/表格内部使用 repr 语义:Text 带引号并转义,其它值递归显示。 **类别 = 类型(值)** -1. `类别 == "Text"` +`if 类别 == "Text"` - *转义文本(值)* +`return 转义文本(值)` -2. `true` +`else` +`if true` - *显示(值)* +`return 显示(值)` +`end` +`end` ## 转义文本 -`(文本)` +`params(文本)` **点 = text.codepoints(文本)** @@ -234,34 +289,46 @@ FunctionRef/PluginHandle/Memory/Resource。 **下标 = 0** -- `下标 < 长度(点)` +`while 下标 < 长度(点)` - **码点 = 点[下标]** +**码点 = 点[下标]** - 1. `码点 == 34` +`if 码点 == 34` - **`结果 = 结果 + "\\\""`** +**`结果 = 结果 + "\\\""`** - 2. `码点 == 92` +`else` +`if 码点 == 92` - **`结果 = 结果 + "\\\\"`** +**`结果 = 结果 + "\\\\"`** - 3. `码点 == 10` +`else` +`if 码点 == 10` - **`结果 = 结果 + "\\n"`** +**`结果 = 结果 + "\\n"`** - 4. `码点 == 9` +`else` +`if 码点 == 9` - **`结果 = 结果 + "\\t"`** +**`结果 = 结果 + "\\t"`** - 5. `码点 == 13` +`else` +`if 码点 == 13` - **`结果 = 结果 + "\\r"`** +**`结果 = 结果 + "\\r"`** - 6. `true` +`else` +`if true` - **结果 = 结果 + text.from_codepoint(码点)** +**结果 = 结果 + text.from_codepoint(码点)** - **下标 = 下标 + 1** +`end` +`end` +`end` +`end` +`end` +`end` +**下标 = 下标 + 1** -*`结果 + "\""`* +`end` +``return 结果 + "\""`` diff --git a/stdlib/fs/file.mq.md b/stdlib/fs/file.mq.md index 134a7b3..612f600 100644 --- a/stdlib/fs/file.mq.md +++ b/stdlib/fs/file.mq.md @@ -3,12 +3,14 @@ import: utf8: "../text/utf8.mq.md" --- +# @exec file + ## 读文本 -`(路径)` +`params(路径)` 以 UTF-8 读取一个有界的项目文件。文件在打开时整文件载入,上限 8 MiB; -结果使用可恢复 `Result` 形状。 +结果使用可恢复 Result 形状。 **流 = resource.open("file", 路径, ["read"])** @@ -18,32 +20,40 @@ import: **关闭 = resource.close(流)** -1. `not 读取.ok` +`if not 读取.ok` - *读取* +`return 读取` -2. `not 关闭.ok` +`else` +`if not 关闭.ok` - *关闭* +`return 关闭` -3. `true` +`else` +`if true` - **文本 = utf8.解码(内存, 0, 读取.value.count)** +**文本 = utf8.解码(内存, 0, 读取.value.count)** - 1. `not 文本.ok` +`if not 文本.ok` - *文本* +`return 文本` - 2. `true` +`else` +`if true` - *{ok: true, value: 文本.value}* +`return {ok: true, value: 文本.value}` +`end` +`end` +`end` +`end` +`end` ## 写文本 -`(路径, 文本)` +`params(路径, 文本)` -把文本按 UTF-8 写入项目文件。路径必须已经通过 `fs_write` 授权; -文件只在 `resource.close` 成功时创建或覆盖,写入缓冲上限 8 MiB。 +把文本按 UTF-8 写入项目文件。路径必须已经通过 fs_write 授权; +文件只在 resource.close 成功时创建或覆盖,写入缓冲上限 8 MiB。 **内存 = memory.new(128, 128)** @@ -55,24 +65,29 @@ import: **关闭 = resource.close(流)** -1. `not 写入.ok` +`if not 写入.ok` - *写入* +`return 写入` -2. `not 关闭.ok` +`else` +`if not 关闭.ok` - *关闭* +`return 关闭` -3. `true` +`else` +`if true` - *{ok: true, value: {count: 写入.value.count}}* +`return {ok: true, value: {count: 写入.value.count}}` +`end` +`end` +`end` ## 复制文件 -`(源, 目标)` +`params(源, 目标)` 按字节复制一个有界的项目文件。源读取和目标写入分别需要 -`fs_read`/`fs_write` 授权,结果值与 [`写文本`](#写文本) 相同。 +fs_read/fs_write 授权,结果值与 [写文本](#写文本) 相同。 **输入 = resource.open("file", 源, ["read"])** @@ -82,125 +97,141 @@ import: **关闭输入 = resource.close(输入)** -1. `not 读取.ok` +`if not 读取.ok` - *读取* +`return 读取` -2. `not 关闭输入.ok` +`else` +`if not 关闭输入.ok` - *关闭输入* +`return 关闭输入` -3. `true` +`else` +`if true` - **输出 = resource.open("file", 目标, ["write"])** +**输出 = resource.open("file", 目标, ["write"])** - **写入 = resource.write(输出, 内存, 0, 读取.value.count)** +**写入 = resource.write(输出, 内存, 0, 读取.value.count)** - **关闭输出 = resource.close(输出)** +**关闭输出 = resource.close(输出)** - 1. `not 写入.ok` +`if not 写入.ok` - *写入* +`return 写入` - 2. `not 关闭输出.ok` +`else` +`if not 关闭输出.ok` - *关闭输出* +`return 关闭输出` - 3. `true` +`else` +`if true` - *{ok: true, value: {count: 写入.value.count}}* +`return {ok: true, value: {count: 写入.value.count}}` +`end` +`end` +`end` +`end` +`end` +`end` ## 存在 -`(路径)` +`params(路径)` -*resource.request("fs.exists", [路径])* +`return resource.request("fs.exists", [路径])` ## 元数据 -`(路径)` +`params(路径)` -*resource.request("fs.metadata", [路径])* +`return resource.request("fs.metadata", [路径])` ## 是文件 -`(路径)` +`params(路径)` **元数据 = resource.request("fs.metadata", [路径])** -1. `not 元数据.ok` +`if not 元数据.ok` - *元数据* +`return 元数据` -2. `true` +`else` +`if true` - *{ok: true, value: 元数据.value.kind == "file"}* +`return {ok: true, value: 元数据.value.kind == "file"}` +`end` +`end` ## 是目录 -`(路径)` +`params(路径)` **元数据 = resource.request("fs.metadata", [路径])** -1. `not 元数据.ok` +`if not 元数据.ok` - *元数据* +`return 元数据` -2. `true` +`else` +`if true` - *{ok: true, value: 元数据.value.kind == "directory"}* +`return {ok: true, value: 元数据.value.kind == "directory"}` +`end` +`end` ## 列出目录 -`(路径)` +`params(路径)` -*resource.request("fs.list", [路径])* +`return resource.request("fs.list", [路径])` ## 创建目录 -`(路径)` +`params(路径)` -*resource.request("fs.mkdir", [路径])* +`return resource.request("fs.mkdir", [路径])` ## 删除 -`(路径)` +`params(路径)` -删除一个文件或空目录。非空目录返回 `fs.not_empty`,不递归删除。 +删除一个文件或空目录。非空目录返回 fs.not_empty,不递归删除。 -*resource.request("fs.remove", [路径])* +`return resource.request("fs.remove", [路径])` ## 重命名 -`(源, 目标)` +`params(源, 目标)` -目标已存在时返回 `fs.exists`,不覆盖。 +目标已存在时返回 fs.exists,不覆盖。 -*resource.request("fs.rename", [源, 目标])* +`return resource.request("fs.rename", [源, 目标])` ## 追加文本 -`(路径, 文本)` +`params(路径, 文本)` 把文本追加到项目文件;文件不存在时创建。仍受 8 MiB 单次读取上限和 -`fs_write` 授权约束。 +fs_write 授权约束。 -*resource.request("fs.append", [路径, 文本])* +`return resource.request("fs.append", [路径, 文本])` ## 读取片段 -`(路径, 偏移, 长度)` +`params(路径, 偏移, 长度)` -从偏移处读取最多 `长度` 字节,按 UTF-8 解码后返回文本。偏移/长度必须 +从偏移处读取最多 长度 字节,按 UTF-8 解码后返回文本。偏移/长度必须 是非负整数,长度上限 8 MiB。 -*resource.request("fs.read_at", [路径, 偏移, 长度])* +`return resource.request("fs.read_at", [路径, 偏移, 长度])` ## 遍历 -`(路径)` +`params(路径)` 递归列出目录下的普通文件,返回相对项目根的路径列表。跳过符号链接, 深度上限 64,条目上限 4096。 -*resource.request("fs.walk", [路径])* +`return resource.request("fs.walk", [路径])` diff --git a/stdlib/io.mq.md b/stdlib/io.mq.md index 60c0c54..6f4e0c3 100644 --- a/stdlib/io.mq.md +++ b/stdlib/io.mq.md @@ -5,34 +5,36 @@ import: console: "./io/console.mq.md" --- +# @exec io + ## 写文本 -`(文本)` +`params(文本)` -*stream.写文本(文本)* +`return stream.写文本(文本)` ## 写全部 -`(流, 内存, 起点, 长度)` +`params(流, 内存, 起点, 长度)` -*stream.写全部(流, 内存, 起点, 长度)* +`return stream.写全部(流, 内存, 起点, 长度)` ## 写值 -`(值)` +`params(值)` 按语言值语义格式化后输出,并追加换行。 -*stream.写文本(format.显示(值) + "\n")* +`return stream.写文本(format.显示(值) + "\n")` ## 读取行 -`()` +`params()` -*console.读取行()* +`return console.读取行()` ## 打印 -`(值)` +`params(值)` -*console.打印(值)* +`return console.打印(值)` diff --git a/stdlib/io/console.mq.md b/stdlib/io/console.mq.md index f88c371..36bcfb2 100644 --- a/stdlib/io/console.mq.md +++ b/stdlib/io/console.mq.md @@ -5,12 +5,14 @@ import: utf8: "../text/utf8.mq.md" --- +# @exec console + ## 读取行 -`()` +`params()` -从已授权的 `stdio/stdin` 资源读取一行。按有界块读取并增量解码 UTF-8; -EOF 返回 `{ok:false, code:"io.eof"}`,无效 UTF-8 返回可恢复错误。 +从已授权的 stdio/stdin 资源读取一行。按有界块读取并增量解码 UTF-8; +EOF 返回 {ok:false, code:"io.eof"},无效 UTF-8 返回可恢复错误。 **流 = resource.open("stdio", "stdin", ["read"])** @@ -22,98 +24,123 @@ EOF 返回 `{ok:false, code:"io.eof"}`,无效 UTF-8 返回可恢复错误。 **错误 = ""** -- `not 结束` +`while not 结束` - **读取 = resource.read(流, 内存, 0, 1)** +**读取 = resource.read(流, 内存, 0, 1)** - 1. `not 读取.ok` +`if not 读取.ok` - **结束 = true** +**结束 = true** - **错误 = 读取.code** +**错误 = 读取.code** - 2. `读取.value.eof and 读取.value.count == 0` +`else` +`if 读取.value.eof and 读取.value.count == 0` - **结束 = true** +**结束 = true** - 3. `内存[0] == 10` +`else` +`if 内存[0] == 10` - **结束 = true** +**结束 = true** - 4. `true` +`else` +`if true` - **字节 = list.append(字节, 内存[0])** +**字节 = list.append(字节, 内存[0])** +`end` +`end` +`end` +`end` +`end` **关闭 = resource.close(流)** -1. `错误 != ""` +`if 错误 != ""` - *{ok: false, code: 错误, message: "stdin read failed"}* +`return {ok: false, code: 错误, message: "stdin read failed"}` -2. `not 关闭.ok` +`else` +`if not 关闭.ok` - *关闭* +`return 关闭` -3. `长度(字节) == 0` +`else` +`if 长度(字节) == 0` - *{ok: false, code: "io.eof", message: "end of input"}* +`return {ok: false, code: "io.eof", message: "end of input"}` -4. `true` +`else` +`if true` - **数据长度 = 长度(字节)** +**数据长度 = 长度(字节)** - 1. `数据长度 > 0 and 字节[数据长度 - 1] == 13` +`if 数据长度 > 0 and 字节[数据长度 - 1] == 13` - **数据长度 = 数据长度 - 1** +**数据长度 = 数据长度 - 1** - 2. `true` +`else` +`if true` - **忽略 = 0** +**忽略 = 0** - **页 = (数据长度 + 65535) // 65536** +`end` +`end` +**页 = (数据长度 + 65535) // 65536** - **数据 = memory.new(页, 页)** +**数据 = memory.new(页, 页)** - **下标 = 0** +**下标 = 0** - - `下标 < 数据长度` +`while 下标 < 数据长度` - **`数据[下标] = 字节[下标]`** +**`数据[下标] = 字节[下标]`** - **下标 = 下标 + 1** +**下标 = 下标 + 1** - **解码 = utf8.解码(数据, 0, 数据长度)** +`end` +**解码 = utf8.解码(数据, 0, 数据长度)** - 1. `not 解码.ok` +`if not 解码.ok` - *解码* +`return 解码` - 2. `true` +`else` +`if true` - *{ok: true, value: 解码.value}* +`return {ok: true, value: 解码.value}` +`end` +`end` +`end` +`end` +`end` +`end` ## 打印 -`(值)` +`params(值)` **结果 = stream.写文本(format.显示(值) + "\n")** -1. `not 结果.ok` +`if not 结果.ok` - *结果* +`return 结果` -2. `true` +`else` +`if true` - *{ok: true, value: None}* +`return {ok: true, value: None}` +`end` +`end` ## 写文本 -`(文本)` +`params(文本)` -*stream.写文本(文本)* +`return stream.写文本(文本)` ## 写全部 -`(流, 内存, 起点, 长度)` +`params(流, 内存, 起点, 长度)` -*stream.写全部(流, 内存, 起点, 长度)* +`return stream.写全部(流, 内存, 起点, 长度)` diff --git a/stdlib/io/stream.mq.md b/stdlib/io/stream.mq.md index 0c06704..febfce0 100644 --- a/stdlib/io/stream.mq.md +++ b/stdlib/io/stream.mq.md @@ -4,26 +4,31 @@ import: utf8: "../text/utf8.mq.md" --- +# @exec stream + ## 页数 -`(字节)` +`params(字节)` **页 = (字节 + 65535) // 65536** -1. `页 == 0` +`if 页 == 0` - *1* +`return 1` -2. `true` +`else` +`if true` - *页* +`return 页` +`end` +`end` ## 写全部 -`(流, 内存, 起点, 长度)` +`params(流, 内存, 起点, 长度)` -把 `长度` 字节从 `内存` 写到资源流。短写只返回实际数量,调用方继续; -零进度返回 `io.write_zero`,不静默吞掉失败。 +把 长度 字节从 内存 写到资源流。短写只返回实际数量,调用方继续; +零进度返回 io.write_zero,不静默吞掉失败。 **已写 = 0** @@ -33,48 +38,59 @@ import: **错误结果 = {ok: false, code: "io.write_zero", message: "resource.write made no progress"}** -- `已写 < 长度` +`while 已写 < 长度` - **剩余 = 长度 - 已写** +**剩余 = 长度 - 已写** - **本次 = resource.write(流, 内存, 起点 + 已写, 剩余)** +**本次 = resource.write(流, 内存, 起点 + 已写, 剩余)** - 1. `not 本次.ok` +`if not 本次.ok` - **失败 = true** +**失败 = true** - **错误结果 = 本次** +**错误结果 = 本次** - **已写 = 长度** +**已写 = 长度** - 2. `本次.value.count == 0` +`else` +`if 本次.value.count == 0` - **失败 = true** +**失败 = true** - **已写 = 长度** +**已写 = 长度** - 3. `true` +`else` +`if true` - **已写 = 已写 + 本次.value.count** +**已写 = 已写 + 本次.value.count** -1. `失败` +`end` +`end` +`end` +`end` +`if 失败` - *错误结果* +`return 错误结果` -2. `已写 < 长度` +`else` +`if 已写 < 长度` - *错误结果* +`return 错误结果` -3. `true` +`else` +`if true` - *{ok: true, value: {count: 长度}}* +`return {ok: true, value: {count: 长度}}` +`end` +`end` +`end` ## 写文本 -`(文本)` +`params(文本)` 把文本编码为 UTF-8 并写入已授权的 stdout 资源流。内存按实际字节长度增长, -写入循环检查 `{ok,count}`;只有全部字节写完并关闭成功才返回成功。 +写入循环检查 {ok,count};只有全部字节写完并关闭成功才返回成功。 **字节数 = format.字节长度(文本)** @@ -88,14 +104,19 @@ import: **关闭 = resource.close(流)** -1. `not 写结果.ok` +`if not 写结果.ok` - *写结果* +`return 写结果` -2. `not 关闭.ok` +`else` +`if not 关闭.ok` - *关闭* +`return 关闭` -3. `true` +`else` +`if true` - *{ok: true, value: {count: 长度}}* +`return {ok: true, value: {count: 长度}}` +`end` +`end` +`end` diff --git a/stdlib/net/http.mq.md b/stdlib/net/http.mq.md index e23aa5a..63d8b3e 100644 --- a/stdlib/net/http.mq.md +++ b/stdlib/net/http.mq.md @@ -3,117 +3,140 @@ import: utf8: "../text/utf8.mq.md" --- +# @exec http + ## 切片字节 -`(字节, 起, 止)` +`params(字节, 起, 止)` **结果 = []** **下标 = 起** -- `下标 < 止 and 下标 < 长度(字节)` +`while 下标 < 止 and 下标 < 长度(字节)` - **结果 = list.append(结果, 字节[下标])** +**结果 = list.append(结果, 字节[下标])** - **下标 = 下标 + 1** +**下标 = 下标 + 1** -*结果* +`end` +`return 结果` ## 找子串 -`(字节, 子, 起点)` +`params(字节, 子, 起点)` **结果 = 0 - 1** **下标 = 起点** -- `下标 + 长度(子) <= 长度(字节) and 结果 < 0` +`while 下标 + 长度(子) <= 长度(字节) and 结果 < 0` - **偏移 = 0** +**偏移 = 0** - **匹配 = true** +**匹配 = true** - - `偏移 < 长度(子) and 匹配` +`while 偏移 < 长度(子) and 匹配` - 1. `字节[下标 + 偏移] != 子[偏移]` +`if 字节[下标 + 偏移] != 子[偏移]` - **匹配 = false** +**匹配 = false** - 2. `true` +`else` +`if true` - **忽略 = 0** +**忽略 = 0** - **偏移 = 偏移 + 1** +`end` +`end` +**偏移 = 偏移 + 1** - 1. `匹配` +`end` +`if 匹配` - **结果 = 下标** +**结果 = 下标** - 2. `true` +`else` +`if true` - **忽略 = 0** +**忽略 = 0** - **下标 = 下标 + 1** +`end` +`end` +**下标 = 下标 + 1** -*结果* +`end` +`return 结果` ## 找字符 -`(字节, 值, 起点)` +`params(字节, 值, 起点)` **结果 = 0 - 1** **下标 = 起点** -- `下标 < 长度(字节) and 结果 < 0` +`while 下标 < 长度(字节) and 结果 < 0` - 1. `字节[下标] == 值` +`if 字节[下标] == 值` - **结果 = 下标** +**结果 = 下标** - 2. `true` +`else` +`if true` - **忽略 = 0** +**忽略 = 0** - **下标 = 下标 + 1** +`end` +`end` +**下标 = 下标 + 1** -*结果* +`end` +`return 结果` ## 十六进制值 -`(字节)` +`params(字节)` **数值 = 0** **下标 = 0** -- `下标 < 长度(字节)` +`while 下标 < 长度(字节)` - **值 = 字节[下标]** +**值 = 字节[下标]** - 1. `值 >= 48 and 值 <= 57` +`if 值 >= 48 and 值 <= 57` - **数值 = 数值 * 16 + 值 - 48** +**数值 = 数值 * 16 + 值 - 48** - 2. `值 >= 65 and 值 <= 70` +`else` +`if 值 >= 65 and 值 <= 70` - **数值 = 数值 * 16 + 值 - 55** +**数值 = 数值 * 16 + 值 - 55** - 3. `值 >= 97 and 值 <= 102` +`else` +`if 值 >= 97 and 值 <= 102` - **数值 = 数值 * 16 + 值 - 87** +**数值 = 数值 * 16 + 值 - 87** - 4. `true` +`else` +`if true` - **忽略 = 0** +**忽略 = 0** - **下标 = 下标 + 1** +`end` +`end` +`end` +`end` +**下标 = 下标 + 1** -*数值* +`end` +`return 数值` ## 文本字节 -`(文本)` +`params(文本)` 把 UTF-8 文本编码为字节列表,上限 8 MiB。 @@ -125,43 +148,46 @@ import: **下标 = 0** -- `下标 < 字节数` +`while 下标 < 字节数` - **结果 = list.append(结果, 内存[下标])** +**结果 = list.append(结果, 内存[下标])** - **下标 = 下标 + 1** +**下标 = 下标 + 1** -*结果* +`end` +`return 结果` ## 字节文本 -`(字节)` +`params(字节)` 把字节列表按 UTF-8 解码为文本,上限 8 MiB。 **长度值 = 长度(字节)** -1. `长度值 == 0` +`if 长度值 == 0` - *{ok: true, value: ""}* +`return {ok: true, value: ""}` +`end` **页 = (长度值 + 65535) // 65536** **内存 = memory.new(页, 页)** **下标 = 0** -- `下标 < 长度值` +`while 下标 < 长度值` - **内存[下标] = 字节[下标]** +**内存[下标] = 字节[下标]** - **下标 = 下标 + 1** +**下标 = 下标 + 1** -*utf8.解码(内存, 0, 长度值)* +`end` +`return utf8.解码(内存, 0, 长度值)` ## 解码分块字节 -`(体)` +`params(体)` **结果 = []** @@ -169,51 +195,62 @@ import: **错误 = ""** -- `位置 < 长度(体) and 错误 == ""` +`while 位置 < 长度(体) and 错误 == ""` - **行尾 = 找子串(体, [13, 10], 位置)** +**行尾 = 找子串(体, [13, 10], 位置)** - 1. `行尾 < 0` +`if 行尾 < 0` - **错误 = "http.chunked"** +**错误 = "http.chunked"** - 2. `true` +`else` +`if true` - **大小 = 十六进制值(切片字节(体, 位置, 行尾))** +**大小 = 十六进制值(切片字节(体, 位置, 行尾))** - 1. `大小 == 0` +`if 大小 == 0` - **位置 = 长度(体)** +**位置 = 长度(体)** - 2. `位置 + 大小 + 4 > 长度(体)` +`else` +`if 位置 + 大小 + 4 > 长度(体)` - **错误 = "http.chunked"** +**错误 = "http.chunked"** - 3. `true` +`else` +`if true` - **结果 = list.concat(结果, 切片字节(体, 行尾 + 2, 行尾 + 2 + 大小))** +**结果 = list.concat(结果, 切片字节(体, 行尾 + 2, 行尾 + 2 + 大小))** - **位置 = 行尾 + 2 + 大小 + 2** +**位置 = 行尾 + 2 + 大小 + 2** -1. `错误 != ""` +`end` +`end` +`end` +`end` +`end` +`end` +`if 错误 != ""` - *{ok: false, code: 错误, message: "分块长度无效"}* +`return {ok: false, code: 错误, message: "分块长度无效"}` -*{ok: true, value: 结果}* +`end` +`return {ok: true, value: 结果}` ## 解析响应字节 -`(字节)` +`params(字节)` 解析 HTTP/1.1 响应字节。头部按 ASCII 解析,正文保持原始字节;chunked -长度以字节计。成功返回 `{ok:true, value:{status, reason, headers, body}}`。 +长度以字节计。成功返回 {ok:true, value:{status, reason, headers, body}}。 **头部结束 = 找子串(字节, [13, 10, 13, 10], 0)** -1. `头部结束 < 0` +`if 头部结束 < 0` - *{ok: false, code: "http.invalid", message: "缺少头部结束"}* +`return {ok: false, code: "http.invalid", message: "缺少头部结束"}` +`end` **头部 = 切片字节(字节, 0, 头部结束)** **体 = 切片字节(字节, 头部结束 + 4, 长度(字节))** @@ -224,123 +261,142 @@ import: **下一行 = 找子串(头部, [13, 10], 0)** -- `下一行 >= 0` +`while 下一行 >= 0` - **行列表 = list.append(行列表, 切片字节(头部, 行起, 下一行))** +**行列表 = list.append(行列表, 切片字节(头部, 行起, 下一行))** - **行起 = 下一行 + 2** +**行起 = 下一行 + 2** - **下一行 = 找子串(头部, [13, 10], 行起)** +**下一行 = 找子串(头部, [13, 10], 行起)** +`end` **行列表 = list.append(行列表, 切片字节(头部, 行起, 长度(头部)))** -1. `长度(行列表) == 0` +`if 长度(行列表) == 0` - *{ok: false, code: "http.invalid", message: "缺少状态行"}* +`return {ok: false, code: "http.invalid", message: "缺少状态行"}` +`end` **状态行 = 字节文本(行列表[0])** -1. `not 状态行.ok` +`if not 状态行.ok` - *{ok: false, code: "http.invalid", message: "状态行不是 ASCII"}* +`return {ok: false, code: "http.invalid", message: "状态行不是 ASCII"}` +`end` **状态字节 = 行列表[0]** **第一空格 = 找字符(状态字节, 32, 0)** **第二空格 = 找字符(状态字节, 32, 第一空格 + 1)** -1. `第一空格 < 0 or 第二空格 < 0` +`if 第一空格 < 0 or 第二空格 < 0` - *{ok: false, code: "http.invalid", message: "状态行格式无效"}* +`return {ok: false, code: "http.invalid", message: "状态行格式无效"}` +`end` **状态文本 = 字节文本(切片字节(状态字节, 第一空格 + 1, 第二空格))** -1. `not 状态文本.ok` +`if not 状态文本.ok` - *{ok: false, code: "http.invalid", message: "状态码不是 ASCII"}* +`return {ok: false, code: "http.invalid", message: "状态码不是 ASCII"}` +`end` **状态 = 整数(状态文本.value)** **原因 = 字节文本(切片字节(状态字节, 第二空格 + 1, 长度(状态字节)))** -1. `not 原因.ok` +`if not 原因.ok` - *{ok: false, code: "http.invalid", message: "原因短语不是 ASCII"}* +`return {ok: false, code: "http.invalid", message: "原因短语不是 ASCII"}` +`end` **头 = {}** **行号 = 1** -- `行号 < 长度(行列表)` +`while 行号 < 长度(行列表)` - **行 = 行列表[行号]** +**行 = 行列表[行号]** - **冒号 = 找字符(行, 58, 0)** +**冒号 = 找字符(行, 58, 0)** - 1. `冒号 >= 0` +`if 冒号 >= 0` - **名 = 字节文本(切片字节(行, 0, 冒号))** +**名 = 字节文本(切片字节(行, 0, 冒号))** - **值 = 字节文本(切片字节(行, 冒号 + 2, 长度(行)))** +**值 = 字节文本(切片字节(行, 冒号 + 2, 长度(行)))** - 1. `名.ok and 值.ok` +`if 名.ok and 值.ok` - **头 = map.set(头, 名.value, 值.value)** +**头 = map.set(头, 名.value, 值.value)** - 2. `true` +`else` +`if true` - **忽略 = 0** +**忽略 = 0** - 2. `true` +`end` +`end` +`else` +`if true` - **忽略 = 0** +**忽略 = 0** - **行号 = 行号 + 1** +`end` +`end` +**行号 = 行号 + 1** +`end` **传输 = map.get(头, "Transfer-Encoding")** **解码后 = 体** -1. `传输 == "chunked"` +`if 传输 == "chunked"` - **分块 = 解码分块字节(体)** +**分块 = 解码分块字节(体)** - 1. `not 分块.ok` +`if not 分块.ok` - *分块* +`return 分块` - **解码后 = 分块.value** +`end` +**解码后 = 分块.value** -2. `true` +`else` +`if true` - **忽略 = 0** +**忽略 = 0** -*{ok: true, value: {status: 状态, reason: 原因.value, headers: 头, body: 解码后}}* +`end` +`end` +`return {ok: true, value: {status: 状态, reason: 原因.value, headers: 头, body: 解码后}}` ## 解析响应 -`(文本)` +`params(文本)` 兼容文本 API:按字节解析后,把正文按 UTF-8 解码。 **响应 = 解析响应字节(文本字节(文本))** -1. `not 响应.ok` +`if not 响应.ok` - *{状态: 0, 原因: "", 头: {}, 体: ""}* +`return {状态: 0, 原因: "", 头: {}, 体: ""}` +`end` **正文 = 字节文本(响应.value.body)** -1. `not 正文.ok` +`if not 正文.ok` - *{状态: 响应.value.status, 原因: 响应.value.reason, 头: 响应.value.headers, 体: ""}* +`return {状态: 响应.value.status, 原因: 响应.value.reason, 头: 响应.value.headers, 体: ""}` -*{状态: 响应.value.status, 原因: 响应.value.reason, 头: 响应.value.headers, 体: 正文.value}* +`end` +`return {状态: 响应.value.status, 原因: 响应.value.reason, 头: 响应.value.headers, 体: 正文.value}` ## 构建请求字节 -`(方法, 路径, 头列表, 体字节)` +`params(方法, 路径, 头列表, 体字节)` 构建 HTTP/1.1 请求字节。方法、路径、头名/值按 UTF-8 编码;正文使用 传入的字节列表。 @@ -349,21 +405,22 @@ import: **下标 = 0** -- `下标 < 长度(头列表)` +`while 下标 < 长度(头列表)` - **头 = 头列表[下标]** +**头 = 头列表[下标]** - **结果 = list.concat(结果, 文本字节(文本(头[0]) + ": " + 文本(头[1]) + "\r\n"))** +**结果 = list.concat(结果, 文本字节(文本(头[0]) + ": " + 文本(头[1]) + "\r\n"))** - **下标 = 下标 + 1** +**下标 = 下标 + 1** +`end` **结果 = list.concat(结果, [13, 10])** -*list.concat(结果, 体字节)* +`return list.concat(结果, 体字节)` ## 构建请求 -`(方法, 路径, 头列表, 体文本)` +`params(方法, 路径, 头列表, 体文本)` 兼容文本 API,正文按 UTF-8 编码。 @@ -371,8 +428,9 @@ import: **文本结果 = 字节文本(请求)** -1. `not 文本结果.ok` +`if not 文本结果.ok` - *""* +`return ""` -*文本结果.value* +`end` +`return 文本结果.value` diff --git a/stdlib/path.mq.md b/stdlib/path.mq.md index 2fbd0a0..542e01d 100644 --- a/stdlib/path.mq.md +++ b/stdlib/path.mq.md @@ -1,22 +1,27 @@ + +# @exec path ## 是否绝对 -`(路径)` +`params(路径)` **点 = text.codepoints(路径)** -1. `长度(点) == 0` +`if 长度(点) == 0` - *false* +`return false` -2. `点[0] == 47` +`else` +`if 点[0] == 47` - *true* +`return true` -*false* +`end` +`end` +`return false` ## 分割 -`(文本, 分隔码点)` +`params(文本, 分隔码点)` **点 = text.codepoints(文本)** @@ -26,65 +31,76 @@ **下标 = 0** -- `下标 < 长度(点)` +`while 下标 < 长度(点)` - 1. `点[下标] == 分隔码点` +`if 点[下标] == 分隔码点` - **结果 = list.append(结果, 当前)** +**结果 = list.append(结果, 当前)** - **当前 = ""** +**当前 = ""** - 2. `true` +`else` +`if true` - **当前 = 当前 + text.from_codepoint(点[下标])** +**当前 = 当前 + text.from_codepoint(点[下标])** - **下标 = 下标 + 1** +`end` +`end` +**下标 = 下标 + 1** -*list.append(结果, 当前)* +`end` +`return list.append(结果, 当前)` ## 连接 -`(片段列表)` +`params(片段列表)` -空片段被跳过,片段之间只插入一个 `/`。 +空片段被跳过,片段之间只插入一个 /。 **结果 = ""** **下标 = 0** -- `下标 < 长度(片段列表)` +`while 下标 < 长度(片段列表)` - **片段 = 文本(片段列表[下标])** +**片段 = 文本(片段列表[下标])** - 1. `片段 != ""` +`if 片段 != ""` - 1. `结果 == ""` +`if 结果 == ""` - **结果 = 片段** +**结果 = 片段** - 2. `true` +`else` +`if true` - **结果 = 结果 + "/" + 片段** +**结果 = 结果 + "/" + 片段** - 2. `true` +`end` +`end` +`else` +`if true` - **忽略 = 0** +**忽略 = 0** - **下标 = 下标 + 1** +`end` +`end` +**下标 = 下标 + 1** -*结果* +`end` +`return 结果` ## 文件名 -`(路径)` +`params(路径)` **片段 = 分割(路径, 47)** -*片段[长度(片段) - 1]* +`return 片段[长度(片段) - 1]` ## 目录名 -`(路径)` +`params(路径)` **片段 = 分割(路径, 47)** @@ -92,50 +108,53 @@ **下标 = 0** -- `下标 < 长度(片段) - 1` +`while 下标 < 长度(片段) - 1` - **结果 = list.append(结果, 片段[下标])** +**结果 = list.append(结果, 片段[下标])** - **下标 = 下标 + 1** +**下标 = 下标 + 1** -*连接(结果)* +`end` +`return 连接(结果)` ## 扩展名 -`(路径)` +`params(路径)` **名字 = 文件名(路径)** **点列表 = 分割(名字, 46)** -1. `长度(点列表) <= 1` +`if 长度(点列表) <= 1` - *""* +`return ""` -*点列表[长度(点列表) - 1]* +`end` +`return 点列表[长度(点列表) - 1]` ## 去尾 -`(列表)` +`params(列表)` **结果 = []** **下标 = 0** -- `下标 < 长度(列表) - 1` +`while 下标 < 长度(列表) - 1` - **结果 = list.append(结果, 列表[下标])** +**结果 = list.append(结果, 列表[下标])** - **下标 = 下标 + 1** +**下标 = 下标 + 1** -*结果* +`end` +`return 结果` ## 规范 -`(路径)` +`params(路径)` -词法规范化:折叠 `.`、空片段和重复 `/`,用 `..` 消去前一片段; -绝对路径保留前导 `/`。不访问文件系统。 +词法规范化:折叠 .、空片段和重复 /,用 .. 消去前一片段; +绝对路径保留前导 /。不访问文件系统。 **片段 = 分割(路径, 47)** @@ -145,36 +164,48 @@ **下标 = 0** -- `下标 < 长度(片段)` +`while 下标 < 长度(片段)` - **段 = 片段[下标]** +**段 = 片段[下标]** - 1. `段 == "" or 段 == "."` +`if 段 == "" or 段 == "."` - **忽略 = 0** +**忽略 = 0** - 2. `段 == ".."` +`else` +`if 段 == ".."` - 1. `长度(栈) > 0 and 栈[长度(栈) - 1] != ".."` +`if 长度(栈) > 0 and 栈[长度(栈) - 1] != ".."` - **栈 = 去尾(栈)** +**栈 = 去尾(栈)** - 2. `not 绝对` +`else` +`if not 绝对` - **栈 = list.append(栈, 段)** +**栈 = list.append(栈, 段)** - 3. `true` +`else` +`if true` - **忽略绝对根 = 0** +**忽略绝对根 = 0** - 3. `true` +`end` +`end` +`end` +`else` +`if true` - **栈 = list.append(栈, 段)** +**栈 = list.append(栈, 段)** - **下标 = 下标 + 1** +`end` +`end` +`end` +**下标 = 下标 + 1** -1. `绝对` +`end` +`if 绝对` - *"/" + 连接(栈)* +`return "/" + 连接(栈)` -*连接(栈)* +`end` +`return 连接(栈)` diff --git a/stdlib/process.mq.md b/stdlib/process.mq.md index a542d81..c91a40f 100644 --- a/stdlib/process.mq.md +++ b/stdlib/process.mq.md @@ -1,10 +1,12 @@ + +# @exec process ## 运行 -`(程序, 参数列表)` +`params(程序, 参数列表)` 在项目模式下运行一个显式授权的可执行文件。程序路径必须与 -`--allow-process PROGRAM` 精确匹配;不经过 shell,清空环境变量, +--allow-process PROGRAM 精确匹配;不经过 shell,清空环境变量, 工作目录是项目根,stdin 为空。5 秒超时、1 MiB stdout/stderr 上限, -结果形状为 `{status, stdout, stderr}`。 +结果形状为 {status, stdout, stderr}。 -*resource.request("process.run", [程序, 参数列表])* +`return resource.request("process.run", [程序, 参数列表])` diff --git a/stdlib/random.mq.md b/stdlib/random.mq.md index fc5e348..55e99a3 100644 --- a/stdlib/random.mq.md +++ b/stdlib/random.mq.md @@ -1,37 +1,42 @@ + +# @exec random ## 字节 -`(数量)` +`params(数量)` -读取 `数量` 个 OS 熵字节,返回 `List`(每个 0–255)。仅项目模式, -需要显式 `--allow-random`;`pure`/`strict` 拒绝。 +读取 数量 个 OS 熵字节,返回 List(每个 0–255)。仅项目模式, +需要显式 --allow-random;pure/strict 拒绝。 -*resource.request("random.bytes", [数量])* +`return resource.request("random.bytes", [数量])` ## 整数 -`(上限)` +`params(上限)` -返回 `0 <= 值 < 上限` 的整数。`上限` 必须大于 0;使用 8 个熵字节 +返回 0 <= 值 < 上限 的整数。上限 必须大于 0;使用 8 个熵字节 组合后取模(无偏拒绝采样尚未实现)。 -1. `上限 <= 0` +`if 上限 <= 0` - *{ok: false, code: "random.invalid", message: "上限必须大于 0"}* +`return {ok: false, code: "random.invalid", message: "上限必须大于 0"}` +`end` **字节结果 = 字节(8)** -1. `not 字节结果.ok` +`if not 字节结果.ok` - *字节结果* +`return 字节结果` +`end` **值 = 0** **下标 = 0** -- `下标 < 8` +`while 下标 < 8` - **值 = 值 * 256 + 字节结果.value[下标]** +**值 = 值 * 256 + 字节结果.value[下标]** - **下标 = 下标 + 1** +**下标 = 下标 + 1** -*{ok: true, value: 值 % 上限}* +`end` +`return {ok: true, value: 值 % 上限}` diff --git a/stdlib/regex.mq.md b/stdlib/regex.mq.md index 89eaa0a..671c714 100644 --- a/stdlib/regex.mq.md +++ b/stdlib/regex.mq.md @@ -1,224 +1,260 @@ + +# @exec regex ## 成功 -`(值)` +`params(值)` -*{ok: true, value: 值}* +`return {ok: true, value: 值}` ## 失败 -`(代码, 消息)` +`params(代码, 消息)` -*{ok: false, code: 代码, message: 消息}* +`return {ok: false, code: 代码, message: 消息}` ## 包含 -`(列表, 值)` +`params(列表, 值)` **结果 = false** **下标 = 0** -- `下标 < 长度(列表) and not 结果` +`while 下标 < 长度(列表) and not 结果` - 1. `列表[下标] == 值` +`if 列表[下标] == 值` - **结果 = true** +**结果 = true** - 2. `true` +`else` +`if true` - **忽略 = 0** +**忽略 = 0** - **下标 = 下标 + 1** +`end` +`end` +**下标 = 下标 + 1** -*结果* +`end` +`return 结果` ## 去头 -`(列表)` +`params(列表)` **结果 = []** **下标 = 1** -- `下标 < 长度(列表)` +`while 下标 < 长度(列表)` - **结果 = list.append(结果, 列表[下标])** +**结果 = list.append(结果, 列表[下标])** - **下标 = 下标 + 1** +**下标 = 下标 + 1** -*结果* +`end` +`return 结果` ## 设置最后 -`(列表, 值)` +`params(列表, 值)` **结果 = []** **下标 = 0** -- `下标 < 长度(列表)` +`while 下标 < 长度(列表)` - 1. `下标 + 1 == 长度(列表)` +`if 下标 + 1 == 长度(列表)` - **结果 = list.append(结果, 值)** +**结果 = list.append(结果, 值)** - 2. `true` +`else` +`if true` - **结果 = list.append(结果, 列表[下标])** +**结果 = list.append(结果, 列表[下标])** - **下标 = 下标 + 1** +`end` +`end` +**下标 = 下标 + 1** -*结果* +`end` +`return 结果` ## 片段 -`(点, 起点, 终点)` +`params(点, 起点, 终点)` **结果 = ""** **下标 = 起点** -- `下标 < 终点` +`while 下标 < 终点` - **结果 = 结果 + text.from_codepoint(点[下标])** +**结果 = 结果 + text.from_codepoint(点[下标])** - **下标 = 下标 + 1** +**下标 = 下标 + 1** -*结果* +`end` +`return 结果` ## 是数字 -`(码点)` +`params(码点)` -*码点 >= 48 and 码点 <= 57* +`return 码点 >= 48 and 码点 <= 57` ## 字面令牌 -`(码点)` +`params(码点)` 包含数量词,默认恰好一次。 -*{kind: "literal", value: 码点, neg: false, min: 1, max: 1}* +`return {kind: "literal", value: 码点, neg: false, min: 1, max: 1}` ## 任意令牌 -`()` +`params()` -*{kind: "any", value: 0, neg: false, min: 1, max: 1}* +`return {kind: "any", value: 0, neg: false, min: 1, max: 1}` ## 类令牌 -`(集合, 否定)` +`params(集合, 否定)` -*{kind: "class", value: 集合, neg: 否定, min: 1, max: 1}* +`return {kind: "class", value: 集合, neg: 否定, min: 1, max: 1}` ## 锚点令牌 -`(方向)` +`params(方向)` -*{kind: "anchor", value: 方向, neg: false, min: 1, max: 1}* +`return {kind: "anchor", value: 方向, neg: false, min: 1, max: 1}` ## 设置量词 -`(令牌, 码点)` +`params(令牌, 码点)` -1. `码点 == 42` +`if 码点 == 42` - *{kind: 令牌.kind, value: 令牌.value, neg: 令牌.neg, min: 0, max: -1}* +`return {kind: 令牌.kind, value: 令牌.value, neg: 令牌.neg, min: 0, max: -1}` -2. `码点 == 43` +`else` +`if 码点 == 43` - *{kind: 令牌.kind, value: 令牌.value, neg: 令牌.neg, min: 1, max: -1}* +`return {kind: 令牌.kind, value: 令牌.value, neg: 令牌.neg, min: 1, max: -1}` -*{kind: 令牌.kind, value: 令牌.value, neg: 令牌.neg, min: 0, max: 1}* +`end` +`end` +`return {kind: 令牌.kind, value: 令牌.value, neg: 令牌.neg, min: 0, max: 1}` ## 编译类 -`(点, 位置)` +`params(点, 位置)` **当前 = 位置 + 1** **否定 = false** -1. `当前 < 长度(点) and 点[当前] == 94` +`if 当前 < 长度(点) and 点[当前] == 94` - **否定 = true** +**否定 = true** - **当前 = 当前 + 1** +**当前 = 当前 + 1** -2. `true` +`else` +`if true` - **忽略否定 = 0** +**忽略否定 = 0** +`end` +`end` **集合 = []** **完成 = false** **错误 = ""** -- `当前 < 长度(点) and not 完成 and 错误 == ""` +`while 当前 < 长度(点) and not 完成 and 错误 == ""` - **码点 = 点[当前]** +**码点 = 点[当前]** - 1. `码点 == 93` +`if 码点 == 93` - **完成 = true** +**完成 = true** - **当前 = 当前 + 1** +**当前 = 当前 + 1** - 2. `码点 == 92` +`else` +`if 码点 == 92` - 1. `当前 + 1 >= 长度(点)` +`if 当前 + 1 >= 长度(点)` - **错误 = "regex.invalid"** +**错误 = "regex.invalid"** - 2. `true` +`else` +`if true` - **集合 = list.append(集合, 点[当前 + 1])** +**集合 = list.append(集合, 点[当前 + 1])** - **当前 = 当前 + 2** +**当前 = 当前 + 2** - 3. `当前 + 2 < 长度(点) and 点[当前 + 1] == 45 and 点[当前 + 2] != 93` +`end` +`end` +`else` +`if 当前 + 2 < 长度(点) and 点[当前 + 1] == 45 and 点[当前 + 2] != 93` - **开始 = 码点** +**开始 = 码点** - **结束 = 点[当前 + 2]** +**结束 = 点[当前 + 2]** - 1. `开始 > 结束` +`if 开始 > 结束` - **错误 = "regex.invalid"** +**错误 = "regex.invalid"** - 2. `true` +`else` +`if true` - **值 = 开始** +**值 = 开始** - - `值 <= 结束` +`while 值 <= 结束` - **集合 = list.append(集合, 值)** +**集合 = list.append(集合, 值)** - **值 = 值 + 1** +**值 = 值 + 1** - **当前 = 当前 + 3** +`end` +**当前 = 当前 + 3** - 4. `true` +`end` +`end` +`else` +`if true` - **集合 = list.append(集合, 码点)** +**集合 = list.append(集合, 码点)** - **当前 = 当前 + 1** +**当前 = 当前 + 1** -1. `not 完成` +`end` +`end` +`end` +`end` +`end` +`if not 完成` - *失败("regex.invalid", "字符类未闭合")* +`return 失败("regex.invalid", "字符类未闭合")` -1. `错误 != ""` +`else` +`if 错误 != ""` - *失败(错误, "字符类范围无效")* +`return 失败(错误, "字符类范围无效")` -*成功({set: 集合, neg: 否定, next: 当前})* +`end` +`end` +`return 成功({set: 集合, neg: 否定, next: 当前})` ## 编译 -`(点, 位置)` +`params(点, 位置)` **令牌表 = []** @@ -228,189 +264,232 @@ **代码 = ""** -- `当前 < 长度(点) and 错误 == ""` +`while 当前 < 长度(点) and 错误 == ""` - **码点 = 点[当前]** +**码点 = 点[当前]** - 1. `码点 == 94` +`if 码点 == 94` - **令牌表 = list.append(令牌表, 锚点令牌("start"))** +**令牌表 = list.append(令牌表, 锚点令牌("start"))** - **当前 = 当前 + 1** +**当前 = 当前 + 1** - 2. `码点 == 36` +`else` +`if 码点 == 36` - **令牌表 = list.append(令牌表, 锚点令牌("end"))** +**令牌表 = list.append(令牌表, 锚点令牌("end"))** - **当前 = 当前 + 1** +**当前 = 当前 + 1** - 3. `码点 == 91` +`else` +`if 码点 == 91` - **类结果 = 编译类(点, 当前)** +**类结果 = 编译类(点, 当前)** - 1. `not 类结果.ok` +`if not 类结果.ok` - **错误 = 类结果.code** +**错误 = 类结果.code** - **代码 = 类结果.message** +**代码 = 类结果.message** - 2. `true` +`else` +`if true` - **令牌表 = list.append(令牌表, 类令牌(类结果.value.set, 类结果.value.neg))** +**令牌表 = list.append(令牌表, 类令牌(类结果.value.set, 类结果.value.neg))** - **当前 = 类结果.value.next** +**当前 = 类结果.value.next** - 4. `码点 == 92` +`end` +`end` +`else` +`if 码点 == 92` - 1. `当前 + 1 >= 长度(点)` +`if 当前 + 1 >= 长度(点)` - **错误 = "regex.invalid"** +**错误 = "regex.invalid"** - **代码 = "转义缺少字符"** +**代码 = "转义缺少字符"** - 2. `true` +`else` +`if true` - **令牌表 = list.append(令牌表, 字面令牌(点[当前 + 1]))** +**令牌表 = list.append(令牌表, 字面令牌(点[当前 + 1]))** - **当前 = 当前 + 2** +**当前 = 当前 + 2** - 5. `码点 == 46` +`end` +`end` +`else` +`if 码点 == 46` - **令牌表 = list.append(令牌表, 任意令牌())** +**令牌表 = list.append(令牌表, 任意令牌())** - **当前 = 当前 + 1** +**当前 = 当前 + 1** - 6. `码点 == 40 or 码点 == 41 or 码点 == 124` +`else` +`if 码点 == 40 or 码点 == 41 or 码点 == 124` - **错误 = "regex.unsupported"** +**错误 = "regex.unsupported"** - **代码 = "不支持分组或选择"** +**代码 = "不支持分组或选择"** - 7. `码点 == 42 or 码点 == 43 or 码点 == 63` +`else` +`if 码点 == 42 or 码点 == 43 or 码点 == 63` - **错误 = "regex.invalid"** +**错误 = "regex.invalid"** - **代码 = "量词没有前一项"** +**代码 = "量词没有前一项"** - 8. `true` +`else` +`if true` - **令牌表 = list.append(令牌表, 字面令牌(码点))** +**令牌表 = list.append(令牌表, 字面令牌(码点))** - **当前 = 当前 + 1** +**当前 = 当前 + 1** - - `错误 == "" and 当前 < 长度(点) and (点[当前] == 42 or 点[当前] == 43 or 点[当前] == 63)` +`end` +`end` +`end` +`end` +`end` +`end` +`end` +`end` +`while 错误 == "" and 当前 < 长度(点) and (点[当前] == 42 or 点[当前] == 43 or 点[当前] == 63)` - **令牌表 = 设置最后(令牌表, 设置量词(令牌表[长度(令牌表) - 1], 点[当前]))** +**令牌表 = 设置最后(令牌表, 设置量词(令牌表[长度(令牌表) - 1], 点[当前]))** - **当前 = 当前 + 1** +**当前 = 当前 + 1** - - `当前 < 长度(点) and (点[当前] == 42 or 点[当前] == 43 or 点[当前] == 63)` +`while 当前 < 长度(点) and (点[当前] == 42 or 点[当前] == 43 or 点[当前] == 63)` - **错误 = "regex.invalid"** +**错误 = "regex.invalid"** - **代码 = "连续量词无效"** +**代码 = "连续量词无效"** -1. `错误 != ""` +`end` +`end` +`end` +`if 错误 != ""` - *失败(错误, 代码)* +`return 失败(错误, 代码)` -*成功(令牌表)* +`end` +`return 成功(令牌表)` ## 单字符匹配 -`(令牌, 码点)` +`params(令牌, 码点)` **类别 = 令牌.kind** -1. `类别 == "any"` +`if 类别 == "any"` - *true* +`return true` -2. `类别 == "literal"` +`else` +`if 类别 == "literal"` - *令牌.value == 码点* +`return 令牌.value == 码点` -3. `类别 == "class"` +`else` +`if 类别 == "class"` - *包含(令牌.value, 码点) != 令牌.neg* +`return 包含(令牌.value, 码点) != 令牌.neg` -*false* +`end` +`end` +`end` +`return false` ## 尝试匹配 -`(令牌, 下标, 当前, 点, 位置, 次数, 要求结束)` +`params(令牌, 下标, 当前, 点, 位置, 次数, 要求结束)` **下限 = 当前.min** **上限 = 当前.max** -1. `次数 >= 下限 and 匹配序列(令牌, 下标 + 1, 点, 位置, 要求结束)` +`if 次数 >= 下限 and 匹配序列(令牌, 下标 + 1, 点, 位置, 要求结束)` - *true* +`return true` -1. `上限 >= 0 and 次数 >= 上限` +`else` +`if 上限 >= 0 and 次数 >= 上限` - *false* +`return false` -1. `位置 < 长度(点) and 单字符匹配(当前, 点[位置])` +`else` +`if 位置 < 长度(点) and 单字符匹配(当前, 点[位置])` - *尝试匹配(令牌, 下标, 当前, 点, 位置 + 1, 次数 + 1, 要求结束)* +`return 尝试匹配(令牌, 下标, 当前, 点, 位置 + 1, 次数 + 1, 要求结束)` -*false* +`end` +`end` +`end` +`return false` ## 匹配序列 -`(令牌, 下标, 点, 位置, 要求结束)` +`params(令牌, 下标, 点, 位置, 要求结束)` -1. `下标 >= 长度(令牌)` +`if 下标 >= 长度(令牌)` - 1. `要求结束` +`if 要求结束` - *位置 == 长度(点)* +`return 位置 == 长度(点)` - *true* +`end` +`return true` +`end` **当前 = 令牌[下标]** -1. `当前.kind == "anchor"` +`if 当前.kind == "anchor"` - 1. `当前.value == "start" and 位置 == 0` +`if 当前.value == "start" and 位置 == 0` - *匹配序列(令牌, 下标 + 1, 点, 位置, 要求结束)* +`return 匹配序列(令牌, 下标 + 1, 点, 位置, 要求结束)` - 2. `当前.value == "end" and 位置 == 长度(点)` +`else` +`if 当前.value == "end" and 位置 == 长度(点)` - *匹配序列(令牌, 下标 + 1, 点, 位置, 要求结束)* +`return 匹配序列(令牌, 下标 + 1, 点, 位置, 要求结束)` - *false* +`end` +`end` +`return false` -*尝试匹配(令牌, 下标, 当前, 点, 位置, 0, 要求结束)* +`end` +`return 尝试匹配(令牌, 下标, 当前, 点, 位置, 0, 要求结束)` ## 匹配 -`(模式, 文本)` +`params(模式, 文本)` -编译后要求整个文本匹配。支持 `^`、`$`、`.`、`*`、`+`、`?`、 -`[...]` 和 `\\` 转义;不支持分组和选择。 +编译后要求整个文本匹配。支持 ^、$、.、*、+、?、 +[...] 和 \\ 转义;不支持分组和选择。 **编译结果 = 编译(text.codepoints(模式), 0)** -1. `not 编译结果.ok` +`if not 编译结果.ok` - *编译结果* +`return 编译结果` -*{ok: true, value: 匹配序列(编译结果.value, 0, text.codepoints(文本), 0, true)}* +`end` +`return {ok: true, value: 匹配序列(编译结果.value, 0, text.codepoints(文本), 0, true)}` ## 搜索 -`(模式, 文本)` +`params(模式, 文本)` **编译结果 = 编译(text.codepoints(模式), 0)** -1. `not 编译结果.ok` +`if not 编译结果.ok` - *编译结果* +`return 编译结果` +`end` **令牌 = 编译结果.value** **点 = text.codepoints(文本)** @@ -419,40 +498,44 @@ **结果 = false** -- `下标 <= 长度(点) and not 结果` +`while 下标 <= 长度(点) and not 结果` - 1. `匹配序列(令牌, 0, 点, 下标, false)` +`if 匹配序列(令牌, 0, 点, 下标, false)` - **结果 = true** +**结果 = true** - 2. `true` +`else` +`if true` - **忽略 = 0** +**忽略 = 0** - **下标 = 下标 + 1** +`end` +`end` +**下标 = 下标 + 1** -*成功(结果)* +`end` +`return 成功(结果)` ## 扩展匹配 -`(模式, 文本)` +`params(模式, 文本)` -使用宿主正则引擎(支持分组、选择、`\\d` 等)判断是否匹配。模式无效时 -返回 `regex.invalid`。仅项目模式;纯 `.mq.md` 子集仍由 `匹配`/`搜索` 提供。 +使用宿主正则引擎(支持分组、选择、\\d 等)判断是否匹配。模式无效时 +返回 regex.invalid。仅项目模式;纯 .mq.md 子集仍由 匹配/搜索 提供。 -*resource.request("regex.match", [模式, 文本])* +`return resource.request("regex.match", [模式, 文本])` ## 扩展搜索 -`(模式, 文本)` +`params(模式, 文本)` -*resource.request("regex.match", [模式, 文本])* +`return resource.request("regex.match", [模式, 文本])` ## 捕获 -`(模式, 文本)` +`params(模式, 文本)` -返回 `{ok:true, value:{matched:Bool, groups:List}}`。下标 0 是 -完整匹配;未参与匹配的分组是 `None`。 +返回 {ok:true, value:{matched:Bool, groups:List}}。下标 0 是 +完整匹配;未参与匹配的分组是 None。 -*resource.request("regex.captures", [模式, 文本])* +`return resource.request("regex.captures", [模式, 文本])` diff --git a/stdlib/stdlib.json b/stdlib/stdlib.json index 2835cd1..6ee8cfe 100644 --- a/stdlib/stdlib.json +++ b/stdlib/stdlib.json @@ -1,5 +1,5 @@ { "name": "marqdo-stdlib", "version": "0.1.0", - "digest": "sha256:9a921f5fc7a929cee1fa4b4d8f2b401a3bf69198d1a753b5dc8de5d28d46583f" + "digest": "sha256:c3fca0cc3bd8f89f0f45d52418113613dd0613711cfdba76b514e5e6244409d2" } diff --git a/stdlib/tests/clock.mq.md b/stdlib/tests/clock.mq.md index 4bfd1e7..438d574 100644 --- a/stdlib/tests/clock.mq.md +++ b/stdlib/tests/clock.mq.md @@ -3,8 +3,10 @@ import: clock: "std:clock" --- +# @exec clock + ## main **现在 = clock.现在()** -*[现在.ok, 类型(现在.value), 现在.value > 1600000000000]* +`return [现在.ok, 类型(现在.value), 现在.value > 1600000000000]` diff --git a/stdlib/tests/compress.mq.md b/stdlib/tests/compress.mq.md index 8b1fdad..e2274b8 100644 --- a/stdlib/tests/compress.mq.md +++ b/stdlib/tests/compress.mq.md @@ -3,10 +3,12 @@ import: compress: "std:compress" --- +# @exec compress + ## main **压缩结果 = compress.压缩("hello 世界")** **解压结果 = compress.解压(压缩结果.value)** -*[压缩结果.ok, 长度(压缩结果.value) > 0, 解压结果.ok, 解压结果.value]* +`return [压缩结果.ok, 长度(压缩结果.value) > 0, 解压结果.ok, 解压结果.value]` diff --git a/stdlib/tests/console.mq.md b/stdlib/tests/console.mq.md index a8d784d..8380978 100644 --- a/stdlib/tests/console.mq.md +++ b/stdlib/tests/console.mq.md @@ -3,8 +3,10 @@ import: console: "std:io/console" --- +# @exec console + ## main **行 = console.读取行()** -*[行.ok, 行.value]* +`return [行.ok, 行.value]` diff --git a/stdlib/tests/csv.mq.md b/stdlib/tests/csv.mq.md index c5dc621..38d5d1d 100644 --- a/stdlib/tests/csv.mq.md +++ b/stdlib/tests/csv.mq.md @@ -3,6 +3,8 @@ import: csv: "std:data/csv" --- +# @exec csv + ## main **`行 = csv.解析行("甲,\"乙,丙\",\"说\"\"好\"")`** @@ -17,4 +19,4 @@ import: **格式化 = csv.格式化(多行.value)** -*[行.value, csv.格式化行(行.value), 空.value, 坏.code, 框.value, 多行.ok, 多行.value, 格式化]* +`return [行.value, csv.格式化行(行.value), 空.value, 坏.code, 框.value, 多行.ok, 多行.value, 格式化]` diff --git a/stdlib/tests/datetime.mq.md b/stdlib/tests/datetime.mq.md index 7abb867..856f08a 100644 --- a/stdlib/tests/datetime.mq.md +++ b/stdlib/tests/datetime.mq.md @@ -3,6 +3,8 @@ import: datetime: "std:datetime" --- +# @exec datetime + ## main -*[datetime.格式化(0), datetime.格式化(1700000000123), datetime.解析("1970-01-01T00:00:00Z").value, datetime.解析("2026-11-21T08:00:00.123Z").value, datetime.解析("2026-13-01T00:00:00Z").ok, datetime.解析("2026-02-29T00:00:00Z").ok, datetime.格式化(-1)]* +`return [datetime.格式化(0), datetime.格式化(1700000000123), datetime.解析("1970-01-01T00:00:00Z").value, datetime.解析("2026-11-21T08:00:00.123Z").value, datetime.解析("2026-13-01T00:00:00Z").ok, datetime.解析("2026-02-29T00:00:00Z").ok, datetime.格式化(-1)]` diff --git a/stdlib/tests/demo.mq.md b/stdlib/tests/demo.mq.md index 3508655..1e2a012 100644 --- a/stdlib/tests/demo.mq.md +++ b/stdlib/tests/demo.mq.md @@ -3,6 +3,8 @@ import: demo: "std:demo" --- +# @exec demo + ## main -*demo.演示函数()* +`return demo.演示函数()` diff --git a/stdlib/tests/env.mq.md b/stdlib/tests/env.mq.md index e21b6b6..f3a7aa0 100644 --- a/stdlib/tests/env.mq.md +++ b/stdlib/tests/env.mq.md @@ -3,6 +3,8 @@ import: env: "std:env" --- +# @exec env + ## main **存在 = env.存在("MARQDO_TEST_ENV")** @@ -11,4 +13,4 @@ import: **缺失 = env.读取("MARQDO_MISSING_ENV")** -*[存在.ok, 存在.value, 读取.ok, 读取.value, 缺失.ok, 缺失.code]* +`return [存在.ok, 存在.value, 读取.ok, 读取.value, 缺失.ok, 缺失.code]` diff --git a/stdlib/tests/format.mq.md b/stdlib/tests/format.mq.md index aeb00a0..07ae010 100644 --- a/stdlib/tests/format.mq.md +++ b/stdlib/tests/format.mq.md @@ -3,6 +3,8 @@ import: format: "std:format" --- +# @exec format + ## main -*[format.字节长度("Aé"), format.显示(["文本", 2, 1.5]), format.显示({a: 1}), format.列表显示(["a", 2]), format.显示(None)]* +`return [format.字节长度("Aé"), format.显示(["文本", 2, 1.5]), format.显示({a: 1}), format.列表显示(["a", 2]), format.显示(None)]` diff --git a/stdlib/tests/fs.mq.md b/stdlib/tests/fs.mq.md index 0873de2..48e0c89 100644 --- a/stdlib/tests/fs.mq.md +++ b/stdlib/tests/fs.mq.md @@ -3,6 +3,8 @@ import: fs: "std:fs/file" --- +# @exec fs + ## main **创建 = fs.创建目录("out")** @@ -33,4 +35,4 @@ import: **删除目录 = fs.删除("out")** -*[创建.ok, 写入.value.count, 存在.value, 元数据.value.kind, 元数据.value.size, 列表.value, 是文件.value, 是目录.value, 重命名.ok, 读取.value, 追加.value, 片段.value, 遍历.value, 删除.ok, 删除目录.ok]* +`return [创建.ok, 写入.value.count, 存在.value, 元数据.value.kind, 元数据.value.size, 列表.value, 是文件.value, 是目录.value, 重命名.ok, 读取.value, 追加.value, 片段.value, 遍历.value, 删除.ok, 删除目录.ok]` diff --git a/stdlib/tests/http.mq.md b/stdlib/tests/http.mq.md index ca2b19d..8a2b327 100644 --- a/stdlib/tests/http.mq.md +++ b/stdlib/tests/http.mq.md @@ -3,6 +3,8 @@ import: http: "std:net/http" --- +# @exec http + ## main **响应文本 = "HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\nTransfer-Encoding: chunked\r\n\r\n5\r\nhello\r\n6\r\n world\r\n0\r\n\r\n"** @@ -19,4 +21,4 @@ import: **请求文本 = http.字节文本(请求字节)** -*[响应.状态, 响应.原因, 响应.头["Content-Type"], 响应.体, 请求, 响应字节.value.status, 正文.value, 请求文本.value]* +`return [响应.状态, 响应.原因, 响应.头["Content-Type"], 响应.体, 请求, 响应字节.value.status, 正文.value, 请求文本.value]` diff --git a/stdlib/tests/io.mq.md b/stdlib/tests/io.mq.md index 28f2f79..951bd2c 100644 --- a/stdlib/tests/io.mq.md +++ b/stdlib/tests/io.mq.md @@ -3,8 +3,10 @@ import: io: "std:io" --- +# @exec io + ## main -> io.写值("stdlib self-test") +> **io.写值("stdlib self-test")** -*None* +`return None` diff --git a/stdlib/tests/json.mq.md b/stdlib/tests/json.mq.md index 9ae9e5d..7c98e41 100644 --- a/stdlib/tests/json.mq.md +++ b/stdlib/tests/json.mq.md @@ -3,6 +3,8 @@ import: json: "std:data/json" --- +# @exec json + ## main **`对象 = json.解析("{\"a\": 1, \"b\": [true, null, \"说\\\"好\"]}")`** @@ -17,22 +19,24 @@ import: **深度下标 = 0** -- `深度下标 < 130` +`while 深度下标 < 130` - **深度文本 = 深度文本 + "["** +**深度文本 = 深度文本 + "["** - **深度下标 = 深度下标 + 1** +**深度下标 = 深度下标 + 1** +`end` **深度下标 = 0** -- `深度下标 < 130` +`while 深度下标 < 130` - **深度文本 = 深度文本 + "]"** +**深度文本 = 深度文本 + "]"** - **深度下标 = 深度下标 + 1** +**深度下标 = 深度下标 + 1** +`end` **深度 = json.解析(深度文本)** **`多个 = json.解析多个("1 2 [3]")`** -*[对象.ok, 对象.value.a, 对象.value.b[2], json.格式化(浮点.value), 失败.ok, 失败.code, 尾随.code, 深度.ok, 深度.code, 多个.ok, 多个.value]* +`return [对象.ok, 对象.value.a, 对象.value.b[2], json.格式化(浮点.value), 失败.ok, 失败.code, 尾随.code, 深度.ok, 深度.code, 多个.ok, 多个.value]` diff --git a/stdlib/tests/path.mq.md b/stdlib/tests/path.mq.md index adad8a7..00facb1 100644 --- a/stdlib/tests/path.mq.md +++ b/stdlib/tests/path.mq.md @@ -3,6 +3,8 @@ import: path: "std:path" --- +# @exec path + ## main -*[path.连接(["a", "", "b", "c"]), path.文件名("a/b/c.txt"), path.目录名("a/b/c.txt"), path.扩展名("a/b/c.txt"), path.规范("./a//b/../c"), path.规范("/a/./b/../c"), path.规范("../a/b"), path.是否绝对("/a"), path.是否绝对("a")]* +`return [path.连接(["a", "", "b", "c"]), path.文件名("a/b/c.txt"), path.目录名("a/b/c.txt"), path.扩展名("a/b/c.txt"), path.规范("./a//b/../c"), path.规范("/a/./b/../c"), path.规范("../a/b"), path.是否绝对("/a"), path.是否绝对("a")]` diff --git a/stdlib/tests/process.mq.md b/stdlib/tests/process.mq.md index 674fa32..c4731ee 100644 --- a/stdlib/tests/process.mq.md +++ b/stdlib/tests/process.mq.md @@ -3,8 +3,10 @@ import: process: "std:process" --- +# @exec process + ## main **结果 = process.运行("/bin/echo", ["hello"])** -*[结果.ok, 结果.value.status, 结果.value.stdout, 结果.value.stderr]* +`return [结果.ok, 结果.value.status, 结果.value.stdout, 结果.value.stderr]` diff --git a/stdlib/tests/random.mq.md b/stdlib/tests/random.mq.md index 06a038f..dc51e4f 100644 --- a/stdlib/tests/random.mq.md +++ b/stdlib/tests/random.mq.md @@ -3,10 +3,12 @@ import: random: "std:random" --- +# @exec random + ## main **字节结果 = random.字节(16)** **整数结果 = random.整数(100)** -*[字节结果.ok, 长度(字节结果.value), 整数结果.ok, 整数结果.value >= 0, 整数结果.value < 100]* +`return [字节结果.ok, 长度(字节结果.value), 整数结果.ok, 整数结果.value >= 0, 整数结果.value < 100]` diff --git a/stdlib/tests/regex.mq.md b/stdlib/tests/regex.mq.md index 3167eca..0dd27e6 100644 --- a/stdlib/tests/regex.mq.md +++ b/stdlib/tests/regex.mq.md @@ -3,6 +3,8 @@ import: regex: "std:regex" --- +# @exec regex + ## main **`星号 = regex.匹配("a*b", "aaab")`** @@ -31,4 +33,4 @@ import: **捕获 = regex.捕获("^(a+)(b|c)$", "aab")** -*[星号.value, 加号.value, 锚点.value, 类.value, 否定类.value, 任意.value, 可选.value, 转义.value, 搜索.value, 无效.ok, 无效.code, 不支持.code, 扩展.value, 捕获.value.matched, 捕获.value.groups]* +`return [星号.value, 加号.value, 锚点.value, 类.value, 否定类.value, 任意.value, 可选.value, 转义.value, 搜索.value, 无效.ok, 无效.code, 不支持.code, 扩展.value, 捕获.value.matched, 捕获.value.groups]` diff --git a/stdlib/tests/stream.mq.md b/stdlib/tests/stream.mq.md index d343477..6c2d7c4 100644 --- a/stdlib/tests/stream.mq.md +++ b/stdlib/tests/stream.mq.md @@ -3,8 +3,10 @@ import: stream: "std:io/stream" --- +# @exec stream + ## main **结果 = stream.写文本("stream\n")** -*[结果.ok, 结果.value.count]* +`return [结果.ok, 结果.value.count]` diff --git a/stdlib/tests/table.mq.md b/stdlib/tests/table.mq.md index b9caf50..da8be64 100644 --- a/stdlib/tests/table.mq.md +++ b/stdlib/tests/table.mq.md @@ -3,6 +3,8 @@ import: table: "std:data/table" --- +# @exec table + ## main **数据 = 表(["名称", "分数"], [["甲", 87], ["乙", 92], ["丙", 71]])** @@ -25,4 +27,4 @@ import: **分组 = table.分组(表(["类别", "值"], [["a", 1], ["b", 2], ["a", 3]]), 0, 1)** -*[选择, 过滤, 排序, 追加, 设置, 连接, 分组, 数据, table.转GFM(数据)]* +`return [选择, 过滤, 排序, 追加, 设置, 连接, 分组, 数据, table.转GFM(数据)]` diff --git a/stdlib/tests/text.mq.md b/stdlib/tests/text.mq.md index a5807f6..989c81d 100644 --- a/stdlib/tests/text.mq.md +++ b/stdlib/tests/text.mq.md @@ -3,10 +3,12 @@ import: text: "std:text" --- +# @exec text + ## main **内存 = memory.new(1, 1)** **长度 = text.utf8编码("é", 内存, 0)** -*[长度, 内存[0], 内存[1]]* +`return [长度, 内存[0], 内存[1]]` diff --git a/stdlib/tests/utf8.mq.md b/stdlib/tests/utf8.mq.md index c7eb9dd..2223712 100644 --- a/stdlib/tests/utf8.mq.md +++ b/stdlib/tests/utf8.mq.md @@ -3,10 +3,12 @@ import: utf8: "std:text/utf8" --- +# @exec utf8 + ## main **内存 = memory.new(1, 1)** **长度 = utf8.编码("é", 内存, 0)** -*[长度, utf8.解码(内存, 0, 长度).value, utf8.解码(内存, 0, 1).ok]* +`return [长度, utf8.解码(内存, 0, 长度).value, utf8.解码(内存, 0, 1).ok]` diff --git a/stdlib/text.mq.md b/stdlib/text.mq.md index ce13721..5336dce 100644 --- a/stdlib/text.mq.md +++ b/stdlib/text.mq.md @@ -1,8 +1,10 @@ + +# @exec text ## utf8编码 -`(文本, 内存, 基址)` +`params(文本, 内存, 基址)` -把 Unicode 标量序列按 UTF-8 写入 `Memory`,返回字节长度。 +把 Unicode 标量序列按 UTF-8 写入 Memory,返回字节长度。 **点 = text.codepoints(文本)** @@ -10,46 +12,54 @@ **偏移 = 0** -- `下标 < 长度(点)` +`while 下标 < 长度(点)` - **码点 = 点[下标]** +**码点 = 点[下标]** - 1. `码点 < 128` +`if 码点 < 128` - **`内存[基址 + 偏移] = 码点`** +**`内存[基址 + 偏移] = 码点`** - **偏移 = 偏移 + 1** +**偏移 = 偏移 + 1** - 2. `码点 < 2048` +`else` +`if 码点 < 2048` - **`内存[基址 + 偏移] = 192 + 码点 // 64`** +**`内存[基址 + 偏移] = 192 + 码点 // 64`** - **`内存[基址 + 偏移 + 1] = 128 + 码点 % 64`** +**`内存[基址 + 偏移 + 1] = 128 + 码点 % 64`** - **偏移 = 偏移 + 2** +**偏移 = 偏移 + 2** - 3. `码点 < 65536` +`else` +`if 码点 < 65536` - **`内存[基址 + 偏移] = 224 + 码点 // 4096`** +**`内存[基址 + 偏移] = 224 + 码点 // 4096`** - **`内存[基址 + 偏移 + 1] = 128 + 码点 // 64 % 64`** +**`内存[基址 + 偏移 + 1] = 128 + 码点 // 64 % 64`** - **`内存[基址 + 偏移 + 2] = 128 + 码点 % 64`** +**`内存[基址 + 偏移 + 2] = 128 + 码点 % 64`** - **偏移 = 偏移 + 3** +**偏移 = 偏移 + 3** - 4. `true` +`else` +`if true` - **`内存[基址 + 偏移] = 240 + 码点 // 262144`** +**`内存[基址 + 偏移] = 240 + 码点 // 262144`** - **`内存[基址 + 偏移 + 1] = 128 + 码点 // 4096 % 64`** +**`内存[基址 + 偏移 + 1] = 128 + 码点 // 4096 % 64`** - **`内存[基址 + 偏移 + 2] = 128 + 码点 // 64 % 64`** +**`内存[基址 + 偏移 + 2] = 128 + 码点 // 64 % 64`** - **`内存[基址 + 偏移 + 3] = 128 + 码点 % 64`** +**`内存[基址 + 偏移 + 3] = 128 + 码点 % 64`** - **偏移 = 偏移 + 4** +**偏移 = 偏移 + 4** - **下标 = 下标 + 1** +`end` +`end` +`end` +`end` +**下标 = 下标 + 1** -*偏移* +`end` +`return 偏移` diff --git a/stdlib/text/utf8.mq.md b/stdlib/text/utf8.mq.md index dc9481b..7a7798c 100644 --- a/stdlib/text/utf8.mq.md +++ b/stdlib/text/utf8.mq.md @@ -1,27 +1,29 @@ + +# @exec utf8 ## 成功 -`(值)` +`params(值)` -*{ok: true, value: 值}* +`return {ok: true, value: 值}` ## 失败 -`(代码, 消息)` +`params(代码, 消息)` -*{ok: false, code: 代码, message: 消息}* +`return {ok: false, code: 代码, message: 消息}` ## 续字节 -`(字节)` +`params(字节)` -*字节 >= 128 and 字节 < 192* +`return 字节 >= 128 and 字节 < 192` ## 编码 -`(文本, 内存, 基址)` +`params(文本, 内存, 基址)` -把 Unicode 标量序列按 UTF-8 写入 `Memory`,返回字节长度。 -这是 `.mq.md` 自己实现的编码逻辑,不是 Rust 内建 UTF-8 转换。 +把 Unicode 标量序列按 UTF-8 写入 Memory,返回字节长度。 +这是 .mq.md 自己实现的编码逻辑,不是 Rust 内建 UTF-8 转换。 **点 = text.codepoints(文本)** @@ -29,125 +31,142 @@ **偏移 = 0** -- `下标 < 长度(点)` +`while 下标 < 长度(点)` - **码点 = 点[下标]** +**码点 = 点[下标]** - 1. `码点 < 128` +`if 码点 < 128` - **`内存[基址 + 偏移] = 码点`** +**`内存[基址 + 偏移] = 码点`** - **偏移 = 偏移 + 1** +**偏移 = 偏移 + 1** - 2. `码点 < 2048` +`else` +`if 码点 < 2048` - **`内存[基址 + 偏移] = 192 + 码点 // 64`** +**`内存[基址 + 偏移] = 192 + 码点 // 64`** - **`内存[基址 + 偏移 + 1] = 128 + 码点 % 64`** +**`内存[基址 + 偏移 + 1] = 128 + 码点 % 64`** - **偏移 = 偏移 + 2** +**偏移 = 偏移 + 2** - 3. `码点 < 65536` +`else` +`if 码点 < 65536` - **`内存[基址 + 偏移] = 224 + 码点 // 4096`** +**`内存[基址 + 偏移] = 224 + 码点 // 4096`** - **`内存[基址 + 偏移 + 1] = 128 + 码点 // 64 % 64`** +**`内存[基址 + 偏移 + 1] = 128 + 码点 // 64 % 64`** - **`内存[基址 + 偏移 + 2] = 128 + 码点 % 64`** +**`内存[基址 + 偏移 + 2] = 128 + 码点 % 64`** - **偏移 = 偏移 + 3** +**偏移 = 偏移 + 3** - 4. `true` +`else` +`if true` - **`内存[基址 + 偏移] = 240 + 码点 // 262144`** +**`内存[基址 + 偏移] = 240 + 码点 // 262144`** - **`内存[基址 + 偏移 + 1] = 128 + 码点 // 4096 % 64`** +**`内存[基址 + 偏移 + 1] = 128 + 码点 // 4096 % 64`** - **`内存[基址 + 偏移 + 2] = 128 + 码点 // 64 % 64`** +**`内存[基址 + 偏移 + 2] = 128 + 码点 // 64 % 64`** - **`内存[基址 + 偏移 + 3] = 128 + 码点 % 64`** +**`内存[基址 + 偏移 + 3] = 128 + 码点 % 64`** - **偏移 = 偏移 + 4** +**偏移 = 偏移 + 4** - **下标 = 下标 + 1** +`end` +`end` +`end` +`end` +**下标 = 下标 + 1** -*偏移* +`end` +`return 偏移` ## 解码2 -`(内存, 基址, 长度, 偏移, 文本)` +`params(内存, 基址, 长度, 偏移, 文本)` -1. `偏移 + 1 >= 长度` +`if 偏移 + 1 >= 长度` - *[文本, 偏移, "utf8.truncated"]* +`return [文本, 偏移, "utf8.truncated"]` +`end` **b1 = 内存[基址 + 偏移 + 1]** -1. `not 续字节(b1)` +`if not 续字节(b1)` - *[文本, 偏移, "utf8.invalid_continuation"]* +`return [文本, 偏移, "utf8.invalid_continuation"]` +`end` **码点 = (内存[基址 + 偏移] - 192) * 64 + (b1 - 128)** -1. `码点 < 128` +`if 码点 < 128` - *[文本, 偏移, "utf8.invalid_scalar"]* +`return [文本, 偏移, "utf8.invalid_scalar"]` -*[文本 + text.from_codepoint(码点), 偏移 + 2, ""]* +`end` +`return [文本 + text.from_codepoint(码点), 偏移 + 2, ""]` ## 解码3 -`(内存, 基址, 长度, 偏移, 文本)` +`params(内存, 基址, 长度, 偏移, 文本)` -1. `偏移 + 2 >= 长度` +`if 偏移 + 2 >= 长度` - *[文本, 偏移, "utf8.truncated"]* +`return [文本, 偏移, "utf8.truncated"]` +`end` **b1 = 内存[基址 + 偏移 + 1]** **b2 = 内存[基址 + 偏移 + 2]** -1. `not (续字节(b1) and 续字节(b2))` +`if not (续字节(b1) and 续字节(b2))` - *[文本, 偏移, "utf8.invalid_continuation"]* +`return [文本, 偏移, "utf8.invalid_continuation"]` +`end` **码点 = (内存[基址 + 偏移] - 224) * 4096 + (b1 - 128) * 64 + (b2 - 128)** -1. `码点 < 2048 or (码点 >= 55296 and 码点 <= 57343)` +`if 码点 < 2048 or (码点 >= 55296 and 码点 <= 57343)` - *[文本, 偏移, "utf8.invalid_scalar"]* +`return [文本, 偏移, "utf8.invalid_scalar"]` -*[文本 + text.from_codepoint(码点), 偏移 + 3, ""]* +`end` +`return [文本 + text.from_codepoint(码点), 偏移 + 3, ""]` ## 解码4 -`(内存, 基址, 长度, 偏移, 文本)` +`params(内存, 基址, 长度, 偏移, 文本)` -1. `偏移 + 3 >= 长度` +`if 偏移 + 3 >= 长度` - *[文本, 偏移, "utf8.truncated"]* +`return [文本, 偏移, "utf8.truncated"]` +`end` **b1 = 内存[基址 + 偏移 + 1]** **b2 = 内存[基址 + 偏移 + 2]** **b3 = 内存[基址 + 偏移 + 3]** -1. `not (续字节(b1) and 续字节(b2) and 续字节(b3))` +`if not (续字节(b1) and 续字节(b2) and 续字节(b3))` - *[文本, 偏移, "utf8.invalid_continuation"]* +`return [文本, 偏移, "utf8.invalid_continuation"]` +`end` **码点 = (内存[基址 + 偏移] - 240) * 262144 + (b1 - 128) * 4096 + (b2 - 128) * 64 + (b3 - 128)** -1. `码点 < 65536 or 码点 > 1114111` +`if 码点 < 65536 or 码点 > 1114111` - *[文本, 偏移, "utf8.invalid_scalar"]* +`return [文本, 偏移, "utf8.invalid_scalar"]` -*[文本 + text.from_codepoint(码点), 偏移 + 4, ""]* +`end` +`return [文本 + text.from_codepoint(码点), 偏移 + 4, ""]` ## 解码 -`(内存, 基址, 长度)` +`params(内存, 基址, 长度)` **偏移 = 0** @@ -155,70 +174,85 @@ **错误 = ""** -- `偏移 < 长度 and 错误 == ""` +`while 偏移 < 长度 and 错误 == ""` - **首 = 内存[基址 + 偏移]** +**首 = 内存[基址 + 偏移]** - 1. `首 < 128` +`if 首 < 128` - **文本 = 文本 + text.from_codepoint(首)** +**文本 = 文本 + text.from_codepoint(首)** - **偏移 = 偏移 + 1** +**偏移 = 偏移 + 1** - 2. `首 < 194` +`else` +`if 首 < 194` - **错误 = "utf8.invalid_lead"** +**错误 = "utf8.invalid_lead"** - 3. `首 < 224` +`else` +`if 首 < 224` - **结果 = 解码2(内存, 基址, 长度, 偏移, 文本)** +**结果 = 解码2(内存, 基址, 长度, 偏移, 文本)** - **文本 = 结果[0]** +**文本 = 结果[0]** - **偏移 = 结果[1]** +**偏移 = 结果[1]** - **错误 = 结果[2]** +**错误 = 结果[2]** - 4. `首 < 240` +`else` +`if 首 < 240` - **结果 = 解码3(内存, 基址, 长度, 偏移, 文本)** +**结果 = 解码3(内存, 基址, 长度, 偏移, 文本)** - **文本 = 结果[0]** +**文本 = 结果[0]** - **偏移 = 结果[1]** +**偏移 = 结果[1]** - **错误 = 结果[2]** +**错误 = 结果[2]** - 5. `首 < 245` +`else` +`if 首 < 245` - **结果 = 解码4(内存, 基址, 长度, 偏移, 文本)** +**结果 = 解码4(内存, 基址, 长度, 偏移, 文本)** - **文本 = 结果[0]** +**文本 = 结果[0]** - **偏移 = 结果[1]** +**偏移 = 结果[1]** - **错误 = 结果[2]** +**错误 = 结果[2]** - 6. `true` +`else` +`if true` - **错误 = "utf8.invalid_lead"** +**错误 = "utf8.invalid_lead"** -1. `错误 == ""` +`end` +`end` +`end` +`end` +`end` +`end` +`end` +`if 错误 == ""` - *成功(文本)* +`return 成功(文本)` -2. `true` +`else` +`if true` - *失败(错误, "UTF-8 解码失败")* +`return 失败(错误, "UTF-8 解码失败")` +`end` +`end` ## utf8编码 -`(文本, 内存, 基址)` +`params(文本, 内存, 基址)` -*编码(文本, 内存, 基址)* +`return 编码(文本, 内存, 基址)` ## utf8解码 -`(内存, 基址, 长度)` +`params(内存, 基址, 长度)` -*解码(内存, 基址, 长度)* +`return 解码(内存, 基址, 长度)` diff --git a/tests/README.md b/tests/README.md index 4ec3042..ceed831 100644 --- a/tests/README.md +++ b/tests/README.md @@ -1,7 +1,7 @@ # Marqdo conformance and integration test corpus This directory holds the P0/P1 conformance corpus required by -`docs/DEVELOPMENT_BLUEPRINT.md` §13/§14. The Rust harnesses live in +RFC-LANG-0002 and `docs/DEVELOPMENT_BLUEPRINT.md` §13/§14. The Rust harnesses live in `crates/cli/tests/` (they use the workspace libraries directly and the `marqdo` binary via `CARGO_BIN_EXE_marqdo`); the fixtures are plain files here so they can be rendered, diffed and reviewed like Markdown documents. @@ -9,6 +9,20 @@ so they can be rendered, diffed and reviewed like Markdown documents. Everything here is data. Nothing in this directory modifies the repository, and no test commits, copies or rewrites files outside a throw-away temp directory. +> **Migration state (RFC-LANG-0002).** The source text in this corpus uses the +> current single syntax. The Rust frontend still implements the pre-RFC mapping, +> so the semantic, negative, property and CLI suites that execute Marqdo source +> are **expected to be red** until the frontend migration lands. `conformance_ast` +> is unaffected by the semantic change (the Markdown profile is unchanged). +> `tests/negative/warnings/01-inferred-signature` pins the optional +> `sem.inferred_signature` lint as enabled; the current frontend does not emit +> it. `sem.no_entry_function` is a `run` entry-selection diagnostic and cannot be +> pinned by `crates/cli/tests/negative.rs`, which only calls `analyze_source` / +> `marqdo_runtime::run`; that coverage needs a CLI integration test. Do not +> regenerate goldens or restore the old mapper to turn these suites green. See +> [`../docs/STATUS.md`](../docs/STATUS.md) and +> [`../docs/migration/README.md`](../docs/migration/README.md). + ## Layout ```text @@ -17,8 +31,8 @@ tests/ │ ├── ast/ 160 × *.mq.md + sibling *.ast.json goldens │ └── semantics/ 73 × *.mq.md + sibling *.expected.json goldens ├── negative/ -│ ├── *.mq.md 52 × compile-time hard-error fixtures + *.expected.json -│ ├── warnings/ 6 × inert-executable warning fixtures + *.expected.json +│ ├── *.mq.md 45 × compile-time hard-error fixtures + *.expected.json +│ ├── warnings/ 2 × warning-model/control fixtures + *.expected.json │ └── runtime/ 21 × runtime-error fixtures + *.expected.json └── README.md this file ``` @@ -29,7 +43,7 @@ Rust harnesses (all in `crates/cli/tests/`): |---|---| | `conformance_ast.rs` | The frozen `marqdo.md.v1` profile parses each fixture into exactly the checked-in AST (node kinds, attributes, literals, byte spans, order). | | `conformance_semantics.rs` | Each semantic fixture compiles through `marqdo_frontend`, is assembled into `marqdo_ir::Program` and executed with `marqdo_runtime` + `marqdo_host::StdHost`; returned wire value and program stdout match. | -| `negative.rs` | Invalid executable shapes are **hard errors** (never prose fallbacks), exact sorted diagnostic-code lists; warnings and runtime error codes are asserted in their own suites. | +| `negative.rs` | Current-syntax diagnostics are **hard errors** (never prose fallbacks): exact sorted `sem.*`/`symbol.*`/`call.*`/`frontmatter.*` code lists, the `sem.inferred_signature` warning model with inert-knowledge controls, and runtime error codes — each asserted in its own suite. | | `properties.rs` | Blueprint §14.2 prose invariance: inserting/removing pure narration paragraphs never changes the executable function IR (modulo source spans) and diagnostics stay error-free. | | `integration_cli.rs` | Real CLI contract: `init`, `check`, `run`, `call`, `inspect`, `fmt`, multi-module imports/cycles, `lock`/`sync --locked`, plugin inspection and explicitly trusted plugin invocation. | @@ -63,8 +77,11 @@ The power/control-flow slice is pinned by: * semantic fixtures 37–44: right-associative power, unary-minus precedence, parentheses, float negative exponents, Strong+CodeSpan assignment, branch, loop and inert prose; -* negative fixtures 49–52: missing power/condition operands and executable - nodes swallowed by a condition paragraph; +* negative fixtures 18–23: malformed payload statements (missing condition, + trailing colon, `end if`, empty `return`, multi-statement payload, bad + `params` syntax); fixtures 24–29 pin control-stack pairing, including the + heading boundary that reports `sem.unclosed_control` and `sem.unmatched_end` + independently; * runtime negatives 11–12: negative integer exponent and exponent budget; * `crates/marqdo-frontend/src/payload.rs` span tests and `crates/cli/tests/integration_cli.rs` CLI span/E2E assertions. @@ -77,8 +94,8 @@ The addressable-memory slice (RFC-CM P1, ADR-0022) is pinned by: * runtime negatives 13–18: out-of-bounds and huge offsets, byte values outside `0..=255`, index assignment on a `List`, growth beyond the declared maximum and negative page counts; -* `tests/negative/runtime/15-index-assign-non-memory.mq.md` also guards the v1 - value semantics of `List` (it must not become shared mutable memory); +* `tests/negative/runtime/15-index-assign-non-memory.mq.md` also guards the + current value semantics of `List` (it must not become shared mutable memory); * `crates/marqdo-runtime/src/memory.rs` unit tests (aliasing, atomic failed growth, forged/stale handles, page arithmetic) and `crates/marqdo-runtime/tests/interpreter.rs` host-boundary/budget tests; @@ -277,8 +294,9 @@ RFC-CM CM-A06 resource streams (ADR-0025) are pinned by: Fixture discovery is directory-based and sorted by file name, so the order is deterministic on every platform. The AST and semantic suites fail loudly if the -corpus shrinks below 100 / 25 fixtures, and the negative suite fails below 30 -compile-time hard-error fixtures. +corpus shrinks below 100 / 25 fixtures; the warning and runtime suites fail if +their directories are empty; the negative suite fails below 30 compile-time +hard-error fixtures. ## AST goldens and `UPDATE_GOLDENS` @@ -326,38 +344,103 @@ golden without verifying the value would defeat the purpose of the corpus. ## Negative fixtures -Compile-time (`tests/negative/*.mq.md`): +All three suites use the single current language contract +(`docs/architecture/RFC-LANG-0002-unified-semantics.md`, +`spec/mapping.md`, `spec/expression.ebnf`): `@exec`/`@knowledge` heading +modes, interchangeable `Strong`/`Emph`/inline-`Code` one-statement payloads, +and explicit `if`/`else`/`while`/`end`/`return`/`params`. Ordinary Markdown +lists, block quotes, tables and emphasis are **not** errors: they are inert +containers/knowledge with an empty execution projection. The v1 +`markdown.invalid_construct` shape errors ("ordered list must have a +condition", "block quote must be a call", "Strong must not nest Emph", "empty +heading") were removed with the old mapping; `markdown.inert_executable` +warnings no longer exist either. + +Compile-time (`tests/negative/*.mq.md`, 45 fixtures): ```json -{"codes": ["markdown.invalid_construct"]} +{"codes": ["sem.unclosed_control"]} ``` The expected list is the exact sorted multiset of **error** diagnostic codes produced by `marqdo_frontend::analyze_source`. Warnings emitted by the same document are ignored here. Every listed code is additionally asserted to have -`error` severity, and every fixture must produce at least one error — invalid -executable shapes never fall back to prose. +`error` severity, and every fixture must produce at least one error — an +invalid Exec payload never falls back to prose. -Warnings (`tests/negative/warnings/*.mq.md`): +Coverage by group: + +| Group | Fixtures | Codes | +|---|---|---| +| heading modes and unit identity | 01–07, 44–45 | `sem.invalid_mode_marker`, `sem.empty_unit_name`, `sem.duplicate_unit_name`, `sem.exec_without_function` | +| payload extraction | 08–17 | `sem.payload_nested` (nested `Emph`/`Strong`/`Link`/math/strikethrough/line break), `sem.empty_payload` (whitespace-only `Strong`/`Emph`) | +| statement grammar | 18–23 | `sem.syntax` | +| control stack and heading boundary | 24–29 | `sem.unmatched_else`, `sem.duplicate_else`, `sem.unmatched_end`, `sem.unclosed_control` | +| signatures | 30–32 | `sem.signature_position` | +| version selection | 33–34 | `sem.unsupported_version_directive` | +| kept non-`sem` errors | 35–43 | `symbol.unknown`, `call.arity`, `symbol.uninitialized`, `frontmatter.invalid` | + +Fixture 29 crosses a heading boundary on purpose: the opener's segment reports +`sem.unclosed_control` and the later `### @exec` segment reports +`sem.unmatched_end`; both are asserted, and neither is "repaired" across the +boundary (`spec/mapping.md` §7). + +`sem.no_entry_function` is a `run` entry-selection diagnostic: it is produced +when the CLI cannot find an Exec H2 `main`. `crates/cli/tests/negative.rs` only +calls `marqdo_frontend::analyze_source` and `marqdo_runtime::run`, and the +latter reports an unknown *function* for a missing name; there is no CLI-entry +suite in that harness, so this corpus cannot pin the code without a harness +change. It is recorded here as a known gap rather than replaced by a weaker +assertion (see `spec/references.md` §7 and `spec/mapping.md` §8). + +### v1 → current reclassification + +| v1 fixtures | v1 expectation | Current disposition | +|---|---|---| +| 01–08 nested `Strong`/`Emph` children | `markdown.invalid_construct` | kept as 08–15 with `sem.payload_nested` | +| 09–12 empty/parse-error carriers | `markdown.invalid_construct`, `expr.parse` | empty carriers kept as 16–17 (`sem.empty_payload`); the unqualified expression-parse cases are replaced by the explicit `sem.syntax` statements in 18–23 | +| 13–24 list/quote shape errors | `markdown.invalid_construct`, `expr.parse` | **removed**: ordinary lists/quotes are valid inert Markdown now; the positive control is `warnings/02-knowledge-and-containers-are-inert` | +| 25–27 link-form calls (external/cross-module/anchor) | `ref.unresolved`, `module.unresolved` | **removed**: link-form calls no longer exist; `ref.unresolved`/`module.unresolved` are now `check --refs`/loader diagnostics outside this harness (`spec/references.md` §7) | +| 28–29 duplicate function/namespace names | `markdown.invalid_construct` | kept as 44–45 with `sem.duplicate_unit_name` (duplicate canonical name, `spec/references.md` §2.3) | +| 30–31 empty function/namespace headings | `markdown.invalid_construct` | replaced by 04–05 with `sem.empty_unit_name` on an actual mode declaration | +| 32–40 unknown/call/signature/frontmatter errors | `symbol.unknown`, `call.arity`, `symbol.uninitialized`, `expr.parse`, `frontmatter.invalid` | kept 35–43 (`frontmatter.*`, `symbol.*`, `call.arity`, `symbol.uninitialized`); malformed-signature cases moved to `sem.syntax`/`sem.signature_position` (23, 30–32) | +| 41–48 frontmatter/link/assignment/power shapes | `frontmatter.invalid`, `expr.parse` | frontmatter cases kept as 40–42; link/quote/assignment shapes removed with the old mapping; power/condition cases replaced by 18–29 | +| 49–52 power/condition operands swallowed by a branch condition | `expr.parse`, `markdown.invalid_construct` | **removed**: executable nodes inside list items are now independent payloads. Replacement negatives are the `sem.syntax` (18–23) and control-stack (24–29) fixtures | + +Warnings (`tests/negative/warnings/*.mq.md`, 2 fixtures): ```json -{"severity": "warning", "codes": ["markdown.inert_executable"]} +{"severity": "warning", "codes": ["sem.inferred_signature"]} ``` These documents must compile **without errors**; the sorted multiset of warning -codes must match exactly. `return`/`strong`/lists/block quotes outside a -function body are inert content (warning), not hard errors. +codes must match exactly. Fixture 01 pins the `sem.inferred_signature` lint for +an Exec H2 that relies on free-variable inference. Fixture 02 is a +zero-diagnostic control: it proves that ordinary ordered lists, bullet lists +and block quotes are valid inert Markdown even inside an `@exec` section, and +that an explicit `params(...)` declaration (allowed after prose) suppresses the +inferred-signature warning. The lint is specified as **optional** +(`spec/mapping.md` §6, "may be enabled"); these fixtures pin it enabled, so if +an implementation leaves it off the warning suite — not the hard-error corpus — +is what must be revisited. -Runtime (`tests/negative/runtime/*.mq.md`): +Runtime (`tests/negative/runtime/*.mq.md`, 21 fixtures): ```json {"function": "main", "args": {}, "codes": ["runtime.division_by_zero"]} ``` These documents compile, then must fail at runtime with the expected stable -error code. Optional keys: `"grants": ["foreign"]` and `"stack_limit": 24` -(used for the recursion-depth fixture so the budget — not the host process -stack — is what fails). +error code. Sources were migrated to the current syntax (explicit `## @exec` +functions, `params(...)` where a function has arguments, payload calls and +explicit `if`/`end`), but the genuine runtime expectations were preserved: +arithmetic type/zero-division, index/field/memory bounds, `call.not_callable`, +`call.arity` through a `ref` function value, non-Bool branch condition, +capability (`permission.denied` for a foreign kernel in pure mode), unsupported +math subset, recursion budget and the addressable-memory/collection errors. +Optional keys: `"grants": ["foreign"]` and `"stack_limit": 24` (used for the +recursion-depth fixture so the budget — not the host process stack — is what +fails). ## CLI integration notes @@ -374,13 +457,15 @@ stack — is what fails). ## Notes discovered while authoring (all since fixed) -The fixtures initially pinned three observations that were reported and then -fixed in the implementation; the goldens below reflect the fixed behaviour: +Two observations were reported and then fixed in the implementation; the +goldens reflect the fixed behaviour: * wire floats round-trip exactly (`serde_json/float_roundtrip` is enabled), so Python `math.pi * 9` keeps `28.274333882308138`; * the default interpreter stack budget is 128 frames so a deeply recursive document returns a structured `resource.exhausted` instead of exhausting the - native debug-build stack (`--stack` can raise it deliberately); -* an external-link call form (`> [x](https://example.com)()`) is rejected with - `ref.unresolved`, the same code used for other unresolvable call targets. + native debug-build stack (`--stack` can raise it deliberately). + +The old link-form block-quote call (`> [x](https://example.com)()`) no longer +exists: a Markdown link is a static reference, so a call is now an ordinary +expression payload (`spec/references.md` §6.2). diff --git a/tests/conformance/semantics/01-constant-return.mq.md b/tests/conformance/semantics/01-constant-return.mq.md index 498dcf1..5556787 100644 --- a/tests/conformance/semantics/01-constant-return.mq.md +++ b/tests/conformance/semantics/01-constant-return.mq.md @@ -1,3 +1,3 @@ -## main +## @exec main -*1 + 2* +*return 1 + 2* diff --git a/tests/conformance/semantics/02-text-return.mq.md b/tests/conformance/semantics/02-text-return.mq.md index 18e6dff..1d3e642 100644 --- a/tests/conformance/semantics/02-text-return.mq.md +++ b/tests/conformance/semantics/02-text-return.mq.md @@ -1,3 +1,3 @@ -## main +## @exec main -*"你好,Marqdo"* +*return "你好,Marqdo"* diff --git a/tests/conformance/semantics/03-float-arithmetic.mq.md b/tests/conformance/semantics/03-float-arithmetic.mq.md index 49102be..0db7a0d 100644 --- a/tests/conformance/semantics/03-float-arithmetic.mq.md +++ b/tests/conformance/semantics/03-float-arithmetic.mq.md @@ -1,3 +1,3 @@ -## main +## @exec main -*1.5 * 2.0* +`return 1.5 * 2.0` diff --git a/tests/conformance/semantics/04-big-int-arithmetic.mq.md b/tests/conformance/semantics/04-big-int-arithmetic.mq.md index e65fc8b..eaeed7b 100644 --- a/tests/conformance/semantics/04-big-int-arithmetic.mq.md +++ b/tests/conformance/semantics/04-big-int-arithmetic.mq.md @@ -1,3 +1,3 @@ -## main +## @exec main -*123456789012345678901234567890 * 10* +`return 123456789012345678901234567890 * 10` diff --git a/tests/conformance/semantics/05-factorio-recursion.mq.md b/tests/conformance/semantics/05-factorio-recursion.mq.md index d189a3f..224f30e 100644 --- a/tests/conformance/semantics/05-factorio-recursion.mq.md +++ b/tests/conformance/semantics/05-factorio-recursion.mq.md @@ -1,13 +1,15 @@ -# 数学 +# @knowledge 数学 -## 阶乘 +## @exec 阶乘 -1. `n <= 1` +`if n <= 1` - *1* +`return 1` -2. `n > 1` +`else` - **结果 = n * 阶乘(n=n-1)** +`结果 = n * 阶乘(n=n-1)` - *结果* +`return 结果` + +`end` diff --git a/tests/conformance/semantics/06-fibonacci-recursion.mq.md b/tests/conformance/semantics/06-fibonacci-recursion.mq.md index 10cd4f0..2529568 100644 --- a/tests/conformance/semantics/06-fibonacci-recursion.mq.md +++ b/tests/conformance/semantics/06-fibonacci-recursion.mq.md @@ -1,11 +1,13 @@ -## 斐波那契 +## @exec 斐波那契 -1. `n < 2` +`if n < 2` - *n* +`return n` -2. `n >= 2` +`else` - **结果 = 斐波那契(n=n-1) + 斐波那契(n=n-2)** +`结果 = 斐波那契(n=n-1) + 斐波那契(n=n-2)` - *结果* +`return 结果` + +`end` diff --git a/tests/conformance/semantics/07-euclid-iterative.mq.md b/tests/conformance/semantics/07-euclid-iterative.mq.md index 4a59c95..ecf3d4c 100644 --- a/tests/conformance/semantics/07-euclid-iterative.mq.md +++ b/tests/conformance/semantics/07-euclid-iterative.mq.md @@ -1,15 +1,17 @@ -## 最大公约数 +## @exec 最大公约数 -**a = 甲** +`a = 甲` -**b = 乙** +`b = 乙` -- `b > 0` +`while b > 0` - **t = b** +`t = b` - **b = a % b** +`b = a % b` - **a = t** +`a = t` -*a* +`end` + +`return a` diff --git a/tests/conformance/semantics/08-loop-sum.mq.md b/tests/conformance/semantics/08-loop-sum.mq.md index 8d08130..ac8e472 100644 --- a/tests/conformance/semantics/08-loop-sum.mq.md +++ b/tests/conformance/semantics/08-loop-sum.mq.md @@ -1,13 +1,15 @@ -## 求和 +## @exec 求和 -**i = 1** +`i = 1` -**total = 0** +`total = 0` -- `i <= n` +`while i <= n` - **total = total + i** +`total = total + i` - **i = i + 1** +`i = i + 1` -*total* +`end` + +`return total` diff --git a/tests/conformance/semantics/09-nested-control-flow.mq.md b/tests/conformance/semantics/09-nested-control-flow.mq.md index 90a580b..ab41713 100644 --- a/tests/conformance/semantics/09-nested-control-flow.mq.md +++ b/tests/conformance/semantics/09-nested-control-flow.mq.md @@ -1,19 +1,23 @@ -## 嵌套 +## @exec 嵌套 **total = 0** -1. `n > 0` +`if n > 0` - **m = 3** +**m = 3** - - `m > 0` +`while m > 0` - **total = total + m** +**total = total + m** - **m = m - 1** +**m = m - 1** -2. `n <= 0` +`end` - **total = 0** +`else` -*total* +**total = 0** + +`end` + +*return total* diff --git a/tests/conformance/semantics/10-explicit-positional-signature.mq.md b/tests/conformance/semantics/10-explicit-positional-signature.mq.md index a43abd5..88af6f7 100644 --- a/tests/conformance/semantics/10-explicit-positional-signature.mq.md +++ b/tests/conformance/semantics/10-explicit-positional-signature.mq.md @@ -1,9 +1,9 @@ -## 加法 +## @exec 加法 -`(a: Int, b: Int)` +`params(a: Int, b: Int)` -*a + b* +`return a + b` -## main +## @exec main -*加法(2, 3)* +`return 加法(2, 3)` diff --git a/tests/conformance/semantics/11-default-parameters.mq.md b/tests/conformance/semantics/11-default-parameters.mq.md index eedcc83..ed44a52 100644 --- a/tests/conformance/semantics/11-default-parameters.mq.md +++ b/tests/conformance/semantics/11-default-parameters.mq.md @@ -1,9 +1,9 @@ -## 默认 +## @exec 默认 -`(x: Int, y: Int = 10)` +`params(x: Int, y: Int = 10)` -*x + y* +`return x + y` -## main +## @exec main -*默认(x=2)* +`return 默认(x=2)` diff --git a/tests/conformance/semantics/12-named-arguments.mq.md b/tests/conformance/semantics/12-named-arguments.mq.md index 93890a6..10c4998 100644 --- a/tests/conformance/semantics/12-named-arguments.mq.md +++ b/tests/conformance/semantics/12-named-arguments.mq.md @@ -1,9 +1,9 @@ -## 减法 +## @exec 减法 -`(a: Int, b: Int)` +`params(a: Int, b: Int)` -*a - b* +`return a - b` -## main +## @exec main -*减法(b=3, a=10)* +`return 减法(b=3, a=10)` diff --git a/tests/conformance/semantics/13-function-ref-call.mq.md b/tests/conformance/semantics/13-function-ref-call.mq.md index ab2611c..e56acb5 100644 --- a/tests/conformance/semantics/13-function-ref-call.mq.md +++ b/tests/conformance/semantics/13-function-ref-call.mq.md @@ -1,11 +1,11 @@ -## 加一 +## @exec 加一 -**n = n + 1** +`n = n + 1` -*n* +`return n` -## main +## @exec main -**f = ref("#加一")** +`f = ref("#加一")` -*f(n=41)* +`return f(n=41)` diff --git a/tests/conformance/semantics/14-function-ref-value.mq.md b/tests/conformance/semantics/14-function-ref-value.mq.md index 5ea20fa..e56876d 100644 --- a/tests/conformance/semantics/14-function-ref-value.mq.md +++ b/tests/conformance/semantics/14-function-ref-value.mq.md @@ -1,9 +1,9 @@ -## 加一 +## @exec 加一 -**n = n + 1** +`n = n + 1` -*n* +`return n` -## main +## @exec main -*ref("#加一")* +`return ref("#加一")` diff --git a/tests/conformance/semantics/15-string-builtins.mq.md b/tests/conformance/semantics/15-string-builtins.mq.md index fe040db..6b01af3 100644 --- a/tests/conformance/semantics/15-string-builtins.mq.md +++ b/tests/conformance/semantics/15-string-builtins.mq.md @@ -1,3 +1,3 @@ -## main +## @exec main -*{"长度": 长度("你好"), "文本": 文本(42)}* +`return {"长度": 长度("你好"), "文本": 文本(42)}` diff --git a/tests/conformance/semantics/16-int-builtins.mq.md b/tests/conformance/semantics/16-int-builtins.mq.md index d3fd99b..5630f46 100644 --- a/tests/conformance/semantics/16-int-builtins.mq.md +++ b/tests/conformance/semantics/16-int-builtins.mq.md @@ -1,3 +1,3 @@ -## main +## @exec main -*整数("40") + 整数(2.0)* +`return 整数("40") + 整数(2.0)` diff --git a/tests/conformance/semantics/17-float-builtins.mq.md b/tests/conformance/semantics/17-float-builtins.mq.md index 12f0171..d24cee5 100644 --- a/tests/conformance/semantics/17-float-builtins.mq.md +++ b/tests/conformance/semantics/17-float-builtins.mq.md @@ -1,3 +1,3 @@ -## main +## @exec main -*小数("1.5") * 小数("2")* +`return 小数("1.5") * 小数("2")` diff --git a/tests/conformance/semantics/18-table-builtin.mq.md b/tests/conformance/semantics/18-table-builtin.mq.md index c7b2f08..d47ea36 100644 --- a/tests/conformance/semantics/18-table-builtin.mq.md +++ b/tests/conformance/semantics/18-table-builtin.mq.md @@ -1,3 +1,3 @@ -## main +## @exec main -*表(["名称", "数量"], [["苹果", 42], ["梨", 7]])* +`return 表(["名称", "数量"], [["苹果", 42], ["梨", 7]])` diff --git a/tests/conformance/semantics/19-type-builtin.mq.md b/tests/conformance/semantics/19-type-builtin.mq.md index 3d9df6b..b92ffcf 100644 --- a/tests/conformance/semantics/19-type-builtin.mq.md +++ b/tests/conformance/semantics/19-type-builtin.mq.md @@ -1,3 +1,3 @@ -## main +## @exec main -*{"a": 类型(1), "b": 类型("x"), "c": 类型(None), "d": 类型(1.5)}* +`return {"a": 类型(1), "b": 类型("x"), "c": 类型(None), "d": 类型(1.5)}` diff --git a/tests/conformance/semantics/20-math-eval-ref.mq.md b/tests/conformance/semantics/20-math-eval-ref.mq.md index 478507f..360e71d 100644 --- a/tests/conformance/semantics/20-math-eval-ref.mq.md +++ b/tests/conformance/semantics/20-math-eval-ref.mq.md @@ -1,9 +1,9 @@ -## 公式 +## @knowledge 公式 $$ A = \pi r^2 $$ -## main +## @exec main -*math.eval(ref("#公式"), {"r": 2}, target="A")* +`return math.eval(ref("#公式"), {"r": 2}, target="A")` diff --git a/tests/conformance/semantics/21-math-eval-positional.mq.md b/tests/conformance/semantics/21-math-eval-positional.mq.md index e65c8d7..76938ae 100644 --- a/tests/conformance/semantics/21-math-eval-positional.mq.md +++ b/tests/conformance/semantics/21-math-eval-positional.mq.md @@ -1,9 +1,9 @@ -## 公式 +## @knowledge 公式 $$ A = r + 1 $$ -## main +## @exec main -*math.eval(ref("#公式"), {"r": 2}, target="A")* +`return math.eval(ref("#公式"), {"r": 2}, target="A")` diff --git a/tests/conformance/semantics/22-print-stdout.mq.md b/tests/conformance/semantics/22-print-stdout.mq.md index 13d2b87..d32633e 100644 --- a/tests/conformance/semantics/22-print-stdout.mq.md +++ b/tests/conformance/semantics/22-print-stdout.mq.md @@ -1,9 +1,9 @@ -## main +## @exec main -> 打印("你好") +> **打印("你好")** -> 打印(42) +> **打印(42)** -> 打印(2.5) +> **打印(2.5)** -*None* +`return None` diff --git a/tests/conformance/semantics/23-unit-fallthrough.mq.md b/tests/conformance/semantics/23-unit-fallthrough.mq.md index b3fcc03..da9581f 100644 --- a/tests/conformance/semantics/23-unit-fallthrough.mq.md +++ b/tests/conformance/semantics/23-unit-fallthrough.mq.md @@ -1,5 +1,5 @@ -## main +## @exec main -**x = 1** +`x = 1` -> 打印(x) +`打印(x)` diff --git a/tests/conformance/semantics/24-none-value.mq.md b/tests/conformance/semantics/24-none-value.mq.md index ddc878d..fc0210a 100644 --- a/tests/conformance/semantics/24-none-value.mq.md +++ b/tests/conformance/semantics/24-none-value.mq.md @@ -1,3 +1,3 @@ -## main +## @exec main -*None* +*return None* diff --git a/tests/conformance/semantics/25-bool-operators.mq.md b/tests/conformance/semantics/25-bool-operators.mq.md index 9ed3366..129a305 100644 --- a/tests/conformance/semantics/25-bool-operators.mq.md +++ b/tests/conformance/semantics/25-bool-operators.mq.md @@ -1,3 +1,3 @@ -## main +## @exec main -*(true and false) or (not false)* +`return (true and false) or (not false)` diff --git a/tests/conformance/semantics/26-mixed-comparison.mq.md b/tests/conformance/semantics/26-mixed-comparison.mq.md index 3f4cae3..26fb434 100644 --- a/tests/conformance/semantics/26-mixed-comparison.mq.md +++ b/tests/conformance/semantics/26-mixed-comparison.mq.md @@ -1,3 +1,3 @@ -## main +## @exec main -*(1 < 1.5) and (2.0 == 2) and not (1 != 1)* +`return (1 < 1.5) and (2.0 == 2) and not (1 != 1)` diff --git a/tests/conformance/semantics/27-floor-division-modulo.mq.md b/tests/conformance/semantics/27-floor-division-modulo.mq.md index ffabc09..79c0d05 100644 --- a/tests/conformance/semantics/27-floor-division-modulo.mq.md +++ b/tests/conformance/semantics/27-floor-division-modulo.mq.md @@ -1,3 +1,3 @@ -## main +## @exec main -*7 // 2 * 10 + 7 % 2* +`return 7 // 2 * 10 + 7 % 2` diff --git a/tests/conformance/semantics/28-index-and-member.mq.md b/tests/conformance/semantics/28-index-and-member.mq.md index c63f080..94bc1a2 100644 --- a/tests/conformance/semantics/28-index-and-member.mq.md +++ b/tests/conformance/semantics/28-index-and-member.mq.md @@ -1,3 +1,3 @@ -## main +## @exec main -*{"first": [10, 20, 30][0], "last": [10, 20, 30][-1], "text": "你好"[1], "member": {"a": 42}.a, "key": {"b": 2}["b"]}* +`return {"first": [10, 20, 30][0], "last": [10, 20, 30][-1], "text": "你好"[1], "member": {"a": 42}.a, "key": {"b": 2}["b"]}` diff --git a/tests/conformance/semantics/29-map-record-literal.mq.md b/tests/conformance/semantics/29-map-record-literal.mq.md index 4f0382a..c3cc7e5 100644 --- a/tests/conformance/semantics/29-map-record-literal.mq.md +++ b/tests/conformance/semantics/29-map-record-literal.mq.md @@ -1,3 +1,3 @@ -## main +## @exec main -*{"a": 1, "b": [true, None]}* +`return {"a": 1, "b": [true, None]}` diff --git a/tests/conformance/semantics/30-print-list-and-map.mq.md b/tests/conformance/semantics/30-print-list-and-map.mq.md index 91f1f86..18239f5 100644 --- a/tests/conformance/semantics/30-print-list-and-map.mq.md +++ b/tests/conformance/semantics/30-print-list-and-map.mq.md @@ -1,7 +1,7 @@ -## main +## @exec main -> 打印([1, 2, 3]) +> **打印([1, 2, 3])** -> 打印({"a": 1}) +> **打印({"a": 1})** -*None* +`return None` diff --git a/tests/conformance/semantics/31-string-concat.mq.md b/tests/conformance/semantics/31-string-concat.mq.md index 15dd111..1b4e882 100644 --- a/tests/conformance/semantics/31-string-concat.mq.md +++ b/tests/conformance/semantics/31-string-concat.mq.md @@ -1,3 +1,3 @@ -## main +## @exec main -*"你好" + "," + "世界"* +`return "你好" + "," + "世界"` diff --git a/tests/conformance/semantics/32-recursive-sum.mq.md b/tests/conformance/semantics/32-recursive-sum.mq.md index ea97945..13b1cbd 100644 --- a/tests/conformance/semantics/32-recursive-sum.mq.md +++ b/tests/conformance/semantics/32-recursive-sum.mq.md @@ -1,11 +1,13 @@ -## 递归和 +## @exec 递归和 -1. `n <= 0` +`if n <= 0` - *0* +`return 0` -2. `n > 0` +`else` - **结果 = n + 递归和(n=n-1)** +`结果 = n + 递归和(n=n-1)` - *结果* +`return 结果` + +`end` diff --git a/tests/conformance/semantics/33-conditional-return-in-loop.mq.md b/tests/conformance/semantics/33-conditional-return-in-loop.mq.md index 7847ae2..82c0f4f 100644 --- a/tests/conformance/semantics/33-conditional-return-in-loop.mq.md +++ b/tests/conformance/semantics/33-conditional-return-in-loop.mq.md @@ -1,9 +1,11 @@ -## 找平方 +## @exec 找平方 -**i = 0** +`i = 0` -- `i * i < target` +`while i * i < target` - **i = i + 1** +`i = i + 1` -*i * i* +`end` + +`return i * i` diff --git a/tests/conformance/semantics/34-elif-chain.mq.md b/tests/conformance/semantics/34-elif-chain.mq.md index 04734c5..df6567b 100644 --- a/tests/conformance/semantics/34-elif-chain.mq.md +++ b/tests/conformance/semantics/34-elif-chain.mq.md @@ -1,13 +1,23 @@ -## 符号 +## @exec 符号 -1. `n < 0` +`if n < 0` - *-1* +`return -1` -2. `n == 0` +`else` - *0* +`if n == 0` -3. `n > 0` +`return 0` - *1* +`else` + +`if n > 0` + +`return 1` + +`end` + +`end` + +`end` diff --git a/tests/conformance/semantics/35-default-and-named-mixed.mq.md b/tests/conformance/semantics/35-default-and-named-mixed.mq.md index d727ef4..cb41376 100644 --- a/tests/conformance/semantics/35-default-and-named-mixed.mq.md +++ b/tests/conformance/semantics/35-default-and-named-mixed.mq.md @@ -1,9 +1,9 @@ -## 混合 +## @exec 混合 -`(x: Int, y: Int = 5, z: Int = 1)` +`params(x: Int, y: Int = 5, z: Int = 1)` -*x * y + z* +`return x * y + z` -## main +## @exec main -*混合(x=2, z=3)* +`return 混合(x=2, z=3)` diff --git a/tests/conformance/semantics/36-foreign-call-python.mq.md b/tests/conformance/semantics/36-foreign-call-python.mq.md index 2f9f7bb..796b95f 100644 --- a/tests/conformance/semantics/36-foreign-call-python.mq.md +++ b/tests/conformance/semantics/36-foreign-call-python.mq.md @@ -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* +`return 结果.area` diff --git a/tests/conformance/semantics/37-power-right-associative.mq.md b/tests/conformance/semantics/37-power-right-associative.mq.md index b16c245..f296811 100644 --- a/tests/conformance/semantics/37-power-right-associative.mq.md +++ b/tests/conformance/semantics/37-power-right-associative.mq.md @@ -1,3 +1,3 @@ -## main +## @exec main -*`2 ** 3 ** 2`* +`return 2 ** 3 ** 2` diff --git a/tests/conformance/semantics/38-power-unary-minus.mq.md b/tests/conformance/semantics/38-power-unary-minus.mq.md index 4840b5f..130c584 100644 --- a/tests/conformance/semantics/38-power-unary-minus.mq.md +++ b/tests/conformance/semantics/38-power-unary-minus.mq.md @@ -1,3 +1,3 @@ -## main +## @exec main -*`-2 ** 2`* +`return -2 ** 2` diff --git a/tests/conformance/semantics/39-power-parenthesized.mq.md b/tests/conformance/semantics/39-power-parenthesized.mq.md index 8a8b305..de4eb1c 100644 --- a/tests/conformance/semantics/39-power-parenthesized.mq.md +++ b/tests/conformance/semantics/39-power-parenthesized.mq.md @@ -1,3 +1,3 @@ -## main +## @exec main -*`(-2) ** 2`* +`return (-2) ** 2` diff --git a/tests/conformance/semantics/40-power-float-negative-exponent.mq.md b/tests/conformance/semantics/40-power-float-negative-exponent.mq.md index 4c6277f..030fde2 100644 --- a/tests/conformance/semantics/40-power-float-negative-exponent.mq.md +++ b/tests/conformance/semantics/40-power-float-negative-exponent.mq.md @@ -1,3 +1,3 @@ -## main +## @exec main -*`2.0 ** -1`* +`return 2.0 ** -1` diff --git a/tests/conformance/semantics/41-power-strong-codespan.mq.md b/tests/conformance/semantics/41-power-strong-codespan.mq.md index 8963b32..4d6b28e 100644 --- a/tests/conformance/semantics/41-power-strong-codespan.mq.md +++ b/tests/conformance/semantics/41-power-strong-codespan.mq.md @@ -1,5 +1,5 @@ -## main +## @exec main **`n = 2 ** 3`** -*n* +*return n* diff --git a/tests/conformance/semantics/42-power-branch.mq.md b/tests/conformance/semantics/42-power-branch.mq.md index d109719..d0de0a9 100644 --- a/tests/conformance/semantics/42-power-branch.mq.md +++ b/tests/conformance/semantics/42-power-branch.mq.md @@ -1,11 +1,17 @@ -## main +## @exec main -**n = 2** +`n = 2` -1. `n ** 2 == 4`,正确分支的自然语言说明。 +`if n ** 2 == 4` - > print("乘方正确") +正确分支的自然语言说明。 -2. `n ** 2 != 4`,另一分支的说明。 +`print("乘方正确")` - > print("乘方错误") +`else` + +另一分支的说明。 + +`print("乘方错误")` + +`end` diff --git a/tests/conformance/semantics/43-power-loop.mq.md b/tests/conformance/semantics/43-power-loop.mq.md index 1b84d7e..a49f77f 100644 --- a/tests/conformance/semantics/43-power-loop.mq.md +++ b/tests/conformance/semantics/43-power-loop.mq.md @@ -1,11 +1,13 @@ -## main +## @exec main -**n = 0** +`n = 0` -**limit = 100** +`limit = 100` -- `n ** 2 < limit` +`while n ** 2 < limit` - **n = n + 1** +`n = n + 1` -*n* +`end` + +`return n` diff --git a/tests/conformance/semantics/44-inert-power-prose.mq.md b/tests/conformance/semantics/44-inert-power-prose.mq.md index 7b44d0e..bc0eb09 100644 --- a/tests/conformance/semantics/44-inert-power-prose.mq.md +++ b/tests/conformance/semantics/44-inert-power-prose.mq.md @@ -1,11 +1,11 @@ -## main +## @exec main -正文里的 `2 ** 3` 不会执行。 +正文里的 2 ** 3 不会执行。 ```text 2 ** 3 ``` -**x = 1** +`x = 1` -*x* +`return x` diff --git a/tests/conformance/semantics/45-memory-buffer.expected.json b/tests/conformance/semantics/45-memory-buffer.expected.json index a292b48..66e69b6 100644 --- a/tests/conformance/semantics/45-memory-buffer.expected.json +++ b/tests/conformance/semantics/45-memory-buffer.expected.json @@ -3,7 +3,7 @@ "function": "main", "stdout": "", "value": { - "type": "int", - "decimal": "141" + "decimal": "141", + "type": "int" } } diff --git a/tests/conformance/semantics/45-memory-buffer.mq.md b/tests/conformance/semantics/45-memory-buffer.mq.md index e3c4cdf..b2a98ad 100644 --- a/tests/conformance/semantics/45-memory-buffer.mq.md +++ b/tests/conformance/semantics/45-memory-buffer.mq.md @@ -1,4 +1,4 @@ -## main +## @exec main This function demonstrates an addressable byte region next to ordinary prose. A copied name shares the same region identity. @@ -11,4 +11,4 @@ A copied name shares the same region identity. **`另一个名字[9] = 99`** -*区域[8] + 区域[9]* +*return 区域[8] + 区域[9]* diff --git a/tests/conformance/semantics/46-memory-grow-zero-fill.expected.json b/tests/conformance/semantics/46-memory-grow-zero-fill.expected.json index cb23ed3..f0068f5 100644 --- a/tests/conformance/semantics/46-memory-grow-zero-fill.expected.json +++ b/tests/conformance/semantics/46-memory-grow-zero-fill.expected.json @@ -3,12 +3,24 @@ "function": "main", "stdout": "", "value": { - "type": "list", "items": [ - {"type": "int", "decimal": "0"}, - {"type": "int", "decimal": "1"}, - {"type": "int", "decimal": "9"}, - {"type": "int", "decimal": "0"} - ] + { + "decimal": "0", + "type": "int" + }, + { + "decimal": "1", + "type": "int" + }, + { + "decimal": "9", + "type": "int" + }, + { + "decimal": "0", + "type": "int" + } + ], + "type": "list" } } diff --git a/tests/conformance/semantics/46-memory-grow-zero-fill.mq.md b/tests/conformance/semantics/46-memory-grow-zero-fill.mq.md index 0b578ac..447cf2d 100644 --- a/tests/conformance/semantics/46-memory-grow-zero-fill.mq.md +++ b/tests/conformance/semantics/46-memory-grow-zero-fill.mq.md @@ -1,14 +1,14 @@ -## main +## @exec main A zero-page region is legal. Growing it returns the previous page count, preserves old bytes and zero-fills every new byte. -**内存 = memory.new(0, 2)** +`内存 = memory.new(0, 2)` -**旧页数 = memory.grow(内存, 1)** +`旧页数 = memory.grow(内存, 1)` -**内存[0] = 9** +`内存[0] = 9` -**页数 = memory.size(内存)** +`页数 = memory.size(内存)` -*[旧页数, 页数, 内存[0], 内存[65535]]* +`return [旧页数, 页数, 内存[0], 内存[65535]]` diff --git a/tests/conformance/semantics/47-memory-isolation-and-alias.expected.json b/tests/conformance/semantics/47-memory-isolation-and-alias.expected.json index ec21dec..2f86634 100644 --- a/tests/conformance/semantics/47-memory-isolation-and-alias.expected.json +++ b/tests/conformance/semantics/47-memory-isolation-and-alias.expected.json @@ -3,13 +3,28 @@ "function": "main", "stdout": "", "value": { - "type": "list", "items": [ - {"type": "int", "decimal": "5"}, - {"type": "int", "decimal": "6"}, - {"type": "int", "decimal": "7"}, - {"type": "bool", "value": true}, - {"type": "bool", "value": false} - ] + { + "decimal": "5", + "type": "int" + }, + { + "decimal": "6", + "type": "int" + }, + { + "decimal": "7", + "type": "int" + }, + { + "type": "bool", + "value": true + }, + { + "type": "bool", + "value": false + } + ], + "type": "list" } } diff --git a/tests/conformance/semantics/47-memory-isolation-and-alias.mq.md b/tests/conformance/semantics/47-memory-isolation-and-alias.mq.md index 9bca1cd..9c3cc30 100644 --- a/tests/conformance/semantics/47-memory-isolation-and-alias.mq.md +++ b/tests/conformance/semantics/47-memory-isolation-and-alias.mq.md @@ -1,4 +1,4 @@ -## main +## @exec main Two regions never alias even at the same offset. A copied name does share the region identity, and equality compares that identity, not the bytes. @@ -15,4 +15,4 @@ the region identity, and equality compares that identity, not the bytes. **`别名[1] = 7`** -*[甲[0], 乙[0], 甲[1], 甲 == 别名, 甲 == 乙]* +*return [甲[0], 乙[0], 甲[1], 甲 == 别名, 甲 == 乙]* diff --git a/tests/conformance/semantics/48-memory-bump-allocator.expected.json b/tests/conformance/semantics/48-memory-bump-allocator.expected.json index fe2da8b..9444476 100644 --- a/tests/conformance/semantics/48-memory-bump-allocator.expected.json +++ b/tests/conformance/semantics/48-memory-bump-allocator.expected.json @@ -3,13 +3,28 @@ "function": "main", "stdout": "", "value": { - "type": "list", "items": [ - {"type": "int", "decimal": "4"}, - {"type": "int", "decimal": "12"}, - {"type": "int", "decimal": "28"}, - {"type": "int", "decimal": "36"}, - {"type": "int", "decimal": "255"} - ] + { + "decimal": "4", + "type": "int" + }, + { + "decimal": "12", + "type": "int" + }, + { + "decimal": "28", + "type": "int" + }, + { + "decimal": "36", + "type": "int" + }, + { + "decimal": "255", + "type": "int" + } + ], + "type": "list" } } diff --git a/tests/conformance/semantics/48-memory-bump-allocator.mq.md b/tests/conformance/semantics/48-memory-bump-allocator.mq.md index ba8fc45..624c518 100644 --- a/tests/conformance/semantics/48-memory-bump-allocator.mq.md +++ b/tests/conformance/semantics/48-memory-bump-allocator.mq.md @@ -1,72 +1,74 @@ -## 写32 +## @exec 写32 -`(内存, 基址, 值)` +`params(内存: Memory, 基址: Int, 值: Int)` 把非负 Int 的低 32 位按大端字节写入区域。 -**字节3 = 值 % 256** +`字节3 = 值 % 256` -**字节2 = 值 // 256 % 256** +`字节2 = 值 // 256 % 256` -**字节1 = 值 // 65536 % 256** +`字节1 = 值 // 65536 % 256` -**字节0 = 值 // 16777216 % 256** +`字节0 = 值 // 16777216 % 256` -**`内存[基址] = 字节0`** +`内存[基址] = 字节0` -**`内存[基址 + 1] = 字节1`** +`内存[基址 + 1] = 字节1` -**`内存[基址 + 2] = 字节2`** +`内存[基址 + 2] = 字节2` -**`内存[基址 + 3] = 字节3`** +`内存[基址 + 3] = 字节3` -*None* +`return None` -## 读32 +## @exec 读32 -`(内存, 基址)` +`params(内存: Memory, 基址: Int)` 同样按大端读取四个字节。 -*内存[基址] * 16777216 + 内存[基址 + 1] * 65536 + 内存[基址 + 2] * 256 + 内存[基址 + 3]* +`return 内存[基址] * 16777216 + 内存[基址 + 1] * 65536 + 内存[基址 + 2] * 256 + 内存[基址 + 3]` -## 分配 +## @exec 分配 -`(内存, 容量, 大小)` +`params(内存: Memory, 容量: Int, 大小: Int)` 区域头四个字节保存下一个空闲偏移。这是顺序分配器:free 只把块交还给调用方, 不在这里实现复用。 -**当前位置 = 读32(内存, 0)** +`当前位置 = 读32(内存, 0)` -1. `当前位置 + 大小 <= 容量` +`if 当前位置 + 大小 <= 容量` - > 写32(内存, 0, 当前位置 + 大小) +`写32(内存, 0, 当前位置 + 大小)` - *当前位置* +`return 当前位置` -2. `true` +`else` - *None* +`return None` -## main +`end` -**内存 = memory.new(1, 1)** +## @exec main -**`内存[0] = 0`** +`内存 = memory.new(1, 1)` -**`内存[1] = 0`** +`内存[0] = 0` -**`内存[2] = 0`** +`内存[1] = 0` -**`内存[3] = 4`** +`内存[2] = 0` -**第一个 = 分配(内存, 65536, 8)** +`内存[3] = 4` -**第二个 = 分配(内存, 65536, 16)** +`第一个 = 分配(内存, 65536, 8)` -**第三个 = 分配(内存, 65536, 8)** +`第二个 = 分配(内存, 65536, 16)` -**`内存[第一个] = 255`** +`第三个 = 分配(内存, 65536, 8)` -*[第一个, 第二个, 第三个, 读32(内存, 0), 内存[第一个]]* +`内存[第一个] = 255` + +`return [第一个, 第二个, 第三个, 读32(内存, 0), 内存[第一个]]` diff --git a/tests/conformance/semantics/49-memory-linked-list.expected.json b/tests/conformance/semantics/49-memory-linked-list.expected.json index dafd343..0009601 100644 --- a/tests/conformance/semantics/49-memory-linked-list.expected.json +++ b/tests/conformance/semantics/49-memory-linked-list.expected.json @@ -3,12 +3,24 @@ "function": "main", "stdout": "", "value": { - "type": "list", "items": [ - {"type": "int", "decimal": "4"}, - {"type": "int", "decimal": "12"}, - {"type": "int", "decimal": "20"}, - {"type": "int", "decimal": "60"} - ] + { + "decimal": "4", + "type": "int" + }, + { + "decimal": "12", + "type": "int" + }, + { + "decimal": "20", + "type": "int" + }, + { + "decimal": "60", + "type": "int" + } + ], + "type": "list" } } diff --git a/tests/conformance/semantics/49-memory-linked-list.mq.md b/tests/conformance/semantics/49-memory-linked-list.mq.md index 83d176b..27a93bc 100644 --- a/tests/conformance/semantics/49-memory-linked-list.mq.md +++ b/tests/conformance/semantics/49-memory-linked-list.mq.md @@ -1,93 +1,97 @@ -## 写32 +## @exec 写32 -`(内存, 基址, 值)` +`params(内存: Memory, 基址: Int, 值: Int)` -**字节3 = 值 % 256** +`字节3 = 值 % 256` -**字节2 = 值 // 256 % 256** +`字节2 = 值 // 256 % 256` -**字节1 = 值 // 65536 % 256** +`字节1 = 值 // 65536 % 256` -**字节0 = 值 // 16777216 % 256** +`字节0 = 值 // 16777216 % 256` -**`内存[基址] = 字节0`** +`内存[基址] = 字节0` -**`内存[基址 + 1] = 字节1`** +`内存[基址 + 1] = 字节1` -**`内存[基址 + 2] = 字节2`** +`内存[基址 + 2] = 字节2` -**`内存[基址 + 3] = 字节3`** +`内存[基址 + 3] = 字节3` -*None* +`return None` -## 读32 +## @exec 读32 -`(内存, 基址)` +`params(内存: Memory, 基址: Int)` -*内存[基址] * 16777216 + 内存[基址 + 1] * 65536 + 内存[基址 + 2] * 256 + 内存[基址 + 3]* +`return 内存[基址] * 16777216 + 内存[基址 + 1] * 65536 + 内存[基址 + 2] * 256 + 内存[基址 + 3]` -## 分配 +## @exec 分配 -`(内存, 容量, 大小)` +`params(内存: Memory, 容量: Int, 大小: Int)` -**当前位置 = 读32(内存, 0)** +`当前位置 = 读32(内存, 0)` -1. `当前位置 + 大小 <= 容量` +`if 当前位置 + 大小 <= 容量` - > 写32(内存, 0, 当前位置 + 大小) +`写32(内存, 0, 当前位置 + 大小)` - *当前位置* +`return 当前位置` -2. `true` +`else` - *None* +`return None` -## 节点 +`end` -`(内存, 值, 下一个)` +## @exec 节点 + +`params(内存: Memory, 值: Int, 下一个: Int)` 节点是 8 字节块:偏移 0 存一个字节的值,偏移 1..4 存 next 偏移;0 表示空。 -**地址 = 分配(内存, 65536, 8)** +`地址 = 分配(内存, 65536, 8)` -**`内存[地址] = 值`** +`内存[地址] = 值` -> 写32(内存, 地址 + 1, 下一个) +`写32(内存, 地址 + 1, 下一个)` -*地址* +`return 地址` -## 遍历求和 +## @exec 遍历求和 -`(内存, 头)` +`params(内存: Memory, 头: Int)` -**当前 = 头** +`当前 = 头` -**总和 = 0** +`总和 = 0` -- `当前 != 0` +`while 当前 != 0` - **总和 = 总和 + 内存[当前]** +`总和 = 总和 + 内存[当前]` - **当前 = 读32(内存, 当前 + 1)** +`当前 = 读32(内存, 当前 + 1)` -*总和* +`end` -## main +`return 总和` -**内存 = memory.new(1, 1)** +## @exec main -**`内存[0] = 0`** +`内存 = memory.new(1, 1)` -**`内存[1] = 0`** +`内存[0] = 0` -**`内存[2] = 0`** +`内存[1] = 0` -**`内存[3] = 4`** +`内存[2] = 0` -**甲 = 节点(内存, 10, 0)** +`内存[3] = 4` -**乙 = 节点(内存, 20, 甲)** +`甲 = 节点(内存, 10, 0)` -**丙 = 节点(内存, 30, 乙)** +`乙 = 节点(内存, 20, 甲)` -*[甲, 乙, 丙, 遍历求和(内存, 丙)]* +`丙 = 节点(内存, 30, 乙)` + +`return [甲, 乙, 丙, 遍历求和(内存, 丙)]` diff --git a/tests/conformance/semantics/50-memory-allocation-failure-atomic.expected.json b/tests/conformance/semantics/50-memory-allocation-failure-atomic.expected.json index d9d017e..a5a0f0f 100644 --- a/tests/conformance/semantics/50-memory-allocation-failure-atomic.expected.json +++ b/tests/conformance/semantics/50-memory-allocation-failure-atomic.expected.json @@ -3,12 +3,23 @@ "function": "main", "stdout": "", "value": { - "type": "list", "items": [ - {"type": "none"}, - {"type": "int", "decimal": "4"}, - {"type": "int", "decimal": "4"}, - {"type": "int", "decimal": "65536"} - ] + { + "type": "none" + }, + { + "decimal": "4", + "type": "int" + }, + { + "decimal": "4", + "type": "int" + }, + { + "decimal": "65536", + "type": "int" + } + ], + "type": "list" } } diff --git a/tests/conformance/semantics/50-memory-allocation-failure-atomic.mq.md b/tests/conformance/semantics/50-memory-allocation-failure-atomic.mq.md index 7833c61..f77d6ba 100644 --- a/tests/conformance/semantics/50-memory-allocation-failure-atomic.mq.md +++ b/tests/conformance/semantics/50-memory-allocation-failure-atomic.mq.md @@ -1,67 +1,69 @@ -## 写32 +## @exec 写32 -`(内存, 基址, 值)` +`params(内存: Memory, 基址: Int, 值: Int)` -**字节3 = 值 % 256** +`字节3 = 值 % 256` -**字节2 = 值 // 256 % 256** +`字节2 = 值 // 256 % 256` -**字节1 = 值 // 65536 % 256** +`字节1 = 值 // 65536 % 256` -**字节0 = 值 // 16777216 % 256** +`字节0 = 值 // 16777216 % 256` -**`内存[基址] = 字节0`** +`内存[基址] = 字节0` -**`内存[基址 + 1] = 字节1`** +`内存[基址 + 1] = 字节1` -**`内存[基址 + 2] = 字节2`** +`内存[基址 + 2] = 字节2` -**`内存[基址 + 3] = 字节3`** +`内存[基址 + 3] = 字节3` -*None* +`return None` -## 读32 +## @exec 读32 -`(内存, 基址)` +`params(内存: Memory, 基址: Int)` -*内存[基址] * 16777216 + 内存[基址 + 1] * 65536 + 内存[基址 + 2] * 256 + 内存[基址 + 3]* +`return 内存[基址] * 16777216 + 内存[基址 + 1] * 65536 + 内存[基址 + 2] * 256 + 内存[基址 + 3]` -## 分配 +## @exec 分配 -`(内存, 容量, 大小)` +`params(内存: Memory, 容量: Int, 大小: Int)` -**当前位置 = 读32(内存, 0)** +`当前位置 = 读32(内存, 0)` -1. `当前位置 + 大小 <= 容量` +`if 当前位置 + 大小 <= 容量` - > 写32(内存, 0, 当前位置 + 大小) +`写32(内存, 0, 当前位置 + 大小)` - *当前位置* +`return 当前位置` -2. `true` +`else` - *None* +`return None` -## main +`end` + +## @exec main 分配失败必须保持区域头不变,之后的分配仍从原位置继续。 -**内存 = memory.new(1, 1)** +`内存 = memory.new(1, 1)` -**`内存[0] = 0`** +`内存[0] = 0` -**`内存[1] = 0`** +`内存[1] = 0` -**`内存[2] = 0`** +`内存[2] = 0` -**`内存[3] = 4`** +`内存[3] = 4` -**失败 = 分配(内存, 65536, 65536)** +`失败 = 分配(内存, 65536, 65536)` -**失败后位置 = 读32(内存, 0)** +`失败后位置 = 读32(内存, 0)` -**成功 = 分配(内存, 65536, 65532)** +`成功 = 分配(内存, 65536, 65532)` -**最终位置 = 读32(内存, 0)** +`最终位置 = 读32(内存, 0)` -*[失败, 失败后位置, 成功, 最终位置]* +`return [失败, 失败后位置, 成功, 最终位置]` diff --git a/tests/conformance/semantics/51-list-map-value-semantics.expected.json b/tests/conformance/semantics/51-list-map-value-semantics.expected.json index 77e76ad..d7bcdd2 100644 --- a/tests/conformance/semantics/51-list-map-value-semantics.expected.json +++ b/tests/conformance/semantics/51-list-map-value-semantics.expected.json @@ -3,43 +3,87 @@ "function": "main", "stdout": "", "value": { - "type": "list", "items": [ { - "type": "list", "items": [ - {"type": "int", "decimal": "1"}, - {"type": "int", "decimal": "2"} - ] + { + "decimal": "1", + "type": "int" + }, + { + "decimal": "2", + "type": "int" + } + ], + "type": "list" }, { - "type": "list", "items": [ - {"type": "int", "decimal": "1"}, - {"type": "int", "decimal": "2"}, - {"type": "int", "decimal": "3"} - ] + { + "decimal": "1", + "type": "int" + }, + { + "decimal": "2", + "type": "int" + }, + { + "decimal": "3", + "type": "int" + } + ], + "type": "list" }, - {"type": "int", "decimal": "2"}, - {"type": "int", "decimal": "2"}, - {"type": "int", "decimal": "2"}, { - "type": "list", - "items": [ - {"type": "text", "value": "b"}, - {"type": "text", "value": "c"} - ] + "decimal": "2", + "type": "int" + }, + { + "decimal": "2", + "type": "int" + }, + { + "decimal": "2", + "type": "int" }, - {"type": "bool", "value": false}, - {"type": "none"}, { - "type": "list", "items": [ - {"type": "int", "decimal": "1"}, - {"type": "int", "decimal": "2"}, - {"type": "int", "decimal": "3"} - ] + { + "type": "text", + "value": "b" + }, + { + "type": "text", + "value": "c" + } + ], + "type": "list" + }, + { + "type": "bool", + "value": false + }, + { + "type": "none" + }, + { + "items": [ + { + "decimal": "1", + "type": "int" + }, + { + "decimal": "2", + "type": "int" + }, + { + "decimal": "3", + "type": "int" + } + ], + "type": "list" } - ] + ], + "type": "list" } } diff --git a/tests/conformance/semantics/51-list-map-value-semantics.mq.md b/tests/conformance/semantics/51-list-map-value-semantics.mq.md index e5cba46..96613d2 100644 --- a/tests/conformance/semantics/51-list-map-value-semantics.mq.md +++ b/tests/conformance/semantics/51-list-map-value-semantics.mq.md @@ -1,18 +1,18 @@ -## main +## @exec main Lists and maps keep value semantics: constructors return new values and the inputs are unchanged. -**原列表 = [1, 2]** +`原列表 = [1, 2]` -**新列表 = list.append(原列表, 3)** +`新列表 = list.append(原列表, 3)` -**原映射 = {a: 1, b: 2}** +`原映射 = {a: 1, b: 2}` -**新映射 = map.set(原映射, "c", 3)** +`新映射 = map.set(原映射, "c", 3)` -**删除后 = map.remove(新映射, "a")** +`删除后 = map.remove(新映射, "a")` -**键 = map.keys(删除后)** +`键 = map.keys(删除后)` -*[原列表, 新列表, 原映射.b, 新映射.b, 删除后.b, 键, map.has(原映射, "c"), map.get(原映射, "z"), list.concat([1], [2, 3])]* +`return [原列表, 新列表, 原映射.b, 新映射.b, 删除后.b, 键, map.has(原映射, "c"), map.get(原映射, "z"), list.concat([1], [2, 3])]` diff --git a/tests/conformance/semantics/52-text-codepoints.expected.json b/tests/conformance/semantics/52-text-codepoints.expected.json index 87fe67a..af60ebb 100644 --- a/tests/conformance/semantics/52-text-codepoints.expected.json +++ b/tests/conformance/semantics/52-text-codepoints.expected.json @@ -3,20 +3,39 @@ "function": "main", "stdout": "", "value": { - "type": "list", "items": [ { - "type": "list", "items": [ - {"type": "int", "decimal": "97"}, - {"type": "int", "decimal": "233"}, - {"type": "int", "decimal": "20013"} - ] + { + "decimal": "97", + "type": "int" + }, + { + "decimal": "233", + "type": "int" + }, + { + "decimal": "20013", + "type": "int" + } + ], + "type": "list" }, - {"type": "text", "value": "中"}, - {"type": "none"}, - {"type": "none"}, - {"type": "int", "decimal": "1"} - ] + { + "type": "text", + "value": "中" + }, + { + "type": "none" + }, + { + "type": "none" + }, + { + "decimal": "1", + "type": "int" + } + ], + "type": "list" } } diff --git a/tests/conformance/semantics/52-text-codepoints.mq.md b/tests/conformance/semantics/52-text-codepoints.mq.md index f33a70c..fc64f3b 100644 --- a/tests/conformance/semantics/52-text-codepoints.mq.md +++ b/tests/conformance/semantics/52-text-codepoints.mq.md @@ -1,7 +1,7 @@ -## main +## @exec main -**点 = text.codepoints("aé中")** +`点 = text.codepoints("aé中")` -**回 = text.from_codepoint(20013)** +`回 = text.from_codepoint(20013)` -*[点, 回, text.from_codepoint(55296), text.from_codepoint(1114112), 长度(回)]* +`return [点, 回, text.from_codepoint(55296), text.from_codepoint(1114112), 长度(回)]` diff --git a/tests/conformance/semantics/53-table-projection.expected.json b/tests/conformance/semantics/53-table-projection.expected.json index 4ebc8f9..0bda8eb 100644 --- a/tests/conformance/semantics/53-table-projection.expected.json +++ b/tests/conformance/semantics/53-table-projection.expected.json @@ -3,24 +3,42 @@ "function": "main", "stdout": "", "value": { - "type": "list", "items": [ { - "type": "list", "items": [ - {"type": "text", "value": "名称"}, - {"type": "text", "value": "分数"} - ] + { + "type": "text", + "value": "名称" + }, + { + "type": "text", + "value": "分数" + } + ], + "type": "list" }, { - "type": "list", "items": [ - {"type": "text", "value": "乙"}, - {"type": "int", "decimal": "92"} - ] + { + "type": "text", + "value": "乙" + }, + { + "decimal": "92", + "type": "int" + } + ], + "type": "list" }, - {"type": "int", "decimal": "87"}, - {"type": "int", "decimal": "2"} - ] + { + "decimal": "87", + "type": "int" + }, + { + "decimal": "2", + "type": "int" + } + ], + "type": "list" } } diff --git a/tests/conformance/semantics/53-table-projection.mq.md b/tests/conformance/semantics/53-table-projection.mq.md index 2de5f6b..87c0a5e 100644 --- a/tests/conformance/semantics/53-table-projection.mq.md +++ b/tests/conformance/semantics/53-table-projection.mq.md @@ -1,5 +1,5 @@ -## main +## @exec main -**数据 = 表(["名称", "分数"], [["甲", 87], ["乙", 92]])** +`数据 = 表(["名称", "分数"], [["甲", 87], ["乙", 92]])` -*[table.columns(数据), table.row(数据, 1), table.cell(数据, 0, 1), 长度(数据)]* +`return [table.columns(数据), table.row(数据, 1), table.cell(数据, 0, 1), 长度(数据)]` diff --git a/tests/conformance/semantics/54-table-filter-stdlib.expected.json b/tests/conformance/semantics/54-table-filter-stdlib.expected.json index 83bd221..58ad363 100644 --- a/tests/conformance/semantics/54-table-filter-stdlib.expected.json +++ b/tests/conformance/semantics/54-table-filter-stdlib.expected.json @@ -3,40 +3,76 @@ "function": "main", "stdout": "", "value": { - "type": "list", "items": [ { - "type": "table", - "header": ["名称", "分数"], + "header": [ + "名称", + "分数" + ], "rows": [ [ - {"type": "text", "value": "甲"}, - {"type": "int", "decimal": "87"} + { + "type": "text", + "value": "甲" + }, + { + "decimal": "87", + "type": "int" + } ], [ - {"type": "text", "value": "乙"}, - {"type": "int", "decimal": "92"} + { + "type": "text", + "value": "乙" + }, + { + "decimal": "92", + "type": "int" + } ], [ - {"type": "text", "value": "丙"}, - {"type": "int", "decimal": "71"} + { + "type": "text", + "value": "丙" + }, + { + "decimal": "71", + "type": "int" + } ] - ] + ], + "type": "table" }, { - "type": "table", - "header": ["名称", "分数"], + "header": [ + "名称", + "分数" + ], "rows": [ [ - {"type": "text", "value": "甲"}, - {"type": "int", "decimal": "87"} + { + "type": "text", + "value": "甲" + }, + { + "decimal": "87", + "type": "int" + } ], [ - {"type": "text", "value": "乙"}, - {"type": "int", "decimal": "92"} + { + "type": "text", + "value": "乙" + }, + { + "decimal": "92", + "type": "int" + } ] - ] + ], + "type": "table" } - ] + ], + "type": "list" } } diff --git a/tests/conformance/semantics/54-table-filter-stdlib.mq.md b/tests/conformance/semantics/54-table-filter-stdlib.mq.md index 684396a..69c15dc 100644 --- a/tests/conformance/semantics/54-table-filter-stdlib.mq.md +++ b/tests/conformance/semantics/54-table-filter-stdlib.mq.md @@ -1,31 +1,35 @@ -## 过滤 +## @exec 过滤 -`(数据, 阈值)` +`params(数据: Table, 阈值: Int)` 只用 table 观察原语和 list 构造原语重建一个新表;输入表不被修改。 -**列 = table.columns(数据)** +`列 = table.columns(数据)` -**结果行 = []** +`结果行 = []` -**行号 = 0** +`行号 = 0` -- `行号 < 长度(数据)` +`while 行号 < 长度(数据)` - **分数 = table.cell(数据, 行号, 1)** +`分数 = table.cell(数据, 行号, 1)` - 1. `分数 > 阈值` +`if 分数 > 阈值` - **结果行 = list.append(结果行, table.row(数据, 行号))** +`结果行 = list.append(结果行, table.row(数据, 行号))` - **行号 = 行号 + 1** +`end` -*表(列, 结果行)* +`行号 = 行号 + 1` -## main +`end` -**原表 = 表(["名称", "分数"], [["甲", 87], ["乙", 92], ["丙", 71]])** +`return 表(列, 结果行)` -**结果 = 过滤(原表, 80)** +## @exec main -*[原表, 结果]* +`原表 = 表(["名称", "分数"], [["甲", 87], ["乙", 92], ["丙", 71]])` + +`结果 = 过滤(原表, 80)` + +`return [原表, 结果]` diff --git a/tests/conformance/semantics/55-first-fit-free-list-allocator.mq.md b/tests/conformance/semantics/55-first-fit-free-list-allocator.mq.md index d1d34e7..c1b6571 100644 --- a/tests/conformance/semantics/55-first-fit-free-list-allocator.mq.md +++ b/tests/conformance/semantics/55-first-fit-free-list-allocator.mq.md @@ -1,338 +1,368 @@ -## 写32 +## @exec 写32 -`(内存, 基址, 值)` +`params(内存: Memory, 基址: Int, 值: Int)` -**字节3 = 值 % 256** +`字节3 = 值 % 256` -**字节2 = 值 // 256 % 256** +`字节2 = 值 // 256 % 256` -**字节1 = 值 // 65536 % 256** +`字节1 = 值 // 65536 % 256` -**字节0 = 值 // 16777216 % 256** +`字节0 = 值 // 16777216 % 256` -**`内存[基址] = 字节0`** +`内存[基址] = 字节0` -**`内存[基址 + 1] = 字节1`** +`内存[基址 + 1] = 字节1` -**`内存[基址 + 2] = 字节2`** +`内存[基址 + 2] = 字节2` -**`内存[基址 + 3] = 字节3`** +`内存[基址 + 3] = 字节3` -*None* +`return None` -## 读32 +## @exec 读32 -`(内存, 基址)` +`params(内存: Memory, 基址: Int)` -*内存[基址] * 16777216 + 内存[基址 + 1] * 65536 + 内存[基址 + 2] * 256 + 内存[基址 + 3]* +`return 内存[基址] * 16777216 + 内存[基址 + 1] * 65536 + 内存[基址 + 2] * 256 + 内存[基址 + 3]` -## 成功 +## @exec 成功 -`(值)` +`params(值)` -*{ok: true, value: 值}* +`return {ok: true, value: 值}` -## 失败 +## @exec 失败 -`(代码, 消息)` +`params(代码, 消息)` -*{ok: false, code: 代码, message: 消息}* +`return {ok: false, code: 代码, message: 消息}` -## 初始化 +## @exec 初始化 -`(内存)` +`params(内存: Memory)` 区域头:偏移 0 是空闲链表头,偏移 4 是 bump 指针;首个块从 8 开始。 -> 写32(内存, 0, 0) +`写32(内存, 0, 0)` -> 写32(内存, 4, 8) +`写32(内存, 4, 8)` -*成功(None)* +`return 成功(None)` -## 查找 +## @exec 查找 -`(内存, 需求)` +`params(内存: Memory, 需求: Int)` -返回 `[前一个空闲块, 当前空闲块, 当前块大小]`;没有合适块时返回零值。 +返回 [前一个空闲块, 当前空闲块, 当前块大小];没有合适块时返回零值。 -**前一个 = 0** +`前一个 = 0` -**当前 = 读32(内存, 0)** +`当前 = 读32(内存, 0)` -- `当前 != 0` +`while 当前 != 0` - **块大小 = 读32(内存, 当前)** +`块大小 = 读32(内存, 当前)` - 1. `块大小 >= 需求` +`if 块大小 >= 需求` - *[前一个, 当前, 块大小]* +`return [前一个, 当前, 块大小]` - **前一个 = 当前** +`end` - **当前 = 读32(内存, 当前 + 4)** +`前一个 = 当前` -*[0, 0, 0]* +`当前 = 读32(内存, 当前 + 4)` -## 分配 +`end` -`(内存, 容量, 请求大小)` +`return [0, 0, 0]` + +## @exec 分配 + +`params(内存: Memory, 容量: Int, 请求大小: Int)` first-fit:先查空闲链表,必要时切分;否则从 bump 指针处取新块。 块头 8 字节:偏移 0 是总块大小,偏移 4 是空闲链表 next。返回 payload 偏移。 -**需求 = (请求大小 + 8 + 7) // 8 * 8** +`需求 = (请求大小 + 8 + 7) // 8 * 8` -**位置 = 查找(内存, 需求)** +`位置 = 查找(内存, 需求)` -**前一个 = 位置[0]** +`前一个 = 位置[0]` -**当前 = 位置[1]** +`当前 = 位置[1]` -**块大小 = 位置[2]** +`块大小 = 位置[2]` -1. `当前 != 0` +`if 当前 != 0` - **余量 = 块大小 - 需求** +`余量 = 块大小 - 需求` - **下一个 = 读32(内存, 当前 + 4)** +`下一个 = 读32(内存, 当前 + 4)` - 1. `余量 >= 16` +`if 余量 >= 16` - **余块 = 当前 + 需求** +`余块 = 当前 + 需求` - > 写32(内存, 余块, 余量) +`写32(内存, 余块, 余量)` - > 写32(内存, 余块 + 4, 下一个) +`写32(内存, 余块 + 4, 下一个)` - 1. `前一个 == 0` +`if 前一个 == 0` - > 写32(内存, 0, 余块) +`写32(内存, 0, 余块)` - 2. `true` +`else` - > 写32(内存, 前一个 + 4, 余块) +`写32(内存, 前一个 + 4, 余块)` - > 写32(内存, 当前, 需求) +`end` - *成功(当前 + 8)* +`写32(内存, 当前, 需求)` - 2. `true` +`return 成功(当前 + 8)` - 1. `前一个 == 0` +`else` - > 写32(内存, 0, 下一个) +`if 前一个 == 0` - 2. `true` +`写32(内存, 0, 下一个)` - > 写32(内存, 前一个 + 4, 下一个) +`else` - *成功(当前 + 8)* +`写32(内存, 前一个 + 4, 下一个)` -2. `true` +`end` - **下一个空位 = 读32(内存, 4)** +`return 成功(当前 + 8)` - 1. `下一个空位 + 需求 <= 容量` +`end` - > 写32(内存, 下一个空位, 需求) +`else` - > 写32(内存, 4, 下一个空位 + 需求) +`下一个空位 = 读32(内存, 4)` - *成功(下一个空位 + 8)* +`if 下一个空位 + 需求 <= 容量` - 2. `true` +`写32(内存, 下一个空位, 需求)` - *失败("alloc.no_space", "没有足够的空闲空间")* +`写32(内存, 4, 下一个空位 + 需求)` -## 插入空闲 +`return 成功(下一个空位 + 8)` -`(内存, 块)` +`else` + +`return 失败("alloc.no_space", "没有足够的空闲空间")` + +`end` + +`end` + +## @exec 插入空闲 + +`params(内存: Memory, 块: Int)` 空闲链表按地址升序;插入后先与后继合并,再与前去合并。 -**前一个 = 0** +`前一个 = 0` -**当前 = 读32(内存, 0)** +`当前 = 读32(内存, 0)` -- `当前 != 0 and 当前 < 块` +`while 当前 != 0 and 当前 < 块` - **前一个 = 当前** +`前一个 = 当前` - **当前 = 读32(内存, 当前 + 4)** +`当前 = 读32(内存, 当前 + 4)` -> 写32(内存, 块 + 4, 当前) +`end` -1. `前一个 == 0` +`写32(内存, 块 + 4, 当前)` - > 写32(内存, 0, 块) +`if 前一个 == 0` -2. `true` +`写32(内存, 0, 块)` - > 写32(内存, 前一个 + 4, 块) +`else` -> 合并(内存, 前一个, 块, 当前) +`写32(内存, 前一个 + 4, 块)` -*成功(None)* +`end` -## 合并 +`合并(内存, 前一个, 块, 当前)` -`(内存, 前一个, 块, 当前)` +`return 成功(None)` + +## @exec 合并 + +`params(内存: Memory, 前一个: Int, 块: Int, 当前: Int)` 相邻块只有在地址连续时才合并,避免产生虚假的大块。 -**块大小 = 读32(内存, 块)** +`块大小 = 读32(内存, 块)` -1. `当前 != 0 and 块 + 块大小 == 当前` +`if 当前 != 0 and 块 + 块大小 == 当前` - **合并大小 = 块大小 + 读32(内存, 当前)** +`合并大小 = 块大小 + 读32(内存, 当前)` - > 写32(内存, 块, 合并大小) +`写32(内存, 块, 合并大小)` - > 写32(内存, 块 + 4, 读32(内存, 当前 + 4)) +`写32(内存, 块 + 4, 读32(内存, 当前 + 4))` -2. `true` +`else` - **忽略后继合并 = 0** +`忽略后继合并 = 0` -**前一个大小 = 0** +`end` -1. `前一个 != 0` +`前一个大小 = 0` - **前一个大小 = 读32(内存, 前一个)** +`if 前一个 != 0` -2. `true` +`前一个大小 = 读32(内存, 前一个)` - **忽略前去读取 = 0** +`else` + +`忽略前去读取 = 0` + +`end` 后继合并完成后再处理前驱;两个判断必须分开执行。 -1. `前一个 != 0 and 前一个 + 前一个大小 == 块` +`if 前一个 != 0 and 前一个 + 前一个大小 == 块` - **前一个新大小 = 前一个大小 + 读32(内存, 块)** +`前一个新大小 = 前一个大小 + 读32(内存, 块)` - > 写32(内存, 前一个, 前一个新大小) +`写32(内存, 前一个, 前一个新大小)` - > 写32(内存, 前一个 + 4, 读32(内存, 块 + 4)) +`写32(内存, 前一个 + 4, 读32(内存, 块 + 4))` -2. `true` +`else` - **忽略前去合并 = 0** +`忽略前去合并 = 0` -*成功(None)* +`end` -## 已在空闲表 +`return 成功(None)` -`(内存, 块)` +## @exec 已在空闲表 + +`params(内存: Memory, 块: Int)` 线性扫描空闲链表,检测重复释放。 -**当前 = 读32(内存, 0)** +`当前 = 读32(内存, 0)` -**结果 = false** +`结果 = false` -- `当前 != 0 and not 结果` +`while 当前 != 0 and not 结果` - 1. `当前 == 块` +`if 当前 == 块` - **结果 = true** +`结果 = true` - 2. `true` +`else` - **当前 = 读32(内存, 当前 + 4)** +`当前 = 读32(内存, 当前 + 4)` -*结果* +`end` -## 释放 +`end` -`(内存, 地址)` +`return 结果` + +## @exec 释放 + +`params(内存: Memory, 地址: Int)` 把 payload 偏移换算回块头;重复释放返回可恢复错误,正常释放按地址插入并由“合并”处理相邻块。 -**块 = 地址 - 8** +`块 = 地址 - 8` -1. `已在空闲表(内存, 块)` +`if 已在空闲表(内存, 块)` - *失败("alloc.double_free", "块已在空闲链表")* +`return 失败("alloc.double_free", "块已在空闲链表")` -> 插入空闲(内存, 块) +`end` -*成功(None)* +`插入空闲(内存, 块)` -## main +`return 成功(None)` -**内存 = memory.new(1, 1)** +## @exec main -> 初始化(内存) +`内存 = memory.new(1, 1)` -**甲 = 分配(内存, 65536, 8)** +`初始化(内存)` -**乙 = 分配(内存, 65536, 16)** +`甲 = 分配(内存, 65536, 8)` -**`内存[甲.value] = 11`** +`乙 = 分配(内存, 65536, 16)` -**`内存[乙.value] = 22`** +`内存[甲.value] = 11` -> 释放(内存, 甲.value) +`内存[乙.value] = 22` -**丙 = 分配(内存, 65536, 8)** +`释放(内存, 甲.value)` -**`内存[丙.value] = 33`** +`丙 = 分配(内存, 65536, 8)` -> 释放(内存, 乙.value) +`内存[丙.value] = 33` -> 释放(内存, 丙.value) +`释放(内存, 乙.value)` -**丁 = 分配(内存, 65536, 4)** +`释放(内存, 丙.value)` -**戊 = 分配(内存, 65536, 16)** +`丁 = 分配(内存, 65536, 4)` -**己 = 分配(内存, 65536, 64)** +`戊 = 分配(内存, 65536, 16)` -> 释放(内存, 己.value) +`己 = 分配(内存, 65536, 64)` -**庚 = 分配(内存, 65536, 8)** +`释放(内存, 己.value)` -**辛 = 分配(内存, 65536, 16)** +`庚 = 分配(内存, 65536, 8)` -**壬 = 分配(内存, 65536, 8)** +`辛 = 分配(内存, 65536, 16)` -**癸 = 分配(内存, 65536, 8)** +`壬 = 分配(内存, 65536, 8)` -**`内存[庚.value] = 44`** +`癸 = 分配(内存, 65536, 8)` -**`内存[辛.value] = 55`** +`内存[庚.value] = 44` -**`内存[壬.value] = 66`** +`内存[辛.value] = 55` -**`内存[癸.value] = 77`** +`内存[壬.value] = 66` -**失败结果 = 分配(内存, 65536, 100000)** +`内存[癸.value] = 77` -**内存2 = memory.new(1, 1)** +`失败结果 = 分配(内存, 65536, 100000)` -> 初始化(内存2) +`内存2 = memory.new(1, 1)` -**甲2 = 分配(内存2, 65536, 8)** +`初始化(内存2)` -**乙2 = 分配(内存2, 65536, 8)** +`甲2 = 分配(内存2, 65536, 8)` -**丙2 = 分配(内存2, 65536, 8)** +`乙2 = 分配(内存2, 65536, 8)` -> 分配(内存2, 65536, 65472) +`丙2 = 分配(内存2, 65536, 8)` -> 释放(内存2, 甲2.value) +`分配(内存2, 65536, 65472)` -> 释放(内存2, 乙2.value) +`释放(内存2, 甲2.value)` -> 释放(内存2, 丙2.value) +`释放(内存2, 乙2.value)` -**丁2 = 分配(内存2, 65536, 40)** +`释放(内存2, 丙2.value)` -**戊2 = 分配(内存2, 65536, 8)** +`丁2 = 分配(内存2, 65536, 40)` -**释放一次 = 释放(内存2, 丁2.value)** +`戊2 = 分配(内存2, 65536, 8)` -**重复释放 = 释放(内存2, 丁2.value)** +`释放一次 = 释放(内存2, 丁2.value)` -*[甲, 乙, 丙, 丁, 戊, 己, 庚, 辛, 壬, 癸, 失败结果, 甲2, 乙2, 丙2, 丁2, 戊2, 释放一次, 重复释放, 内存[甲.value], 内存[乙.value], 内存[丙.value], 内存[丁.value], 内存[戊.value], 内存[庚.value], 内存[辛.value], 内存[壬.value], 内存[癸.value]]* +`重复释放 = 释放(内存2, 丁2.value)` + +`return [甲, 乙, 丙, 丁, 戊, 己, 庚, 辛, 壬, 癸, 失败结果, 甲2, 乙2, 丙2, 丁2, 戊2, 释放一次, 重复释放, 内存[甲.value], 内存[乙.value], 内存[丙.value], 内存[丁.value], 内存[戊.value], 内存[庚.value], 内存[辛.value], 内存[壬.value], 内存[癸.value]]` diff --git a/tests/conformance/semantics/56-memory-binary-tree.mq.md b/tests/conformance/semantics/56-memory-binary-tree.mq.md index 29dc859..b52beda 100644 --- a/tests/conformance/semantics/56-memory-binary-tree.mq.md +++ b/tests/conformance/semantics/56-memory-binary-tree.mq.md @@ -1,112 +1,122 @@ -## 写32 +## @exec 写32 -`(内存, 基址, 值)` +`params(内存: Memory, 基址: Int, 值: Int)` -**字节3 = 值 % 256** +`字节3 = 值 % 256` -**字节2 = 值 // 256 % 256** +`字节2 = 值 // 256 % 256` -**字节1 = 值 // 65536 % 256** +`字节1 = 值 // 65536 % 256` -**字节0 = 值 // 16777216 % 256** +`字节0 = 值 // 16777216 % 256` -**`内存[基址] = 字节0`** +`内存[基址] = 字节0` -**`内存[基址 + 1] = 字节1`** +`内存[基址 + 1] = 字节1` -**`内存[基址 + 2] = 字节2`** +`内存[基址 + 2] = 字节2` -**`内存[基址 + 3] = 字节3`** +`内存[基址 + 3] = 字节3` -*None* +`return None` -## 读32 +## @exec 读32 -`(内存, 基址)` +`params(内存: Memory, 基址: Int)` -*内存[基址] * 16777216 + 内存[基址 + 1] * 65536 + 内存[基址 + 2] * 256 + 内存[基址 + 3]* +`return 内存[基址] * 16777216 + 内存[基址 + 1] * 65536 + 内存[基址 + 2] * 256 + 内存[基址 + 3]` -## 新节点 +## @exec 新节点 -`(内存, 值)` +`params(内存: Memory, 值: Int)` 每个节点 16 字节:偏移 0 存一个字节的值,偏移 4 存左子,偏移 8 存右子;0 表示空。 节点值必须落在 0..255。 -**位置 = 读32(内存, 0)** +`位置 = 读32(内存, 0)` -**`内存[位置] = 值`** +`内存[位置] = 值` -> 写32(内存, 位置 + 4, 0) +`写32(内存, 位置 + 4, 0)` -> 写32(内存, 位置 + 8, 0) +`写32(内存, 位置 + 8, 0)` -> 写32(内存, 0, 位置 + 16) +`写32(内存, 0, 位置 + 16)` -*位置* +`return 位置` -## 插入 +## @exec 插入 -`(内存, 根, 值)` +`params(内存: Memory, 根: Int, 值: Int)` -1. `根 == 0` +`if 根 == 0` - *新节点(内存, 值)* +`return 新节点(内存, 值)` -2. `值 < 内存[根]` +`else` - **左 = 插入(内存, 读32(内存, 根 + 4), 值)** +`if 值 < 内存[根]` - > 写32(内存, 根 + 4, 左) +`左 = 插入(内存, 读32(内存, 根 + 4), 值)` - *根* +`写32(内存, 根 + 4, 左)` -3. `true` +`return 根` - **右 = 插入(内存, 读32(内存, 根 + 8), 值)** +`else` - > 写32(内存, 根 + 8, 右) +`右 = 插入(内存, 读32(内存, 根 + 8), 值)` - *根* +`写32(内存, 根 + 8, 右)` -## 遍历 +`return 根` -`(内存, 根)` +`end` + +`end` + +## @exec 遍历 + +`params(内存: Memory, 根: Int)` 中序遍历,返回从小到大的值列表。 -1. `根 == 0` +`if 根 == 0` - *[]* +`return []` -**左 = 遍历(内存, 读32(内存, 根 + 4))** +`end` -**右 = 遍历(内存, 读32(内存, 根 + 8))** +`左 = 遍历(内存, 读32(内存, 根 + 4))` -*list.concat(list.concat(左, [内存[根]]), 右)* +`右 = 遍历(内存, 读32(内存, 根 + 8))` -## main +`return list.concat(list.concat(左, [内存[根]]), 右)` -**内存 = memory.new(1, 1)** +## @exec main -**`内存[0] = 0`** +`内存 = memory.new(1, 1)` -**`内存[1] = 0`** +`内存[0] = 0` -**`内存[2] = 0`** +`内存[1] = 0` -**`内存[3] = 8`** +`内存[2] = 0` -**根 = 0** +`内存[3] = 8` -**值表 = [5, 3, 8, 1, 4, 7, 9]** +`根 = 0` -**下标 = 0** +`值表 = [5, 3, 8, 1, 4, 7, 9]` -- `下标 < 长度(值表)` +`下标 = 0` - **根 = 插入(内存, 根, 值表[下标])** +`while 下标 < 长度(值表)` - **下标 = 下标 + 1** +`根 = 插入(内存, 根, 值表[下标])` -*[根, 遍历(内存, 根), 读32(内存, 根 + 4), 读32(内存, 根 + 8)]* +`下标 = 下标 + 1` + +`end` + +`return [根, 遍历(内存, 根), 读32(内存, 根 + 4), 读32(内存, 根 + 8)]` diff --git a/tests/conformance/semantics/57-csv-row-splitter.mq.md b/tests/conformance/semantics/57-csv-row-splitter.mq.md index fbbc5e1..f5ff7f8 100644 --- a/tests/conformance/semantics/57-csv-row-splitter.mq.md +++ b/tests/conformance/semantics/57-csv-row-splitter.mq.md @@ -1,35 +1,39 @@ -## 分割 +## @exec 分割 -`(文本)` +`params(文本: Text)` 这是 CSV 单行拆分的最小实现:只处理逗号分隔,不支持引号或转义;空字段保留。 -**结果 = []** +`结果 = []` -**当前 = ""** +`当前 = ""` -**点 = text.codepoints(文本)** +`点 = text.codepoints(文本)` -**下标 = 0** +`下标 = 0` -- `下标 < 长度(点)` +`while 下标 < 长度(点)` - **字符 = text.from_codepoint(点[下标])** +`字符 = text.from_codepoint(点[下标])` - 1. `字符 == ","` +`if 字符 == ","` - **结果 = list.append(结果, 当前)** +`结果 = list.append(结果, 当前)` - **当前 = ""** +`当前 = ""` - 2. `true` +`else` - **当前 = 当前 + 字符** +`当前 = 当前 + 字符` - **下标 = 下标 + 1** +`end` -*list.concat(结果, [当前])* +`下标 = 下标 + 1` -## main +`end` -*[分割("甲,乙,,丙"), 分割(""), 分割("a,b")]* +`return list.concat(结果, [当前])` + +## @exec main + +`return [分割("甲,乙,,丙"), 分割(""), 分割("a,b")]` diff --git a/tests/conformance/semantics/58-memory-hash-table.mq.md b/tests/conformance/semantics/58-memory-hash-table.mq.md index c96253b..c916a3f 100644 --- a/tests/conformance/semantics/58-memory-hash-table.mq.md +++ b/tests/conformance/semantics/58-memory-hash-table.mq.md @@ -1,164 +1,182 @@ -## 写32 +## @exec 写32 -`(内存, 基址, 值)` +`params(内存: Memory, 基址: Int, 值: Int)` -**字节3 = 值 % 256** +`字节3 = 值 % 256` -**字节2 = 值 // 256 % 256** +`字节2 = 值 // 256 % 256` -**字节1 = 值 // 65536 % 256** +`字节1 = 值 // 65536 % 256` -**字节0 = 值 // 16777216 % 256** +`字节0 = 值 // 16777216 % 256` -**`内存[基址] = 字节0`** +`内存[基址] = 字节0` -**`内存[基址 + 1] = 字节1`** +`内存[基址 + 1] = 字节1` -**`内存[基址 + 2] = 字节2`** +`内存[基址 + 2] = 字节2` -**`内存[基址 + 3] = 字节3`** +`内存[基址 + 3] = 字节3` -*None* +`return None` -## 读32 +## @exec 读32 -`(内存, 基址)` +`params(内存: Memory, 基址: Int)` -*内存[基址] * 16777216 + 内存[基址 + 1] * 65536 + 内存[基址 + 2] * 256 + 内存[基址 + 3]* +`return 内存[基址] * 16777216 + 内存[基址 + 1] * 65536 + 内存[基址 + 2] * 256 + 内存[基址 + 3]` -## 成功 +## @exec 成功 -`(值)` +`params(值)` -*{ok: true, value: 值}* +`return {ok: true, value: 值}` -## 失败 +## @exec 失败 -`(代码, 消息)` +`params(代码, 消息)` -*{ok: false, code: 代码, message: 消息}* +`return {ok: false, code: 代码, message: 消息}` -## 初始化 +## @exec 初始化 -`(内存, 容量)` +`params(内存: Memory, 容量: Int)` 头部 8 字节:0..3 是元素数,4..7 是槽数。槽从偏移 8 开始,每槽 8 字节: 键 u32 + 值 u32。键 0 表示空槽,因此业务键必须从 1 开始。 -> 写32(内存, 0, 0) +`写32(内存, 0, 0)` -> 写32(内存, 4, 容量) +`写32(内存, 4, 容量)` -*成功(None)* +`return 成功(None)` -## 插入 +## @exec 插入 -`(内存, 键, 值)` +`params(内存: Memory, 键: Int, 值: Int)` 线性探测;键已存在时只更新值,不增加元素数。 -**容量 = 读32(内存, 4)** +`容量 = 读32(内存, 4)` -**位置 = 键 % 容量** +`位置 = 键 % 容量` -**尝试 = 0** +`尝试 = 0` -**完成 = false** +`完成 = false` -- `尝试 < 容量 and not 完成` +`while 尝试 < 容量 and not 完成` - **槽 = 8 + (位置 + 尝试) % 容量 * 8** +`槽 = 8 + (位置 + 尝试) % 容量 * 8` - **槽键 = 读32(内存, 槽)** +`槽键 = 读32(内存, 槽)` - 1. `槽键 == 0` +`if 槽键 == 0` - > 写32(内存, 槽, 键) +`写32(内存, 槽, 键)` - > 写32(内存, 槽 + 4, 值) +`写32(内存, 槽 + 4, 值)` - > 写32(内存, 0, 读32(内存, 0) + 1) +`写32(内存, 0, 读32(内存, 0) + 1)` - **完成 = true** +`完成 = true` - 2. `槽键 == 键` +`else` - > 写32(内存, 槽 + 4, 值) +`if 槽键 == 键` - **完成 = true** +`写32(内存, 槽 + 4, 值)` - 3. `true` +`完成 = true` - **尝试 = 尝试 + 1** +`else` -1. `完成` +`尝试 = 尝试 + 1` - *成功(None)* +`end` -2. `true` +`end` - *失败("hash.full", "哈希表已满")* +`end` -## 查找 +`if 完成` -`(内存, 键)` +`return 成功(None)` + +`else` + +`return 失败("hash.full", "哈希表已满")` + +`end` + +## @exec 查找 + +`params(内存: Memory, 键: Int)` 遇到空槽即停止;找不到返回 None。 -**容量 = 读32(内存, 4)** +`容量 = 读32(内存, 4)` -**位置 = 键 % 容量** +`位置 = 键 % 容量` -**尝试 = 0** +`尝试 = 0` -**结果 = None** +`结果 = None` -- `尝试 < 容量` +`while 尝试 < 容量` - **槽 = 8 + (位置 + 尝试) % 容量 * 8** +`槽 = 8 + (位置 + 尝试) % 容量 * 8` - **槽键 = 读32(内存, 槽)** +`槽键 = 读32(内存, 槽)` - 1. `槽键 == 键` +`if 槽键 == 键` - **结果 = 读32(内存, 槽 + 4)** +`结果 = 读32(内存, 槽 + 4)` - **尝试 = 容量** +`尝试 = 容量` - 2. `槽键 == 0` +`else` - **尝试 = 容量** +`if 槽键 == 0` - 3. `true` +`尝试 = 容量` - **尝试 = 尝试 + 1** +`else` -*结果* +`尝试 = 尝试 + 1` -## main +`end` + +`end` + +`end` + +`return 结果` + +## @exec main 业务键从 1 开始。37 与 5 在 32 个槽中同余,用来验证线性探测。 -**内存 = memory.new(1, 1)** +`内存 = memory.new(1, 1)` -> 初始化(内存, 32) +`初始化(内存, 32)` -**插入5 = 插入(内存, 5, 50)** +`插入5 = 插入(内存, 5, 50)` -> 插入(内存, 37, 370) +`插入(内存, 37, 370)` -> 插入(内存, 12, 120) +`插入(内存, 12, 120)` -> 插入(内存, 5, 55) +`插入(内存, 5, 55)` -**内存2 = memory.new(1, 1)** +`内存2 = memory.new(1, 1)` -> 初始化(内存2, 2) +`初始化(内存2, 2)` -> 插入(内存2, 1, 10) +`插入(内存2, 1, 10)` -> 插入(内存2, 2, 20) +`插入(内存2, 2, 20)` -**表满 = 插入(内存2, 4, 40)** +`表满 = 插入(内存2, 4, 40)` -*[插入5, 查找(内存, 5), 查找(内存, 37), 查找(内存, 12), 查找(内存, 99), 读32(内存, 0), 表满, 查找(内存2, 1), 查找(内存2, 2)]* +`return [插入5, 查找(内存, 5), 查找(内存, 37), 查找(内存, 12), 查找(内存, 99), 读32(内存, 0), 表满, 查找(内存2, 1), 查找(内存2, 2)]` diff --git a/tests/conformance/semantics/59-utf8-encoder.mq.md b/tests/conformance/semantics/59-utf8-encoder.mq.md index 897c8fe..11e9917 100644 --- a/tests/conformance/semantics/59-utf8-encoder.mq.md +++ b/tests/conformance/semantics/59-utf8-encoder.mq.md @@ -1,74 +1,88 @@ -## 编码 +## @exec 编码 -`(文本, 内存, 基址)` +`params(文本: Text, 内存: Memory, 基址: Int)` -把 Unicode 标量序列按 UTF-8 编码写入 `Memory`,返回字节长度。 -这是 `.mq.md` 自己实现的编码逻辑,不是 Rust 内建 UTF-8 转换。 +把 Unicode 标量序列按 UTF-8 编码写入 Memory,返回字节长度。 +这是 .mq.md 自己实现的编码逻辑,不是 Rust 内建 UTF-8 转换。 -**点 = text.codepoints(文本)** +`点 = text.codepoints(文本)` -**下标 = 0** +`下标 = 0` -**偏移 = 0** +`偏移 = 0` -- `下标 < 长度(点)` +`while 下标 < 长度(点)` - **码点 = 点[下标]** +`码点 = 点[下标]` - 1. `码点 < 128` +`if 码点 < 128` - **`内存[基址 + 偏移] = 码点`** +`内存[基址 + 偏移] = 码点` - **偏移 = 偏移 + 1** +`偏移 = 偏移 + 1` - 2. `码点 < 2048` +`else` - **`内存[基址 + 偏移] = 192 + 码点 // 64`** +`if 码点 < 2048` - **`内存[基址 + 偏移 + 1] = 128 + 码点 % 64`** +`内存[基址 + 偏移] = 192 + 码点 // 64` - **偏移 = 偏移 + 2** +`内存[基址 + 偏移 + 1] = 128 + 码点 % 64` - 3. `码点 < 65536` +`偏移 = 偏移 + 2` - **`内存[基址 + 偏移] = 224 + 码点 // 4096`** +`else` - **`内存[基址 + 偏移 + 1] = 128 + 码点 // 64 % 64`** +`if 码点 < 65536` - **`内存[基址 + 偏移 + 2] = 128 + 码点 % 64`** +`内存[基址 + 偏移] = 224 + 码点 // 4096` - **偏移 = 偏移 + 3** +`内存[基址 + 偏移 + 1] = 128 + 码点 // 64 % 64` - 4. `true` +`内存[基址 + 偏移 + 2] = 128 + 码点 % 64` - **`内存[基址 + 偏移] = 240 + 码点 // 262144`** +`偏移 = 偏移 + 3` - **`内存[基址 + 偏移 + 1] = 128 + 码点 // 4096 % 64`** +`else` - **`内存[基址 + 偏移 + 2] = 128 + 码点 // 64 % 64`** +`内存[基址 + 偏移] = 240 + 码点 // 262144` - **`内存[基址 + 偏移 + 3] = 128 + 码点 % 64`** +`内存[基址 + 偏移 + 1] = 128 + 码点 // 4096 % 64` - **偏移 = 偏移 + 4** +`内存[基址 + 偏移 + 2] = 128 + 码点 // 64 % 64` - **下标 = 下标 + 1** +`内存[基址 + 偏移 + 3] = 128 + 码点 % 64` -*偏移* +`偏移 = 偏移 + 4` -## main +`end` -**内存 = memory.new(1, 1)** +`end` -**长度 = 编码("Aé中𝄞", 内存, 0)** +`end` -**字节 = []** +`下标 = 下标 + 1` -**下标 = 0** +`end` -- `下标 < 长度` +`return 偏移` - **字节 = list.append(字节, 内存[下标])** +## @exec main - **下标 = 下标 + 1** +`内存 = memory.new(1, 1)` -*[长度, 字节]* +`长度 = 编码("Aé中𝄞", 内存, 0)` + +`字节 = []` + +`下标 = 0` + +`while 下标 < 长度` + +`字节 = list.append(字节, 内存[下标])` + +`下标 = 下标 + 1` + +`end` + +`return [长度, 字节]` diff --git a/tests/conformance/semantics/60-utf8-decoder.mq.md b/tests/conformance/semantics/60-utf8-decoder.mq.md index d570b08..c38b128 100644 --- a/tests/conformance/semantics/60-utf8-decoder.mq.md +++ b/tests/conformance/semantics/60-utf8-decoder.mq.md @@ -1,185 +1,227 @@ -## 成功 +## @exec 成功 -`(值)` +`params(值)` -*{ok: true, value: 值}* +`return {ok: true, value: 值}` -## 失败 +## @exec 失败 -`(代码, 消息)` +`params(代码, 消息)` -*{ok: false, code: 代码, message: 消息}* +`return {ok: false, code: 代码, message: 消息}` -## 续字节 +## @exec 续字节 -`(字节)` +`params(字节: Int)` -*字节 >= 128 and 字节 < 192* +`return 字节 >= 128 and 字节 < 192` -## 解码2 +## @exec 解码2 -`(内存, 基址, 长度, 偏移, 文本)` +`params(内存: Memory, 基址: Int, 长度: Int, 偏移: Int, 文本: Text)` -1. `偏移 + 1 >= 长度` +`if 偏移 + 1 >= 长度` - *[文本, 偏移, "utf8.truncated"]* +`return [文本, 偏移, "utf8.truncated"]` -**b1 = 内存[基址 + 偏移 + 1]** +`end` -1. `not 续字节(b1)` +`b1 = 内存[基址 + 偏移 + 1]` - *[文本, 偏移, "utf8.invalid_continuation"]* +`if not 续字节(b1)` -**码点 = (内存[基址 + 偏移] - 192) * 64 + (b1 - 128)** +`return [文本, 偏移, "utf8.invalid_continuation"]` -1. `码点 < 128` +`end` - *[文本, 偏移, "utf8.invalid_scalar"]* +`码点 = (内存[基址 + 偏移] - 192) * 64 + (b1 - 128)` -*[文本 + text.from_codepoint(码点), 偏移 + 2, ""]* +`if 码点 < 128` -## 解码3 +`return [文本, 偏移, "utf8.invalid_scalar"]` -`(内存, 基址, 长度, 偏移, 文本)` +`end` -1. `偏移 + 2 >= 长度` +`return [文本 + text.from_codepoint(码点), 偏移 + 2, ""]` - *[文本, 偏移, "utf8.truncated"]* +## @exec 解码3 -**b1 = 内存[基址 + 偏移 + 1]** +`params(内存: Memory, 基址: Int, 长度: Int, 偏移: Int, 文本: Text)` -**b2 = 内存[基址 + 偏移 + 2]** +`if 偏移 + 2 >= 长度` -1. `not (续字节(b1) and 续字节(b2))` +`return [文本, 偏移, "utf8.truncated"]` - *[文本, 偏移, "utf8.invalid_continuation"]* +`end` -**码点 = (内存[基址 + 偏移] - 224) * 4096 + (b1 - 128) * 64 + (b2 - 128)** +`b1 = 内存[基址 + 偏移 + 1]` -1. `码点 < 2048 or (码点 >= 55296 and 码点 <= 57343)` +`b2 = 内存[基址 + 偏移 + 2]` - *[文本, 偏移, "utf8.invalid_scalar"]* +`if not (续字节(b1) and 续字节(b2))` -*[文本 + text.from_codepoint(码点), 偏移 + 3, ""]* +`return [文本, 偏移, "utf8.invalid_continuation"]` -## 解码4 +`end` -`(内存, 基址, 长度, 偏移, 文本)` +`码点 = (内存[基址 + 偏移] - 224) * 4096 + (b1 - 128) * 64 + (b2 - 128)` -1. `偏移 + 3 >= 长度` +`if 码点 < 2048 or (码点 >= 55296 and 码点 <= 57343)` - *[文本, 偏移, "utf8.truncated"]* +`return [文本, 偏移, "utf8.invalid_scalar"]` -**b1 = 内存[基址 + 偏移 + 1]** +`end` -**b2 = 内存[基址 + 偏移 + 2]** +`return [文本 + text.from_codepoint(码点), 偏移 + 3, ""]` -**b3 = 内存[基址 + 偏移 + 3]** +## @exec 解码4 -1. `not (续字节(b1) and 续字节(b2) and 续字节(b3))` +`params(内存: Memory, 基址: Int, 长度: Int, 偏移: Int, 文本: Text)` - *[文本, 偏移, "utf8.invalid_continuation"]* +`if 偏移 + 3 >= 长度` -**码点 = (内存[基址 + 偏移] - 240) * 262144 + (b1 - 128) * 4096 + (b2 - 128) * 64 + (b3 - 128)** +`return [文本, 偏移, "utf8.truncated"]` -1. `码点 < 65536 or 码点 > 1114111` +`end` - *[文本, 偏移, "utf8.invalid_scalar"]* +`b1 = 内存[基址 + 偏移 + 1]` -*[文本 + text.from_codepoint(码点), 偏移 + 4, ""]* +`b2 = 内存[基址 + 偏移 + 2]` -## 解码 +`b3 = 内存[基址 + 偏移 + 3]` -`(内存, 基址, 长度)` +`if not (续字节(b1) and 续字节(b2) and 续字节(b3))` -**偏移 = 0** +`return [文本, 偏移, "utf8.invalid_continuation"]` -**文本 = ""** +`end` -**错误 = ""** +`码点 = (内存[基址 + 偏移] - 240) * 262144 + (b1 - 128) * 4096 + (b2 - 128) * 64 + (b3 - 128)` -- `偏移 < 长度 and 错误 == ""` +`if 码点 < 65536 or 码点 > 1114111` - **首 = 内存[基址 + 偏移]** +`return [文本, 偏移, "utf8.invalid_scalar"]` - 1. `首 < 128` +`end` - **文本 = 文本 + text.from_codepoint(首)** +`return [文本 + text.from_codepoint(码点), 偏移 + 4, ""]` - **偏移 = 偏移 + 1** +## @exec 解码 - 2. `首 < 194` +`params(内存: Memory, 基址: Int, 长度: Int)` - **错误 = "utf8.invalid_lead"** +`偏移 = 0` - 3. `首 < 224` +`文本 = ""` - **结果 = 解码2(内存, 基址, 长度, 偏移, 文本)** +`错误 = ""` - **文本 = 结果[0]** +`while 偏移 < 长度 and 错误 == ""` - **偏移 = 结果[1]** +`首 = 内存[基址 + 偏移]` - **错误 = 结果[2]** +`if 首 < 128` - 4. `首 < 240` +`文本 = 文本 + text.from_codepoint(首)` - **结果 = 解码3(内存, 基址, 长度, 偏移, 文本)** +`偏移 = 偏移 + 1` - **文本 = 结果[0]** +`else` - **偏移 = 结果[1]** +`if 首 < 194` - **错误 = 结果[2]** +`错误 = "utf8.invalid_lead"` - 5. `首 < 245` +`else` - **结果 = 解码4(内存, 基址, 长度, 偏移, 文本)** +`if 首 < 224` - **文本 = 结果[0]** +`结果 = 解码2(内存, 基址, 长度, 偏移, 文本)` - **偏移 = 结果[1]** +`文本 = 结果[0]` - **错误 = 结果[2]** +`偏移 = 结果[1]` - 6. `true` +`错误 = 结果[2]` - **错误 = "utf8.invalid_lead"** +`else` -1. `错误 == ""` +`if 首 < 240` - *成功(文本)* +`结果 = 解码3(内存, 基址, 长度, 偏移, 文本)` -2. `true` +`文本 = 结果[0]` - *失败(错误, "UTF-8 解码失败")* +`偏移 = 结果[1]` -## 写字节 +`错误 = 结果[2]` -`(内存, 基址, 字节)` +`else` -**下标 = 0** +`if 首 < 245` -- `下标 < 长度(字节)` +`结果 = 解码4(内存, 基址, 长度, 偏移, 文本)` - **`内存[基址 + 下标] = 字节[下标]`** +`文本 = 结果[0]` - **下标 = 下标 + 1** +`偏移 = 结果[1]` -*None* +`错误 = 结果[2]` -## main +`else` -**内存 = memory.new(1, 1)** +`错误 = "utf8.invalid_lead"` -> 写字节(内存, 0, [65, 195, 169, 228, 184, 173]) +`end` -> 写字节(内存, 16, [228, 184]) +`end` -> 写字节(内存, 32, [228, 65, 173]) +`end` -> 写字节(内存, 48, [237, 160, 128]) +`end` -> 写字节(内存, 64, [240, 157, 132, 158]) +`end` -*[解码(内存, 0, 6), 解码(内存, 16, 2), 解码(内存, 32, 3), 解码(内存, 48, 3), 解码(内存, 64, 4)]* +`end` + +`if 错误 == ""` + +`return 成功(文本)` + +`else` + +`return 失败(错误, "UTF-8 解码失败")` + +`end` + +## @exec 写字节 + +`params(内存: Memory, 基址: Int, 字节: List)` + +`下标 = 0` + +`while 下标 < 长度(字节)` + +`内存[基址 + 下标] = 字节[下标]` + +`下标 = 下标 + 1` + +`end` + +`return None` + +## @exec main + +`内存 = memory.new(1, 1)` + +`写字节(内存, 0, [65, 195, 169, 228, 184, 173])` + +`写字节(内存, 16, [228, 184])` + +`写字节(内存, 32, [228, 65, 173])` + +`写字节(内存, 48, [237, 160, 128])` + +`写字节(内存, 64, [240, 157, 132, 158])` + +`return [解码(内存, 0, 6), 解码(内存, 16, 2), 解码(内存, 32, 3), 解码(内存, 48, 3), 解码(内存, 64, 4)]` diff --git a/tests/conformance/semantics/61-memory-graph-adjacency.mq.md b/tests/conformance/semantics/61-memory-graph-adjacency.mq.md index dce9236..0532733 100644 --- a/tests/conformance/semantics/61-memory-graph-adjacency.mq.md +++ b/tests/conformance/semantics/61-memory-graph-adjacency.mq.md @@ -1,113 +1,115 @@ -## 写32 +## @exec 写32 -`(内存, 基址, 值)` +`params(内存: Memory, 基址: Int, 值: Int)` -**字节3 = 值 % 256** +`字节3 = 值 % 256` -**字节2 = 值 // 256 % 256** +`字节2 = 值 // 256 % 256` -**字节1 = 值 // 65536 % 256** +`字节1 = 值 // 65536 % 256` -**字节0 = 值 // 16777216 % 256** +`字节0 = 值 // 16777216 % 256` -**`内存[基址] = 字节0`** +`内存[基址] = 字节0` -**`内存[基址 + 1] = 字节1`** +`内存[基址 + 1] = 字节1` -**`内存[基址 + 2] = 字节2`** +`内存[基址 + 2] = 字节2` -**`内存[基址 + 3] = 字节3`** +`内存[基址 + 3] = 字节3` -*None* +`return None` -## 读32 +## @exec 读32 -`(内存, 基址)` +`params(内存: Memory, 基址: Int)` -*内存[基址] * 16777216 + 内存[基址 + 1] * 65536 + 内存[基址 + 2] * 256 + 内存[基址 + 3]* +`return 内存[基址] * 16777216 + 内存[基址 + 1] * 65536 + 内存[基址 + 2] * 256 + 内存[基址 + 3]` -## 分配 +## @exec 分配 -`(内存, 大小)` +`params(内存: Memory, 大小: Int)` 简单 bump 分配;调用方保证容量足够。 -**位置 = 读32(内存, 0)** +`位置 = 读32(内存, 0)` -> 写32(内存, 0, 位置 + 大小) +`写32(内存, 0, 位置 + 大小)` -*位置* +`return 位置` -## 新节点 +## @exec 新节点 -`(内存, 值)` +`params(内存: Memory, 值: Int)` 节点 16 字节:偏移 0 存一个字节的值,偏移 4 存边链表头;0 表示空。 -**位置 = 分配(内存, 16)** +`位置 = 分配(内存, 16)` -**`内存[位置] = 值`** +`内存[位置] = 值` -> 写32(内存, 位置 + 4, 0) +`写32(内存, 位置 + 4, 0)` -*位置* +`return 位置` -## 加边 +## @exec 加边 -`(内存, 源, 目标)` +`params(内存: Memory, 源: Int, 目标: Int)` 边 8 字节:目标 u32 + 下一条边 u32。头插到源节点的边链表。 -**边 = 分配(内存, 8)** +`边 = 分配(内存, 8)` -> 写32(内存, 边, 目标) +`写32(内存, 边, 目标)` -> 写32(内存, 边 + 4, 读32(内存, 源 + 4)) +`写32(内存, 边 + 4, 读32(内存, 源 + 4))` -> 写32(内存, 源 + 4, 边) +`写32(内存, 源 + 4, 边)` -*None* +`return None` -## 邻接 +## @exec 邻接 -`(内存, 节点)` +`params(内存: Memory, 节点: Int)` 返回节点值列表;顺序是头插顺序(后加的边在前)。 -**当前 = 读32(内存, 节点 + 4)** +`当前 = 读32(内存, 节点 + 4)` -**结果 = []** +`结果 = []` -- `当前 != 0` +`while 当前 != 0` - **结果 = list.append(结果, 读32(内存, 当前))** +`结果 = list.append(结果, 读32(内存, 当前))` - **当前 = 读32(内存, 当前 + 4)** +`当前 = 读32(内存, 当前 + 4)` -*结果* +`end` -## main +`return 结果` -**内存 = memory.new(1, 1)** +## @exec main -**`内存[0] = 0`** +`内存 = memory.new(1, 1)` -**`内存[1] = 0`** +`内存[0] = 0` -**`内存[2] = 0`** +`内存[1] = 0` -**`内存[3] = 8`** +`内存[2] = 0` -**甲 = 新节点(内存, 1)** +`内存[3] = 8` -**乙 = 新节点(内存, 2)** +`甲 = 新节点(内存, 1)` -**丙 = 新节点(内存, 3)** +`乙 = 新节点(内存, 2)` -> 加边(内存, 甲, 乙) +`丙 = 新节点(内存, 3)` -> 加边(内存, 甲, 丙) +`加边(内存, 甲, 乙)` -> 加边(内存, 乙, 丙) +`加边(内存, 甲, 丙)` -*[甲, 乙, 丙, 邻接(内存, 甲), 邻接(内存, 乙), 邻接(内存, 丙)]* +`加边(内存, 乙, 丙)` + +`return [甲, 乙, 丙, 邻接(内存, 甲), 邻接(内存, 乙), 邻接(内存, 丙)]` diff --git a/tests/conformance/semantics/62-json-array-parser.mq.md b/tests/conformance/semantics/62-json-array-parser.mq.md index a7fabd2..4f4b9ec 100644 --- a/tests/conformance/semantics/62-json-array-parser.mq.md +++ b/tests/conformance/semantics/62-json-array-parser.mq.md @@ -1,627 +1,847 @@ -## 成功值 +## @exec 成功值 -`(值, 下一位置)` +`params(值, 下一位置)` -*{ok: true, value: 值, next: 下一位置}* +`return {ok: true, value: 值, next: 下一位置}` -## 失败 +## @exec 失败 -`(代码, 消息)` +`params(代码, 消息)` -*{ok: false, code: 代码, message: 消息}* +`return {ok: false, code: 代码, message: 消息}` -## 是空白 +## @exec 是空白 -`(码点)` +`params(码点: Int)` -*码点 == 32 or 码点 == 9 or 码点 == 10 or 码点 == 13* +`return 码点 == 32 or 码点 == 9 or 码点 == 10 or 码点 == 13` -## 是数字 +## @exec 是数字 -`(码点)` +`params(码点: Int)` -*码点 >= 48 and 码点 <= 57* +`return 码点 >= 48 and 码点 <= 57` -## 跳过空白 +## @exec 跳过空白 -`(点, 位置)` +`params(点: List, 位置: Int)` -**当前 = 位置** +`当前 = 位置` -- `当前 < 长度(点) and 是空白(点[当前])` +`while 当前 < 长度(点) and 是空白(点[当前])` - **当前 = 当前 + 1** +`当前 = 当前 + 1` -*当前* +`end` -## 匹配 +`return 当前` -`(点, 位置, 文本)` +## @exec 匹配 -**目标 = text.codepoints(文本)** +`params(点: List, 位置: Int, 文本: Text)` -**下标 = 0** +`目标 = text.codepoints(文本)` -**结果 = true** +`下标 = 0` -- `下标 < 长度(目标) and 结果` +`结果 = true` - 1. `位置 + 下标 >= 长度(点)` +`while 下标 < 长度(目标) and 结果` - **结果 = false** +`if 位置 + 下标 >= 长度(点)` - 2. `点[位置 + 下标] != 目标[下标]` +`结果 = false` - **结果 = false** +`else` - 3. `true` +`if 点[位置 + 下标] != 目标[下标]` - **继续 = 0** +`结果 = false` - **下标 = 下标 + 1** +`else` -*结果* +`继续 = 0` -## 片段 +`end` -`(点, 起点, 终点)` +`end` -**结果 = ""** +`下标 = 下标 + 1` -**下标 = 起点** +`end` -- `下标 < 终点` +`return 结果` - **结果 = 结果 + text.from_codepoint(点[下标])** +## @exec 片段 - **下标 = 下标 + 1** +`params(点: List, 起点: Int, 终点: Int)` -*结果* +`结果 = ""` -## 解析数字 +`下标 = 起点` -`(点, 位置)` +`while 下标 < 终点` -JSON 数字:可选负号、整数位、可选小数位、可选指数;含 `.`/`e` 返回 Float。 +`结果 = 结果 + text.from_codepoint(点[下标])` -**开始 = 位置** +`下标 = 下标 + 1` -**当前 = 位置** +`end` -1. `text.from_codepoint(点[当前]) == "-"` +`return 结果` - **当前 = 当前 + 1** +## @exec 解析数字 -2. `true` +`params(点: List, 位置: Int)` - **非负 = 0** +JSON 数字:可选负号、整数位、可选小数位、可选指数;含 ./e 返回 Float。 -**整数位 = 0** +`开始 = 位置` -- `当前 < 长度(点) and 是数字(点[当前])` +`当前 = 位置` - **整数位 = 整数位 + 1** +`if text.from_codepoint(点[当前]) == "-"` - **当前 = 当前 + 1** +`当前 = 当前 + 1` -**有小数 = false** +`else` -**小数位 = 0** +`非负 = 0` -1. `当前 < 长度(点) and text.from_codepoint(点[当前]) == "."` +`end` - **有小数 = true** +`整数位 = 0` - **当前 = 当前 + 1** +`while 当前 < 长度(点) and 是数字(点[当前])` - - `当前 < 长度(点) and 是数字(点[当前])` +`整数位 = 整数位 + 1` - **小数位 = 小数位 + 1** +`当前 = 当前 + 1` - **当前 = 当前 + 1** +`end` -2. `true` +`有小数 = false` - **忽略 = 0** +`小数位 = 0` -**指数位 = 0** +`if 当前 < 长度(点) and text.from_codepoint(点[当前]) == "."` -**指数标记 = false** +`有小数 = true` -1. `当前 < 长度(点) and (text.from_codepoint(点[当前]) == "e" or text.from_codepoint(点[当前]) == "E")` +`当前 = 当前 + 1` - **有小数 = true** +`while 当前 < 长度(点) and 是数字(点[当前])` - **指数标记 = true** +`小数位 = 小数位 + 1` - **当前 = 当前 + 1** +`当前 = 当前 + 1` - 1. `当前 < 长度(点) and (text.from_codepoint(点[当前]) == "+" or text.from_codepoint(点[当前]) == "-")` +`end` - **当前 = 当前 + 1** +`else` - 2. `true` +`忽略 = 0` - **忽略指数符号 = 0** +`end` - - `当前 < 长度(点) and 是数字(点[当前])` +`指数位 = 0` - **指数位 = 指数位 + 1** +`指数标记 = false` - **当前 = 当前 + 1** +`if 当前 < 长度(点) and (text.from_codepoint(点[当前]) == "e" or text.from_codepoint(点[当前]) == "E")` -1. `整数位 == 0` +`有小数 = true` - *失败("json.invalid_number", "数字缺少整数位")* +`指数标记 = true` -1. `有小数 and not 指数标记 and 小数位 == 0` +`当前 = 当前 + 1` - *失败("json.invalid_number", "小数缺少位数")* +`if 当前 < 长度(点) and (text.from_codepoint(点[当前]) == "+" or text.from_codepoint(点[当前]) == "-")` -1. `指数标记 and 指数位 == 0` +`当前 = 当前 + 1` - *失败("json.invalid_number", "指数缺少位数")* +`else` -**原文 = 片段(点, 开始, 当前)** +`忽略指数符号 = 0` -1. `有小数` +`end` - *成功值(小数(原文), 当前)* +`while 当前 < 长度(点) and 是数字(点[当前])` -*成功值(整数(原文), 当前)* +`指数位 = 指数位 + 1` -## 十六进制值 +`当前 = 当前 + 1` -`(码点)` +`end` -1. `码点 >= 48 and 码点 <= 57` +`else` - *码点 - 48* +`if 整数位 == 0` -2. `码点 >= 65 and 码点 <= 70` +`return 失败("json.invalid_number", "数字缺少整数位")` - *码点 - 55* +`else` -3. `码点 >= 97 and 码点 <= 102` +`if 有小数 and not 指数标记 and 小数位 == 0` - *码点 - 87* +`return 失败("json.invalid_number", "小数缺少位数")` -*0 - 1* +`else` -## 解析字符串 +`if 指数标记 and 指数位 == 0` -`(点, 位置)` +`return 失败("json.invalid_number", "指数缺少位数")` -**当前 = 位置 + 1** +`end` -**结果 = ""** +`end` -**完成 = false** +`end` -**错误 = ""** +`end` -- `当前 < 长度(点) and not 完成 and 错误 == ""` +`原文 = 片段(点, 开始, 当前)` - **码点 = 点[当前]** +`if 有小数` - 1. `码点 == 34` +`return 成功值(小数(原文), 当前)` - **完成 = true** +`end` - **当前 = 当前 + 1** +`return 成功值(整数(原文), 当前)` - 2. `码点 == 92` +## @exec 十六进制值 - 1. `当前 + 1 >= 长度(点)` +`params(码点: Int)` - **错误 = "json.invalid_escape"** +`if 码点 >= 48 and 码点 <= 57` - 2. `true` +`return 码点 - 48` - **转义码点 = 点[当前 + 1]** +`else` - 1. `转义码点 == 34` +`if 码点 >= 65 and 码点 <= 70` - **结果 = 结果 + text.from_codepoint(34)** +`return 码点 - 55` - **当前 = 当前 + 2** +`else` - 2. `转义码点 == 92` +`if 码点 >= 97 and 码点 <= 102` - **结果 = 结果 + text.from_codepoint(92)** +`return 码点 - 87` - **当前 = 当前 + 2** +`end` - 3. `转义码点 == 47` +`end` - **结果 = 结果 + text.from_codepoint(47)** +`end` - **当前 = 当前 + 2** +`return 0 - 1` - 4. `转义码点 == 98` +## @exec 解析字符串 - **结果 = 结果 + text.from_codepoint(8)** +`params(点: List, 位置: Int)` - **当前 = 当前 + 2** +`当前 = 位置 + 1` - 5. `转义码点 == 102` +`结果 = ""` - **结果 = 结果 + text.from_codepoint(12)** +`完成 = false` - **当前 = 当前 + 2** +`错误 = ""` - 6. `转义码点 == 110` +`while 当前 < 长度(点) and not 完成 and 错误 == ""` - **结果 = 结果 + text.from_codepoint(10)** +`码点 = 点[当前]` - **当前 = 当前 + 2** +`if 码点 == 34` - 7. `转义码点 == 114` +`完成 = true` - **结果 = 结果 + text.from_codepoint(13)** +`当前 = 当前 + 1` - **当前 = 当前 + 2** +`else` - 8. `转义码点 == 116` +`if 码点 == 92` - **结果 = 结果 + text.from_codepoint(9)** +`if 当前 + 1 >= 长度(点)` - **当前 = 当前 + 2** +`错误 = "json.invalid_escape"` - 9. `转义码点 == 117` +`else` - 1. `当前 + 5 >= 长度(点)` +`转义码点 = 点[当前 + 1]` - **错误 = "json.invalid_escape"** +`if 转义码点 == 34` - 2. `true` +`结果 = 结果 + text.from_codepoint(34)` - **数字 = 十六进制值(点[当前 + 2]) * 4096 + 十六进制值(点[当前 + 3]) * 256 + 十六进制值(点[当前 + 4]) * 16 + 十六进制值(点[当前 + 5])** +`当前 = 当前 + 2` - 1. `数字 < 0 or (数字 >= 55296 and 数字 <= 57343)` +`else` - **错误 = "json.invalid_escape"** +`if 转义码点 == 92` - 2. `true` +`结果 = 结果 + text.from_codepoint(92)` - **结果 = 结果 + text.from_codepoint(数字)** +`当前 = 当前 + 2` - **当前 = 当前 + 6** +`else` - 10. `true` +`if 转义码点 == 47` - **错误 = "json.invalid_escape"** +`结果 = 结果 + text.from_codepoint(47)` - 3. `true` +`当前 = 当前 + 2` - **结果 = 结果 + text.from_codepoint(码点)** +`else` - **当前 = 当前 + 1** +`if 转义码点 == 98` -1. `错误 != ""` +`结果 = 结果 + text.from_codepoint(8)` - *失败("json.invalid_string", "字符串转义无效")* +`当前 = 当前 + 2` -1. `not 完成` +`else` - *失败("json.unexpected_eof", "字符串未闭合")* +`if 转义码点 == 102` -*成功值(结果, 当前)* +`结果 = 结果 + text.from_codepoint(12)` -## 解析对象 +`当前 = 当前 + 2` -`(点, 位置)` +`else` -*解析对象项(点, 位置 + 1, {})* +`if 转义码点 == 110` -## 解析对象项 +`结果 = 结果 + text.from_codepoint(10)` -`(点, 位置, 已解析)` +`当前 = 当前 + 2` -**位置 = 跳过空白(点, 位置)** +`else` -1. `位置 >= 长度(点)` +`if 转义码点 == 114` - *失败("json.unexpected_eof", "对象未闭合")* +`结果 = 结果 + text.from_codepoint(13)` -**当前 = text.from_codepoint(点[位置])** +`当前 = 当前 + 2` -1. `当前 == "}"` +`else` - *成功值(已解析, 位置 + 1)* +`if 转义码点 == 116` -**键结果 = 解析字符串(点, 位置)** +`结果 = 结果 + text.from_codepoint(9)` -1. `not 键结果.ok` +`当前 = 当前 + 2` - *键结果* +`else` -**键 = 键结果.value** +`if 转义码点 == 117` -**位置 = 跳过空白(点, 键结果.next)** +`if 当前 + 5 >= 长度(点)` -1. `位置 >= 长度(点)` +`错误 = "json.invalid_escape"` - *失败("json.unexpected_eof", "对象缺少冒号")* +`else` -1. `text.from_codepoint(点[位置]) != ":"` +`数字 = 十六进制值(点[当前 + 2]) * 4096 + 十六进制值(点[当前 + 3]) * 256 + 十六进制值(点[当前 + 4]) * 16 + 十六进制值(点[当前 + 5])` - *失败("json.invalid_object", "对象缺少冒号")* +`if 数字 < 0 or (数字 >= 55296 and 数字 <= 57343)` -**位置 = 跳过空白(点, 位置 + 1)** +`错误 = "json.invalid_escape"` -**值结果 = 解析值(点, 位置)** +`else` -1. `not 值结果.ok` +`结果 = 结果 + text.from_codepoint(数字)` - *值结果* +`当前 = 当前 + 6` -**新的已解析 = map.set(已解析, 键, 值结果.value)** +`end` -**位置 = 跳过空白(点, 值结果.next)** +`end` -1. `位置 >= 长度(点)` +`else` - *失败("json.unexpected_eof", "对象未闭合")* +`错误 = "json.invalid_escape"` -**分隔 = text.from_codepoint(点[位置])** +`end` -1. `分隔 == ","` +`end` - *解析对象项(点, 位置 + 1, 新的已解析)* +`end` -2. `分隔 == "}"` +`end` - *成功值(新的已解析, 位置 + 1)* +`end` -3. `true` +`end` - *失败("json.invalid_object", "对象缺少逗号或 }")* +`end` -## 解析值 +`end` -`(点, 位置)` +`end` -**位置 = 跳过空白(点, 位置)** +`end` -1. `位置 >= 长度(点)` +`else` - *失败("json.unexpected_eof", "需要值")* +`结果 = 结果 + text.from_codepoint(码点)` -**首 = text.from_codepoint(点[位置])** +`当前 = 当前 + 1` -**首码点 = 点[位置]** +`end` -1. `首码点 == 34` +`end` - *解析字符串(点, 位置)* +`end` -2. `首码点 == 123` +`if 错误 != ""` - *解析对象(点, 位置)* +`return 失败("json.invalid_string", "字符串转义无效")` -3. `首 == "["` +`else` - *解析数组(点, 位置)* +`if not 完成` -4. `首 == "-" or 是数字(点[位置])` +`return 失败("json.unexpected_eof", "字符串未闭合")` - *解析数字(点, 位置)* +`end` -5. `首 == "t"` +`end` - 1. `匹配(点, 位置, "true")` +`return 成功值(结果, 当前)` - *成功值(true, 位置 + 4)* +## @exec 解析对象 - 2. `true` +`params(点: List, 位置: Int)` - *失败("json.invalid_literal", "无效字面量")* +`return 解析对象项(点, 位置 + 1, {})` -6. `首 == "f"` +## @exec 解析对象项 - 1. `匹配(点, 位置, "false")` +`params(点: List, 位置: Int, 已解析: Map)` - *成功值(false, 位置 + 5)* +`位置 = 跳过空白(点, 位置)` - 2. `true` +`if 位置 >= 长度(点)` - *失败("json.invalid_literal", "无效字面量")* +`return 失败("json.unexpected_eof", "对象未闭合")` -7. `首 == "n"` +`end` - 1. `匹配(点, 位置, "null")` +`当前 = text.from_codepoint(点[位置])` - *成功值(None, 位置 + 4)* +`if 当前 == "}"` - 2. `true` +`return 成功值(已解析, 位置 + 1)` - *失败("json.invalid_literal", "无效字面量")* +`end` -8. `true` +`键结果 = 解析字符串(点, 位置)` - *失败("json.unexpected_token", "不支持的值")* +`if not 键结果.ok` -## 解析数组 +`return 键结果` -`(点, 位置)` +`end` -*解析数组项(点, 位置 + 1, [])* +`键 = 键结果.value` -## 解析数组项 +`位置 = 跳过空白(点, 键结果.next)` -`(点, 位置, 已解析)` +`if 位置 >= 长度(点)` -**位置 = 跳过空白(点, 位置)** +`return 失败("json.unexpected_eof", "对象缺少冒号")` -1. `位置 >= 长度(点)` +`else` - *失败("json.unexpected_eof", "数组未闭合")* +`if text.from_codepoint(点[位置]) != ":"` -**当前 = text.from_codepoint(点[位置])** +`return 失败("json.invalid_object", "对象缺少冒号")` -1. `当前 == "]"` +`end` - *成功值(已解析, 位置 + 1)* +`end` -**项 = 解析值(点, 位置)** +`位置 = 跳过空白(点, 位置 + 1)` -1. `not 项.ok` +`值结果 = 解析值(点, 位置)` - *项* +`if not 值结果.ok` -**新的已解析 = list.append(已解析, 项.value)** +`return 值结果` -**位置 = 跳过空白(点, 项.next)** +`end` -1. `位置 >= 长度(点)` +`新的已解析 = map.set(已解析, 键, 值结果.value)` - *失败("json.unexpected_eof", "数组未闭合")* +`位置 = 跳过空白(点, 值结果.next)` -**分隔 = text.from_codepoint(点[位置])** +`if 位置 >= 长度(点)` -1. `分隔 == ","` +`return 失败("json.unexpected_eof", "对象未闭合")` - *解析数组项(点, 位置 + 1, 新的已解析)* +`end` -2. `分隔 == "]"` +`分隔 = text.from_codepoint(点[位置])` - *成功值(新的已解析, 位置 + 1)* +`if 分隔 == ","` -3. `true` +`return 解析对象项(点, 位置 + 1, 新的已解析)` - *失败("json.invalid_array", "数组缺少逗号或 ]")* +`else` -## 格式化文本 +`if 分隔 == "}"` -`(文本)` +`return 成功值(新的已解析, 位置 + 1)` -**点 = text.codepoints(文本)** +`else` -**`结果 = "\""`** +`return 失败("json.invalid_object", "对象缺少逗号或 }")` -**下标 = 0** +`end` -- `下标 < 长度(点)` +`end` - **码点 = 点[下标]** +## @exec 解析值 - 1. `码点 == 34` +`params(点: List, 位置: Int)` - **`结果 = 结果 + "\\\""`** +`位置 = 跳过空白(点, 位置)` - 2. `码点 == 92` +`if 位置 >= 长度(点)` - **`结果 = 结果 + "\\\\"`** +`return 失败("json.unexpected_eof", "需要值")` - 3. `码点 == 10` +`end` - **`结果 = 结果 + "\\n"`** +`首 = text.from_codepoint(点[位置])` - 4. `码点 == 9` +`首码点 = 点[位置]` - **`结果 = 结果 + "\\t"`** +`if 首码点 == 34` - 5. `码点 == 13` +`return 解析字符串(点, 位置)` - **`结果 = 结果 + "\\r"`** +`else` - 6. `true` +`if 首码点 == 123` - **结果 = 结果 + text.from_codepoint(码点)** +`return 解析对象(点, 位置)` - **下标 = 下标 + 1** +`else` -*`结果 + "\""`* +`if 首 == "["` -## 格式化列表 +`return 解析数组(点, 位置)` -`(列表)` +`else` -**结果 = "["** +`if 首 == "-" or 是数字(点[位置])` -**下标 = 0** +`return 解析数字(点, 位置)` -- `下标 < 长度(列表)` +`else` - 1. `下标 > 0` +`if 首 == "t"` - **结果 = 结果 + ", "** +`if 匹配(点, 位置, "true")` - 2. `true` +`return 成功值(true, 位置 + 4)` - **忽略 = 0** +`else` - **结果 = 结果 + 格式化(列表[下标])** +`return 失败("json.invalid_literal", "无效字面量")` - **下标 = 下标 + 1** +`end` -*结果 + "]"* +`else` -## 格式化对象 +`if 首 == "f"` -`(映射)` +`if 匹配(点, 位置, "false")` -**键列表 = map.keys(映射)** +`return 成功值(false, 位置 + 5)` -**结果 = "{"** +`else` -**下标 = 0** +`return 失败("json.invalid_literal", "无效字面量")` -- `下标 < 长度(键列表)` +`end` - 1. `下标 > 0` +`else` - **结果 = 结果 + ", "** +`if 首 == "n"` - 2. `true` +`if 匹配(点, 位置, "null")` - **忽略 = 0** +`return 成功值(None, 位置 + 4)` - **当前键 = 键列表[下标]** +`else` - **结果 = 结果 + 格式化文本(当前键) + ": " + 格式化(map.get(映射, 当前键))** +`return 失败("json.invalid_literal", "无效字面量")` - **下标 = 下标 + 1** +`end` -*结果 + "}"* +`else` -## 格式化 +`return 失败("json.unexpected_token", "不支持的值")` -`(值)` +`end` -**类别 = 类型(值)** +`end` -1. `类别 == "Text"` +`end` - *格式化文本(值)* +`end` -2. `类别 == "None"` +`end` - *"null"* +`end` -3. `类别 == "Bool" or 类别 == "Int" or 类别 == "Float"` +`end` - *文本(值)* +## @exec 解析数组 -4. `类别 == "List"` +`params(点: List, 位置: Int)` - *格式化列表(值)* +`return 解析数组项(点, 位置 + 1, [])` -5. `类别 == "Map"` +## @exec 解析数组项 - *格式化对象(值)* +`params(点: List, 位置: Int, 已解析: List)` -*"null"* +`位置 = 跳过空白(点, 位置)` -## main +`if 位置 >= 长度(点)` -**`对象结果 = 解析值(text.codepoints("{\"a\": 1, \"b\": [true, null, \"说\\\"好\"]}"), 0)`** +`return 失败("json.unexpected_eof", "数组未闭合")` -**`字符串结果 = 解析值(text.codepoints("\"a\\nb\""), 0)`** +`end` -**`浮点结果 = 解析值(text.codepoints("[1, 2.5, -3e2, 4E-1, {\"a\": 1.0}, \"x\"]"), 0)`** +`当前 = text.from_codepoint(点[位置])` -**格式化结果 = 格式化(浮点结果.value)** +`if 当前 == "]"` -*[解析值(text.codepoints(" [1, 23, [4, 5], -6] "), 0), 解析值(text.codepoints("[1 2]"), 0), 解析值(text.codepoints("[1,"), 0), 对象结果, 字符串结果, 浮点结果, 格式化结果]* +`return 成功值(已解析, 位置 + 1)` + +`end` + +`项 = 解析值(点, 位置)` + +`if not 项.ok` + +`return 项` + +`end` + +`新的已解析 = list.append(已解析, 项.value)` + +`位置 = 跳过空白(点, 项.next)` + +`if 位置 >= 长度(点)` + +`return 失败("json.unexpected_eof", "数组未闭合")` + +`end` + +`分隔 = text.from_codepoint(点[位置])` + +`if 分隔 == ","` + +`return 解析数组项(点, 位置 + 1, 新的已解析)` + +`else` + +`if 分隔 == "]"` + +`return 成功值(新的已解析, 位置 + 1)` + +`else` + +`return 失败("json.invalid_array", "数组缺少逗号或 ]")` + +`end` + +`end` + +## @exec 格式化文本 + +`params(文本: Text)` + +`点 = text.codepoints(文本)` + +`结果 = "\""` + +`下标 = 0` + +`while 下标 < 长度(点)` + +`码点 = 点[下标]` + +`if 码点 == 34` + +`结果 = 结果 + "\\\""` + +`else` + +`if 码点 == 92` + +`结果 = 结果 + "\\\\"` + +`else` + +`if 码点 == 10` + +`结果 = 结果 + "\\n"` + +`else` + +`if 码点 == 9` + +`结果 = 结果 + "\\t"` + +`else` + +`if 码点 == 13` + +`结果 = 结果 + "\\r"` + +`else` + +`结果 = 结果 + text.from_codepoint(码点)` + +`end` + +`end` + +`end` + +`end` + +`end` + +`下标 = 下标 + 1` + +`end` + +`return 结果 + "\""` + +## @exec 格式化列表 + +`params(列表: List)` + +`结果 = "["` + +`下标 = 0` + +`while 下标 < 长度(列表)` + +`if 下标 > 0` + +`结果 = 结果 + ", "` + +`else` + +`忽略 = 0` + +`end` + +`结果 = 结果 + 格式化(列表[下标])` + +`下标 = 下标 + 1` + +`end` + +`return 结果 + "]"` + +## @exec 格式化对象 + +`params(映射: Map)` + +`键列表 = map.keys(映射)` + +`结果 = "{"` + +`下标 = 0` + +`while 下标 < 长度(键列表)` + +`if 下标 > 0` + +`结果 = 结果 + ", "` + +`else` + +`忽略 = 0` + +`end` + +`当前键 = 键列表[下标]` + +`结果 = 结果 + 格式化文本(当前键) + ": " + 格式化(map.get(映射, 当前键))` + +`下标 = 下标 + 1` + +`end` + +`return 结果 + "}"` + +## @exec 格式化 + +`params(值)` + +`类别 = 类型(值)` + +`if 类别 == "Text"` + +`return 格式化文本(值)` + +`else` + +`if 类别 == "None"` + +`return "null"` + +`else` + +`if 类别 == "Bool" or 类别 == "Int" or 类别 == "Float"` + +`return 文本(值)` + +`else` + +`if 类别 == "List"` + +`return 格式化列表(值)` + +`else` + +`if 类别 == "Map"` + +`return 格式化对象(值)` + +`end` + +`end` + +`end` + +`end` + +`end` + +`return "null"` + +## @exec main + +`对象结果 = 解析值(text.codepoints("{\"a\": 1, \"b\": [true, null, \"说\\\"好\"]}"), 0)` + +`字符串结果 = 解析值(text.codepoints("\"a\\nb\""), 0)` + +`浮点结果 = 解析值(text.codepoints("[1, 2.5, -3e2, 4E-1, {\"a\": 1.0}, \"x\"]"), 0)` + +`格式化结果 = 格式化(浮点结果.value)` + +`return [解析值(text.codepoints(" [1, 23, [4, 5], -6] "), 0), 解析值(text.codepoints("[1 2]"), 0), 解析值(text.codepoints("[1,"), 0), 对象结果, 字符串结果, 浮点结果, 格式化结果]` diff --git a/tests/conformance/semantics/63-memory-bytecode-vm.mq.md b/tests/conformance/semantics/63-memory-bytecode-vm.mq.md index f9f94a1..3a55328 100644 --- a/tests/conformance/semantics/63-memory-bytecode-vm.mq.md +++ b/tests/conformance/semantics/63-memory-bytecode-vm.mq.md @@ -1,130 +1,164 @@ -## 成功 +## @exec 成功 -`(值)` +`params(值)` -*{ok: true, value: 值}* +`return {ok: true, value: 值}` -## 失败 +## @exec 失败 -`(代码, 消息)` +`params(代码, 消息)` -*{ok: false, code: 代码, message: 消息}* +`return {ok: false, code: 代码, message: 消息}` -## 写字节 +## @exec 写字节 -`(内存, 基址, 字节)` +`params(内存: Memory, 基址: Int, 字节: List)` -**下标 = 0** +`下标 = 0` -- `下标 < 长度(字节)` +`while 下标 < 长度(字节)` - **`内存[基址 + 下标] = 字节[下标]`** +`内存[基址 + 下标] = 字节[下标]` - **下标 = 下标 + 1** +`下标 = 下标 + 1` -*None* +`end` -## 运行 +`return None` -`(内存, 程序长度, 栈基址)` +## @exec 运行 -程序从偏移 0 开始,栈从 `栈基址` 开始。指令集: +`params(内存: Memory, 程序长度: Int, 栈基址: Int)` + +程序从偏移 0 开始,栈从 栈基址 开始。指令集: 1 = PUSH 立即数,2 = ADD,3 = MUL,5 = JMP,6 = JZ,7 = HALT。 -**指令指针 = 0** +`指令指针 = 0` -**栈指针 = 0** +`栈指针 = 0` -**运行中 = true** +`运行中 = true` -**错误 = ""** +`错误 = ""` -- `指令指针 < 程序长度 and 运行中 and 错误 == ""` +`while 指令指针 < 程序长度 and 运行中 and 错误 == ""` - **操作码 = 内存[指令指针]** +`操作码 = 内存[指令指针]` - 1. `操作码 == 1` +`if 操作码 == 1` - **`内存[栈基址 + 栈指针] = 内存[指令指针 + 1]`** +`内存[栈基址 + 栈指针] = 内存[指令指针 + 1]` - **栈指针 = 栈指针 + 1** +`栈指针 = 栈指针 + 1` - **指令指针 = 指令指针 + 2** +`指令指针 = 指令指针 + 2` - 2. `操作码 == 2` +`else` - **右 = 内存[栈基址 + 栈指针 - 1]** +`if 操作码 == 2` - **左 = 内存[栈基址 + 栈指针 - 2]** +`右 = 内存[栈基址 + 栈指针 - 1]` - **`内存[栈基址 + 栈指针 - 2] = 左 + 右`** +`左 = 内存[栈基址 + 栈指针 - 2]` - **栈指针 = 栈指针 - 1** +`内存[栈基址 + 栈指针 - 2] = 左 + 右` - **指令指针 = 指令指针 + 1** +`栈指针 = 栈指针 - 1` - 3. `操作码 == 3` +`指令指针 = 指令指针 + 1` - **右 = 内存[栈基址 + 栈指针 - 1]** +`else` - **左 = 内存[栈基址 + 栈指针 - 2]** +`if 操作码 == 3` - **`内存[栈基址 + 栈指针 - 2] = 左 * 右`** +`右 = 内存[栈基址 + 栈指针 - 1]` - **栈指针 = 栈指针 - 1** +`左 = 内存[栈基址 + 栈指针 - 2]` - **指令指针 = 指令指针 + 1** +`内存[栈基址 + 栈指针 - 2] = 左 * 右` - 4. `操作码 == 5` +`栈指针 = 栈指针 - 1` - **指令指针 = 内存[指令指针 + 1]** +`指令指针 = 指令指针 + 1` - 5. `操作码 == 6` +`else` - **条件 = 内存[栈基址 + 栈指针 - 1]** +`if 操作码 == 5` - **栈指针 = 栈指针 - 1** +`指令指针 = 内存[指令指针 + 1]` - 1. `条件 == 0` +`else` - **指令指针 = 内存[指令指针 + 1]** +`if 操作码 == 6` - 2. `true` +`条件 = 内存[栈基址 + 栈指针 - 1]` - **指令指针 = 指令指针 + 2** +`栈指针 = 栈指针 - 1` - 6. `操作码 == 7` +`if 条件 == 0` - **运行中 = false** +`指令指针 = 内存[指令指针 + 1]` - 7. `true` +`else` - **错误 = "vm.invalid_opcode"** +`指令指针 = 指令指针 + 2` -1. `错误 != ""` +`end` - *失败("vm.invalid_opcode", "未知指令")* +`else` -1. `栈指针 == 0` +`if 操作码 == 7` - *失败("vm.empty_stack", "没有结果")* +`运行中 = false` -*成功(内存[栈基址 + 栈指针 - 1])* +`else` -## main +`错误 = "vm.invalid_opcode"` -**内存 = memory.new(1, 1)** +`end` -第一段程序计算 `(5 + 7) * 3`。 +`end` -> 写字节(内存, 0, [1, 5, 1, 7, 2, 1, 3, 3, 7]) +`end` -**算术结果 = 运行(内存, 9, 1024)** +`end` + +`end` + +`end` + +`end` + +`if 错误 != ""` + +`return 失败("vm.invalid_opcode", "未知指令")` + +`else` + +`if 栈指针 == 0` + +`return 失败("vm.empty_stack", "没有结果")` + +`end` + +`end` + +`return 成功(内存[栈基址 + 栈指针 - 1])` + +## @exec main + +`内存 = memory.new(1, 1)` + +第一段程序计算 (5 + 7) * 3。 + +`写字节(内存, 0, [1, 5, 1, 7, 2, 1, 3, 3, 7])` + +`算术结果 = 运行(内存, 9, 1024)` 第二段程序在条件为 0 时跳到偏移 8,压入 42 后停机。 -> 写字节(内存, 0, [1, 0, 6, 8, 1, 99, 7, 0, 1, 42, 7]) +`写字节(内存, 0, [1, 0, 6, 8, 1, 99, 7, 0, 1, 42, 7])` -**分支结果 = 运行(内存, 11, 2048)** +`分支结果 = 运行(内存, 11, 2048)` -*[算术结果, 分支结果]* +`return [算术结果, 分支结果]` diff --git a/tests/conformance/semantics/64-memory-integer-codecs.mq.md b/tests/conformance/semantics/64-memory-integer-codecs.mq.md index d6ace4f..17ba4c7 100644 --- a/tests/conformance/semantics/64-memory-integer-codecs.mq.md +++ b/tests/conformance/semantics/64-memory-integer-codecs.mq.md @@ -1,108 +1,118 @@ -## 写大端 +## @exec 写大端 -`(内存, 基址, 值, 宽度)` +`params(内存: Memory, 基址: Int, 值: Int, 宽度: Int)` -从最低字节开始写,放到 `基址 + 宽度 - 1 - 下标`,因此最终是大端序。 -调用方保证 `值` 能放进 `宽度` 字节。 +从最低字节开始写,放到 基址 + 宽度 - 1 - 下标,因此最终是大端序。 +调用方保证 值 能放进 宽度 字节。 -**当前 = 值** +`当前 = 值` -**下标 = 0** +`下标 = 0` -- `下标 < 宽度` +`while 下标 < 宽度` - **`内存[基址 + 宽度 - 1 - 下标] = 当前 % 256`** +`内存[基址 + 宽度 - 1 - 下标] = 当前 % 256` - **当前 = 当前 // 256** +`当前 = 当前 // 256` - **下标 = 下标 + 1** +`下标 = 下标 + 1` -*None* +`end` -## 读大端 +`return None` -`(内存, 基址, 宽度)` +## @exec 读大端 -**值 = 0** +`params(内存: Memory, 基址: Int, 宽度: Int)` -**下标 = 0** +`值 = 0` -- `下标 < 宽度` +`下标 = 0` - **值 = 值 * 256 + 内存[基址 + 下标]** +`while 下标 < 宽度` - **下标 = 下标 + 1** +`值 = 值 * 256 + 内存[基址 + 下标]` -*值* +`下标 = 下标 + 1` -## 写变长 +`end` -`(内存, 基址, 值)` +`return 值` + +## @exec 写变长 + +`params(内存: Memory, 基址: Int, 值: Int)` LEB128:每字节低 7 位,最高位表示是否还有后续;返回写入字节数。 -**当前 = 值** +`当前 = 值` -**偏移 = 0** +`偏移 = 0` -- `当前 >= 128` +`while 当前 >= 128` - **`内存[基址 + 偏移] = 当前 % 128 + 128`** +`内存[基址 + 偏移] = 当前 % 128 + 128` - **当前 = 当前 // 128** +`当前 = 当前 // 128` - **偏移 = 偏移 + 1** +`偏移 = 偏移 + 1` -**`内存[基址 + 偏移] = 当前`** +`end` -*偏移 + 1* +`内存[基址 + 偏移] = 当前` -## 读变长 +`return 偏移 + 1` -`(内存, 基址)` +## @exec 读变长 -返回 `[值, 消耗字节数]`。 +`params(内存: Memory, 基址: Int)` -**值 = 0** +返回 [值, 消耗字节数]。 -**倍数 = 1** +`值 = 0` -**偏移 = 0** +`倍数 = 1` -**继续 = true** +`偏移 = 0` -- `继续` +`继续 = true` - **字节 = 内存[基址 + 偏移]** +`while 继续` - **值 = 值 + 字节 % 128 * 倍数** +`字节 = 内存[基址 + 偏移]` - 1. `字节 < 128` +`值 = 值 + 字节 % 128 * 倍数` - **继续 = false** +`if 字节 < 128` - 2. `true` +`继续 = false` - **倍数 = 倍数 * 128** +`else` - **偏移 = 偏移 + 1** +`倍数 = 倍数 * 128` -*[值, 偏移 + 1]* +`偏移 = 偏移 + 1` -## main +`end` -**内存 = memory.new(1, 1)** +`end` -> 写大端(内存, 0, 4660, 2) +`return [值, 偏移 + 1]` -> 写大端(内存, 16, 305419896, 4) +## @exec main -> 写大端(内存, 32, 1311768467463790320, 8) +`内存 = memory.new(1, 1)` -> 写大端(内存, 48, 18446744073709551615, 8) +`写大端(内存, 0, 4660, 2)` -**变长长度 = 写变长(内存, 128, 123456789)** +`写大端(内存, 16, 305419896, 4)` -**变长 = 读变长(内存, 128)** +`写大端(内存, 32, 1311768467463790320, 8)` -*[读大端(内存, 0, 2), 读大端(内存, 16, 4), 读大端(内存, 32, 8), 读大端(内存, 48, 8), 变长长度, 变长[0], 变长[1], 内存[48], 内存[55]]* +`写大端(内存, 48, 18446744073709551615, 8)` + +`变长长度 = 写变长(内存, 128, 123456789)` + +`变长 = 读变长(内存, 128)` + +`return [读大端(内存, 0, 2), 读大端(内存, 16, 4), 读大端(内存, 32, 8), 读大端(内存, 48, 8), 变长长度, 变长[0], 变长[1], 内存[48], 内存[55]]` diff --git a/tests/conformance/semantics/65-table-sort-stdlib.mq.md b/tests/conformance/semantics/65-table-sort-stdlib.mq.md index 0385f6c..5e60385 100644 --- a/tests/conformance/semantics/65-table-sort-stdlib.mq.md +++ b/tests/conformance/semantics/65-table-sort-stdlib.mq.md @@ -1,69 +1,77 @@ -## 插入有序 +## @exec 插入有序 -`(已排序, 行, 列)` +`params(已排序: List, 行: List, 列: Int)` -把一行插入到已按 `列` 升序排列的行列表中;返回新列表,不修改输入。 +把一行插入到已按 列 升序排列的行列表中;返回新列表,不修改输入。 -**新列表 = []** +`新列表 = []` -**已插入 = false** +`已插入 = false` -**下标 = 0** +`下标 = 0` -- `下标 < 长度(已排序)` +`while 下标 < 长度(已排序)` - **当前行 = 已排序[下标]** +`当前行 = 已排序[下标]` - 1. `not 已插入 and 当前行[列] > 行[列]` +`if not 已插入 and 当前行[列] > 行[列]` - **新列表 = list.append(新列表, 行)** +`新列表 = list.append(新列表, 行)` - **新列表 = list.append(新列表, 当前行)** +`新列表 = list.append(新列表, 当前行)` - **已插入 = true** +`已插入 = true` - 2. `true` +`else` - **新列表 = list.append(新列表, 当前行)** +`新列表 = list.append(新列表, 当前行)` - **下标 = 下标 + 1** +`end` -1. `not 已插入` +`下标 = 下标 + 1` - **新列表 = list.append(新列表, 行)** +`end` -2. `true` +`if not 已插入` - **忽略 = 0** +`新列表 = list.append(新列表, 行)` -*新列表* +`else` -## 排序 +`忽略 = 0` -`(数据, 列)` +`end` + +`return 新列表` + +## @exec 排序 + +`params(数据: Table, 列: Int)` 按列号升序排序;输入表不变,输出新表。 -**列名 = table.columns(数据)** +`列名 = table.columns(数据)` -**行数 = 长度(数据)** +`行数 = 长度(数据)` -**已排序 = []** +`已排序 = []` -**下标 = 0** +`下标 = 0` -- `下标 < 行数` +`while 下标 < 行数` - **已排序 = 插入有序(已排序, table.row(数据, 下标), 列)** +`已排序 = 插入有序(已排序, table.row(数据, 下标), 列)` - **下标 = 下标 + 1** +`下标 = 下标 + 1` -*表(列名, 已排序)* +`end` -## main +`return 表(列名, 已排序)` -**原表 = 表(["名称", "分数"], [["甲", 87], ["乙", 92], ["丙", 71]])** +## @exec main -**升序 = 排序(原表, 1)** +`原表 = 表(["名称", "分数"], [["甲", 87], ["乙", 92], ["丙", 71]])` -*[原表, 升序]* +`升序 = 排序(原表, 1)` + +`return [原表, 升序]` diff --git a/tests/conformance/semantics/66-resource-stdout-write.mq.md b/tests/conformance/semantics/66-resource-stdout-write.mq.md index 4148397..677f295 100644 --- a/tests/conformance/semantics/66-resource-stdout-write.mq.md +++ b/tests/conformance/semantics/66-resource-stdout-write.mq.md @@ -1,69 +1,81 @@ -## 编码 +## @exec 编码 -`(文本, 内存, 基址)` +`params(文本: Text, 内存: Memory, 基址: Int)` -**点 = text.codepoints(文本)** +`点 = text.codepoints(文本)` -**下标 = 0** +`下标 = 0` -**偏移 = 0** +`偏移 = 0` -- `下标 < 长度(点)` +`while 下标 < 长度(点)` - **码点 = 点[下标]** +`码点 = 点[下标]` - 1. `码点 < 128` +`if 码点 < 128` - **`内存[基址 + 偏移] = 码点`** +`内存[基址 + 偏移] = 码点` - **偏移 = 偏移 + 1** +`偏移 = 偏移 + 1` - 2. `码点 < 2048` +`else` - **`内存[基址 + 偏移] = 192 + 码点 // 64`** +`if 码点 < 2048` - **`内存[基址 + 偏移 + 1] = 128 + 码点 % 64`** +`内存[基址 + 偏移] = 192 + 码点 // 64` - **偏移 = 偏移 + 2** +`内存[基址 + 偏移 + 1] = 128 + 码点 % 64` - 3. `码点 < 65536` +`偏移 = 偏移 + 2` - **`内存[基址 + 偏移] = 224 + 码点 // 4096`** +`else` - **`内存[基址 + 偏移 + 1] = 128 + 码点 // 64 % 64`** +`if 码点 < 65536` - **`内存[基址 + 偏移 + 2] = 128 + 码点 % 64`** +`内存[基址 + 偏移] = 224 + 码点 // 4096` - **偏移 = 偏移 + 3** +`内存[基址 + 偏移 + 1] = 128 + 码点 // 64 % 64` - 4. `true` +`内存[基址 + 偏移 + 2] = 128 + 码点 % 64` - **`内存[基址 + 偏移] = 240 + 码点 // 262144`** +`偏移 = 偏移 + 3` - **`内存[基址 + 偏移 + 1] = 128 + 码点 // 4096 % 64`** +`else` - **`内存[基址 + 偏移 + 2] = 128 + 码点 // 64 % 64`** +`内存[基址 + 偏移] = 240 + 码点 // 262144` - **`内存[基址 + 偏移 + 3] = 128 + 码点 % 64`** +`内存[基址 + 偏移 + 1] = 128 + 码点 // 4096 % 64` - **偏移 = 偏移 + 4** +`内存[基址 + 偏移 + 2] = 128 + 码点 // 64 % 64` - **下标 = 下标 + 1** +`内存[基址 + 偏移 + 3] = 128 + 码点 % 64` -*偏移* +`偏移 = 偏移 + 4` -## main +`end` -**内存 = memory.new(1, 1)** +`end` -**长度 = 编码("你好,资源!\n", 内存, 0)** +`end` -**标准输出 = resource.open("stdio", "stdout", ["write"])** +`下标 = 下标 + 1` -**写入 = resource.write(标准输出, 内存, 0, 长度)** +`end` -**关闭 = resource.close(标准输出)** +`return 偏移` -**再次读取 = resource.read(标准输出, 内存, 0, 1)** +## @exec main -*[类型(标准输出), 写入, 关闭, 再次读取]* +`内存 = memory.new(1, 1)` + +`长度 = 编码("你好,资源!\n", 内存, 0)` + +`标准输出 = resource.open("stdio", "stdout", ["write"])` + +`写入 = resource.write(标准输出, 内存, 0, 长度)` + +`关闭 = resource.close(标准输出)` + +`再次读取 = resource.read(标准输出, 内存, 0, 1)` + +`return [类型(标准输出), 写入, 关闭, 再次读取]` diff --git a/tests/conformance/semantics/67-table-join-stdlib.mq.md b/tests/conformance/semantics/67-table-join-stdlib.mq.md index 8b3c020..1b5c81e 100644 --- a/tests/conformance/semantics/67-table-join-stdlib.mq.md +++ b/tests/conformance/semantics/67-table-join-stdlib.mq.md @@ -1,45 +1,51 @@ -## 连接 +## @exec 连接 -`(左, 右, 左列, 右列)` +`params(左: Table, 右: Table, 左列: Int, 右列: Int)` 按 equality 连接两张表;输出表头是左表头接右表头,原表不变。 -**表头 = list.concat(table.columns(左), table.columns(右))** +`表头 = list.concat(table.columns(左), table.columns(右))` -**结果行 = []** +`结果行 = []` -**左行号 = 0** +`左行号 = 0` -- `左行号 < 长度(左)` +`while 左行号 < 长度(左)` - **左行 = table.row(左, 左行号)** +`左行 = table.row(左, 左行号)` - **键 = 左行[左列]** +`键 = 左行[左列]` - **右行号 = 0** +`右行号 = 0` - - `右行号 < 长度(右)` +`while 右行号 < 长度(右)` - **右行 = table.row(右, 右行号)** +`右行 = table.row(右, 右行号)` - 1. `右行[右列] == 键` +`if 右行[右列] == 键` - **结果行 = list.append(结果行, list.concat(左行, 右行))** +`结果行 = list.append(结果行, list.concat(左行, 右行))` - 2. `true` +`else` - **继续 = 0** +`继续 = 0` - **右行号 = 右行号 + 1** +`end` - **左行号 = 左行号 + 1** +`右行号 = 右行号 + 1` -*表(表头, 结果行)* +`end` -## main +`左行号 = 左行号 + 1` -**左表 = 表(["名称", "分数"], [["甲", 87], ["乙", 92], ["丙", 71]])** +`end` -**右表 = 表(["名称", "等级"], [["乙", "A"], ["甲", "B"], ["丁", "C"]])** +`return 表(表头, 结果行)` -*[左表, 右表, 连接(左表, 右表, 0, 0)]* +## @exec main + +`左表 = 表(["名称", "分数"], [["甲", 87], ["乙", 92], ["丙", 71]])` + +`右表 = 表(["名称", "等级"], [["乙", "A"], ["甲", "B"], ["丁", "C"]])` + +`return [左表, 右表, 连接(左表, 右表, 0, 0)]` diff --git a/tests/conformance/semantics/68-csv-quoted-row.mq.md b/tests/conformance/semantics/68-csv-quoted-row.mq.md index dfcf01b..be0b109 100644 --- a/tests/conformance/semantics/68-csv-quoted-row.mq.md +++ b/tests/conformance/semantics/68-csv-quoted-row.mq.md @@ -1,66 +1,84 @@ -## 解析 +## @exec 解析 -`(文本)` +`params(文本: Text)` -单行 CSV:逗号分隔、双引号包裹、`""` 表示一个字面双引号。 +单行 CSV:逗号分隔、双引号包裹、"" 表示一个字面双引号。 不处理换行、多行字段或首尾空白。 -**点 = text.codepoints(文本)** +`点 = text.codepoints(文本)` -**下标 = 0** +`下标 = 0` -**字段 = ""** +`字段 = ""` -**字段表 = []** +`字段表 = []` -**引号内 = false** +`引号内 = false` -- `下标 < 长度(点)` +`while 下标 < 长度(点)` - **字符 = text.from_codepoint(点[下标])** +`字符 = text.from_codepoint(点[下标])` - 1. `引号内 and 字符 == "\""` +`if 引号内 and 字符 == "\""` - 1. `下标 + 1 < 长度(点) and text.from_codepoint(点[下标 + 1]) == "\""` +`if 下标 + 1 < 长度(点) and text.from_codepoint(点[下标 + 1]) == "\""` - **`字段 = 字段 + "\""`** +`字段 = 字段 + "\""` - **下标 = 下标 + 2** +`下标 = 下标 + 2` - 2. `true` +`else` - **引号内 = false** +`引号内 = false` - **下标 = 下标 + 1** +`下标 = 下标 + 1` - 2. `引号内` +`end` - **字段 = 字段 + 字符** +`else` - **下标 = 下标 + 1** +`if 引号内` - 3. `字符 == "\""` +`字段 = 字段 + 字符` - **引号内 = true** +`下标 = 下标 + 1` - **下标 = 下标 + 1** +`else` - 4. `字符 == ","` +`if 字符 == "\""` - **字段表 = list.append(字段表, 字段)** +`引号内 = true` - **字段 = ""** +`下标 = 下标 + 1` - **下标 = 下标 + 1** +`else` - 5. `true` +`if 字符 == ","` - **字段 = 字段 + 字符** +`字段表 = list.append(字段表, 字段)` - **下标 = 下标 + 1** +`字段 = ""` -*list.concat(字段表, [字段])* +`下标 = 下标 + 1` -## main +`else` -*`[解析("甲,\"乙,丙\",\"说\"\"好\""), 解析("a,,c"), 解析("\"\""), 解析("\"a\"\"b\",c")]`* +`字段 = 字段 + 字符` + +`下标 = 下标 + 1` + +`end` + +`end` + +`end` + +`end` + +`end` + +`return list.concat(字段表, [字段])` + +## @exec main + +`return [解析("甲,\"乙,丙\",\"说\"\"好\""), 解析("a,,c"), 解析("\"\""), 解析("\"a\"\"b\",c")]` diff --git a/tests/conformance/semantics/69-table-group-stdlib.mq.md b/tests/conformance/semantics/69-table-group-stdlib.mq.md index 65d2c33..25489f9 100644 --- a/tests/conformance/semantics/69-table-group-stdlib.mq.md +++ b/tests/conformance/semantics/69-table-group-stdlib.mq.md @@ -1,41 +1,45 @@ -## 分组 +## @exec 分组 -`(数据, 键列, 值列)` +`params(数据: Table, 键列: Int, 值列: Int)` 按文本键列分组,把值列聚合成 Map:键 -> List。输入表不变。 -**结果 = {}** +`结果 = {}` -**行号 = 0** +`行号 = 0` -- `行号 < 长度(数据)` +`while 行号 < 长度(数据)` - **行 = table.row(数据, 行号)** +`行 = table.row(数据, 行号)` - **键 = 行[键列]** +`键 = 行[键列]` - **当前 = map.get(结果, 键)** +`当前 = map.get(结果, 键)` - **列表 = []** +`列表 = []` - 1. `map.has(结果, 键)` +`if map.has(结果, 键)` - **列表 = 当前** +`列表 = 当前` - 2. `true` +`else` - **忽略 = 0** +`忽略 = 0` - **列表 = list.append(列表, 行[值列])** +`end` - **结果 = map.set(结果, 键, 列表)** +`列表 = list.append(列表, 行[值列])` - **行号 = 行号 + 1** +`结果 = map.set(结果, 键, 列表)` -*结果* +`行号 = 行号 + 1` -## main +`end` -**数据 = 表(["类别", "值"], [["a", 1], ["b", 2], ["a", 3], ["b", 4], ["a", 5]])** +`return 结果` -*[数据, 分组(数据, 0, 1)]* +## @exec main + +`数据 = 表(["类别", "值"], [["a", 1], ["b", 2], ["a", 3], ["b", 4], ["a", 5]])` + +`return [数据, 分组(数据, 0, 1)]` diff --git a/tests/conformance/semantics/70-matrix-multiply.mq.md b/tests/conformance/semantics/70-matrix-multiply.mq.md index 8fcd1c0..6dba295 100644 --- a/tests/conformance/semantics/70-matrix-multiply.mq.md +++ b/tests/conformance/semantics/70-matrix-multiply.mq.md @@ -1,47 +1,53 @@ -## 矩阵乘 +## @exec 矩阵乘 -`(左, 右)` +`params(左: List, 右: List)` List-of-List 行主序矩阵乘法;调用方保证维度匹配。使用 Int 精确算术。 -**结果 = []** +`结果 = []` -**行号 = 0** +`行号 = 0` -- `行号 < 长度(左)` +`while 行号 < 长度(左)` - **左行 = 左[行号]** +`左行 = 左[行号]` - **新行 = []** +`新行 = []` - **列号 = 0** +`列号 = 0` - - `列号 < 长度(右[0])` +`while 列号 < 长度(右[0])` - **总和 = 0** +`总和 = 0` - **内号 = 0** +`内号 = 0` - - `内号 < 长度(左行)` +`while 内号 < 长度(左行)` - **总和 = 总和 + 左行[内号] * 右[内号][列号]** +`总和 = 总和 + 左行[内号] * 右[内号][列号]` - **内号 = 内号 + 1** +`内号 = 内号 + 1` - **新行 = list.append(新行, 总和)** +`end` - **列号 = 列号 + 1** +`新行 = list.append(新行, 总和)` - **结果 = list.append(结果, 新行)** +`列号 = 列号 + 1` - **行号 = 行号 + 1** +`end` -*结果* +`结果 = list.append(结果, 新行)` -## main +`行号 = 行号 + 1` -**左 = [[1, 2, 3], [4, 5, 6]]** +`end` -**右 = [[7, 8], [9, 10], [11, 12]]** +`return 结果` -*[左, 右, 矩阵乘(左, 右)]* +## @exec main + +`左 = [[1, 2, 3], [4, 5, 6]]` + +`右 = [[7, 8], [9, 10], [11, 12]]` + +`return [左, 右, 矩阵乘(左, 右)]` diff --git a/tests/conformance/semantics/71-http-parser.mq.md b/tests/conformance/semantics/71-http-parser.mq.md index 7c82a67..8815cc1 100644 --- a/tests/conformance/semantics/71-http-parser.mq.md +++ b/tests/conformance/semantics/71-http-parser.mq.md @@ -1,250 +1,291 @@ -## 切片 +## @exec 切片 -`(点, 起, 止)` +`params(点: List, 起: Int, 止: Int)` -**结果 = ""** +`结果 = ""` -**下标 = 起** +`下标 = 起` -- `下标 < 止` +`while 下标 < 止` - **结果 = 结果 + text.from_codepoint(点[下标])** +`结果 = 结果 + text.from_codepoint(点[下标])` - **下标 = 下标 + 1** +`下标 = 下标 + 1` -*结果* +`end` -## 找子串 +`return 结果` -`(点, 子点, 起点)` +## @exec 找子串 -**结果 = 0 - 1** +`params(点: List, 子点: List, 起点: Int)` -**下标 = 起点** +`结果 = 0 - 1` -- `下标 + 长度(子点) <= 长度(点) and 结果 < 0` +`下标 = 起点` - **偏移 = 0** +`while 下标 + 长度(子点) <= 长度(点) and 结果 < 0` - **匹配 = true** +`偏移 = 0` - - `偏移 < 长度(子点) and 匹配` +`匹配 = true` - 1. `点[下标 + 偏移] != 子点[偏移]` +`while 偏移 < 长度(子点) and 匹配` - **匹配 = false** +`if 点[下标 + 偏移] != 子点[偏移]` - 2. `true` +`匹配 = false` - **忽略 = 0** +`else` - **偏移 = 偏移 + 1** +`忽略 = 0` - 1. `匹配` +`end` - **结果 = 下标** +`偏移 = 偏移 + 1` - 2. `true` +`end` - **忽略 = 0** +`if 匹配` - **下标 = 下标 + 1** +`结果 = 下标` -*结果* +`else` -## 找字符 +`忽略 = 0` -`(点, 码点, 起点)` +`end` -**结果 = 0 - 1** +`下标 = 下标 + 1` -**下标 = 起点** +`end` -- `下标 < 长度(点) and 结果 < 0` +`return 结果` - 1. `点[下标] == 码点` +## @exec 找字符 - **结果 = 下标** +`params(点: List, 码点: Int, 起点: Int)` - 2. `true` +`结果 = 0 - 1` - **忽略 = 0** +`下标 = 起点` - **下标 = 下标 + 1** +`while 下标 < 长度(点) and 结果 < 0` -*结果* +`if 点[下标] == 码点` -## 十六进制值 +`结果 = 下标` -`(点)` +`else` -**数值 = 0** +`忽略 = 0` -**下标 = 0** +`end` -- `下标 < 长度(点)` +`下标 = 下标 + 1` - **码点 = 点[下标]** +`end` - 1. `码点 >= 48 and 码点 <= 57` +`return 结果` - **数值 = 数值 * 16 + 码点 - 48** +## @exec 十六进制值 - 2. `码点 >= 65 and 码点 <= 70` +`params(点: List)` - **数值 = 数值 * 16 + 码点 - 55** +`数值 = 0` - 3. `码点 >= 97 and 码点 <= 102` +`下标 = 0` - **数值 = 数值 * 16 + 码点 - 87** +`while 下标 < 长度(点)` - 4. `true` +`码点 = 点[下标]` - **忽略 = 0** +`if 码点 >= 48 and 码点 <= 57` - **下标 = 下标 + 1** +`数值 = 数值 * 16 + 码点 - 48` -*数值* +`else` -## 解码分块 +`if 码点 >= 65 and 码点 <= 70` -`(体)` +`数值 = 数值 * 16 + 码点 - 55` -**点 = text.codepoints(体)** +`else` -**结果 = ""** +`if 码点 >= 97 and 码点 <= 102` -**位置 = 0** +`数值 = 数值 * 16 + 码点 - 87` -- `位置 < 长度(点)` +`else` - **行尾 = 找子串(点, text.codepoints("\r\n"), 位置)** +`忽略 = 0` - - `行尾 < 0` +`end` - *""* +`end` - **大小文本 = 切片(点, 位置, 行尾)** +`end` - **大小 = 十六进制值(text.codepoints(大小文本))** +`下标 = 下标 + 1` - 1. `大小 == 0` +`end` - **位置 = 长度(点)** +`return 数值` - 2. `true` +## @exec 解码分块 - **结果 = 结果 + 切片(点, 行尾 + 2, 行尾 + 2 + 大小)** +`params(体: Text)` - **位置 = 行尾 + 2 + 大小 + 2** +`点 = text.codepoints(体)` -*结果* +`结果 = ""` -## 解析响应 +`位置 = 0` -`(文本)` +`while 位置 < 长度(点)` -**点 = text.codepoints(文本)** +`行尾 = 找子串(点, text.codepoints("\r\n"), 位置)` -**分隔 = text.codepoints("\r\n\r\n")** +`while 行尾 < 0` -**头部结束 = 找子串(点, 分隔, 0)** +`return ""` -**头部 = 切片(点, 0, 头部结束)** +`end` -**体 = 切片(点, 头部结束 + 4, 长度(点))** +`大小文本 = 切片(点, 位置, 行尾)` -**头部点 = text.codepoints(头部)** +`大小 = 十六进制值(text.codepoints(大小文本))` -**行列表 = []** +`if 大小 == 0` -**行起 = 0** +`位置 = 长度(点)` -**下一行 = 找子串(头部点, text.codepoints("\r\n"), 0)** +`else` -- `下一行 >= 0` +`结果 = 结果 + 切片(点, 行尾 + 2, 行尾 + 2 + 大小)` - **行列表 = list.append(行列表, 切片(头部点, 行起, 下一行))** +`位置 = 行尾 + 2 + 大小 + 2` - **行起 = 下一行 + 2** +`end` - **下一行 = 找子串(头部点, text.codepoints("\r\n"), 行起)** +`end` -**行列表 = list.append(行列表, 切片(头部点, 行起, 长度(头部点)))** +`return 结果` -**状态行 = 行列表[0]** +## @exec 解析响应 -**状态点 = text.codepoints(状态行)** +`params(文本: Text)` -**第一空格 = 找字符(状态点, 32, 0)** +`点 = text.codepoints(文本)` -**第二空格 = 找字符(状态点, 32, 第一空格 + 1)** +`分隔 = text.codepoints("\r\n\r\n")` -**状态 = 整数(切片(状态点, 第一空格 + 1, 第二空格))** +`头部结束 = 找子串(点, 分隔, 0)` -**原因 = 切片(状态点, 第二空格 + 1, 长度(状态点))** +`头部 = 切片(点, 0, 头部结束)` -**头 = {}** +`体 = 切片(点, 头部结束 + 4, 长度(点))` -**行号 = 1** +`头部点 = text.codepoints(头部)` -- `行号 < 长度(行列表)` +`行列表 = []` - **行点 = text.codepoints(行列表[行号])** +`行起 = 0` - **冒号 = 找字符(行点, 58, 0)** +`下一行 = 找子串(头部点, text.codepoints("\r\n"), 0)` - 1. `冒号 >= 0` +`while 下一行 >= 0` - **名 = 切片(行点, 0, 冒号)** +`行列表 = list.append(行列表, 切片(头部点, 行起, 下一行))` - **值 = 切片(行点, 冒号 + 2, 长度(行点))** +`行起 = 下一行 + 2` - **头 = map.set(头, 名, 值)** +`下一行 = 找子串(头部点, text.codepoints("\r\n"), 行起)` - 2. `true` +`end` - **忽略 = 0** +`行列表 = list.append(行列表, 切片(头部点, 行起, 长度(头部点)))` - **行号 = 行号 + 1** +`状态行 = 行列表[0]` -**传输 = map.get(头, "Transfer-Encoding")** +`状态点 = text.codepoints(状态行)` -**解码后 = 体** +`第一空格 = 找字符(状态点, 32, 0)` -1. `传输 == "chunked"` +`第二空格 = 找字符(状态点, 32, 第一空格 + 1)` - **解码后 = 解码分块(体)** +`状态 = 整数(切片(状态点, 第一空格 + 1, 第二空格))` -2. `true` +`原因 = 切片(状态点, 第二空格 + 1, 长度(状态点))` - **解码后 = 体** +`头 = {}` -*{状态: 状态, 原因: 原因, 头: 头, 体: 解码后}* +`行号 = 1` -## 构建请求 +`while 行号 < 长度(行列表)` -`(方法, 路径, 头列表, 体)` +`行点 = text.codepoints(行列表[行号])` -**请求 = 方法 + " " + 路径 + " HTTP/1.1\r\n"** +`冒号 = 找字符(行点, 58, 0)` -**行号 = 0** +`if 冒号 >= 0` -- `行号 < 长度(头列表)` +`名 = 切片(行点, 0, 冒号)` - **请求 = 请求 + 头列表[行号][0] + ": " + 头列表[行号][1] + "\r\n"** +`值 = 切片(行点, 冒号 + 2, 长度(行点))` - **行号 = 行号 + 1** +`头 = map.set(头, 名, 值)` -*请求 + "\r\n" + 体* +`else` -## main +`忽略 = 0` -**响应文本 = "HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\nTransfer-Encoding: chunked\r\n\r\n5\r\nhello\r\n6\r\n world\r\n0\r\n\r\n"** +`end` -**响应 = 解析响应(响应文本)** +`行号 = 行号 + 1` -**请求 = 构建请求("GET", "/health", [["Accept", "text/plain"], ["Host", "example.test"]], "")** +`end` -*[响应.状态, 响应.原因, 响应.头["Content-Type"], 响应.体, 请求]* +`传输 = map.get(头, "Transfer-Encoding")` +`解码后 = 体` + +`if 传输 == "chunked"` + +`解码后 = 解码分块(体)` + +`else` + +`解码后 = 体` + +`end` + +`return {状态: 状态, 原因: 原因, 头: 头, 体: 解码后}` + +## @exec 构建请求 + +`params(方法: Text, 路径: Text, 头列表: List, 体: Text)` + +`请求 = 方法 + " " + 路径 + " HTTP/1.1\r\n"` + +`行号 = 0` + +`while 行号 < 长度(头列表)` + +`请求 = 请求 + 头列表[行号][0] + ": " + 头列表[行号][1] + "\r\n"` + +`行号 = 行号 + 1` + +`end` + +`return 请求 + "\r\n" + 体` + +## @exec main + +`响应文本 = "HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\nTransfer-Encoding: chunked\r\n\r\n5\r\nhello\r\n6\r\n world\r\n0\r\n\r\n"` + +`响应 = 解析响应(响应文本)` + +`请求 = 构建请求("GET", "/health", [["Accept", "text/plain"], ["Host", "example.test"]], "")` + +`return [响应.状态, 响应.原因, 响应.头["Content-Type"], 响应.体, 请求]` diff --git a/tests/conformance/semantics/72-table-columnar.mq.md b/tests/conformance/semantics/72-table-columnar.mq.md index 0b81de6..4480468 100644 --- a/tests/conformance/semantics/72-table-columnar.mq.md +++ b/tests/conformance/semantics/72-table-columnar.mq.md @@ -3,236 +3,274 @@ import: 数据表: "std:data/table" --- -## 转表 +## @exec 转表 -`(列存)` +`params(列存: Map)` -**列 = 列存["列"]** +`列 = 列存["列"]` -**数据 = 列存["数据"]** +`数据 = 列存["数据"]` -**行数 = 0** +`行数 = 0` -1. `长度(数据) > 0` +`if 长度(数据) > 0` - **行数 = 长度(数据[0])** +`行数 = 长度(数据[0])` -2. `true` +`else` - **忽略 = 0** +`忽略 = 0` -**行列表 = []** +`end` -**行号 = 0** +`行列表 = []` -- `行号 < 行数` +`行号 = 0` - **行 = []** +`while 行号 < 行数` - **列号 = 0** +`行 = []` - - `列号 < 长度(列)` +`列号 = 0` - **行 = list.append(行, 数据[列号][行号])** +`while 列号 < 长度(列)` - **列号 = 列号 + 1** +`行 = list.append(行, 数据[列号][行号])` - **行列表 = list.append(行列表, 行)** +`列号 = 列号 + 1` - **行号 = 行号 + 1** +`end` -*表(列, 行列表)* +`行列表 = list.append(行列表, 行)` -## 列存排序 +`行号 = 行号 + 1` -`(列存, 目标列)` +`end` -**列 = 列存["列"]** +`return 表(列, 行列表)` -**数据 = 列存["数据"]** +## @exec 列存排序 -**行数 = 长度(数据[目标列])** +`params(列存: Map, 目标列: Int)` -**顺序 = []** +`列 = 列存["列"]` -**行号 = 0** +`数据 = 列存["数据"]` -- `行号 < 行数` +`行数 = 长度(数据[目标列])` - **顺序 = list.append(顺序, 行号)** +`顺序 = []` - **行号 = 行号 + 1** +`行号 = 0` -**下标 = 1** +`while 行号 < 行数` -- `下标 < 行数` +`顺序 = list.append(顺序, 行号)` - **当前 = 下标** +`行号 = 行号 + 1` - **新顺序 = []** +`end` - **已插入 = false** +`下标 = 1` - **位 = 0** +`while 下标 < 行数` - - `位 < 长度(顺序)` +`当前 = 下标` - **已有 = 顺序[位]** +`新顺序 = []` - 1. `not 已插入 and 数据[目标列][已有] > 数据[目标列][当前]` +`已插入 = false` - **新顺序 = list.append(新顺序, 当前)** +`位 = 0` - **新顺序 = list.append(新顺序, 已有)** +`while 位 < 长度(顺序)` - **已插入 = true** +`已有 = 顺序[位]` - 2. `true` +`if not 已插入 and 数据[目标列][已有] > 数据[目标列][当前]` - **新顺序 = list.append(新顺序, 已有)** +`新顺序 = list.append(新顺序, 当前)` - **位 = 位 + 1** +`新顺序 = list.append(新顺序, 已有)` - 1. `not 已插入` +`已插入 = true` - **新顺序 = list.append(新顺序, 当前)** +`else` - 2. `true` +`新顺序 = list.append(新顺序, 已有)` - **忽略 = 0** +`end` - **顺序 = 新顺序** +`位 = 位 + 1` - **下标 = 下标 + 1** +`end` -**新数据 = []** +`if not 已插入` -**列号 = 0** +`新顺序 = list.append(新顺序, 当前)` -- `列号 < 长度(列)` +`else` - **新列 = []** +`忽略 = 0` - **位 = 0** +`end` - - `位 < 行数` +`顺序 = 新顺序` - **新列 = list.append(新列, 数据[列号][顺序[位]])** +`下标 = 下标 + 1` - **位 = 位 + 1** +`end` - **新数据 = list.append(新数据, 新列)** +`新数据 = []` - **列号 = 列号 + 1** +`列号 = 0` -*{列: 列, 数据: 新数据}* +`while 列号 < 长度(列)` -## 列存过滤 +`新列 = []` -`(列存, 目标列, 阈值)` +`位 = 0` -**列 = 列存["列"]** +`while 位 < 行数` -**数据 = 列存["数据"]** +`新列 = list.append(新列, 数据[列号][顺序[位]])` -**行数 = 长度(数据[目标列])** +`位 = 位 + 1` -**保留 = []** +`end` -**行号 = 0** +`新数据 = list.append(新数据, 新列)` -- `行号 < 行数` +`列号 = 列号 + 1` - 1. `数据[目标列][行号] > 阈值` +`end` - **保留 = list.append(保留, 行号)** +`return {列: 列, 数据: 新数据}` - 2. `true` +## @exec 列存过滤 - **忽略 = 0** +`params(列存: Map, 目标列: Int, 阈值: Int)` - **行号 = 行号 + 1** +`列 = 列存["列"]` -**新数据 = []** +`数据 = 列存["数据"]` -**列号 = 0** +`行数 = 长度(数据[目标列])` -- `列号 < 长度(列)` +`保留 = []` - **新列 = []** +`行号 = 0` - **位 = 0** +`while 行号 < 行数` - - `位 < 长度(保留)` +`if 数据[目标列][行号] > 阈值` - **新列 = list.append(新列, 数据[列号][保留[位]])** +`保留 = list.append(保留, 行号)` - **位 = 位 + 1** +`else` - **新数据 = list.append(新数据, 新列)** +`忽略 = 0` - **列号 = 列号 + 1** +`end` -*{列: 列, 数据: 新数据}* +`行号 = 行号 + 1` -## 表相等 +`end` -`(左, 右)` +`新数据 = []` -**左列 = table.columns(左)** +`列号 = 0` -**右列 = table.columns(右)** +`while 列号 < 长度(列)` -**相等 = 长度(左列) == 长度(右列) and 长度(左) == 长度(右)** +`新列 = []` -**列号 = 0** +`位 = 0` -- `列号 < 长度(左列) and 相等` +`while 位 < 长度(保留)` - 1. `左列[列号] != 右列[列号]` +`新列 = list.append(新列, 数据[列号][保留[位]])` - **相等 = false** +`位 = 位 + 1` - 2. `true` +`end` - **忽略 = 0** +`新数据 = list.append(新数据, 新列)` - **列号 = 列号 + 1** +`列号 = 列号 + 1` -**行号 = 0** +`end` -- `行号 < 长度(左) and 相等` +`return {列: 列, 数据: 新数据}` - **列号 = 0** +## @exec 表相等 - - `列号 < 长度(左列) and 相等` +`params(左: Table, 右: Table)` - 1. `table.cell(左, 行号, 列号) != table.cell(右, 行号, 列号)` +`左列 = table.columns(左)` - **相等 = false** +`右列 = table.columns(右)` - 2. `true` +`相等 = 长度(左列) == 长度(右列) and 长度(左) == 长度(右)` - **忽略 = 0** +`列号 = 0` - **列号 = 列号 + 1** +`while 列号 < 长度(左列) and 相等` - **行号 = 行号 + 1** +`if 左列[列号] != 右列[列号]` -*相等* +`相等 = false` -## main +`else` -**列存 = {列: ["名称", "分数"], 数据: [["甲", "乙", "丙"], [87, 92, 71]]}** +`忽略 = 0` -**行表 = 转表(列存)** +`end` -**排序行 = 数据表.排序(行表, 1)** +`列号 = 列号 + 1` -**排序列 = 转表(列存排序(列存, 1))** +`end` -**过滤行 = 数据表.过滤数值大于(行表, 1, 80)** +`行号 = 0` -**过滤列 = 转表(列存过滤(列存, 1, 80))** +`while 行号 < 长度(左) and 相等` -*[表相等(转表(列存), 行表), 表相等(排序行, 排序列), 表相等(过滤行, 过滤列)]* +`列号 = 0` + +`while 列号 < 长度(左列) and 相等` + +`if table.cell(左, 行号, 列号) != table.cell(右, 行号, 列号)` + +`相等 = false` + +`else` + +`忽略 = 0` + +`end` + +`列号 = 列号 + 1` + +`end` + +`行号 = 行号 + 1` + +`end` + +`return 相等` + +## @exec main + +`列存 = {列: ["名称", "分数"], 数据: [["甲", "乙", "丙"], [87, 92, 71]]}` + +`行表 = 转表(列存)` + +`排序行 = 数据表.排序(行表, 1)` + +`排序列 = 转表(列存排序(列存, 1))` + +`过滤行 = 数据表.过滤数值大于(行表, 1, 80)` + +`过滤列 = 转表(列存过滤(列存, 1, 80))` + +`return [表相等(转表(列存), 行表), 表相等(排序行, 排序列), 表相等(过滤行, 过滤列)]` diff --git a/tests/conformance/semantics/73-sparse-matrix.mq.md b/tests/conformance/semantics/73-sparse-matrix.mq.md index 28bed6f..aa64e29 100644 --- a/tests/conformance/semantics/73-sparse-matrix.mq.md +++ b/tests/conformance/semantics/73-sparse-matrix.mq.md @@ -1,99 +1,115 @@ -## 查值 +## @exec 查值 -`(三元组, 行, 列)` +`params(三元组: List, 行: Int, 列: Int)` -**值 = 0** +`值 = 0` -**下标 = 0** +`下标 = 0` -- `下标 < 长度(三元组)` +`while 下标 < 长度(三元组)` - 1. `三元组[下标][0] == 行 and 三元组[下标][1] == 列` +`if 三元组[下标][0] == 行 and 三元组[下标][1] == 列` - **值 = 三元组[下标][2]** +`值 = 三元组[下标][2]` - 2. `true` +`else` - **忽略 = 0** +`忽略 = 0` - **下标 = 下标 + 1** +`end` -*值* +`下标 = 下标 + 1` -## 三列转稠密 +`end` -`(三元组, 行数, 列数)` +`return 值` -**矩阵 = []** +## @exec 三列转稠密 -**行号 = 0** +`params(三元组: List, 行数: Int, 列数: Int)` -- `行号 < 行数` +`矩阵 = []` - **行 = []** +`行号 = 0` - **列号 = 0** +`while 行号 < 行数` - - `列号 < 列数` +`行 = []` - **行 = list.append(行, 查值(三元组, 行号, 列号))** +`列号 = 0` - **列号 = 列号 + 1** +`while 列号 < 列数` - **矩阵 = list.append(矩阵, 行)** +`行 = list.append(行, 查值(三元组, 行号, 列号))` - **行号 = 行号 + 1** +`列号 = 列号 + 1` -*矩阵* +`end` -## 稀疏乘法 +`矩阵 = list.append(矩阵, 行)` -`(左, 右, 行数, 内维, 列数)` +`行号 = 行号 + 1` -**结果 = []** +`end` -**行号 = 0** +`return 矩阵` -- `行号 < 行数` +## @exec 稀疏乘法 - **列号 = 0** +`params(左: List, 右: List, 行数: Int, 内维: Int, 列数: Int)` - - `列号 < 列数` +`结果 = []` - **和 = 0** +`行号 = 0` - **内号 = 0** +`while 行号 < 行数` - - `内号 < 内维` +`列号 = 0` - **左值 = 查值(左, 行号, 内号)** +`while 列号 < 列数` - **右值 = 查值(右, 内号, 列号)** +`和 = 0` - **和 = 和 + 左值 * 右值** +`内号 = 0` - **内号 = 内号 + 1** +`while 内号 < 内维` - 1. `和 != 0` +`左值 = 查值(左, 行号, 内号)` - **结果 = list.append(结果, [行号, 列号, 和])** +`右值 = 查值(右, 内号, 列号)` - 2. `true` +`和 = 和 + 左值 * 右值` - **忽略 = 0** +`内号 = 内号 + 1` - **列号 = 列号 + 1** +`end` - **行号 = 行号 + 1** +`if 和 != 0` -*结果* +`结果 = list.append(结果, [行号, 列号, 和])` -## main +`else` -**左 = [[0, 0, 1], [0, 2, 2], [1, 1, 3]]** +`忽略 = 0` -**右 = [[0, 0, 4], [1, 1, 5], [2, 0, 6]]** +`end` -**乘积 = 稀疏乘法(左, 右, 2, 3, 2)** +`列号 = 列号 + 1` -*[乘积, 三列转稠密(乘积, 2, 2)]* +`end` + +`行号 = 行号 + 1` + +`end` + +`return 结果` + +## @exec main + +`左 = [[0, 0, 1], [0, 2, 2], [1, 1, 3]]` + +`右 = [[0, 0, 4], [1, 1, 5], [2, 0, 6]]` + +`乘积 = 稀疏乘法(左, 右, 2, 3, 2)` + +`return [乘积, 三列转稠密(乘积, 2, 2)]` diff --git a/tests/negative/01-invalid-mode-marker-case.expected.json b/tests/negative/01-invalid-mode-marker-case.expected.json new file mode 100644 index 0000000..d1c4824 --- /dev/null +++ b/tests/negative/01-invalid-mode-marker-case.expected.json @@ -0,0 +1,5 @@ +{ + "codes": [ + "sem.invalid_mode_marker" + ] +} diff --git a/tests/negative/01-invalid-mode-marker-case.mq.md b/tests/negative/01-invalid-mode-marker-case.mq.md new file mode 100644 index 0000000..5a49783 --- /dev/null +++ b/tests/negative/01-invalid-mode-marker-case.mq.md @@ -0,0 +1,5 @@ + +# @exec 01-invalid-mode-marker-case +## @Exec main + +`return 1` diff --git a/tests/negative/01-invalid-strong-nested-emph.expected.json b/tests/negative/01-invalid-strong-nested-emph.expected.json deleted file mode 100644 index c30f3be..0000000 --- a/tests/negative/01-invalid-strong-nested-emph.expected.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "codes": [ - "markdown.invalid_construct" - ] -} diff --git a/tests/negative/02-invalid-mode-marker-misspelled.expected.json b/tests/negative/02-invalid-mode-marker-misspelled.expected.json new file mode 100644 index 0000000..d1c4824 --- /dev/null +++ b/tests/negative/02-invalid-mode-marker-misspelled.expected.json @@ -0,0 +1,5 @@ +{ + "codes": [ + "sem.invalid_mode_marker" + ] +} diff --git a/tests/negative/02-invalid-mode-marker-misspelled.mq.md b/tests/negative/02-invalid-mode-marker-misspelled.mq.md new file mode 100644 index 0000000..8dbf906 --- /dev/null +++ b/tests/negative/02-invalid-mode-marker-misspelled.mq.md @@ -0,0 +1,5 @@ + +# @exec 02-invalid-mode-marker-misspelled +## @knowledg 说明 + +普通知识文字。 diff --git a/tests/negative/02-invalid-strong-nested-strong.expected.json b/tests/negative/02-invalid-strong-nested-strong.expected.json deleted file mode 100644 index c30f3be..0000000 --- a/tests/negative/02-invalid-strong-nested-strong.expected.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "codes": [ - "markdown.invalid_construct" - ] -} diff --git a/tests/negative/03-invalid-mode-marker-conflict.expected.json b/tests/negative/03-invalid-mode-marker-conflict.expected.json new file mode 100644 index 0000000..d1c4824 --- /dev/null +++ b/tests/negative/03-invalid-mode-marker-conflict.expected.json @@ -0,0 +1,5 @@ +{ + "codes": [ + "sem.invalid_mode_marker" + ] +} diff --git a/tests/negative/03-invalid-mode-marker-conflict.mq.md b/tests/negative/03-invalid-mode-marker-conflict.mq.md new file mode 100644 index 0000000..a9041f8 --- /dev/null +++ b/tests/negative/03-invalid-mode-marker-conflict.mq.md @@ -0,0 +1,3 @@ +## @exec @knowledge main + +`return 1` diff --git a/tests/negative/03-invalid-strong-nested-link.expected.json b/tests/negative/03-invalid-strong-nested-link.expected.json deleted file mode 100644 index c30f3be..0000000 --- a/tests/negative/03-invalid-strong-nested-link.expected.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "codes": [ - "markdown.invalid_construct" - ] -} diff --git a/tests/negative/04-empty-unit-name-exec.expected.json b/tests/negative/04-empty-unit-name-exec.expected.json new file mode 100644 index 0000000..bb3be12 --- /dev/null +++ b/tests/negative/04-empty-unit-name-exec.expected.json @@ -0,0 +1,5 @@ +{ + "codes": [ + "sem.empty_unit_name" + ] +} diff --git a/tests/negative/04-empty-unit-name-exec.mq.md b/tests/negative/04-empty-unit-name-exec.mq.md new file mode 100644 index 0000000..10b063a --- /dev/null +++ b/tests/negative/04-empty-unit-name-exec.mq.md @@ -0,0 +1 @@ +## @exec diff --git a/tests/negative/04-invalid-strong-nested-math.expected.json b/tests/negative/04-invalid-strong-nested-math.expected.json deleted file mode 100644 index c30f3be..0000000 --- a/tests/negative/04-invalid-strong-nested-math.expected.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "codes": [ - "markdown.invalid_construct" - ] -} diff --git a/tests/negative/05-empty-unit-name-knowledge.expected.json b/tests/negative/05-empty-unit-name-knowledge.expected.json new file mode 100644 index 0000000..bb3be12 --- /dev/null +++ b/tests/negative/05-empty-unit-name-knowledge.expected.json @@ -0,0 +1,5 @@ +{ + "codes": [ + "sem.empty_unit_name" + ] +} diff --git a/tests/negative/05-empty-unit-name-knowledge.mq.md b/tests/negative/05-empty-unit-name-knowledge.mq.md new file mode 100644 index 0000000..ac51847 --- /dev/null +++ b/tests/negative/05-empty-unit-name-knowledge.mq.md @@ -0,0 +1 @@ +# @knowledge diff --git a/tests/negative/05-invalid-strong-nested-strikethrough.expected.json b/tests/negative/05-invalid-strong-nested-strikethrough.expected.json deleted file mode 100644 index c30f3be..0000000 --- a/tests/negative/05-invalid-strong-nested-strikethrough.expected.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "codes": [ - "markdown.invalid_construct" - ] -} diff --git a/tests/negative/06-exec-without-function-under-knowledge.expected.json b/tests/negative/06-exec-without-function-under-knowledge.expected.json new file mode 100644 index 0000000..f59e861 --- /dev/null +++ b/tests/negative/06-exec-without-function-under-knowledge.expected.json @@ -0,0 +1,5 @@ +{ + "codes": [ + "sem.exec_without_function" + ] +} diff --git a/tests/negative/06-exec-without-function-under-knowledge.mq.md b/tests/negative/06-exec-without-function-under-knowledge.mq.md new file mode 100644 index 0000000..c342cd1 --- /dev/null +++ b/tests/negative/06-exec-without-function-under-knowledge.mq.md @@ -0,0 +1,5 @@ +## @knowledge 说明 + +### @exec 过程 + +`x = 1` diff --git a/tests/negative/06-invalid-strong-linebreak.expected.json b/tests/negative/06-invalid-strong-linebreak.expected.json deleted file mode 100644 index c30f3be..0000000 --- a/tests/negative/06-invalid-strong-linebreak.expected.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "codes": [ - "markdown.invalid_construct" - ] -} diff --git a/tests/negative/07-exec-without-function-under-h1.expected.json b/tests/negative/07-exec-without-function-under-h1.expected.json new file mode 100644 index 0000000..f59e861 --- /dev/null +++ b/tests/negative/07-exec-without-function-under-h1.expected.json @@ -0,0 +1,5 @@ +{ + "codes": [ + "sem.exec_without_function" + ] +} diff --git a/tests/negative/07-exec-without-function-under-h1.mq.md b/tests/negative/07-exec-without-function-under-h1.mq.md new file mode 100644 index 0000000..afba2ba --- /dev/null +++ b/tests/negative/07-exec-without-function-under-h1.mq.md @@ -0,0 +1,3 @@ +# @exec 顶层 + +`x = 1` diff --git a/tests/negative/07-invalid-emph-nested-strong.expected.json b/tests/negative/07-invalid-emph-nested-strong.expected.json deleted file mode 100644 index c30f3be..0000000 --- a/tests/negative/07-invalid-emph-nested-strong.expected.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "codes": [ - "markdown.invalid_construct" - ] -} diff --git a/tests/negative/08-invalid-emph-nested-emph.expected.json b/tests/negative/08-invalid-emph-nested-emph.expected.json deleted file mode 100644 index c30f3be..0000000 --- a/tests/negative/08-invalid-emph-nested-emph.expected.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "codes": [ - "markdown.invalid_construct" - ] -} diff --git a/tests/negative/08-payload-nested-strong-emph.expected.json b/tests/negative/08-payload-nested-strong-emph.expected.json new file mode 100644 index 0000000..564a9a1 --- /dev/null +++ b/tests/negative/08-payload-nested-strong-emph.expected.json @@ -0,0 +1,5 @@ +{ + "codes": [ + "sem.payload_nested" + ] +} diff --git a/tests/negative/01-invalid-strong-nested-emph.mq.md b/tests/negative/08-payload-nested-strong-emph.mq.md similarity index 54% rename from tests/negative/01-invalid-strong-nested-emph.mq.md rename to tests/negative/08-payload-nested-strong-emph.mq.md index 58254fe..90d8b82 100644 --- a/tests/negative/01-invalid-strong-nested-emph.mq.md +++ b/tests/negative/08-payload-nested-strong-emph.mq.md @@ -1,3 +1,3 @@ -## f +## @exec f **a *b* c** diff --git a/tests/negative/09-invalid-strong-empty-payload.expected.json b/tests/negative/09-invalid-strong-empty-payload.expected.json deleted file mode 100644 index c30f3be..0000000 --- a/tests/negative/09-invalid-strong-empty-payload.expected.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "codes": [ - "markdown.invalid_construct" - ] -} diff --git a/tests/negative/09-payload-nested-strong-strong.expected.json b/tests/negative/09-payload-nested-strong-strong.expected.json new file mode 100644 index 0000000..564a9a1 --- /dev/null +++ b/tests/negative/09-payload-nested-strong-strong.expected.json @@ -0,0 +1,5 @@ +{ + "codes": [ + "sem.payload_nested" + ] +} diff --git a/tests/negative/02-invalid-strong-nested-strong.mq.md b/tests/negative/09-payload-nested-strong-strong.mq.md similarity index 57% rename from tests/negative/02-invalid-strong-nested-strong.mq.md rename to tests/negative/09-payload-nested-strong-strong.mq.md index 8b35ef1..f00fad3 100644 --- a/tests/negative/02-invalid-strong-nested-strong.mq.md +++ b/tests/negative/09-payload-nested-strong-strong.mq.md @@ -1,3 +1,3 @@ -## f +## @exec f **a __b__ c** diff --git a/tests/negative/10-invalid-emph-empty-payload.expected.json b/tests/negative/10-invalid-emph-empty-payload.expected.json deleted file mode 100644 index c30f3be..0000000 --- a/tests/negative/10-invalid-emph-empty-payload.expected.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "codes": [ - "markdown.invalid_construct" - ] -} diff --git a/tests/negative/10-invalid-emph-empty-payload.mq.md b/tests/negative/10-invalid-emph-empty-payload.mq.md deleted file mode 100644 index 252e11d..0000000 --- a/tests/negative/10-invalid-emph-empty-payload.mq.md +++ /dev/null @@ -1,3 +0,0 @@ -## f - -*`` ``* diff --git a/tests/negative/10-payload-nested-strong-link.expected.json b/tests/negative/10-payload-nested-strong-link.expected.json new file mode 100644 index 0000000..564a9a1 --- /dev/null +++ b/tests/negative/10-payload-nested-strong-link.expected.json @@ -0,0 +1,5 @@ +{ + "codes": [ + "sem.payload_nested" + ] +} diff --git a/tests/negative/03-invalid-strong-nested-link.mq.md b/tests/negative/10-payload-nested-strong-link.mq.md similarity index 77% rename from tests/negative/03-invalid-strong-nested-link.mq.md rename to tests/negative/10-payload-nested-strong-link.mq.md index 2fa0008..281404a 100644 --- a/tests/negative/03-invalid-strong-nested-link.mq.md +++ b/tests/negative/10-payload-nested-strong-link.mq.md @@ -1,3 +1,3 @@ -## f +## @exec f **见[链接](https://example.com)** diff --git a/tests/negative/11-invalid-strong-expression.mq.md b/tests/negative/11-invalid-strong-expression.mq.md deleted file mode 100644 index ea1296c..0000000 --- a/tests/negative/11-invalid-strong-expression.mq.md +++ /dev/null @@ -1,3 +0,0 @@ -## f - -**1 +** diff --git a/tests/negative/11-payload-nested-strong-math.expected.json b/tests/negative/11-payload-nested-strong-math.expected.json new file mode 100644 index 0000000..564a9a1 --- /dev/null +++ b/tests/negative/11-payload-nested-strong-math.expected.json @@ -0,0 +1,5 @@ +{ + "codes": [ + "sem.payload_nested" + ] +} diff --git a/tests/negative/04-invalid-strong-nested-math.mq.md b/tests/negative/11-payload-nested-strong-math.mq.md similarity index 54% rename from tests/negative/04-invalid-strong-nested-math.mq.md rename to tests/negative/11-payload-nested-strong-math.mq.md index 01b113a..a932d53 100644 --- a/tests/negative/04-invalid-strong-nested-math.mq.md +++ b/tests/negative/11-payload-nested-strong-math.mq.md @@ -1,3 +1,3 @@ -## f +## @exec f **$x + y$** diff --git a/tests/negative/12-invalid-emph-expression.mq.md b/tests/negative/12-invalid-emph-expression.mq.md deleted file mode 100644 index 71f6df2..0000000 --- a/tests/negative/12-invalid-emph-expression.mq.md +++ /dev/null @@ -1,3 +0,0 @@ -## f - -*1 +* diff --git a/tests/negative/12-payload-nested-strong-strikethrough.expected.json b/tests/negative/12-payload-nested-strong-strikethrough.expected.json new file mode 100644 index 0000000..564a9a1 --- /dev/null +++ b/tests/negative/12-payload-nested-strong-strikethrough.expected.json @@ -0,0 +1,5 @@ +{ + "codes": [ + "sem.payload_nested" + ] +} diff --git a/tests/negative/05-invalid-strong-nested-strikethrough.mq.md b/tests/negative/12-payload-nested-strong-strikethrough.mq.md similarity index 59% rename from tests/negative/05-invalid-strong-nested-strikethrough.mq.md rename to tests/negative/12-payload-nested-strong-strikethrough.mq.md index 3982134..384e809 100644 --- a/tests/negative/05-invalid-strong-nested-strikethrough.mq.md +++ b/tests/negative/12-payload-nested-strong-strikethrough.mq.md @@ -1,3 +1,3 @@ -## f +## @exec f **~~删除~~** diff --git a/tests/negative/13-ordered-item-no-condition.expected.json b/tests/negative/13-ordered-item-no-condition.expected.json deleted file mode 100644 index c30f3be..0000000 --- a/tests/negative/13-ordered-item-no-condition.expected.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "codes": [ - "markdown.invalid_construct" - ] -} diff --git a/tests/negative/13-ordered-item-no-condition.mq.md b/tests/negative/13-ordered-item-no-condition.mq.md deleted file mode 100644 index ed4c17a..0000000 --- a/tests/negative/13-ordered-item-no-condition.mq.md +++ /dev/null @@ -1,3 +0,0 @@ -## f - -1. 没有条件 diff --git a/tests/negative/13-payload-nested-emph-strong.expected.json b/tests/negative/13-payload-nested-emph-strong.expected.json new file mode 100644 index 0000000..564a9a1 --- /dev/null +++ b/tests/negative/13-payload-nested-emph-strong.expected.json @@ -0,0 +1,5 @@ +{ + "codes": [ + "sem.payload_nested" + ] +} diff --git a/tests/negative/07-invalid-emph-nested-strong.mq.md b/tests/negative/13-payload-nested-emph-strong.mq.md similarity index 54% rename from tests/negative/07-invalid-emph-nested-strong.mq.md rename to tests/negative/13-payload-nested-emph-strong.mq.md index 2e55e7f..ad0a1c7 100644 --- a/tests/negative/07-invalid-emph-nested-strong.mq.md +++ b/tests/negative/13-payload-nested-emph-strong.mq.md @@ -1,3 +1,3 @@ -## f +## @exec f *a **b** c* diff --git a/tests/negative/14-bullet-item-no-condition.expected.json b/tests/negative/14-bullet-item-no-condition.expected.json deleted file mode 100644 index c30f3be..0000000 --- a/tests/negative/14-bullet-item-no-condition.expected.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "codes": [ - "markdown.invalid_construct" - ] -} diff --git a/tests/negative/14-bullet-item-no-condition.mq.md b/tests/negative/14-bullet-item-no-condition.mq.md deleted file mode 100644 index 3251afe..0000000 --- a/tests/negative/14-bullet-item-no-condition.mq.md +++ /dev/null @@ -1,3 +0,0 @@ -## f - -- 没有条件 diff --git a/tests/negative/14-payload-nested-emph-emph.expected.json b/tests/negative/14-payload-nested-emph-emph.expected.json new file mode 100644 index 0000000..564a9a1 --- /dev/null +++ b/tests/negative/14-payload-nested-emph-emph.expected.json @@ -0,0 +1,5 @@ +{ + "codes": [ + "sem.payload_nested" + ] +} diff --git a/tests/negative/08-invalid-emph-nested-emph.mq.md b/tests/negative/14-payload-nested-emph-emph.mq.md similarity index 50% rename from tests/negative/08-invalid-emph-nested-emph.mq.md rename to tests/negative/14-payload-nested-emph-emph.mq.md index 9cbc3c4..625cd46 100644 --- a/tests/negative/08-invalid-emph-nested-emph.mq.md +++ b/tests/negative/14-payload-nested-emph-emph.mq.md @@ -1,3 +1,3 @@ -## f +## @exec f *a _b_ c* diff --git a/tests/negative/15-ordered-item-first-block-not-paragraph.expected.json b/tests/negative/15-ordered-item-first-block-not-paragraph.expected.json deleted file mode 100644 index c30f3be..0000000 --- a/tests/negative/15-ordered-item-first-block-not-paragraph.expected.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "codes": [ - "markdown.invalid_construct" - ] -} diff --git a/tests/negative/15-ordered-item-first-block-not-paragraph.mq.md b/tests/negative/15-ordered-item-first-block-not-paragraph.mq.md deleted file mode 100644 index 9e73c86..0000000 --- a/tests/negative/15-ordered-item-first-block-not-paragraph.mq.md +++ /dev/null @@ -1,3 +0,0 @@ -## f - -1. > 引用不是条件 diff --git a/tests/negative/15-payload-nested-linebreak.expected.json b/tests/negative/15-payload-nested-linebreak.expected.json new file mode 100644 index 0000000..564a9a1 --- /dev/null +++ b/tests/negative/15-payload-nested-linebreak.expected.json @@ -0,0 +1,5 @@ +{ + "codes": [ + "sem.payload_nested" + ] +} diff --git a/tests/negative/06-invalid-strong-linebreak.mq.md b/tests/negative/15-payload-nested-linebreak.mq.md similarity index 50% rename from tests/negative/06-invalid-strong-linebreak.mq.md rename to tests/negative/15-payload-nested-linebreak.mq.md index fae8caf..60d974d 100644 --- a/tests/negative/06-invalid-strong-linebreak.mq.md +++ b/tests/negative/15-payload-nested-linebreak.mq.md @@ -1,4 +1,4 @@ -## f +## @exec f **a b** diff --git a/tests/negative/16-empty-payload-strong.expected.json b/tests/negative/16-empty-payload-strong.expected.json new file mode 100644 index 0000000..2fd8b12 --- /dev/null +++ b/tests/negative/16-empty-payload-strong.expected.json @@ -0,0 +1,5 @@ +{ + "codes": [ + "sem.empty_payload" + ] +} diff --git a/tests/negative/09-invalid-strong-empty-payload.mq.md b/tests/negative/16-empty-payload-strong.mq.md similarity index 50% rename from tests/negative/09-invalid-strong-empty-payload.mq.md rename to tests/negative/16-empty-payload-strong.mq.md index 198e407..0cc213e 100644 --- a/tests/negative/09-invalid-strong-empty-payload.mq.md +++ b/tests/negative/16-empty-payload-strong.mq.md @@ -1,3 +1,3 @@ -## f +## @exec f **`` ``** diff --git a/tests/negative/16-ordered-item-first-inline-not-code.expected.json b/tests/negative/16-ordered-item-first-inline-not-code.expected.json deleted file mode 100644 index c30f3be..0000000 --- a/tests/negative/16-ordered-item-first-inline-not-code.expected.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "codes": [ - "markdown.invalid_construct" - ] -} diff --git a/tests/negative/16-ordered-item-first-inline-not-code.mq.md b/tests/negative/16-ordered-item-first-inline-not-code.mq.md deleted file mode 100644 index 9860de9..0000000 --- a/tests/negative/16-ordered-item-first-inline-not-code.mq.md +++ /dev/null @@ -1,3 +0,0 @@ -## f - -1. 普通文本 diff --git a/tests/negative/17-empty-payload-emph.expected.json b/tests/negative/17-empty-payload-emph.expected.json new file mode 100644 index 0000000..2fd8b12 --- /dev/null +++ b/tests/negative/17-empty-payload-emph.expected.json @@ -0,0 +1,5 @@ +{ + "codes": [ + "sem.empty_payload" + ] +} diff --git a/tests/negative/17-empty-payload-emph.mq.md b/tests/negative/17-empty-payload-emph.mq.md new file mode 100644 index 0000000..5741675 --- /dev/null +++ b/tests/negative/17-empty-payload-emph.mq.md @@ -0,0 +1,3 @@ +## @exec f + +*`` ``* diff --git a/tests/negative/17-ordered-condition-invalid-expression.mq.md b/tests/negative/17-ordered-condition-invalid-expression.mq.md deleted file mode 100644 index 7e5e717..0000000 --- a/tests/negative/17-ordered-condition-invalid-expression.mq.md +++ /dev/null @@ -1,3 +0,0 @@ -## f - -1. `n >` diff --git a/tests/negative/18-quote-not-a-call.expected.json b/tests/negative/18-quote-not-a-call.expected.json deleted file mode 100644 index c30f3be..0000000 --- a/tests/negative/18-quote-not-a-call.expected.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "codes": [ - "markdown.invalid_construct" - ] -} diff --git a/tests/negative/18-quote-not-a-call.mq.md b/tests/negative/18-quote-not-a-call.mq.md deleted file mode 100644 index 1b20bb7..0000000 --- a/tests/negative/18-quote-not-a-call.mq.md +++ /dev/null @@ -1,3 +0,0 @@ -## f - -> 这不是调用 diff --git a/tests/negative/11-invalid-strong-expression.expected.json b/tests/negative/18-syntax-if-missing-operand.expected.json similarity index 55% rename from tests/negative/11-invalid-strong-expression.expected.json rename to tests/negative/18-syntax-if-missing-operand.expected.json index 8f17ea3..8386193 100644 --- a/tests/negative/11-invalid-strong-expression.expected.json +++ b/tests/negative/18-syntax-if-missing-operand.expected.json @@ -1,5 +1,5 @@ { "codes": [ - "expr.parse" + "sem.syntax" ] } diff --git a/tests/negative/18-syntax-if-missing-operand.mq.md b/tests/negative/18-syntax-if-missing-operand.mq.md new file mode 100644 index 0000000..48fdfc9 --- /dev/null +++ b/tests/negative/18-syntax-if-missing-operand.mq.md @@ -0,0 +1,3 @@ +## @exec f + +`if x >` diff --git a/tests/negative/19-quote-multi-paragraph.expected.json b/tests/negative/19-quote-multi-paragraph.expected.json deleted file mode 100644 index c30f3be..0000000 --- a/tests/negative/19-quote-multi-paragraph.expected.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "codes": [ - "markdown.invalid_construct" - ] -} diff --git a/tests/negative/19-quote-multi-paragraph.mq.md b/tests/negative/19-quote-multi-paragraph.mq.md deleted file mode 100644 index 1d59665..0000000 --- a/tests/negative/19-quote-multi-paragraph.mq.md +++ /dev/null @@ -1,5 +0,0 @@ -## f - -> 打印(1) -> -> 打印(2) diff --git a/tests/negative/12-invalid-emph-expression.expected.json b/tests/negative/19-syntax-if-trailing-colon.expected.json similarity index 55% rename from tests/negative/12-invalid-emph-expression.expected.json rename to tests/negative/19-syntax-if-trailing-colon.expected.json index 8f17ea3..8386193 100644 --- a/tests/negative/12-invalid-emph-expression.expected.json +++ b/tests/negative/19-syntax-if-trailing-colon.expected.json @@ -1,5 +1,5 @@ { "codes": [ - "expr.parse" + "sem.syntax" ] } diff --git a/tests/negative/19-syntax-if-trailing-colon.mq.md b/tests/negative/19-syntax-if-trailing-colon.mq.md new file mode 100644 index 0000000..190302e --- /dev/null +++ b/tests/negative/19-syntax-if-trailing-colon.mq.md @@ -0,0 +1,3 @@ +## @exec f + +`if x > 0:` diff --git a/tests/negative/20-quote-nested.expected.json b/tests/negative/20-quote-nested.expected.json deleted file mode 100644 index c30f3be..0000000 --- a/tests/negative/20-quote-nested.expected.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "codes": [ - "markdown.invalid_construct" - ] -} diff --git a/tests/negative/20-quote-nested.mq.md b/tests/negative/20-quote-nested.mq.md deleted file mode 100644 index 419a1a6..0000000 --- a/tests/negative/20-quote-nested.mq.md +++ /dev/null @@ -1,3 +0,0 @@ -## f - -> > 打印(1) diff --git a/tests/negative/17-ordered-condition-invalid-expression.expected.json b/tests/negative/20-syntax-end-if.expected.json similarity index 55% rename from tests/negative/17-ordered-condition-invalid-expression.expected.json rename to tests/negative/20-syntax-end-if.expected.json index 8f17ea3..8386193 100644 --- a/tests/negative/17-ordered-condition-invalid-expression.expected.json +++ b/tests/negative/20-syntax-end-if.expected.json @@ -1,5 +1,5 @@ { "codes": [ - "expr.parse" + "sem.syntax" ] } diff --git a/tests/negative/20-syntax-end-if.mq.md b/tests/negative/20-syntax-end-if.mq.md new file mode 100644 index 0000000..88992bc --- /dev/null +++ b/tests/negative/20-syntax-end-if.mq.md @@ -0,0 +1,3 @@ +## @exec f + +`end if` diff --git a/tests/negative/21-quote-empty.expected.json b/tests/negative/21-quote-empty.expected.json deleted file mode 100644 index c30f3be..0000000 --- a/tests/negative/21-quote-empty.expected.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "codes": [ - "markdown.invalid_construct" - ] -} diff --git a/tests/negative/21-quote-empty.mq.md b/tests/negative/21-quote-empty.mq.md deleted file mode 100644 index dcf6a4d..0000000 --- a/tests/negative/21-quote-empty.mq.md +++ /dev/null @@ -1,3 +0,0 @@ -## f - -> diff --git a/tests/negative/22-quote-two-calls-one-paragraph.expected.json b/tests/negative/21-syntax-return-missing-value.expected.json similarity index 55% rename from tests/negative/22-quote-two-calls-one-paragraph.expected.json rename to tests/negative/21-syntax-return-missing-value.expected.json index 8f17ea3..8386193 100644 --- a/tests/negative/22-quote-two-calls-one-paragraph.expected.json +++ b/tests/negative/21-syntax-return-missing-value.expected.json @@ -1,5 +1,5 @@ { "codes": [ - "expr.parse" + "sem.syntax" ] } diff --git a/tests/negative/21-syntax-return-missing-value.mq.md b/tests/negative/21-syntax-return-missing-value.mq.md new file mode 100644 index 0000000..af48104 --- /dev/null +++ b/tests/negative/21-syntax-return-missing-value.mq.md @@ -0,0 +1,3 @@ +## @exec f + +`return` diff --git a/tests/negative/22-quote-two-calls-one-paragraph.mq.md b/tests/negative/22-quote-two-calls-one-paragraph.mq.md deleted file mode 100644 index 70a2566..0000000 --- a/tests/negative/22-quote-two-calls-one-paragraph.mq.md +++ /dev/null @@ -1,3 +0,0 @@ -## f - -> 打印(1) 打印(2) diff --git a/tests/negative/22-syntax-multi-statement-payload.expected.json b/tests/negative/22-syntax-multi-statement-payload.expected.json new file mode 100644 index 0000000..8386193 --- /dev/null +++ b/tests/negative/22-syntax-multi-statement-payload.expected.json @@ -0,0 +1,5 @@ +{ + "codes": [ + "sem.syntax" + ] +} diff --git a/tests/negative/22-syntax-multi-statement-payload.mq.md b/tests/negative/22-syntax-multi-statement-payload.mq.md new file mode 100644 index 0000000..346ab05 --- /dev/null +++ b/tests/negative/22-syntax-multi-statement-payload.mq.md @@ -0,0 +1,3 @@ +## @exec f + +`x = 1; return x` diff --git a/tests/negative/23-quote-non-call-expression.expected.json b/tests/negative/23-quote-non-call-expression.expected.json deleted file mode 100644 index c30f3be..0000000 --- a/tests/negative/23-quote-non-call-expression.expected.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "codes": [ - "markdown.invalid_construct" - ] -} diff --git a/tests/negative/23-quote-non-call-expression.mq.md b/tests/negative/23-quote-non-call-expression.mq.md deleted file mode 100644 index b297cdd..0000000 --- a/tests/negative/23-quote-non-call-expression.mq.md +++ /dev/null @@ -1,3 +0,0 @@ -## f - -> 1 + 2 diff --git a/tests/negative/23-syntax-malformed-params.expected.json b/tests/negative/23-syntax-malformed-params.expected.json new file mode 100644 index 0000000..8386193 --- /dev/null +++ b/tests/negative/23-syntax-malformed-params.expected.json @@ -0,0 +1,5 @@ +{ + "codes": [ + "sem.syntax" + ] +} diff --git a/tests/negative/23-syntax-malformed-params.mq.md b/tests/negative/23-syntax-malformed-params.mq.md new file mode 100644 index 0000000..0468d98 --- /dev/null +++ b/tests/negative/23-syntax-malformed-params.mq.md @@ -0,0 +1,5 @@ +## @exec f + +`params(1x: Int)` + +`return 1` diff --git a/tests/negative/24-quote-link-form-without-arguments.expected.json b/tests/negative/24-quote-link-form-without-arguments.expected.json deleted file mode 100644 index c30f3be..0000000 --- a/tests/negative/24-quote-link-form-without-arguments.expected.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "codes": [ - "markdown.invalid_construct" - ] -} diff --git a/tests/negative/24-quote-link-form-without-arguments.mq.md b/tests/negative/24-quote-link-form-without-arguments.mq.md deleted file mode 100644 index 9c2f588..0000000 --- a/tests/negative/24-quote-link-form-without-arguments.mq.md +++ /dev/null @@ -1,7 +0,0 @@ -## f - -*1* - -## main - -> [f](#f) diff --git a/tests/negative/24-unmatched-else.expected.json b/tests/negative/24-unmatched-else.expected.json new file mode 100644 index 0000000..f46f32e --- /dev/null +++ b/tests/negative/24-unmatched-else.expected.json @@ -0,0 +1,5 @@ +{ + "codes": [ + "sem.unmatched_else" + ] +} diff --git a/tests/negative/24-unmatched-else.mq.md b/tests/negative/24-unmatched-else.mq.md new file mode 100644 index 0000000..56a637f --- /dev/null +++ b/tests/negative/24-unmatched-else.mq.md @@ -0,0 +1,3 @@ +## @exec f + +`else` diff --git a/tests/negative/25-duplicate-else.expected.json b/tests/negative/25-duplicate-else.expected.json new file mode 100644 index 0000000..8594da8 --- /dev/null +++ b/tests/negative/25-duplicate-else.expected.json @@ -0,0 +1,5 @@ +{ + "codes": [ + "sem.duplicate_else" + ] +} diff --git a/tests/negative/25-duplicate-else.mq.md b/tests/negative/25-duplicate-else.mq.md new file mode 100644 index 0000000..8d57c97 --- /dev/null +++ b/tests/negative/25-duplicate-else.mq.md @@ -0,0 +1,11 @@ +## @exec f + +`params(flag: Bool)` + +`if flag` + +`else` + +`else` + +`end` diff --git a/tests/negative/25-quote-external-link-call.expected.json b/tests/negative/25-quote-external-link-call.expected.json deleted file mode 100644 index 73e646b..0000000 --- a/tests/negative/25-quote-external-link-call.expected.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "codes": [ - "ref.unresolved" - ] -} diff --git a/tests/negative/25-quote-external-link-call.mq.md b/tests/negative/25-quote-external-link-call.mq.md deleted file mode 100644 index d5bab71..0000000 --- a/tests/negative/25-quote-external-link-call.mq.md +++ /dev/null @@ -1,3 +0,0 @@ -## main - -> [x](https://example.com)() diff --git a/tests/negative/26-quote-cross-module-link-call.expected.json b/tests/negative/26-quote-cross-module-link-call.expected.json deleted file mode 100644 index e6a5e73..0000000 --- a/tests/negative/26-quote-cross-module-link-call.expected.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "codes": [ - "module.unresolved" - ] -} diff --git a/tests/negative/26-quote-cross-module-link-call.mq.md b/tests/negative/26-quote-cross-module-link-call.mq.md deleted file mode 100644 index 5e25beb..0000000 --- a/tests/negative/26-quote-cross-module-link-call.mq.md +++ /dev/null @@ -1,3 +0,0 @@ -## main - -> [f](./other.mq.md#f)() diff --git a/tests/negative/26-unmatched-end.expected.json b/tests/negative/26-unmatched-end.expected.json new file mode 100644 index 0000000..2e3448c --- /dev/null +++ b/tests/negative/26-unmatched-end.expected.json @@ -0,0 +1,5 @@ +{ + "codes": [ + "sem.unmatched_end" + ] +} diff --git a/tests/negative/26-unmatched-end.mq.md b/tests/negative/26-unmatched-end.mq.md new file mode 100644 index 0000000..78ccd0c --- /dev/null +++ b/tests/negative/26-unmatched-end.mq.md @@ -0,0 +1,3 @@ +## @exec f + +`end` diff --git a/tests/negative/27-quote-unresolved-anchor.expected.json b/tests/negative/27-quote-unresolved-anchor.expected.json deleted file mode 100644 index 73e646b..0000000 --- a/tests/negative/27-quote-unresolved-anchor.expected.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "codes": [ - "ref.unresolved" - ] -} diff --git a/tests/negative/27-quote-unresolved-anchor.mq.md b/tests/negative/27-quote-unresolved-anchor.mq.md deleted file mode 100644 index f7f6016..0000000 --- a/tests/negative/27-quote-unresolved-anchor.mq.md +++ /dev/null @@ -1,3 +0,0 @@ -## main - -> [f](#不存在)() diff --git a/tests/negative/27-unclosed-control-if.expected.json b/tests/negative/27-unclosed-control-if.expected.json new file mode 100644 index 0000000..8bed151 --- /dev/null +++ b/tests/negative/27-unclosed-control-if.expected.json @@ -0,0 +1,5 @@ +{ + "codes": [ + "sem.unclosed_control" + ] +} diff --git a/tests/negative/27-unclosed-control-if.mq.md b/tests/negative/27-unclosed-control-if.mq.md new file mode 100644 index 0000000..3227aec --- /dev/null +++ b/tests/negative/27-unclosed-control-if.mq.md @@ -0,0 +1,7 @@ +## @exec f + +`params(flag: Bool)` + +`if flag` + +`return 1` diff --git a/tests/negative/28-duplicate-function-name.expected.json b/tests/negative/28-duplicate-function-name.expected.json deleted file mode 100644 index c30f3be..0000000 --- a/tests/negative/28-duplicate-function-name.expected.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "codes": [ - "markdown.invalid_construct" - ] -} diff --git a/tests/negative/28-duplicate-function-name.mq.md b/tests/negative/28-duplicate-function-name.mq.md deleted file mode 100644 index 78decb3..0000000 --- a/tests/negative/28-duplicate-function-name.mq.md +++ /dev/null @@ -1,7 +0,0 @@ -## f - -*1* - -## f - -*2* diff --git a/tests/negative/28-unclosed-control-while.expected.json b/tests/negative/28-unclosed-control-while.expected.json new file mode 100644 index 0000000..8bed151 --- /dev/null +++ b/tests/negative/28-unclosed-control-while.expected.json @@ -0,0 +1,5 @@ +{ + "codes": [ + "sem.unclosed_control" + ] +} diff --git a/tests/negative/28-unclosed-control-while.mq.md b/tests/negative/28-unclosed-control-while.mq.md new file mode 100644 index 0000000..1b43755 --- /dev/null +++ b/tests/negative/28-unclosed-control-while.mq.md @@ -0,0 +1,5 @@ +## @exec f + +`params(flag: Bool)` + +`while flag` diff --git a/tests/negative/29-control-across-heading.expected.json b/tests/negative/29-control-across-heading.expected.json new file mode 100644 index 0000000..f0dc761 --- /dev/null +++ b/tests/negative/29-control-across-heading.expected.json @@ -0,0 +1,6 @@ +{ + "codes": [ + "sem.unclosed_control", + "sem.unmatched_end" + ] +} diff --git a/tests/negative/29-control-across-heading.mq.md b/tests/negative/29-control-across-heading.mq.md new file mode 100644 index 0000000..504cd16 --- /dev/null +++ b/tests/negative/29-control-across-heading.mq.md @@ -0,0 +1,9 @@ +## @exec f + +`params(flag: Bool)` + +`if flag` + +### @exec 续写 + +`end` diff --git a/tests/negative/29-duplicate-namespace-name.expected.json b/tests/negative/29-duplicate-namespace-name.expected.json deleted file mode 100644 index c30f3be..0000000 --- a/tests/negative/29-duplicate-namespace-name.expected.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "codes": [ - "markdown.invalid_construct" - ] -} diff --git a/tests/negative/29-duplicate-namespace-name.mq.md b/tests/negative/29-duplicate-namespace-name.mq.md deleted file mode 100644 index fcbe79a..0000000 --- a/tests/negative/29-duplicate-namespace-name.mq.md +++ /dev/null @@ -1,7 +0,0 @@ -# a - -## f - -*1* - -# a diff --git a/tests/negative/30-empty-function-heading.expected.json b/tests/negative/30-empty-function-heading.expected.json deleted file mode 100644 index c30f3be..0000000 --- a/tests/negative/30-empty-function-heading.expected.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "codes": [ - "markdown.invalid_construct" - ] -} diff --git a/tests/negative/30-empty-function-heading.mq.md b/tests/negative/30-empty-function-heading.mq.md deleted file mode 100644 index d040b05..0000000 --- a/tests/negative/30-empty-function-heading.mq.md +++ /dev/null @@ -1,3 +0,0 @@ -## - -*1* diff --git a/tests/negative/30-signature-position-after-statement.expected.json b/tests/negative/30-signature-position-after-statement.expected.json new file mode 100644 index 0000000..07996f5 --- /dev/null +++ b/tests/negative/30-signature-position-after-statement.expected.json @@ -0,0 +1,5 @@ +{ + "codes": [ + "sem.signature_position" + ] +} diff --git a/tests/negative/30-signature-position-after-statement.mq.md b/tests/negative/30-signature-position-after-statement.mq.md new file mode 100644 index 0000000..50a236c --- /dev/null +++ b/tests/negative/30-signature-position-after-statement.mq.md @@ -0,0 +1,7 @@ +## @exec f + +`x = 1` + +`params(y: Int)` + +`return x` diff --git a/tests/negative/31-empty-namespace-heading.expected.json b/tests/negative/31-empty-namespace-heading.expected.json deleted file mode 100644 index c30f3be..0000000 --- a/tests/negative/31-empty-namespace-heading.expected.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "codes": [ - "markdown.invalid_construct" - ] -} diff --git a/tests/negative/31-empty-namespace-heading.mq.md b/tests/negative/31-empty-namespace-heading.mq.md deleted file mode 100644 index 4e53868..0000000 --- a/tests/negative/31-empty-namespace-heading.mq.md +++ /dev/null @@ -1,5 +0,0 @@ -# - -## f - -*1* diff --git a/tests/negative/31-signature-position-in-list.expected.json b/tests/negative/31-signature-position-in-list.expected.json new file mode 100644 index 0000000..07996f5 --- /dev/null +++ b/tests/negative/31-signature-position-in-list.expected.json @@ -0,0 +1,5 @@ +{ + "codes": [ + "sem.signature_position" + ] +} diff --git a/tests/negative/31-signature-position-in-list.mq.md b/tests/negative/31-signature-position-in-list.mq.md new file mode 100644 index 0000000..80e39ed --- /dev/null +++ b/tests/negative/31-signature-position-in-list.mq.md @@ -0,0 +1,5 @@ +## @exec f + +- `params(n: Int)` + +`return 0` diff --git a/tests/negative/32-signature-position-duplicate.expected.json b/tests/negative/32-signature-position-duplicate.expected.json new file mode 100644 index 0000000..07996f5 --- /dev/null +++ b/tests/negative/32-signature-position-duplicate.expected.json @@ -0,0 +1,5 @@ +{ + "codes": [ + "sem.signature_position" + ] +} diff --git a/tests/negative/32-signature-position-duplicate.mq.md b/tests/negative/32-signature-position-duplicate.mq.md new file mode 100644 index 0000000..eb300b0 --- /dev/null +++ b/tests/negative/32-signature-position-duplicate.mq.md @@ -0,0 +1,7 @@ +## @exec f + +`params(a: Int)` + +`params(b: Int)` + +`return a` diff --git a/tests/negative/32-unknown-function.mq.md b/tests/negative/32-unknown-function.mq.md deleted file mode 100644 index ecdf743..0000000 --- a/tests/negative/32-unknown-function.mq.md +++ /dev/null @@ -1,3 +0,0 @@ -## f - -*nope(1)* diff --git a/tests/negative/33-inferred-signature-positional.mq.md b/tests/negative/33-inferred-signature-positional.mq.md deleted file mode 100644 index 548d063..0000000 --- a/tests/negative/33-inferred-signature-positional.mq.md +++ /dev/null @@ -1,9 +0,0 @@ -## g - -**n = n + 1** - -*n* - -## f - -*g(1)* diff --git a/tests/negative/33-unsupported-version-directive.expected.json b/tests/negative/33-unsupported-version-directive.expected.json new file mode 100644 index 0000000..3eb3d4f --- /dev/null +++ b/tests/negative/33-unsupported-version-directive.expected.json @@ -0,0 +1,5 @@ +{ + "codes": [ + "sem.unsupported_version_directive" + ] +} diff --git a/tests/negative/33-unsupported-version-directive.mq.md b/tests/negative/33-unsupported-version-directive.mq.md new file mode 100644 index 0000000..82849b1 --- /dev/null +++ b/tests/negative/33-unsupported-version-directive.mq.md @@ -0,0 +1,7 @@ +--- +marqdo_semantics: 1 +--- + +## @exec main + +`return 1` diff --git a/tests/negative/34-missing-required-argument.mq.md b/tests/negative/34-missing-required-argument.mq.md deleted file mode 100644 index 0fb01b4..0000000 --- a/tests/negative/34-missing-required-argument.mq.md +++ /dev/null @@ -1,9 +0,0 @@ -## g - -`(a: Int, b: Int)` - -*a + b* - -## f - -*g(a=1)* diff --git a/tests/negative/34-unsupported-syntax-selection.expected.json b/tests/negative/34-unsupported-syntax-selection.expected.json new file mode 100644 index 0000000..3eb3d4f --- /dev/null +++ b/tests/negative/34-unsupported-syntax-selection.expected.json @@ -0,0 +1,5 @@ +{ + "codes": [ + "sem.unsupported_version_directive" + ] +} diff --git a/tests/negative/34-unsupported-syntax-selection.mq.md b/tests/negative/34-unsupported-syntax-selection.mq.md new file mode 100644 index 0000000..eafc75d --- /dev/null +++ b/tests/negative/34-unsupported-syntax-selection.mq.md @@ -0,0 +1,7 @@ +--- +syntax: v1 +--- + +## @exec main + +`return 1` diff --git a/tests/negative/32-unknown-function.expected.json b/tests/negative/35-unknown-function.expected.json similarity index 100% rename from tests/negative/32-unknown-function.expected.json rename to tests/negative/35-unknown-function.expected.json diff --git a/tests/negative/35-unknown-function.mq.md b/tests/negative/35-unknown-function.mq.md new file mode 100644 index 0000000..a360a02 --- /dev/null +++ b/tests/negative/35-unknown-function.mq.md @@ -0,0 +1,3 @@ +## @exec f + +`return nope(1)` diff --git a/tests/negative/35-unknown-named-argument.expected.json b/tests/negative/35-unknown-named-argument.expected.json deleted file mode 100644 index 79d7da1..0000000 --- a/tests/negative/35-unknown-named-argument.expected.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "codes": [ - "call.arity" - ] -} diff --git a/tests/negative/35-unknown-named-argument.mq.md b/tests/negative/35-unknown-named-argument.mq.md deleted file mode 100644 index c42269d..0000000 --- a/tests/negative/35-unknown-named-argument.mq.md +++ /dev/null @@ -1,9 +0,0 @@ -## g - -`(a: Int)` - -*a* - -## f - -*g(nope=1, a=2)* diff --git a/tests/negative/36-malformed-signature-name.expected.json b/tests/negative/36-malformed-signature-name.expected.json deleted file mode 100644 index 8f17ea3..0000000 --- a/tests/negative/36-malformed-signature-name.expected.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "codes": [ - "expr.parse" - ] -} diff --git a/tests/negative/36-malformed-signature-name.mq.md b/tests/negative/36-malformed-signature-name.mq.md deleted file mode 100644 index 7862947..0000000 --- a/tests/negative/36-malformed-signature-name.mq.md +++ /dev/null @@ -1,5 +0,0 @@ -## f - -`(1x)` - -*1* diff --git a/tests/negative/39-unknown-variable-explicit-signature.expected.json b/tests/negative/36-unknown-variable.expected.json similarity index 100% rename from tests/negative/39-unknown-variable-explicit-signature.expected.json rename to tests/negative/36-unknown-variable.expected.json diff --git a/tests/negative/36-unknown-variable.mq.md b/tests/negative/36-unknown-variable.mq.md new file mode 100644 index 0000000..77e6f41 --- /dev/null +++ b/tests/negative/36-unknown-variable.mq.md @@ -0,0 +1,5 @@ +## @exec f + +`params()` + +`return typo` diff --git a/tests/negative/33-inferred-signature-positional.expected.json b/tests/negative/37-call-arity-missing-argument.expected.json similarity index 100% rename from tests/negative/33-inferred-signature-positional.expected.json rename to tests/negative/37-call-arity-missing-argument.expected.json diff --git a/tests/negative/37-call-arity-missing-argument.mq.md b/tests/negative/37-call-arity-missing-argument.mq.md new file mode 100644 index 0000000..7c13f14 --- /dev/null +++ b/tests/negative/37-call-arity-missing-argument.mq.md @@ -0,0 +1,9 @@ +## @exec g + +`params(a: Int, b: Int)` + +`return a + b` + +## @exec f + +`return g(a=1)` diff --git a/tests/negative/37-malformed-signature-duplicate-param.expected.json b/tests/negative/37-malformed-signature-duplicate-param.expected.json deleted file mode 100644 index 8f17ea3..0000000 --- a/tests/negative/37-malformed-signature-duplicate-param.expected.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "codes": [ - "expr.parse" - ] -} diff --git a/tests/negative/37-malformed-signature-duplicate-param.mq.md b/tests/negative/37-malformed-signature-duplicate-param.mq.md deleted file mode 100644 index 4571968..0000000 --- a/tests/negative/37-malformed-signature-duplicate-param.mq.md +++ /dev/null @@ -1,5 +0,0 @@ -## f - -`(a, a)` - -*a* diff --git a/tests/negative/34-missing-required-argument.expected.json b/tests/negative/38-call-arity-unknown-named.expected.json similarity index 100% rename from tests/negative/34-missing-required-argument.expected.json rename to tests/negative/38-call-arity-unknown-named.expected.json diff --git a/tests/negative/38-call-arity-unknown-named.mq.md b/tests/negative/38-call-arity-unknown-named.mq.md new file mode 100644 index 0000000..2bfb233 --- /dev/null +++ b/tests/negative/38-call-arity-unknown-named.mq.md @@ -0,0 +1,9 @@ +## @exec g + +`params(a: Int)` + +`return a` + +## @exec f + +`return g(nope=1, a=2)` diff --git a/tests/negative/38-signature-non-constant-default.expected.json b/tests/negative/38-signature-non-constant-default.expected.json deleted file mode 100644 index c09be1b..0000000 --- a/tests/negative/38-signature-non-constant-default.expected.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "codes": [ - "expr.parse", - "symbol.unknown" - ] -} diff --git a/tests/negative/38-signature-non-constant-default.mq.md b/tests/negative/38-signature-non-constant-default.mq.md deleted file mode 100644 index a2fc2b2..0000000 --- a/tests/negative/38-signature-non-constant-default.mq.md +++ /dev/null @@ -1,5 +0,0 @@ -## f - -`(a = f())` - -*a* diff --git a/tests/negative/40-partial-branch-assignment-ambiguity.expected.json b/tests/negative/39-uninitialized-partial-branch.expected.json similarity index 100% rename from tests/negative/40-partial-branch-assignment-ambiguity.expected.json rename to tests/negative/39-uninitialized-partial-branch.expected.json diff --git a/tests/negative/39-uninitialized-partial-branch.mq.md b/tests/negative/39-uninitialized-partial-branch.mq.md new file mode 100644 index 0000000..9739f68 --- /dev/null +++ b/tests/negative/39-uninitialized-partial-branch.mq.md @@ -0,0 +1,11 @@ +## @exec f + +`params(flag: Bool)` + +`if flag` + +`x = 1` + +`end` + +`return x` diff --git a/tests/negative/39-unknown-variable-explicit-signature.mq.md b/tests/negative/39-unknown-variable-explicit-signature.mq.md deleted file mode 100644 index da547d9..0000000 --- a/tests/negative/39-unknown-variable-explicit-signature.mq.md +++ /dev/null @@ -1,5 +0,0 @@ -## f - -`(r: Number)` - -*r * typo* diff --git a/tests/negative/41-frontmatter-invalid-yaml.expected.json b/tests/negative/40-frontmatter-invalid-yaml.expected.json similarity index 100% rename from tests/negative/41-frontmatter-invalid-yaml.expected.json rename to tests/negative/40-frontmatter-invalid-yaml.expected.json diff --git a/tests/negative/41-frontmatter-invalid-yaml.mq.md b/tests/negative/40-frontmatter-invalid-yaml.mq.md similarity index 52% rename from tests/negative/41-frontmatter-invalid-yaml.mq.md rename to tests/negative/40-frontmatter-invalid-yaml.mq.md index a35bc11..ae17762 100644 --- a/tests/negative/41-frontmatter-invalid-yaml.mq.md +++ b/tests/negative/40-frontmatter-invalid-yaml.mq.md @@ -2,6 +2,6 @@ import: [unclosed --- -## main +## @exec main -*1* +`return 1` diff --git a/tests/negative/40-partial-branch-assignment-ambiguity.mq.md b/tests/negative/40-partial-branch-assignment-ambiguity.mq.md deleted file mode 100644 index e790fff..0000000 --- a/tests/negative/40-partial-branch-assignment-ambiguity.mq.md +++ /dev/null @@ -1,7 +0,0 @@ -## f - -1. `true` - - **x = 1** - -*x* diff --git a/tests/negative/42-frontmatter-invalid-import-shape.expected.json b/tests/negative/41-frontmatter-invalid-import-shape.expected.json similarity index 100% rename from tests/negative/42-frontmatter-invalid-import-shape.expected.json rename to tests/negative/41-frontmatter-invalid-import-shape.expected.json diff --git a/tests/negative/41-frontmatter-invalid-import-shape.mq.md b/tests/negative/41-frontmatter-invalid-import-shape.mq.md new file mode 100644 index 0000000..97acc53 --- /dev/null +++ b/tests/negative/41-frontmatter-invalid-import-shape.mq.md @@ -0,0 +1,7 @@ +--- +import: 42 +--- + +## @exec main + +`return 1` diff --git a/tests/negative/46-duplicate-import-alias-frontmatter.expected.json b/tests/negative/42-frontmatter-duplicate-import-alias.expected.json similarity index 100% rename from tests/negative/46-duplicate-import-alias-frontmatter.expected.json rename to tests/negative/42-frontmatter-duplicate-import-alias.expected.json diff --git a/tests/negative/46-duplicate-import-alias-frontmatter.mq.md b/tests/negative/42-frontmatter-duplicate-import-alias.mq.md similarity index 59% rename from tests/negative/46-duplicate-import-alias-frontmatter.mq.md rename to tests/negative/42-frontmatter-duplicate-import-alias.mq.md index 68e441b..034515b 100644 --- a/tests/negative/46-duplicate-import-alias-frontmatter.mq.md +++ b/tests/negative/42-frontmatter-duplicate-import-alias.mq.md @@ -4,6 +4,6 @@ import: a: "y" --- -## main +## @exec main -*1* +`return 1` diff --git a/tests/negative/42-frontmatter-invalid-import-shape.mq.md b/tests/negative/42-frontmatter-invalid-import-shape.mq.md deleted file mode 100644 index 68b48ba..0000000 --- a/tests/negative/42-frontmatter-invalid-import-shape.mq.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -import: 42 ---- - -## main - -*1* diff --git a/tests/negative/43-unknown-callee-in-quote.mq.md b/tests/negative/43-unknown-callee-in-quote.mq.md deleted file mode 100644 index fc71c96..0000000 --- a/tests/negative/43-unknown-callee-in-quote.mq.md +++ /dev/null @@ -1,3 +0,0 @@ -## f - -> nope(1) diff --git a/tests/negative/43-unknown-callee-in-quote.expected.json b/tests/negative/43-unknown-variable-with-signature.expected.json similarity index 100% rename from tests/negative/43-unknown-callee-in-quote.expected.json rename to tests/negative/43-unknown-variable-with-signature.expected.json diff --git a/tests/negative/43-unknown-variable-with-signature.mq.md b/tests/negative/43-unknown-variable-with-signature.mq.md new file mode 100644 index 0000000..10fa623 --- /dev/null +++ b/tests/negative/43-unknown-variable-with-signature.mq.md @@ -0,0 +1,5 @@ +## @exec f + +`params(r: Number)` + +`return r * typo` diff --git a/tests/negative/44-duplicate-function-name.expected.json b/tests/negative/44-duplicate-function-name.expected.json new file mode 100644 index 0000000..8d06cb9 --- /dev/null +++ b/tests/negative/44-duplicate-function-name.expected.json @@ -0,0 +1,5 @@ +{ + "codes": [ + "sem.duplicate_unit_name" + ] +} diff --git a/tests/negative/44-duplicate-function-name.mq.md b/tests/negative/44-duplicate-function-name.mq.md new file mode 100644 index 0000000..f2b9e62 --- /dev/null +++ b/tests/negative/44-duplicate-function-name.mq.md @@ -0,0 +1,7 @@ +## @exec f + +`return 1` + +## @exec f + +`return 2` diff --git a/tests/negative/44-link-call-bad-arguments.expected.json b/tests/negative/44-link-call-bad-arguments.expected.json deleted file mode 100644 index 8f17ea3..0000000 --- a/tests/negative/44-link-call-bad-arguments.expected.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "codes": [ - "expr.parse" - ] -} diff --git a/tests/negative/44-link-call-bad-arguments.mq.md b/tests/negative/44-link-call-bad-arguments.mq.md deleted file mode 100644 index 7d3b23f..0000000 --- a/tests/negative/44-link-call-bad-arguments.mq.md +++ /dev/null @@ -1,7 +0,0 @@ -## f - -*1* - -## main - -> [f](#f)(a=) diff --git a/tests/negative/45-branch-condition-invalid-expression.expected.json b/tests/negative/45-branch-condition-invalid-expression.expected.json deleted file mode 100644 index 8f17ea3..0000000 --- a/tests/negative/45-branch-condition-invalid-expression.expected.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "codes": [ - "expr.parse" - ] -} diff --git a/tests/negative/45-branch-condition-invalid-expression.mq.md b/tests/negative/45-branch-condition-invalid-expression.mq.md deleted file mode 100644 index 0cb32c0..0000000 --- a/tests/negative/45-branch-condition-invalid-expression.mq.md +++ /dev/null @@ -1,5 +0,0 @@ -## f - -1. `n >` - - *1* diff --git a/tests/negative/45-duplicate-namespace-name.expected.json b/tests/negative/45-duplicate-namespace-name.expected.json new file mode 100644 index 0000000..8d06cb9 --- /dev/null +++ b/tests/negative/45-duplicate-namespace-name.expected.json @@ -0,0 +1,5 @@ +{ + "codes": [ + "sem.duplicate_unit_name" + ] +} diff --git a/tests/negative/45-duplicate-namespace-name.mq.md b/tests/negative/45-duplicate-namespace-name.mq.md new file mode 100644 index 0000000..1121161 --- /dev/null +++ b/tests/negative/45-duplicate-namespace-name.mq.md @@ -0,0 +1,7 @@ +# @knowledge 命名空间 + +## @exec f + +`return 1` + +# @knowledge 命名空间 diff --git a/tests/negative/47-unsupported-quote-statement.expected.json b/tests/negative/47-unsupported-quote-statement.expected.json deleted file mode 100644 index 8f17ea3..0000000 --- a/tests/negative/47-unsupported-quote-statement.expected.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "codes": [ - "expr.parse" - ] -} diff --git a/tests/negative/47-unsupported-quote-statement.mq.md b/tests/negative/47-unsupported-quote-statement.mq.md deleted file mode 100644 index 4bc8c94..0000000 --- a/tests/negative/47-unsupported-quote-statement.mq.md +++ /dev/null @@ -1,3 +0,0 @@ -## f - -> `x = 1` diff --git a/tests/negative/48-strong-assignment-bad-target.expected.json b/tests/negative/48-strong-assignment-bad-target.expected.json deleted file mode 100644 index 8f17ea3..0000000 --- a/tests/negative/48-strong-assignment-bad-target.expected.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "codes": [ - "expr.parse" - ] -} diff --git a/tests/negative/48-strong-assignment-bad-target.mq.md b/tests/negative/48-strong-assignment-bad-target.mq.md deleted file mode 100644 index 0a2e8a4..0000000 --- a/tests/negative/48-strong-assignment-bad-target.mq.md +++ /dev/null @@ -1,3 +0,0 @@ -## f - -**1x = 2** diff --git a/tests/negative/49-power-missing-operand.expected.json b/tests/negative/49-power-missing-operand.expected.json deleted file mode 100644 index 8f17ea3..0000000 --- a/tests/negative/49-power-missing-operand.expected.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "codes": [ - "expr.parse" - ] -} diff --git a/tests/negative/49-power-missing-operand.mq.md b/tests/negative/49-power-missing-operand.mq.md deleted file mode 100644 index 04caa6d..0000000 --- a/tests/negative/49-power-missing-operand.mq.md +++ /dev/null @@ -1,3 +0,0 @@ -## main - -*`2 **`* diff --git a/tests/negative/50-branch-condition-missing-operand.expected.json b/tests/negative/50-branch-condition-missing-operand.expected.json deleted file mode 100644 index 8f17ea3..0000000 --- a/tests/negative/50-branch-condition-missing-operand.expected.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "codes": [ - "expr.parse" - ] -} diff --git a/tests/negative/50-branch-condition-missing-operand.mq.md b/tests/negative/50-branch-condition-missing-operand.mq.md deleted file mode 100644 index 59de28a..0000000 --- a/tests/negative/50-branch-condition-missing-operand.mq.md +++ /dev/null @@ -1,7 +0,0 @@ -## main - -**n = 2** - -1. `n ** 2 ==` - - > print("x") diff --git a/tests/negative/51-branch-condition-swallowed-strong.expected.json b/tests/negative/51-branch-condition-swallowed-strong.expected.json deleted file mode 100644 index c30f3be..0000000 --- a/tests/negative/51-branch-condition-swallowed-strong.expected.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "codes": [ - "markdown.invalid_construct" - ] -} diff --git a/tests/negative/51-branch-condition-swallowed-strong.mq.md b/tests/negative/51-branch-condition-swallowed-strong.mq.md deleted file mode 100644 index 619ef13..0000000 --- a/tests/negative/51-branch-condition-swallowed-strong.mq.md +++ /dev/null @@ -1,5 +0,0 @@ -## main - -1. `n > 0` **print("hidden")** - - > print("body") diff --git a/tests/negative/52-loop-condition-swallowed-emph.expected.json b/tests/negative/52-loop-condition-swallowed-emph.expected.json deleted file mode 100644 index c30f3be..0000000 --- a/tests/negative/52-loop-condition-swallowed-emph.expected.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "codes": [ - "markdown.invalid_construct" - ] -} diff --git a/tests/negative/52-loop-condition-swallowed-emph.mq.md b/tests/negative/52-loop-condition-swallowed-emph.mq.md deleted file mode 100644 index 30378d9..0000000 --- a/tests/negative/52-loop-condition-swallowed-emph.mq.md +++ /dev/null @@ -1,5 +0,0 @@ -## main - -- `n > 0` *1* - - > print("body") diff --git a/tests/negative/runtime/01-division-by-zero.mq.md b/tests/negative/runtime/01-division-by-zero.mq.md index 9e7872f..7a655a1 100644 --- a/tests/negative/runtime/01-division-by-zero.mq.md +++ b/tests/negative/runtime/01-division-by-zero.mq.md @@ -1,3 +1,3 @@ -## main +## @exec main -*1 // 0* +`1 // 0` diff --git a/tests/negative/runtime/02-type-error.mq.md b/tests/negative/runtime/02-type-error.mq.md index 8069839..e9b36d3 100644 --- a/tests/negative/runtime/02-type-error.mq.md +++ b/tests/negative/runtime/02-type-error.mq.md @@ -1,3 +1,3 @@ -## main +## @exec main -*1 + "x"* +`1 + "x"` diff --git a/tests/negative/runtime/03-index-out-of-bounds.mq.md b/tests/negative/runtime/03-index-out-of-bounds.mq.md index 4fc331b..d8d61c8 100644 --- a/tests/negative/runtime/03-index-out-of-bounds.mq.md +++ b/tests/negative/runtime/03-index-out-of-bounds.mq.md @@ -1,3 +1,3 @@ -## main +## @exec main -*[1, 2][5]* +`[1, 2][5]` diff --git a/tests/negative/runtime/04-unknown-field.mq.md b/tests/negative/runtime/04-unknown-field.mq.md index 7a99061..2ce51a4 100644 --- a/tests/negative/runtime/04-unknown-field.mq.md +++ b/tests/negative/runtime/04-unknown-field.mq.md @@ -1,3 +1,3 @@ -## main +## @exec main -*{"a": 1}.b* +`{"a": 1}.b` diff --git a/tests/negative/runtime/05-not-callable.mq.md b/tests/negative/runtime/05-not-callable.mq.md index de123e6..2d76510 100644 --- a/tests/negative/runtime/05-not-callable.mq.md +++ b/tests/negative/runtime/05-not-callable.mq.md @@ -1,5 +1,5 @@ -## main +## @exec main -**x = 1** +`x = 1` -*x(1)* +`x(1)` diff --git a/tests/negative/runtime/06-permission-denied-foreign.mq.md b/tests/negative/runtime/06-permission-denied-foreign.mq.md index 89dde49..d3ea64c 100644 --- a/tests/negative/runtime/06-permission-denied-foreign.mq.md +++ b/tests/negative/runtime/06-permission-denied-foreign.mq.md @@ -1,9 +1,9 @@ -## 代码 +## @knowledge 代码 ```python print(1) ``` -## main +## @exec main -*foreign.call(ref("#代码"), None)* +`foreign.call(ref("#代码"), None)` diff --git a/tests/negative/runtime/07-math-unsupported.mq.md b/tests/negative/runtime/07-math-unsupported.mq.md index afc6166..de92011 100644 --- a/tests/negative/runtime/07-math-unsupported.mq.md +++ b/tests/negative/runtime/07-math-unsupported.mq.md @@ -1,9 +1,9 @@ -## 公式 +## @knowledge 公式 $$ \sin(x) $$ -## main +## @exec main -*math.eval(ref("#公式"), {})* +`math.eval(ref("#公式"), {})` diff --git a/tests/negative/runtime/08-stack-overflow.mq.md b/tests/negative/runtime/08-stack-overflow.mq.md index d373f54..5e2f8e5 100644 --- a/tests/negative/runtime/08-stack-overflow.mq.md +++ b/tests/negative/runtime/08-stack-overflow.mq.md @@ -1,3 +1,3 @@ -## 递归 +## @exec 递归 -*递归()* +`递归()` diff --git a/tests/negative/runtime/09-branch-condition-not-bool.mq.md b/tests/negative/runtime/09-branch-condition-not-bool.mq.md index 2cf43db..16adf4f 100644 --- a/tests/negative/runtime/09-branch-condition-not-bool.mq.md +++ b/tests/negative/runtime/09-branch-condition-not-bool.mq.md @@ -1,5 +1,7 @@ -## main +## @exec main -1. `1` +`if 1` - *1* +`return 1` + +`end` diff --git a/tests/negative/runtime/10-function-ref-bad-argument.mq.md b/tests/negative/runtime/10-function-ref-bad-argument.mq.md index ef984de..6ec6aea 100644 --- a/tests/negative/runtime/10-function-ref-bad-argument.mq.md +++ b/tests/negative/runtime/10-function-ref-bad-argument.mq.md @@ -1,11 +1,11 @@ -## f +## @exec f -**n = n + 1** +`params(n: Int)` -*n* +`return n + 1` -## main +## @exec main -**g = ref("#f")** +`g = ref("#f")` -*g(bad=1)* +`g(bad=1)` diff --git a/tests/negative/runtime/11-int-negative-exponent.mq.md b/tests/negative/runtime/11-int-negative-exponent.mq.md index 53e257b..012a67b 100644 --- a/tests/negative/runtime/11-int-negative-exponent.mq.md +++ b/tests/negative/runtime/11-int-negative-exponent.mq.md @@ -1,3 +1,3 @@ -## main +## @exec main -*`2 ** -1`* +`2 ** -1` diff --git a/tests/negative/runtime/12-integer-exponent-limit.mq.md b/tests/negative/runtime/12-integer-exponent-limit.mq.md index cb7f8be..56031f4 100644 --- a/tests/negative/runtime/12-integer-exponent-limit.mq.md +++ b/tests/negative/runtime/12-integer-exponent-limit.mq.md @@ -1,3 +1,3 @@ -## main +## @exec main -*`2 ** 100001`* +`2 ** 100001` diff --git a/tests/negative/runtime/13-memory-out-of-bounds.mq.md b/tests/negative/runtime/13-memory-out-of-bounds.mq.md index e58aab5..eee2df4 100644 --- a/tests/negative/runtime/13-memory-out-of-bounds.mq.md +++ b/tests/negative/runtime/13-memory-out-of-bounds.mq.md @@ -1,5 +1,5 @@ -## main +## @exec main -**内存 = memory.new(1, 1)** +`内存 = memory.new(1, 1)` -*内存[65536]* +`内存[65536]` diff --git a/tests/negative/runtime/14-memory-byte-range.mq.md b/tests/negative/runtime/14-memory-byte-range.mq.md index 29735ff..0be976a 100644 --- a/tests/negative/runtime/14-memory-byte-range.mq.md +++ b/tests/negative/runtime/14-memory-byte-range.mq.md @@ -1,5 +1,5 @@ -## main +## @exec main -**内存 = memory.new(1, 1)** +`内存 = memory.new(1, 1)` -**`内存[0] = 256`** +`内存[0] = 256` diff --git a/tests/negative/runtime/15-index-assign-non-memory.mq.md b/tests/negative/runtime/15-index-assign-non-memory.mq.md index 69a058b..e08e46c 100644 --- a/tests/negative/runtime/15-index-assign-non-memory.mq.md +++ b/tests/negative/runtime/15-index-assign-non-memory.mq.md @@ -1,8 +1,8 @@ -## main +## @exec main -List values keep their v1 value semantics: index assignment is not defined -for them and must not silently turn a list into shared mutable memory. +List values keep their current value semantics: index assignment is not +defined for them and must not silently turn a list into shared mutable memory. -**列表 = [1, 2]** +`列表 = [1, 2]` -**`列表[0] = 9`** +`列表[0] = 9` diff --git a/tests/negative/runtime/16-memory-huge-offset.mq.md b/tests/negative/runtime/16-memory-huge-offset.mq.md index 06a1d34..340d06a 100644 --- a/tests/negative/runtime/16-memory-huge-offset.mq.md +++ b/tests/negative/runtime/16-memory-huge-offset.mq.md @@ -1,5 +1,5 @@ -## main +## @exec main -**内存 = memory.new(1, 1)** +`内存 = memory.new(1, 1)` -*内存[999999999999999999999999999999999999999]* +`内存[999999999999999999999999999999999999999]` diff --git a/tests/negative/runtime/17-memory-grow-beyond-max.mq.md b/tests/negative/runtime/17-memory-grow-beyond-max.mq.md index 73b5073..23d8f2f 100644 --- a/tests/negative/runtime/17-memory-grow-beyond-max.mq.md +++ b/tests/negative/runtime/17-memory-grow-beyond-max.mq.md @@ -1,5 +1,5 @@ -## main +## @exec main -**内存 = memory.new(1, 1)** +`内存 = memory.new(1, 1)` -*memory.grow(内存, 1)* +`memory.grow(内存, 1)` diff --git a/tests/negative/runtime/18-memory-negative-pages.mq.md b/tests/negative/runtime/18-memory-negative-pages.mq.md index c288597..9d11fe9 100644 --- a/tests/negative/runtime/18-memory-negative-pages.mq.md +++ b/tests/negative/runtime/18-memory-negative-pages.mq.md @@ -1,3 +1,3 @@ -## main +## @exec main -*[memory.new(0 - 1, 1)]* +`[memory.new(0 - 1, 1)]` diff --git a/tests/negative/runtime/19-list-append-wrong-type.mq.md b/tests/negative/runtime/19-list-append-wrong-type.mq.md index 74d754b..5d7370e 100644 --- a/tests/negative/runtime/19-list-append-wrong-type.mq.md +++ b/tests/negative/runtime/19-list-append-wrong-type.mq.md @@ -1,3 +1,3 @@ -## main +## @exec main -*list.append({a: 1}, 2)* +`list.append({a: 1}, 2)` diff --git a/tests/negative/runtime/20-table-cell-out-of-bounds.mq.md b/tests/negative/runtime/20-table-cell-out-of-bounds.mq.md index b498642..f71f585 100644 --- a/tests/negative/runtime/20-table-cell-out-of-bounds.mq.md +++ b/tests/negative/runtime/20-table-cell-out-of-bounds.mq.md @@ -1,5 +1,5 @@ -## main +## @exec main -**数据 = 表(["a"], [[1]])** +`数据 = 表(["a"], [[1]])` -*table.cell(数据, 1, 0)* +`table.cell(数据, 1, 0)` diff --git a/tests/negative/runtime/21-map-key-not-text.mq.md b/tests/negative/runtime/21-map-key-not-text.mq.md index 87c54c1..7eecb2a 100644 --- a/tests/negative/runtime/21-map-key-not-text.mq.md +++ b/tests/negative/runtime/21-map-key-not-text.mq.md @@ -1,5 +1,5 @@ -## main +## @exec main -**数据 = {a: 1}** +`数据 = {a: 1}` -*map.get(数据, 1)* +`map.get(数据, 1)` diff --git a/tests/negative/warnings/01-return-outside-function.expected.json b/tests/negative/warnings/01-inferred-signature.expected.json similarity index 58% rename from tests/negative/warnings/01-return-outside-function.expected.json rename to tests/negative/warnings/01-inferred-signature.expected.json index 60cb3cb..b1f95d3 100644 --- a/tests/negative/warnings/01-return-outside-function.expected.json +++ b/tests/negative/warnings/01-inferred-signature.expected.json @@ -1,6 +1,6 @@ { "severity": "warning", "codes": [ - "markdown.inert_executable" + "sem.inferred_signature" ] } diff --git a/tests/negative/warnings/01-inferred-signature.mq.md b/tests/negative/warnings/01-inferred-signature.mq.md new file mode 100644 index 0000000..d234acb --- /dev/null +++ b/tests/negative/warnings/01-inferred-signature.mq.md @@ -0,0 +1,9 @@ +# @knowledge 说明 + +这一行**加粗**只是文档,不会执行。 + +## @exec 加一 + +`n = n + 1` + +`return n` diff --git a/tests/negative/warnings/01-return-outside-function.mq.md b/tests/negative/warnings/01-return-outside-function.mq.md deleted file mode 100644 index 10fd998..0000000 --- a/tests/negative/warnings/01-return-outside-function.mq.md +++ /dev/null @@ -1 +0,0 @@ -*1* diff --git a/tests/negative/warnings/02-knowledge-and-containers-are-inert.expected.json b/tests/negative/warnings/02-knowledge-and-containers-are-inert.expected.json new file mode 100644 index 0000000..5935f84 --- /dev/null +++ b/tests/negative/warnings/02-knowledge-and-containers-are-inert.expected.json @@ -0,0 +1,4 @@ +{ + "severity": "warning", + "codes": [] +} diff --git a/tests/negative/warnings/02-knowledge-and-containers-are-inert.mq.md b/tests/negative/warnings/02-knowledge-and-containers-are-inert.mq.md new file mode 100644 index 0000000..f11c9a0 --- /dev/null +++ b/tests/negative/warnings/02-knowledge-and-containers-are-inert.mq.md @@ -0,0 +1,21 @@ +# @knowledge 使用说明 + +普通列表与引用是文档结构: + +1. 第一步 +2. 第二步 + +> 这是一段引用,不会调用任何函数。 + +## @exec 求和 + +普通列表和引用在 Exec 区域也只是容器,不产生语句: + +1. 说明一 +2. 说明二 + +> 引用说明。 + +`params(a: Int, b: Int)` + +`return a + b` diff --git a/tests/negative/warnings/02-strong-outside-function.expected.json b/tests/negative/warnings/02-strong-outside-function.expected.json deleted file mode 100644 index 60cb3cb..0000000 --- a/tests/negative/warnings/02-strong-outside-function.expected.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "severity": "warning", - "codes": [ - "markdown.inert_executable" - ] -} diff --git a/tests/negative/warnings/02-strong-outside-function.mq.md b/tests/negative/warnings/02-strong-outside-function.mq.md deleted file mode 100644 index c33dc3b..0000000 --- a/tests/negative/warnings/02-strong-outside-function.mq.md +++ /dev/null @@ -1 +0,0 @@ -**x = 1** diff --git a/tests/negative/warnings/03-ordered-list-outside-function.expected.json b/tests/negative/warnings/03-ordered-list-outside-function.expected.json deleted file mode 100644 index 60cb3cb..0000000 --- a/tests/negative/warnings/03-ordered-list-outside-function.expected.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "severity": "warning", - "codes": [ - "markdown.inert_executable" - ] -} diff --git a/tests/negative/warnings/03-ordered-list-outside-function.mq.md b/tests/negative/warnings/03-ordered-list-outside-function.mq.md deleted file mode 100644 index 8787ffc..0000000 --- a/tests/negative/warnings/03-ordered-list-outside-function.mq.md +++ /dev/null @@ -1,3 +0,0 @@ -1. `true` - - *1* diff --git a/tests/negative/warnings/04-bullet-list-outside-function.expected.json b/tests/negative/warnings/04-bullet-list-outside-function.expected.json deleted file mode 100644 index 60cb3cb..0000000 --- a/tests/negative/warnings/04-bullet-list-outside-function.expected.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "severity": "warning", - "codes": [ - "markdown.inert_executable" - ] -} diff --git a/tests/negative/warnings/04-bullet-list-outside-function.mq.md b/tests/negative/warnings/04-bullet-list-outside-function.mq.md deleted file mode 100644 index a454281..0000000 --- a/tests/negative/warnings/04-bullet-list-outside-function.mq.md +++ /dev/null @@ -1,3 +0,0 @@ -- `true` - - *1* diff --git a/tests/negative/warnings/05-quote-outside-function.expected.json b/tests/negative/warnings/05-quote-outside-function.expected.json deleted file mode 100644 index 60cb3cb..0000000 --- a/tests/negative/warnings/05-quote-outside-function.expected.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "severity": "warning", - "codes": [ - "markdown.inert_executable" - ] -} diff --git a/tests/negative/warnings/05-quote-outside-function.mq.md b/tests/negative/warnings/05-quote-outside-function.mq.md deleted file mode 100644 index d9a57b4..0000000 --- a/tests/negative/warnings/05-quote-outside-function.mq.md +++ /dev/null @@ -1 +0,0 @@ -> 打印(1) diff --git a/tests/negative/warnings/06-executable-in-module-root-prose.expected.json b/tests/negative/warnings/06-executable-in-module-root-prose.expected.json deleted file mode 100644 index 6baa22a..0000000 --- a/tests/negative/warnings/06-executable-in-module-root-prose.expected.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "severity": "warning", - "codes": [ - "markdown.inert_executable", - "markdown.inert_executable" - ] -} diff --git a/tests/negative/warnings/06-executable-in-module-root-prose.mq.md b/tests/negative/warnings/06-executable-in-module-root-prose.mq.md deleted file mode 100644 index 8a2e95e..0000000 --- a/tests/negative/warnings/06-executable-in-module-root-prose.mq.md +++ /dev/null @@ -1,5 +0,0 @@ -模块开头的叙述。 - -**结果 = 1** - -继续叙述,*返回表达式* 也在函数外。 diff --git a/tests/security/run-lane.sh b/tests/security/run-lane.sh index 802f3fa..dac4f91 100755 --- a/tests/security/run-lane.sh +++ b/tests/security/run-lane.sh @@ -56,13 +56,11 @@ echo "== positive CLI contract ==" echo "== strict language resources are console-only ==" mkdir -p .cache/security cat > .cache/security/file-resource.mq.md <<'MQ' -## main +## @exec main -**内存 = memory.new(1, 1)** - -> resource.open("file", "README.md", ["read"]) - -*None* +`内存 = memory.new(1, 1)` +`resource.open("file", "README.md", ["read"])` +`return None` MQ set +e "$bin" run .cache/security/file-resource.mq.md --mode strict >/dev/null 2>.cache/security/file-resource.err @@ -79,11 +77,10 @@ grep -q "permission.denied" .cache/security/file-resource.err || { } cat > .cache/security/tcp-resource.mq.md <<'MQ' -## main +## @exec main -> resource.open("tcp", "127.0.0.1:9", ["read", "write"]) - -*None* +`resource.open("tcp", "127.0.0.1:9", ["read", "write"])` +`return None` MQ set +e "$bin" run .cache/security/tcp-resource.mq.md --mode strict >/dev/null 2>.cache/security/tcp-resource.err