pystacker 1.9.2__tar.gz → 1.13.0__tar.gz

{pystacker-1.9.2/pystacker.egg-info → pystacker-1.13.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pystacker
-Version: 1.9.2
+Version: 1.13.0
 Summary: Stacker: RPN Calculator in Python
 Author: remokasu
 License: MIT License
@@ -276,6 +276,26 @@ Stacker allows for straightforward RPN input. For example:
 
     Result: Pushes `7` onto the stack as `x` equals `0`.
 
+  - ##### cond Statement
+
+    The `cond` statement evaluates condition-result pairs in order and executes the first matching branch.
+
+    Syntax:
+    ```bash
+    {condition1} {result1} {condition2} {result2} ... n cond
+    ```
+
+    `n` is the number of condition-result pairs.
+
+    Example:
+    ```bash
+    stacker:0> 5 $x set
+    stacker:1> {x 0 >} {"positive"} {x 0 <} {"negative"} {true} {"zero"} 3 cond
+    ["positive"]
+    ```
+
+    Result: Pushes `"positive"` onto the stack as `x` is greater than `0`. Use `{true}` as the last condition to provide a default branch.
+
   - #### Loops
 
     Loops in Stacker allow for repeated execution of code blocks.
@@ -347,23 +367,43 @@ Stacker allows for straightforward RPN input. For example:
 
     Result: Pushes numbers 1 through 11 onto the stack by repeatedly duplicating and incrementing.
 
+  - ##### while Loop
+
+    The `while` loop repeats a code block while a condition is true.
+
+    Syntax:
+    ```bash
+    {condition} {body} while
+    ```
+
+    Example:
+    ```bash
+    stacker:0> 1 $i set 0 $s set
+    stacker:2> {i 6 <=} {s i + $s set i ++ $i set} while
+    stacker:2> s
+    [21]
+    ```
+
+    Result: Sums numbers from 1 to 6.
+
+    Note: Use `{condition}` as a code block that leaves a boolean on the stack. The loop terminates when the condition evaluates to false.
+
   - #### break
-    - syntax:
-      ```bash
-      {break}
-      ```
-    - example:
-      ```bash
-      stacker:0> 0 i set
-      stacker:1> 0 9 i {{break} i 5 == if i echo} do
-      0
-      1
-      2
-      3
-      4
-      5
-      ```
-      This example prints the numbers from 0 to 5. When `i` is equal to `5`, the loop is terminated by `break`.
+
+    `break` immediately exits the innermost loop (`do`, `dolist`, `times`, `while`).
+
+    Syntax:
+    ```bash
+    {break}
+    ```
+
+    Example:
+    ```bash
+    stacker:0> 0 $s set 1 10 $i {i 5 == {break} if s i + $s set} do s
+    [10]
+    ```
+
+    Result: Sums 1 through 4, then exits when `i` reaches 5. Note that `break` inside `if` immediately stops execution of the current block — `s i + $s set` is not executed when `i` equals 5.
 
 - ### Define a function:
   - syntax:
@@ -722,11 +762,14 @@ print(stacker.eval("3 4 +"))
 ### Control Operators
 | Operator | Description                                           | Example                    |
 |----------|-------------------------------------------------------|----------------------------|
-| if       | Conditional statement                                 | `{...} true  if`           |
-| ifelse   | Conditional statement with an else block              | `{true block} {false block} true ifelse`  |
+| if       | Conditional statement                                 | `true {...} if`            |
+| ifelse   | Conditional statement with an else block              | `true {true block} {false block} ifelse`  |
 | iferror  | Conditional statement for error handling              | `{try block} {catch block} iferror` |
+| cond     | Multi-branch conditional (first matching pair wins)   | `{x 0 >} {"pos"} {true} {"other"} 2 cond` |
 | do       | Loop                                                  | `0 10 i {i echo} do`      |
+| dolist   | Loop over the elements of a list                      | `[1 2 3] x {x echo} dolist` |
 | times    | Loop a specified number of times                      | `{dup ++} 10 times`        |
+| while    | Loop while a condition is true                        | `{i 10 <} {i ++ $i set} while` |
 | break    | Break out of a loop                                    | `break`                   |
 
 
@@ -749,6 +792,32 @@ print(stacker.eval("3 4 +"))
 | filter   | Filter an array based on a condition                  | `[1 2 3 4 5] {2 % 0 ==} filter` |
 | all      | Check if all elements of an array satisfy a condition  | `[1 2 3 4 5] {2 % 0 ==} all` |
 | any      | Check if any element of an array satisfies a condition | `[1 2 3 4 5] {2 % 0 ==} any` |
+| car      | Return the first element of a list                    | `[1 2 3] car`              |
+| cdr      | Return the list without its first element             | `[1 2 3] cdr`              |
+| cons     | Prepend an element to a list                          | `1 [2 3] cons`             |
+| pair?    | Return true if the value is a non-empty list          | `[1 2 3] pair?`            |
+| apply    | Expand list elements onto the stack and apply a function | `[3 4] {+} apply`       |
+
+Note: Blocks passed to `map`, `filter`, `reduce`, and `fold` must leave a value on the stack. For side-effect-only iteration (e.g. printing each element), use `dolist` instead.
+
+
+### Type Operators
+| Operator | Description                                           | Example                    |
+|----------|-------------------------------------------------------|----------------------------|
+| int      | Convert to int                                        | `3.7 int`                  |
+| float    | Convert to float                                      | `3 float`                  |
+| str      | Convert to string                                     | `42 str`                   |
+| bool     | Convert to bool                                       | `1 bool`                   |
+| complex  | Convert to complex number                             | `3 complex`                |
+| type     | Get the type of a value                               | `42 type`                  |
+| int?     | Returns true if the value is an int (not bool)        | `42 int?`                  |
+| float?   | Returns true if the value is a float                  | `3.14 float?`              |
+| str?     | Returns true if the value is a string                 | `"hello" str?`             |
+| bool?    | Returns true if the value is a bool                   | `true bool?`               |
+| complex? | Returns true if the value is a complex number         | `1+2j complex?`            |
+| list?    | Returns true if the value is a list                   | `[1 2 3] list?`            |
+| null?    | Returns true if the value is null or an empty list    | `null null?`               |
+| number?  | Returns true if the value is a number (int, float, or complex) | `42 number?`    |
 
 
 ### Other Operators

{pystacker-1.9.2 → pystacker-1.13.0}/README.md

@@ -241,6 +241,26 @@ Stacker allows for straightforward RPN input. For example:
 
     Result: Pushes `7` onto the stack as `x` equals `0`.
 
+  - ##### cond Statement
+
+    The `cond` statement evaluates condition-result pairs in order and executes the first matching branch.
+
+    Syntax:
+    ```bash
+    {condition1} {result1} {condition2} {result2} ... n cond
+    ```
+
+    `n` is the number of condition-result pairs.
+
+    Example:
+    ```bash
+    stacker:0> 5 $x set
+    stacker:1> {x 0 >} {"positive"} {x 0 <} {"negative"} {true} {"zero"} 3 cond
+    ["positive"]
+    ```
+
+    Result: Pushes `"positive"` onto the stack as `x` is greater than `0`. Use `{true}` as the last condition to provide a default branch.
+
   - #### Loops
 
     Loops in Stacker allow for repeated execution of code blocks.
@@ -312,23 +332,43 @@ Stacker allows for straightforward RPN input. For example:
 
     Result: Pushes numbers 1 through 11 onto the stack by repeatedly duplicating and incrementing.
 
+  - ##### while Loop
+
+    The `while` loop repeats a code block while a condition is true.
+
+    Syntax:
+    ```bash
+    {condition} {body} while
+    ```
+
+    Example:
+    ```bash
+    stacker:0> 1 $i set 0 $s set
+    stacker:2> {i 6 <=} {s i + $s set i ++ $i set} while
+    stacker:2> s
+    [21]
+    ```
+
+    Result: Sums numbers from 1 to 6.
+
+    Note: Use `{condition}` as a code block that leaves a boolean on the stack. The loop terminates when the condition evaluates to false.
+
   - #### break
-    - syntax:
-      ```bash
-      {break}
-      ```
-    - example:
-      ```bash
-      stacker:0> 0 i set
-      stacker:1> 0 9 i {{break} i 5 == if i echo} do
-      0
-      1
-      2
-      3
-      4
-      5
-      ```
-      This example prints the numbers from 0 to 5. When `i` is equal to `5`, the loop is terminated by `break`.
+
+    `break` immediately exits the innermost loop (`do`, `dolist`, `times`, `while`).
+
+    Syntax:
+    ```bash
+    {break}
+    ```
+
+    Example:
+    ```bash
+    stacker:0> 0 $s set 1 10 $i {i 5 == {break} if s i + $s set} do s
+    [10]
+    ```
+
+    Result: Sums 1 through 4, then exits when `i` reaches 5. Note that `break` inside `if` immediately stops execution of the current block — `s i + $s set` is not executed when `i` equals 5.
 
 - ### Define a function:
   - syntax:
@@ -687,11 +727,14 @@ print(stacker.eval("3 4 +"))
 ### Control Operators
 | Operator | Description                                           | Example                    |
 |----------|-------------------------------------------------------|----------------------------|
-| if       | Conditional statement                                 | `{...} true  if`           |
-| ifelse   | Conditional statement with an else block              | `{true block} {false block} true ifelse`  |
+| if       | Conditional statement                                 | `true {...} if`            |
+| ifelse   | Conditional statement with an else block              | `true {true block} {false block} ifelse`  |
 | iferror  | Conditional statement for error handling              | `{try block} {catch block} iferror` |
+| cond     | Multi-branch conditional (first matching pair wins)   | `{x 0 >} {"pos"} {true} {"other"} 2 cond` |
 | do       | Loop                                                  | `0 10 i {i echo} do`      |
+| dolist   | Loop over the elements of a list                      | `[1 2 3] x {x echo} dolist` |
 | times    | Loop a specified number of times                      | `{dup ++} 10 times`        |
+| while    | Loop while a condition is true                        | `{i 10 <} {i ++ $i set} while` |
 | break    | Break out of a loop                                    | `break`                   |
 
 
@@ -714,6 +757,32 @@ print(stacker.eval("3 4 +"))
 | filter   | Filter an array based on a condition                  | `[1 2 3 4 5] {2 % 0 ==} filter` |
 | all      | Check if all elements of an array satisfy a condition  | `[1 2 3 4 5] {2 % 0 ==} all` |
 | any      | Check if any element of an array satisfies a condition | `[1 2 3 4 5] {2 % 0 ==} any` |
+| car      | Return the first element of a list                    | `[1 2 3] car`              |
+| cdr      | Return the list without its first element             | `[1 2 3] cdr`              |
+| cons     | Prepend an element to a list                          | `1 [2 3] cons`             |
+| pair?    | Return true if the value is a non-empty list          | `[1 2 3] pair?`            |
+| apply    | Expand list elements onto the stack and apply a function | `[3 4] {+} apply`       |
+
+Note: Blocks passed to `map`, `filter`, `reduce`, and `fold` must leave a value on the stack. For side-effect-only iteration (e.g. printing each element), use `dolist` instead.
+
+
+### Type Operators
+| Operator | Description                                           | Example                    |
+|----------|-------------------------------------------------------|----------------------------|
+| int      | Convert to int                                        | `3.7 int`                  |
+| float    | Convert to float                                      | `3 float`                  |
+| str      | Convert to string                                     | `42 str`                   |
+| bool     | Convert to bool                                       | `1 bool`                   |
+| complex  | Convert to complex number                             | `3 complex`                |
+| type     | Get the type of a value                               | `42 type`                  |
+| int?     | Returns true if the value is an int (not bool)        | `42 int?`                  |
+| float?   | Returns true if the value is a float                  | `3.14 float?`              |
+| str?     | Returns true if the value is a string                 | `"hello" str?`             |
+| bool?    | Returns true if the value is a bool                   | `true bool?`               |
+| complex? | Returns true if the value is a complex number         | `1+2j complex?`            |
+| list?    | Returns true if the value is a list                   | `[1 2 3] list?`            |
+| null?    | Returns true if the value is null or an empty list    | `null null?`               |
+| number?  | Returns true if the value is a number (int, float, or complex) | `42 number?`    |
 
 
 ### Other Operators

{pystacker-1.9.2 → pystacker-1.13.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pystacker"
-version = "1.9.2"
+version = "1.13.0"
 authors = [
     {name = "remokasu"}
 ]

{pystacker-1.9.2 → pystacker-1.13.0/pystacker.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pystacker
-Version: 1.9.2
+Version: 1.13.0
 Summary: Stacker: RPN Calculator in Python
 Author: remokasu
 License: MIT License
@@ -276,6 +276,26 @@ Stacker allows for straightforward RPN input. For example:
 
     Result: Pushes `7` onto the stack as `x` equals `0`.
 
+  - ##### cond Statement
+
+    The `cond` statement evaluates condition-result pairs in order and executes the first matching branch.
+
+    Syntax:
+    ```bash
+    {condition1} {result1} {condition2} {result2} ... n cond
+    ```
+
+    `n` is the number of condition-result pairs.
+
+    Example:
+    ```bash
+    stacker:0> 5 $x set
+    stacker:1> {x 0 >} {"positive"} {x 0 <} {"negative"} {true} {"zero"} 3 cond
+    ["positive"]
+    ```
+
+    Result: Pushes `"positive"` onto the stack as `x` is greater than `0`. Use `{true}` as the last condition to provide a default branch.
+
   - #### Loops
 
     Loops in Stacker allow for repeated execution of code blocks.
@@ -347,23 +367,43 @@ Stacker allows for straightforward RPN input. For example:
 
     Result: Pushes numbers 1 through 11 onto the stack by repeatedly duplicating and incrementing.
 
+  - ##### while Loop
+
+    The `while` loop repeats a code block while a condition is true.
+
+    Syntax:
+    ```bash
+    {condition} {body} while
+    ```
+
+    Example:
+    ```bash
+    stacker:0> 1 $i set 0 $s set
+    stacker:2> {i 6 <=} {s i + $s set i ++ $i set} while
+    stacker:2> s
+    [21]
+    ```
+
+    Result: Sums numbers from 1 to 6.
+
+    Note: Use `{condition}` as a code block that leaves a boolean on the stack. The loop terminates when the condition evaluates to false.
+
   - #### break
-    - syntax:
-      ```bash
-      {break}
-      ```
-    - example:
-      ```bash
-      stacker:0> 0 i set
-      stacker:1> 0 9 i {{break} i 5 == if i echo} do
-      0
-      1
-      2
-      3
-      4
-      5
-      ```
-      This example prints the numbers from 0 to 5. When `i` is equal to `5`, the loop is terminated by `break`.
+
+    `break` immediately exits the innermost loop (`do`, `dolist`, `times`, `while`).
+
+    Syntax:
+    ```bash
+    {break}
+    ```
+
+    Example:
+    ```bash
+    stacker:0> 0 $s set 1 10 $i {i 5 == {break} if s i + $s set} do s
+    [10]
+    ```
+
+    Result: Sums 1 through 4, then exits when `i` reaches 5. Note that `break` inside `if` immediately stops execution of the current block — `s i + $s set` is not executed when `i` equals 5.
 
 - ### Define a function:
   - syntax:
@@ -722,11 +762,14 @@ print(stacker.eval("3 4 +"))
 ### Control Operators
 | Operator | Description                                           | Example                    |
 |----------|-------------------------------------------------------|----------------------------|
-| if       | Conditional statement                                 | `{...} true  if`           |
-| ifelse   | Conditional statement with an else block              | `{true block} {false block} true ifelse`  |
+| if       | Conditional statement                                 | `true {...} if`            |
+| ifelse   | Conditional statement with an else block              | `true {true block} {false block} ifelse`  |
 | iferror  | Conditional statement for error handling              | `{try block} {catch block} iferror` |
+| cond     | Multi-branch conditional (first matching pair wins)   | `{x 0 >} {"pos"} {true} {"other"} 2 cond` |
 | do       | Loop                                                  | `0 10 i {i echo} do`      |
+| dolist   | Loop over the elements of a list                      | `[1 2 3] x {x echo} dolist` |
 | times    | Loop a specified number of times                      | `{dup ++} 10 times`        |
+| while    | Loop while a condition is true                        | `{i 10 <} {i ++ $i set} while` |
 | break    | Break out of a loop                                    | `break`                   |
 
 
@@ -749,6 +792,32 @@ print(stacker.eval("3 4 +"))
 | filter   | Filter an array based on a condition                  | `[1 2 3 4 5] {2 % 0 ==} filter` |
 | all      | Check if all elements of an array satisfy a condition  | `[1 2 3 4 5] {2 % 0 ==} all` |
 | any      | Check if any element of an array satisfies a condition | `[1 2 3 4 5] {2 % 0 ==} any` |
+| car      | Return the first element of a list                    | `[1 2 3] car`              |
+| cdr      | Return the list without its first element             | `[1 2 3] cdr`              |
+| cons     | Prepend an element to a list                          | `1 [2 3] cons`             |
+| pair?    | Return true if the value is a non-empty list          | `[1 2 3] pair?`            |
+| apply    | Expand list elements onto the stack and apply a function | `[3 4] {+} apply`       |
+
+Note: Blocks passed to `map`, `filter`, `reduce`, and `fold` must leave a value on the stack. For side-effect-only iteration (e.g. printing each element), use `dolist` instead.
+
+
+### Type Operators
+| Operator | Description                                           | Example                    |
+|----------|-------------------------------------------------------|----------------------------|
+| int      | Convert to int                                        | `3.7 int`                  |
+| float    | Convert to float                                      | `3 float`                  |
+| str      | Convert to string                                     | `42 str`                   |
+| bool     | Convert to bool                                       | `1 bool`                   |
+| complex  | Convert to complex number                             | `3 complex`                |
+| type     | Get the type of a value                               | `42 type`                  |
+| int?     | Returns true if the value is an int (not bool)        | `42 int?`                  |
+| float?   | Returns true if the value is a float                  | `3.14 float?`              |
+| str?     | Returns true if the value is a string                 | `"hello" str?`             |
+| bool?    | Returns true if the value is a bool                   | `true bool?`               |
+| complex? | Returns true if the value is a complex number         | `1+2j complex?`            |
+| list?    | Returns true if the value is a list                   | `[1 2 3] list?`            |
+| null?    | Returns true if the value is null or an empty list    | `null null?`               |
+| number?  | Returns true if the value is a number (int, float, or complex) | `42 number?`    |
 
 
 ### Other Operators

{pystacker-1.9.2 → pystacker-1.13.0}/pystacker.egg-info/SOURCES.txt

@@ -20,6 +20,7 @@ stacker/data/top.txt
 stacker/engine/__init__.py
 stacker/engine/core.py
 stacker/engine/data_type.py
+stacker/engine/recursion.py
 stacker/engine/scope.py
 stacker/engine/sfunction.py
 stacker/engine/slambda.py
@@ -77,23 +78,44 @@ stacker/syntax/__init__.py
 stacker/syntax/lexer.py
 stacker/syntax/parser.py
 stacker/syntax/test_parser.py
+stacker/syntax/token_rules.py
 stacker/util/__init__.py
 stacker/util/color.py
 stacker/util/disp.py
 test/test_aggregate.py
+test/test_apply.py
+test/test_block_comments.py
+test/test_cond.py
+test/test_debug_flag.py
 test/test_defmacro.py
+test/test_defmacro_advanced.py
 test/test_defun.py
+test/test_defun_advanced.py
+test/test_disp.py
 test/test_error_formatter.py
 test/test_error_messages.py
+test/test_expand.py
+test/test_hof_advanced.py
 test/test_if_else_statement.py
 test/test_include.py
 test/test_inline_comments.py
 test/test_lambda.py
+test/test_lazy_block_binding.py
+test/test_list_primitives.py
+test/test_loop_advanced.py
 test/test_loop_statement.py
+test/test_multiline_accumulation.py
 test/test_no_dollar_in_blocks.py
 test/test_no_dollar_syntax.py
+test/test_recursion_limit.py
 test/test_reduce.py
+test/test_repl_continuation.py
 test/test_scope.py
+test/test_semantics_freeze.py
 test/test_stacker.py
 test/test_string_apostrophe.py
-test/test_transform.py
+test/test_token_list_cache.py
+test/test_transform.py
+test/test_triple_quote_strings.py
+test/test_unterminated_errors.py
+test/test_while_loop.py

{pystacker-1.9.2 → pystacker-1.13.0}/stacker/__main__.py

@@ -10,8 +10,16 @@ import stacker
 
 from stacker.runtime.exec_modes import CommandLineMode, ReplMode, ScriptMode
 
+from stacker.engine import recursion
 from stacker.lib import disp_logo
-from stacker.lib.config import plugins_dir_path, stacker_dotfile_path
+from stacker.lib.config import (
+    DEFAULT_RECURSION_LIMIT,
+    MAX_RECURSION_LIMIT,
+    RECURSION_BACKSTOP_MARGIN,
+    RECURSION_FRAMES_PER_LEVEL,
+    plugins_dir_path,
+    stacker_dotfile_path,
+)
 from stacker.stacker import Stacker
 from stacker.util import colored
 
@@ -21,13 +29,34 @@ parser.add_argument(
 )
 parser.add_argument("--debug", action="store_true", help="Enable debug mode")
 parser.add_argument("-e", default=None, help="Execute the given command.")
+parser.add_argument(
+    "--recursion-limit",
+    metavar="N",
+    type=int,
+    default=DEFAULT_RECURSION_LIMIT,
+    help=(
+        "Maximum Stacker function recursion depth "
+        f"(1-{MAX_RECURSION_LIMIT}, default {DEFAULT_RECURSION_LIMIT})."
+    ),
+)
 parser.add_argument("script", nargs="?", default=None, help="Script file to run.")
 argv = parser.parse_args()
 
-sys.setrecursionlimit(1 << 30)
+if not 1 <= argv.recursion_limit <= MAX_RECURSION_LIMIT:
+    parser.error(
+        f"--recursion-limit must be between 1 and {MAX_RECURSION_LIMIT}, "
+        f"got {argv.recursion_limit}"
+    )
+recursion.set_limit(argv.recursion_limit)
+
+# Finite backstop replacing the old `1 << 30`: pathological recursion that
+# bypasses the function-call guard stops with RecursionError, not a segfault
+sys.setrecursionlimit(
+    MAX_RECURSION_LIMIT * RECURSION_FRAMES_PER_LEVEL + RECURSION_BACKSTOP_MARGIN
+)
 
 
-def load_stacker_lib(stacker: Stacker, dir_path) -> bool:
+def load_stacker_lib(stacker: Stacker, dir_path: str) -> bool:
     """Load the Stacker library from the specified directory.
     :param stacker: The Stacker instance to pass to the plugins.
     :param dir_path: The directory to load the Stacker library from.
@@ -48,7 +77,7 @@ def load_stacker_lib(stacker: Stacker, dir_path) -> bool:
     return True
 
 
-def load_plugins(stacker: Stacker, plugins_dir_path) -> bool:
+def load_plugins(stacker: Stacker, plugins_dir_path: str) -> bool:
     """Load plugins from the plugins directory.
     :param stacker: The Stacker instance to pass to the plugins.
     :return: None
@@ -111,7 +140,7 @@ def copy_plugin_to_install_dir(plugin_path: str, debug_mode: bool) -> None:
             traceback.print_exc()
 
 
-def main():
+def main() -> None:
     """Main entry point for the Stacker CLI."""
     # add plugin
     if argv.addplugin:

{pystacker-1.9.2 → pystacker-1.13.0}/stacker/constant.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import math
 
 
-constants = {
+constants: dict[str, int | float | bool | None] = {
     "e": math.e,
     "pi": math.pi,
     "phi": (1 + math.sqrt(5)) / 2,