snail-lang 0.7.6__tar.gz → 0.7.8__tar.gz

{snail_lang-0.7.6 → snail_lang-0.7.8}/Cargo.lock

@@ -312,25 +312,25 @@ checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
 
 [[package]]
 name = "snail-ast"
-version = "0.7.6"
+version = "0.7.8"
 
 [[package]]
 name = "snail-error"
-version = "0.7.6"
+version = "0.7.8"
 dependencies = [
  "snail-ast",
 ]
 
 [[package]]
 name = "snail-lower"
-version = "0.7.6"
+version = "0.7.8"
 dependencies = [
  "snail-python",
 ]
 
 [[package]]
 name = "snail-parser"
-version = "0.7.6"
+version = "0.7.8"
 dependencies = [
  "pest",
  "pest_derive",
@@ -340,7 +340,7 @@ dependencies = [
 
 [[package]]
 name = "snail-python"
-version = "0.7.6"
+version = "0.7.8"
 dependencies = [
  "pyo3",
  "snail-ast",

{snail_lang-0.7.6 → snail_lang-0.7.8}/PKG-INFO

@@ -1,10 +1,14 @@
 Metadata-Version: 2.4
 Name: snail-lang
-Version: 0.7.6
+Version: 0.7.8
 Requires-Dist: astunparse>=1.6.3 ; python_full_version < '3.9'
 Requires-Dist: jmespath>=1.0.1
 Requires-Dist: maturin>=1.5 ; extra == 'dev'
+Requires-Dist: black ; extra == 'dev'
+Requires-Dist: isort ; extra == 'dev'
+Requires-Dist: mypy ; extra == 'dev'
 Requires-Dist: pytest ; extra == 'dev'
+Requires-Dist: ruff ; extra == 'dev'
 Provides-Extra: dev
 License-File: LICENSE
 Summary: Snail programming language interpreter
@@ -73,7 +77,7 @@ END { print("done") }
 | `$f` | All fields as a list |
 | `$n` | Global line number (across all files) |
 | `$fn` | Per-file line number |
-| `$p` | Current file path |
+| `$src` | Current file path |
 | `$m` | Last regex match object |
 
 

{snail_lang-0.7.6 → snail_lang-0.7.8}/README.md

@@ -60,7 +60,7 @@ END { print("done") }
 | `$f` | All fields as a list |
 | `$n` | Global line number (across all files) |
 | `$fn` | Per-file line number |
-| `$p` | Current file path |
+| `$src` | Current file path |
 | `$m` | Last regex match object |
 
 

{snail_lang-0.7.6 → snail_lang-0.7.8}/crates/snail-ast/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "snail-ast"
-version = "0.7.6"
+version = "0.7.8"
 edition = "2024"
 readme = "README.md"
 

{snail_lang-0.7.6 → snail_lang-0.7.8}/crates/snail-error/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "snail-error"
-version = "0.7.6"
+version = "0.7.8"
 edition = "2024"
 readme = "README.md"
 

{snail_lang-0.7.6 → snail_lang-0.7.8}/crates/snail-parser/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "snail-parser"
-version = "0.7.6"
+version = "0.7.8"
 edition = "2024"
 readme = "README.md"
 

{snail_lang-0.7.6 → snail_lang-0.7.8}/crates/snail-parser/src/lib.rs

@@ -159,11 +159,14 @@ pub fn parse_awk_program_with_begin_end(
     Ok(program)
 }
 
-const AWK_ONLY_NAMES: [&str; 5] = ["$n", "$fn", "$p", "$m", "$f"];
+const AWK_ONLY_NAMES: [&str; 4] = ["$n", "$fn", "$m", "$f"];
 const AWK_ONLY_MESSAGE: &str = "awk variables are only valid in awk mode; use --awk";
 
-const MAP_ONLY_NAMES: [&str; 3] = ["$src", "$fd", "$text"];
+const MAP_ONLY_NAMES: [&str; 2] = ["$fd", "$text"];
 const MAP_ONLY_MESSAGE: &str = "map variables are only valid in map mode; use --map";
+const MAP_OR_AWK_NAMES: [&str; 1] = ["$src"];
+const MAP_OR_AWK_MESSAGE: &str =
+    "map/awk variables are only valid in map or awk mode; use --map or --awk";
 
 /// Parses a map program that processes files one at a time.
 /// Allows map variables ($src, $fd, $text) but rejects awk variables.
@@ -933,6 +936,9 @@ fn validate_expr(expr: &Expr, source: &str) -> Result<(), ParseError> {
             if MAP_ONLY_NAMES.contains(&name.as_str()) {
                 return Err(error_with_span(MAP_ONLY_MESSAGE, span.clone(), source));
             }
+            if MAP_OR_AWK_NAMES.contains(&name.as_str()) {
+                return Err(error_with_span(MAP_OR_AWK_MESSAGE, span.clone(), source));
+            }
         }
         Expr::Placeholder { .. } => {}
         Expr::FieldIndex { span, .. } => {

{snail_lang-0.7.6 → snail_lang-0.7.8}/crates/snail-parser/src/snail.pest

@@ -259,7 +259,7 @@ none = { "None" }
 // Special variables: exception, AWK fields, map vars, injected vars
 exception_var = { "$e" ~ !ident_continue }
 field_index_var = @{ "$" ~ ASCII_DIGIT+ }
-injected_var = { "$text" | "$src" | "$env" | "$fn" | "$fd" | "$n" | "$p" | "$m" | "$f" }
+injected_var = { "$text" | "$src" | "$env" | "$fn" | "$fd" | "$n" | "$m" | "$f" }
 
 // Number, string, and regex literals
 number = @{ ASCII_DIGIT+ ~ ("." ~ ASCII_DIGIT+)? }

{snail_lang-0.7.6 → snail_lang-0.7.8}/crates/snail-python/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "snail-python"
-version = "0.7.6"
+version = "0.7.8"
 edition.workspace = true
 build = "build.rs"
 

{snail_lang-0.7.6 → snail_lang-0.7.8}/crates/snail-python/src/lower/awk.rs

@@ -23,41 +23,27 @@ pub(crate) fn lower_awk_file_loop_with_auto_print(
         span,
     )?);
 
-    let stdin_body = vec![
-        assign_name(
-            builder,
-            "__snail_file",
-            builder
-                .call_node(
-                    "Attribute",
-                    vec![
-                        name_expr(
-                            builder,
-                            "sys",
-                            span,
-                            builder.load_ctx().map_err(py_err_to_lower)?,
-                        )?,
-                        "stdin".to_string().into_py(builder.py()),
+    let stdin_assign = assign_name(
+        builder,
+        "__snail_file",
+        builder
+            .call_node(
+                "Attribute",
+                vec![
+                    name_expr(
+                        builder,
+                        "sys",
+                        span,
                         builder.load_ctx().map_err(py_err_to_lower)?,
-                    ],
-                    span,
-                )
-                .map_err(py_err_to_lower)?,
-            span,
-        )?,
-        lower_awk_line_loop_with_auto_print(
-            builder,
-            program,
-            span,
-            name_expr(
-                builder,
-                "__snail_file",
+                    )?,
+                    "stdin".to_string().into_py(builder.py()),
+                    builder.load_ctx().map_err(py_err_to_lower)?,
+                ],
                 span,
-                builder.load_ctx().map_err(py_err_to_lower)?,
-            )?,
-            auto_print,
-        )?,
-    ];
+            )
+            .map_err(py_err_to_lower)?,
+        span,
+    )?;
 
     let open_call = builder
         .call_node(
@@ -85,46 +71,35 @@ pub(crate) fn lower_awk_file_loop_with_auto_print(
         )
         .map_err(py_err_to_lower)?;
 
-    let with_item = builder
-        .call_node_no_loc(
-            "withitem",
-            vec![
-                open_call,
-                name_expr(
-                    builder,
-                    "__snail_file",
-                    span,
-                    builder.store_ctx().map_err(py_err_to_lower)?,
-                )?,
-            ],
-        )
-        .map_err(py_err_to_lower)?;
-    let with_stmt = builder
+    let enter_context_call = builder
         .call_node(
-            "With",
+            "Call",
             vec![
-                PyList::new_bound(builder.py(), vec![with_item]).into_py(builder.py()),
-                PyList::new_bound(
-                    builder.py(),
-                    vec![lower_awk_line_loop_with_auto_print(
-                        builder,
-                        program,
-                        span,
-                        name_expr(
-                            builder,
-                            "__snail_file",
-                            span,
+                builder
+                    .call_node(
+                        "Attribute",
+                        vec![
+                            name_expr(
+                                builder,
+                                "__snail_stack",
+                                span,
+                                builder.load_ctx().map_err(py_err_to_lower)?,
+                            )?,
+                            "enter_context".to_string().into_py(builder.py()),
                             builder.load_ctx().map_err(py_err_to_lower)?,
-                        )?,
-                        auto_print,
-                    )?],
-                )
-                .into_py(builder.py()),
+                        ],
+                        span,
+                    )
+                    .map_err(py_err_to_lower)?,
+                PyList::new_bound(builder.py(), vec![open_call]).into_py(builder.py()),
+                PyList::empty_bound(builder.py()).into_py(builder.py()),
             ],
             span,
         )
         .map_err(py_err_to_lower)?;
 
+    let file_assign = assign_name(builder, "__snail_file", enter_context_call, span)?;
+
     let test = builder
         .call_node(
             "Compare",
@@ -161,14 +136,80 @@ pub(crate) fn lower_awk_file_loop_with_auto_print(
             "If",
             vec![
                 test,
-                PyList::new_bound(builder.py(), stdin_body).into_py(builder.py()),
-                PyList::new_bound(builder.py(), vec![with_stmt]).into_py(builder.py()),
+                PyList::new_bound(builder.py(), vec![stdin_assign]).into_py(builder.py()),
+                PyList::new_bound(builder.py(), vec![file_assign]).into_py(builder.py()),
             ],
             span,
         )
         .map_err(py_err_to_lower)?;
 
-    file_loop.push(if_stmt);
+    let exit_stack_call = builder
+        .call_node(
+            "Call",
+            vec![
+                builder
+                    .call_node(
+                        "Attribute",
+                        vec![
+                            name_expr(
+                                builder,
+                                "contextlib",
+                                span,
+                                builder.load_ctx().map_err(py_err_to_lower)?,
+                            )?,
+                            "ExitStack".to_string().into_py(builder.py()),
+                            builder.load_ctx().map_err(py_err_to_lower)?,
+                        ],
+                        span,
+                    )
+                    .map_err(py_err_to_lower)?,
+                PyList::empty_bound(builder.py()).into_py(builder.py()),
+                PyList::empty_bound(builder.py()).into_py(builder.py()),
+            ],
+            span,
+        )
+        .map_err(py_err_to_lower)?;
+
+    let with_item = builder
+        .call_node_no_loc(
+            "withitem",
+            vec![
+                exit_stack_call,
+                name_expr(
+                    builder,
+                    "__snail_stack",
+                    span,
+                    builder.store_ctx().map_err(py_err_to_lower)?,
+                )?,
+            ],
+        )
+        .map_err(py_err_to_lower)?;
+
+    let line_loop = lower_awk_line_loop_with_auto_print(
+        builder,
+        program,
+        span,
+        name_expr(
+            builder,
+            "__snail_file",
+            span,
+            builder.load_ctx().map_err(py_err_to_lower)?,
+        )?,
+        auto_print,
+    )?;
+
+    let with_stmt = builder
+        .call_node(
+            "With",
+            vec![
+                PyList::new_bound(builder.py(), vec![with_item]).into_py(builder.py()),
+                PyList::new_bound(builder.py(), vec![if_stmt, line_loop]).into_py(builder.py()),
+            ],
+            span,
+        )
+        .map_err(py_err_to_lower)?;
+
+    file_loop.push(with_stmt);
     Ok(file_loop)
 }
 
@@ -344,6 +385,17 @@ pub(crate) fn lower_awk_line_loop_with_auto_print(
         )?,
         span,
     )?);
+    loop_body.push(assign_name(
+        builder,
+        SNAIL_MAP_SRC_PYVAR,
+        name_expr(
+            builder,
+            "__snail_path",
+            span,
+            builder.load_ctx().map_err(py_err_to_lower)?,
+        )?,
+        span,
+    )?);
 
     loop_body.extend(lower_awk_rules_with_auto_print(
         builder,

{snail_lang-0.7.6 → snail_lang-0.7.8}/crates/snail-python/src/lower/constants.rs

@@ -24,7 +24,6 @@ pub(crate) const SNAIL_INCR_TMP: &str = "__snail_incr_tmp";
 // Awk-related constants (public within crate)
 pub(crate) const SNAIL_AWK_NR: &str = "$n";
 pub(crate) const SNAIL_AWK_FNR: &str = "$fn";
-pub(crate) const SNAIL_AWK_PATH: &str = "$p";
 pub(crate) const SNAIL_AWK_MATCH: &str = "$m";
 pub(crate) const SNAIL_AWK_FIELDS: &str = "$f";
 pub(crate) const SNAIL_AWK_LINE_PYVAR: &str = "__snail_line";
@@ -53,7 +52,6 @@ pub(crate) fn injected_py_name(name: &str) -> Option<&'static str> {
         // Awk variables
         SNAIL_AWK_NR => Some(SNAIL_AWK_NR_PYVAR),
         SNAIL_AWK_FNR => Some(SNAIL_AWK_FNR_PYVAR),
-        SNAIL_AWK_PATH => Some(SNAIL_AWK_PATH_PYVAR),
         SNAIL_AWK_MATCH => Some(SNAIL_AWK_MATCH_PYVAR),
         SNAIL_AWK_FIELDS => Some(SNAIL_AWK_FIELDS_PYVAR),
         // Map variables

{snail_lang-0.7.6 → snail_lang-0.7.8}/crates/snail-python/src/lower/program.rs

@@ -98,6 +98,15 @@ pub fn lower_awk_program_with_auto_print(
                                 ],
                             )
                             .map_err(py_err_to_lower)?,
+                        builder
+                            .call_node_no_loc(
+                                "alias",
+                                vec![
+                                    "contextlib".to_string().into_py(builder.py()),
+                                    builder.py().None().into_py(builder.py()),
+                                ],
+                            )
+                            .map_err(py_err_to_lower)?,
                     ],
                 )
                 .into_py(builder.py()),

{snail_lang-0.7.6 → snail_lang-0.7.8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "snail-lang"
-version = "0.7.6"
+version = "0.7.8"
 description = "Snail programming language interpreter"
 readme = "README.md"
 requires-python = ">=3.8"
@@ -17,7 +17,11 @@ dependencies = [
 [project.optional-dependencies]
 dev = [
     "maturin>=1.5",
+    "black",
+    "isort",
+    "mypy",
     "pytest",
+    "ruff",
 ]
 
 [project.scripts]
@@ -28,3 +32,27 @@ bindings = "pyo3"
 python-source = "python"
 module-name = "snail._native"
 manifest-path = "crates/snail-python/Cargo.toml"
+
+[tool.black]
+line-length = 88
+target-version = ["py38"]
+
+[tool.isort]
+profile = "black"
+line_length = 88
+src_paths = ["python"]
+
+[tool.ruff]
+line-length = 88
+target-version = "py38"
+src = ["python"]
+exclude = ["target", ".venv", "build", "dist"]
+
+[tool.mypy]
+python_version = "3.12"
+show_error_codes = true
+warn_unused_ignores = true
+
+[[tool.mypy.overrides]]
+module = ["snail._native"]
+ignore_missing_imports = true

{snail_lang-0.7.6 → snail_lang-0.7.8}/python/snail/cli.py

@@ -2,7 +2,8 @@ from __future__ import annotations
 
 import os
 import sys
-from typing import Optional
+from types import TracebackType
+from typing import Any, Iterable, Optional, cast
 
 from . import __build_info__, compile_ast, exec
 
@@ -58,7 +59,7 @@ def _install_trimmed_excepthook() -> None:
     def _snail_excepthook(
         exc_type: type[BaseException],
         exc: BaseException,
-        tb: object,
+        tb: TracebackType | None,
     ) -> None:
         if exc_type is KeyboardInterrupt:
             return original_excepthook(exc_type, exc, tb)
@@ -72,13 +73,13 @@ def _install_trimmed_excepthook() -> None:
         )
         _trim_traceback_exception(tb_exc, internal_files)
         try:
-            import _colorize
+            import _colorize  # type: ignore[import-not-found]
 
             colorize = _colorize.can_colorize(file=sys.stderr)
         except Exception:
             colorize = hasattr(sys.stderr, "isatty") and sys.stderr.isatty()
         try:
-            formatted = tb_exc.format(colorize=colorize)
+            formatted = cast(Iterable[str], cast(Any, tb_exc).format(colorize=colorize))
         except TypeError:
             formatted = tb_exc.format()
         for line in formatted:
@@ -407,12 +408,21 @@ def main(argv: Optional[list[str]] = None) -> int:
         try:
             output = ast.unparse(python_ast)
         except AttributeError:
-            import astunparse
+            import astunparse  # type: ignore[import-not-found]
 
             output = astunparse.unparse(python_ast).rstrip("\n")
         print(output)
         return 0
 
+    if mode == "awk" and not args[1:]:
+        try:
+            is_tty = sys.stdin.isatty()
+        except Exception:
+            is_tty = False
+        if is_tty:
+            print('Missing input (see "snail --help")', file=sys.stderr)
+            return 1
+
     separators = "".join(namespace.field_separators)
     field_separators = separators if separators else None
     include_whitespace = namespace.include_whitespace or field_separators is None

{snail_lang-0.7.6 → snail_lang-0.7.8}/python/snail/runtime/__init__.py

@@ -223,7 +223,9 @@ def _lazy_aug_index(obj, index, value, op: str):
     return _get_aug_index()(obj, index, value, op)
 
 
-def __snail_awk_split(line: str, separators: Optional[str], include_whitespace: bool):
+def __snail_awk_split_internal(
+    line: str, separators: Optional[str], include_whitespace: bool
+):
     if not separators:
         return line.split()
     if not include_whitespace:
@@ -245,6 +247,11 @@ def __snail_awk_split(line: str, separators: Optional[str], include_whitespace:
     return regex.split(stripped)
 
 
+def __snail_awk_split(line: str, separators: Optional[str], include_whitespace: bool):
+    fields = __snail_awk_split_internal(line, separators, include_whitespace)
+    return [f for f in fields if f]
+
+
 def __snail_partial(func, /, *args, **kwargs):
     import functools
 

{snail_lang-0.7.6 → snail_lang-0.7.8}/python/snail/runtime/structured_accessor.py

@@ -100,7 +100,7 @@ def __snail_jmespath_query(query: str):
     Used by the $[query] syntax which lowers to __snail_jmespath_query(query).
     """
 
-    import jmespath as _jmespath
+    import jmespath as _jmespath  # type: ignore[import-untyped]
 
     transpiled = _transpile_jmespath_query(query)