mirascript 0.1.76__tar.gz → 0.1.78__tar.gz

{mirascript-0.1.76 → mirascript-0.1.78}/Cargo.lock

@@ -22,9 +22,9 @@ checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649"
 
 [[package]]
 name = "cc"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c89588d05638b5b4594a3348a2d6c20277e43a7f5c5202b05cc56888475a47b8"
+checksum = "5add81bb678e6cb321aff7fa0dc7689ad82b112dbc032cea19f91d6b8e3582b9"
 dependencies = [
  "find-msvc-tools",
  "shlex",
@@ -89,9 +89,9 @@ dependencies = [
 
 [[package]]
 name = "ctor"
-version = "1.0.10"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2e30e509674ef0ec91e21a7735766db37d163d46151b6a361d8b83dd79116bd"
+checksum = "e9bb72bb94fdc1bd619f4c18cc91ecf6302aeb333d31b3c6ec0bb841cd920209"
 
 [[package]]
 name = "divan"
@@ -282,7 +282,7 @@ dependencies = [
 
 [[package]]
 name = "mira-constants"
-version = "0.1.76"
+version = "0.1.78"
 dependencies = [
  "mira-core",
  "wasm-bindgen",
@@ -290,7 +290,7 @@ dependencies = [
 
 [[package]]
 name = "mira-core"
-version = "0.1.76"
+version = "0.1.78"
 dependencies = [
  "divan",
  "mimalloc",
@@ -304,7 +304,7 @@ dependencies = [
 
 [[package]]
 name = "mira-napi"
-version = "0.1.76"
+version = "0.1.78"
 dependencies = [
  "mira-core",
  "napi",
@@ -314,7 +314,7 @@ dependencies = [
 
 [[package]]
 name = "mira-python"
-version = "0.1.76"
+version = "0.1.78"
 dependencies = [
  "mira-core",
  "pyo3",
@@ -323,7 +323,7 @@ dependencies = [
 
 [[package]]
 name = "mira-wasm"
-version = "0.1.76"
+version = "0.1.78"
 dependencies = [
  "console_error_panic_hook",
  "mira-core",

{mirascript-0.1.76 → mirascript-0.1.78}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mirascript
-Version: 0.1.76
+Version: 0.1.78
 Classifier: Development Status :: 4 - Beta
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: 3
@@ -31,9 +31,9 @@ Description-Content-Type: text/markdown; charset=UTF-8; variant=GFM
 Project-URL: Documentation, https://mira.cloudpss.net/
 Project-URL: Repository, https://github.com/CloudPSS/MiraScript
 
-# MiraScript Python Bindings
+# MiraScript
 
-Python 绑定用于在 Python 中调用 MiraScript 编译器能力，支持脚本编译与执行。
+MiraScript 是 CloudPSS 维护的表达式优先脚本语言项目。Python 绑定用于在 Python 中调用 MiraScript 编译器能力，支持脚本编译与执行。
 
 ## 安装
 

{mirascript-0.1.76/crates/python → mirascript-0.1.78}/README.md

@@ -1,6 +1,6 @@
-# MiraScript Python Bindings
+# MiraScript
 
-Python 绑定用于在 Python 中调用 MiraScript 编译器能力，支持脚本编译与执行。
+MiraScript 是 CloudPSS 维护的表达式优先脚本语言项目。Python 绑定用于在 Python 中调用 MiraScript 编译器能力，支持脚本编译与执行。
 
 ## 安装
 

{mirascript-0.1.76 → mirascript-0.1.78}/crates/core/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "mira-core"
-version = "0.1.76"
+version = "0.1.78"
 edition = "2024"
 publish = false
 

{mirascript-0.1.76 → mirascript-0.1.78}/crates/core/src/emitter/opcode.rs

@@ -290,10 +290,6 @@ pub enum OpCode {
     /// ELSE\
     /// } else {
     Else,
-    /// EL_IF IF*\
-    /// } else if *** {\
-    /// This instruction must be followed by an `IF*` instruction\
-    ElIf,
     /// IF_END\
     /// }
     IfEnd,

{mirascript-0.1.76 → mirascript-0.1.78}/crates/python/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "mira-python"
-version = "0.1.76"
+version = "0.1.78"
 edition = "2021"
 readme = "README.md"
 

{mirascript-0.1.76 → mirascript-0.1.78/crates/python}/README.md

@@ -1,6 +1,6 @@
-# MiraScript Python Bindings
+# MiraScript
 
-Python 绑定用于在 Python 中调用 MiraScript 编译器能力，支持脚本编译与执行。
+MiraScript 是 CloudPSS 维护的表达式优先脚本语言项目。Python 绑定用于在 Python 中调用 MiraScript 编译器能力，支持脚本编译与执行。
 
 ## 安装
 

mirascript-0.1.78/crates/python/tests/snapshots/test_snapshot/test_shared_context_keys/shared_context_keys.txt

@@ -0,0 +1 @@
+['E', 'LN10', 'LN2', 'LOG10E', 'LOG2E', 'PI', 'SQRT1_2', 'SQRT2', 'abs', 'acos', 'acosh', 'all', 'any', 'asin', 'asinh', 'atan', 'atan2', 'atanh', 'b_and', 'b_not', 'b_or', 'b_xor', 'cbrt', 'ceil', 'chars', 'contains', 'cos', 'cosh', 'debug_print', 'e', 'ends_with', 'entries', 'exp', 'expm1', 'factorial', 'filter', 'filter_map', 'find', 'flatten', 'floor', 'fold', 'format', 'from_json', 'gamma', 'group_by', 'hypot', 'join', 'keys', 'len', 'log', 'log10', 'log1p', 'log2', 'map', 'matrix', 'max', 'min', 'new_array', 'new_record', 'panic', 'pi', 'pow', 'product', 'random', 'repeat', 'replace', 'reverse', 'round', 'sar', 'shl', 'shr', 'sign', 'sin', 'sinh', 'sort', 'sort_by', 'split', 'sqrt', 'starts_with', 'sum', 'tan', 'tanh', 'to_datetime', 'to_iso8601', 'to_json', 'to_lowercase', 'to_number', 'to_string', 'to_timestamp', 'to_uppercase', 'trim', 'trim_end', 'trim_start', 'trunc', 'unique', 'unique_by', 'values', 'with', 'zip']

{mirascript-0.1.76 → mirascript-0.1.78}/crates/python/tests/test_cli.py

@@ -5,7 +5,9 @@
 
 from __future__ import annotations
 
+import ast
 import sys
+import types
 from io import StringIO
 from pathlib import Path
 from tempfile import TemporaryDirectory
@@ -13,7 +15,7 @@ from unittest.mock import patch
 
 import pytest
 
-from mirascript.__main__ import main
+import mirascript.__main__ as cli
 
 # 示例 .mira 文件目录
 EXAMPLES_DIR = (Path(__file__).parent / "../../../examples").resolve()
@@ -25,7 +27,7 @@ EXAMPLES_DIR = (Path(__file__).parent / "../../../examples").resolve()
 
 
 def _run_main(
-    args: list[str], *, prog: str | None = "mirascript"
+    args: list[str], *, prog: str | None = "mirascript", stdin: str | None = None
 ) -> tuple[int, str, str]:
     """运行 main 函数，返回 (exit_code, stdout, stderr)。"""
 
@@ -35,8 +37,9 @@ def _run_main(
     @patch("sys.argv", [prog or "mirascript", *args])
     @patch("sys.stdout", stdout)
     @patch("sys.stderr", stderr)
+    @patch("sys.stdin", StringIO(stdin) if stdin is not None else StringIO())
     def run_main():
-        return main(prog=prog)
+        return cli.main(prog=prog)
 
     exit_code = run_main()
     return exit_code, stdout.getvalue(), stderr.getvalue()
@@ -77,21 +80,21 @@ def test_eval_string():
     """通过 --eval 执行字符串表达式。"""
     exit_code, stdout, stderr = _run_main(["-e", 'return "hello";'])
     assert exit_code == 0
-    assert "[OK] hello" in stdout
+    assert stdout == "[OK] 'hello'\n"
 
 
 def test_eval_arithmetic():
     """通过 --eval 执行算术表达式。"""
     exit_code, stdout, stderr = _run_main(["-e", "return 1 + 2 * 3;"])
     assert exit_code == 0
-    assert "[OK] 7" in stdout
+    assert stdout == "[OK] 7\n"
 
 
 def test_eval_with_prog_none():
     """__main__ 直接调用时 --eval 也能正常工作。"""
     exit_code, stdout, stderr = _run_main(["-e", "return 99;"], prog=None)
     assert exit_code == 0
-    assert "[OK] 99" in stdout
+    assert stdout == "[OK] 99\n"
 
 
 # ---------------------------------------------------------------------------
@@ -103,7 +106,7 @@ def test_eval_with_single_variable():
     """通过 -v 传入单个变量。"""
     exit_code, stdout, stderr = _run_main(["-v", "x=10", "-e", "return x;"])
     assert exit_code == 0
-    assert "[OK] 10" in stdout
+    assert stdout == "[OK] 10\n"
 
 
 def test_eval_with_multiple_variables():
@@ -112,7 +115,7 @@ def test_eval_with_multiple_variables():
         ["-v", "a=3", "-v", "b=4", "-e", "return a + b;"]
     )
     assert exit_code == 0
-    assert "[OK] 7" in stdout
+    assert stdout == "[OK] 7\n"
 
 
 def test_eval_with_string_variable():
@@ -121,14 +124,14 @@ def test_eval_with_string_variable():
         ["-v", 'name="Mira"', "-e", 'return "Hello, $name!";']
     )
     assert exit_code == 0
-    assert "[OK] Hello, Mira!" in stdout
+    assert stdout == "[OK] 'Hello, Mira!'\n"
 
 
 def test_eval_with_expression_variable():
     """变量值可以是表达式。"""
     exit_code, stdout, stderr = _run_main(["-v", "x=3*4", "-e", "return x;"])
     assert exit_code == 0
-    assert "[OK] 12" in stdout
+    assert stdout == "[OK] 12\n"
 
 
 def test_invalid_variable_format():
@@ -152,8 +155,6 @@ def test_invalid_variable_value():
 def test_run_mira_file():
     """执行一个 .mira 脚本文件。"""
     hello_file = EXAMPLES_DIR / "01_hello_world.mira"
-    if not hello_file.is_file():
-        pytest.skip("Example file not found")
     exit_code, stdout, stderr = _run_main([str(hello_file)])
     # hello_world.mira 没有 return 语句，结果可能是 nil
     assert exit_code == 0
@@ -162,8 +163,6 @@ def test_run_mira_file():
 def test_run_mira_file_41_fib():
     """执行 fib 示例确认返回值。"""
     fib_file = EXAMPLES_DIR / "41_fib.mira"
-    if not fib_file.is_file():
-        pytest.skip("Example file not found")
     exit_code, stdout, stderr = _run_main([str(fib_file)])
     assert exit_code == 0
 
@@ -182,17 +181,9 @@ def test_nonexistent_file():
 
 def test_stdin_input():
     """通过 stdin 传入代码。"""
-    import io
-
-    stdin_mock = io.StringIO("return 123;")
-    with patch.object(sys, "argv", ["mirascript", "-"]), patch.object(
-        sys, "stdin", stdin_mock
-    ), patch.object(sys, "stdout", StringIO()), patch.object(sys, "stderr", StringIO()):
-        exit_code = main()
-        # stdin 模式下会读取 stdin 内容并执行
-        # 注意: main 内部使用 sys.stdin.read()，mock 后应正常
-    # 这里只验证不崩溃即可
-    assert exit_code in (0, 1)
+    exit_code, stdout, stderr = _run_main(["-"], stdin="return 123;")
+    assert exit_code == 0
+    assert stdout == "[OK] 123\n"
 
 
 # ---------------------------------------------------------------------------
@@ -259,3 +250,82 @@ def test_eval_with_no_return():
     """没有 return 语句的 eval（模板模式测试）。"""
     exit_code, stdout, stderr = _run_main(["-t", "-e", "just a string"])
     assert exit_code == 0
+
+
+# ---------------------------------------------------------------------------
+# 白盒：__main__ 内部函数与异常路径
+# ---------------------------------------------------------------------------
+
+
+def test_compile_exception_exits_with_code_2():
+    with patch.object(cli, "compile", side_effect=RuntimeError("boom")):
+        with pytest.raises(SystemExit) as exc:
+            cli._compile("return 1;", "script")
+    assert exc.value.code == 2
+
+
+if sys.version_info >= (3, 9):
+
+    def test_get_unparse_prefers_stdlib():
+        unparse = cli._get_unparse()
+        assert unparse is ast.unparse
+
+    def test_get_unparse_raises_if_all_missing(monkeypatch: pytest.MonkeyPatch):
+        monkeypatch.delattr(ast, "unparse", raising=False)
+        monkeypatch.delitem(sys.modules, "astunparse", raising=False)
+
+        with pytest.raises(ImportError):
+            cli._get_unparse()
+
+
+def test_get_unparse_fallback_to_astunparse(monkeypatch: pytest.MonkeyPatch):
+    monkeypatch.delattr(ast, "unparse", raising=False)
+
+    fake = types.ModuleType("astunparse")
+
+    def fake_unparse(node):
+        return "fake_unparse"
+
+    fake.unparse = fake_unparse  # pyright: ignore[reportAttributeAccessIssue]
+    monkeypatch.setitem(sys.modules, "astunparse", fake)
+
+    unparse = cli._get_unparse()
+    assert unparse is fake_unparse
+
+
+def test_print_debug_writes_python_file(tmp_path: Path):
+    script, diagnostics = cli.compile(
+        "return 42;", input_mode="script", filename="<test>"
+    )
+    assert diagnostics is not None
+    assert script is not None
+
+    out = tmp_path / "debug_out.py"
+    cli._print_debug(script, str(out), {"x": 1})
+
+    content = out.read_text(encoding="utf-8")
+    assert "if __name__ == '__main__'" in content
+    assert "result = script({'x': 1})" in content
+
+
+def test_main_returns_1_when_script_raises():
+    def bad_script(_ctx=None):
+        raise RuntimeError("runtime failure")
+
+    with patch.object(cli, "_compile", return_value=(bad_script, [])):
+        exit_code, stdout, stderr = _run_main(["-e", "return 1;"])
+
+    assert exit_code == 1
+
+
+def test_main_variable_evaluation_exception_returns_1():
+    def compile_side_effect(code, mode, filename=None):
+        if filename and filename.startswith("<variable:"):
+            raise RuntimeError("var compile failure")
+        return cli.compile(code, input_mode=mode, filename=filename)
+
+    with patch.object(cli, "_compile", side_effect=compile_side_effect):
+        exit_code, stdout, stderr = _run_main(["-v", "x=1", "-e", "return 1;"])
+
+    assert exit_code == 1
+    assert "Error evaluating variable" in stderr

mirascript-0.1.78/crates/python/tests/test_compiler.py

@@ -0,0 +1,119 @@
+from __future__ import annotations
+
+import struct
+import sys
+import types
+
+import pytest
+
+from mirascript._compiler.consts import (
+    _read_constant,
+    read_constants,
+    read_index,
+    read_param,
+    split_chunk,
+)
+from mirascript._compiler.diagnostics import Diagnostic, decode_diagnostics
+from mirascript._compiler.opcode import OpCode, get_opcode_name
+from mirascript._compiler.script import wrap_vm_script
+
+
+def test_consts_read_constant_and_errors():
+    assert _read_constant(bytes([0]), 0) == (None, 1)
+    assert _read_constant(bytes([1]), 0) == (True, 1)
+    assert _read_constant(bytes([2]), 0) == (False, 1)
+
+    ordinal = bytes([3]) + struct.pack("<i", 7)
+    assert _read_constant(ordinal, 0) == (7.0, 5)
+
+    num = bytes([4]) + struct.pack("<d", 1.5)
+    assert _read_constant(num, 0) == (1.5, 9)
+
+    text = "abc".encode("utf-8")
+    s = bytes([5]) + struct.pack("<I", len(text)) + text
+    assert _read_constant(s, 0) == ("abc", 8)
+
+    with pytest.raises(ValueError):
+        _read_constant(bytes([9]), 0)
+
+
+def test_consts_read_constants_split_and_index_param():
+    c1 = bytes([1])
+    c2 = bytes([3]) + struct.pack("<i", 8)
+    assert read_constants(c1 + c2) == (True, 8.0)
+
+    code_data = b"ABCD"
+    const_data = b"XYZ"
+    chunk_size = 12 + len(code_data) + len(const_data)
+    chunk = (
+        struct.pack("<I", chunk_size)
+        + struct.pack("<I", len(code_data))
+        + code_data
+        + struct.pack("<I", len(const_data))
+        + const_data
+    )
+    got_const, got_code = split_chunk(chunk)
+    assert got_const == const_data
+    assert got_code == code_data
+
+    with pytest.raises(ValueError):
+        split_chunk(b"short")
+    with pytest.raises(ValueError):
+        split_chunk(struct.pack("<I", 9999) + b"\x00" * 20)
+
+    assert read_param(bytes([5]), 0, False) == (5, 1)
+    assert read_param(struct.pack("<I", 300), 0, True) == (300, 4)
+    assert read_index(struct.pack("<b", -7), 0, False) == (-7, 1)
+    assert read_index(struct.pack("<i", -300), 0, True) == (-300, 4)
+
+
+def test_diagnostic_paths_and_decode(monkeypatch: pytest.MonkeyPatch):
+    d = Diagnostic(1, 2, 3, 4, 12000)
+    assert d.level == "SourceMap"
+
+    fake_core = types.ModuleType("mirascript._compiler.core")
+    monkeypatch.setitem(sys.modules, "mirascript._compiler.core", fake_core)
+    Diagnostic._cache.clear()
+    unknown = Diagnostic(1, 1, 1, 1, 987654)
+    assert unknown.level == "Unknown"
+    assert "Unknown diagnostic code" in unknown.message
+
+    diagnostics, source_map = decode_diagnostics(
+        [
+            1,
+            2,
+            3,
+            4,
+            1001,
+            10,
+            11,
+            12,
+            13,
+            12000,
+        ]
+    )
+    assert len(diagnostics) == 1
+    assert len(source_map) == 1
+    assert "[" in str(diagnostics[0])
+
+
+def test_opcode_immutability_and_names():
+    with pytest.raises(AttributeError):
+        OpCode.NEW = 1
+    with pytest.raises(AttributeError):
+        del OpCode.ADD
+    with pytest.raises(AttributeError):
+        _ = OpCode.NO_SUCH
+
+    assert get_opcode_name(-99999) == "-99999"
+
+    public_names = [k for k in OpCode.__dict__.keys() if not k.startswith("_")]
+    assert public_names
+    assert OpCode.__getattr__(public_names[0]) == OpCode.__dict__[public_names[0]]
+
+
+def test_wrap_vm_script_exception_branch():
+    wrapped = wrap_vm_script(RuntimeError("x"), filename="f", source="s", ast=None)
+    with pytest.raises(RuntimeError):
+        wrapped()
+    assert getattr(wrapped, "filename") == "f"

mirascript-0.1.78/crates/python/tests/test_constants.py

@@ -0,0 +1,22 @@
+from mirascript import Uninitialized, VmUninitialized
+
+
+def test_uninitialized_constant():
+    """测试 Uninitialized 常量的类型和行为。"""
+
+    # 检查类型
+    assert Uninitialized is not None
+
+    # 检查字符串表示
+    assert str(Uninitialized) == "<uninitialized>"
+    assert repr(Uninitialized) == "<uninitialized>"
+
+    # 检查比较操作
+    assert Uninitialized == Uninitialized
+    assert not (Uninitialized != Uninitialized)
+
+    # 检查哈希值
+    assert hash(Uninitialized) == hash(Uninitialized)
+
+    # 检查布尔值
+    assert bool(Uninitialized) is False

mirascript-0.1.78/crates/python/tests/test_helper_convert.py

@@ -0,0 +1,74 @@
+from __future__ import annotations
+
+import math
+
+import pytest
+
+from mirascript import to_boolean, to_string, to_number, to_format, VmError, VmValue
+
+
+def test_to_boolean():
+    assert to_boolean(True) is True
+    assert to_boolean(False) is False
+    assert to_boolean(1, fallback=False) is False
+    with pytest.raises(Exception):
+        to_boolean(1)
+
+
+def test_to_string():
+    assert to_string("abc") == "abc"
+    assert to_string(123) == "123"
+    assert to_string(-0.0) == "0"
+    assert to_string(float("nan")) == "nan"
+    assert to_string(float("inf")) == "inf"
+    assert to_string(-float("inf")) == "-inf"
+    assert to_string({"a": -0.0, "b": 1}) == "a: 0, b: 1"
+    assert to_string([float("nan"), -0.0, 0.0, 0, 1]) == "nan, 0, 0, 0, 1"
+
+    class CantString:
+        def __str__(self):
+            raise Exception("Cannot convert to string")
+
+    value: VmValue = CantString()  # pyright: ignore[reportAssignmentType]
+
+    assert to_string(value, fallback="fallback") == "fallback"
+    with pytest.raises(VmError):
+        to_string(value)
+
+
+def test_to_number():
+    assert to_number(123) == 123
+    assert to_number(-0.0) == -0.0
+    assert math.isnan(to_number(float("nan")))
+    assert to_number(float("inf")) == float("inf")
+    assert to_number(-float("inf")) == -float("inf")
+    assert to_number("123") == 123
+    assert to_number("-0") == 0 and math.copysign(1, to_number("-0")) == -1
+    assert to_number("0x1A") == 26
+    assert to_number("0b101") == 5
+    assert to_number("0o17") == 15
+    assert to_number("1.23e4") == 12300.0
+    assert to_number("  42  ") == 42
+    assert math.isnan(to_number("nan"))
+    assert to_number("inf") == float("inf")
+    assert to_number("-inf") == -float("inf")
+
+    value: VmValue = [1]
+
+    assert to_number(value, fallback=12) == 12
+    with pytest.raises(VmError):
+        to_number(value)
+
+
+def test_to_format():
+    assert to_format("abc") == "abc"
+    assert to_format(123) == "123"
+    assert to_format(-0.0) == "0"
+    assert to_format(float("nan")) == "nan"
+    assert to_format(float("inf")) == "inf"
+    assert to_format(-float("inf")) == "-inf"
+    assert to_format({"a": -0.0, "b": 1}) == "a: 0, b: 1"
+    assert to_format([float("nan"), -0.0, 0.0, 0, 1]) == "nan, 0, 0, 0, 1"
+    assert to_format(math.pi) == "3.14159"
+    assert to_format(math.pi, ".0") == "3"
+    assert to_format(math.pi, ".-1") == "3.14159"