execsql2 2.17.0__py3-none-any.whl → 2.17.2__py3-none-any.whl

execsql/metacommands/prompt.py

@@ -4,21 +4,35 @@ from execsql.exceptions import ErrInfo
 """
 Interactive user prompt metacommand handlers for execsql.
 
-Implements all ``x_*`` handler functions that display GUI dialogs or
-console prompts to the user:
-
-- ``x_prompt_action`` — ACTION prompt (choose from a list of actions)
-- ``x_prompt_message`` — MESSAGE dialog
-- ``x_prompt_display`` — DISPLAY (show a query result)
-- ``x_prompt_entry`` — ENTRY FORM (fill in substitution variables)
-- ``x_prompt_compare`` — COMPARE dialog
-- ``x_prompt_selectrows`` — SELECT ROWS dialog
-- ``x_prompt_map`` — MAP display
-- ``x_open_file`` — OPEN FILE browser
-- ``x_save_file`` — SAVE FILE browser
-- ``x_get_directory`` — GET DIRECTORY browser
-- ``x_credentials`` — CREDENTIALS dialog
-- ``x_gui_console`` — GUI console on/off control
+Implements handlers that display GUI dialogs or console prompts.
+The PROMPT family routes through the active GUI backend (Tkinter,
+Textual, or Console) via :mod:`execsql.utils.gui`.
+
+PROMPT variants:
+
+- ``x_prompt`` — PROMPT DISPLAY (show a query result in a dialog)
+- ``x_prompt_action`` — PROMPT ACTION (choose from a list of actions)
+- ``x_prompt_ask`` — PROMPT ASK (yes/no, optionally with DISPLAY/COMPARE)
+- ``x_prompt_ask_compare`` — PROMPT ASK … COMPARE (yes/no over two tables)
+- ``x_prompt_compare`` — PROMPT COMPARE (side-by-side or stacked table diff)
+- ``x_prompt_connect`` — PROMPT CONNECT (interactive DB connection dialog)
+- ``x_prompt_credentials`` — PROMPT CREDENTIALS (username/password dialog)
+- ``x_prompt_directory`` — PROMPT DIRECTORY (folder picker)
+- ``x_prompt_enter`` — PROMPT ENTER_SUB (single text-entry dialog)
+- ``x_prompt_entryform`` — PROMPT ENTRY_FORM (multi-field form)
+- ``x_prompt_map`` — PROMPT MAP (markers on an interactive map)
+- ``x_prompt_openfile`` — PROMPT OPENFILE (file picker)
+- ``x_prompt_pause`` — PROMPT PAUSE (modal pause dialog with timer)
+- ``x_prompt_savefile`` — PROMPT SAVEFILE (file save dialog)
+- ``x_prompt_select_rows`` — PROMPT SELECT_ROWS (multi-row selection dialog)
+
+Console / non-PROMPT siblings:
+
+- ``x_ask`` — ASK (terminal-only yes/no, no GUI)
+- ``x_pause`` — PAUSE (terminal-only "press a key to continue")
+- ``x_msg`` — PROMPT MESSAGE (single-button text dialog)
+- ``x_reset_dialog_canceled`` — RESET DIALOG_CANCELED (clear the
+  dialog-cancellation flag set by a PROMPT cancel).
 """
 
 import os
@@ -126,7 +140,7 @@ def x_prompt_enter(**kwargs: Any) -> None:
             _state.exec_log.log_exit_halt(*current_script_line(), msg="Quit from prompt to enter a SUB value.")
             exit_now(2, None)
     else:
-        subvarset = _state.subvars if sub_var[0] != "~" else _state.commandliststack[-1].localvars
+        subvarset = _state.subvars if sub_var[0] != "~" else _state.current_localvars()
         subvarset.add_substitution(sub_var, txtval)
         script_name, lno = current_script_line()
         if as_pw:
@@ -252,7 +266,7 @@ def x_prompt_entryform(**kwargs: Any) -> None:
                     ) from e
                 if entry_col < 1:
                     entry_col = 1
-        subvarset = _state.subvars if subvar[0] != "~" else _state.commandliststack[-1].localvars
+        subvarset = _state.subvars if subvar[0] != "~" else _state.current_localvars()
         subvarset.remove_substitution(subvar)
         entry_list.append(
             EntrySpec(
@@ -293,7 +307,7 @@ def x_prompt_entryform(**kwargs: Any) -> None:
         for e in entries:
             if e.value:
                 value = str(e.value)
-                subvarset = _state.subvars if subvar[0] != "~" else _state.commandliststack[-1].localvars
+                subvarset = _state.subvars if subvar[0] != "~" else _state.current_localvars()
                 subvarset.add_substitution(e.name, value)
                 _state.exec_log.log_status_info(
                     f"Substitution variable {e.name} set to {{{value}}} on line {line_no} of {script}",
@@ -425,7 +439,7 @@ def x_prompt_ask_compare(**kwargs: Any) -> None:
             exit_now(2, None)
     else:
         respstr = "Yes" if btn == 1 else "No"
-        subvarset = _state.subvars if subvar[0] != "~" else _state.commandliststack[-1].localvars
+        subvarset = _state.subvars if subvar[0] != "~" else _state.current_localvars()
         subvarset.add_substitution(subvar, respstr)
         _state.exec_log.log_status_info(f"Question {{{kwargs['msg']}}} on line {lno} answered {respstr}")
 
@@ -462,7 +476,7 @@ def x_prompt_ask(**kwargs: Any) -> None:
             exit_now(2, None)
     else:
         respstr = "Yes" if btn == 1 else "No"
-        subvarset = _state.subvars if subvar[0] != "~" else _state.commandliststack[-1].localvars
+        subvarset = _state.subvars if subvar[0] != "~" else _state.current_localvars()
         subvarset.add_substitution(subvar, respstr)
         _state.exec_log.log_status_info(
             f"Question {{{kwargs['question']}}} answered {respstr} on line {lno} of script {script}",
@@ -605,7 +619,7 @@ def x_prompt_savefile(**kwargs: Any) -> None:
     sub_name5 = kwargs["fnbase_match"]
     startdir = kwargs["startdir"]
     try:
-        subvarset = _state.subvars if sub_name[0] != "~" else _state.commandliststack[-1].localvars
+        subvarset = _state.subvars if sub_name[0] != "~" else _state.current_localvars()
         subvarset.remove_substitution(sub_name)
         script, lno = current_script_line()
         working_dir = startdir if startdir is not None else str(Path(script).resolve().parent)
@@ -628,7 +642,7 @@ def x_prompt_savefile(**kwargs: Any) -> None:
                 f"Substitution variable {sub_name} set to path and filename {fn} at line {lno} of {script}",
             )
             if sub_name2 is not None:
-                subvarset2 = _state.subvars if sub_name2[0] != "~" else _state.commandliststack[-1].localvars
+                subvarset2 = _state.subvars if sub_name2[0] != "~" else _state.current_localvars()
                 subvarset2.remove_substitution(sub_name2)
                 basefn = Path(fn).name
                 subvarset2.add_substitution(sub_name2, basefn)
@@ -636,7 +650,7 @@ def x_prompt_savefile(**kwargs: Any) -> None:
                     f"Substitution variable {sub_name2} set to filename {basefn} at line {lno} of {script}",
                 )
             if sub_name3 is not None:
-                subvarset3 = _state.subvars if sub_name3[0] != "~" else _state.commandliststack[-1].localvars
+                subvarset3 = _state.subvars if sub_name3[0] != "~" else _state.current_localvars()
                 subvarset3.remove_substitution(sub_name3)
                 dirname = str(Path(fn).parent)
                 if os.name != "posix":
@@ -646,7 +660,7 @@ def x_prompt_savefile(**kwargs: Any) -> None:
                     f"Substitution variable {sub_name3} set to path {dirname} at line {lno} of {script}",
                 )
             if sub_name4 is not None:
-                subvarset4 = _state.subvars if sub_name4[0] != "~" else _state.commandliststack[-1].localvars
+                subvarset4 = _state.subvars if sub_name4[0] != "~" else _state.current_localvars()
                 subvarset4.remove_substitution(sub_name4)
                 ext = Path(fn).suffix
                 if ext is None:
@@ -655,7 +669,7 @@ def x_prompt_savefile(**kwargs: Any) -> None:
                     ext = ext[1:]
                     subvarset4.add_substitution(sub_name4, ext)
             if sub_name5 is not None:
-                subvarset5 = _state.subvars if sub_name5[0] != "~" else _state.commandliststack[-1].localvars
+                subvarset5 = _state.subvars if sub_name5[0] != "~" else _state.current_localvars()
                 subvarset5.remove_substitution(sub_name5)
                 subvarset5.add_substitution(sub_name5, Path(fn).stem)
     except (ErrInfo, SystemExit):
@@ -678,7 +692,7 @@ def x_prompt_openfile(**kwargs: Any) -> None:
             other_msg="Different values can't be assigned to the same substitution variable.",
         )
     try:
-        subvarset = _state.subvars if sub_name[0] != "~" else _state.commandliststack[-1].localvars
+        subvarset = _state.subvars if sub_name[0] != "~" else _state.current_localvars()
         subvarset.remove_substitution(sub_name)
         script, lno = current_script_line()
         working_dir = startdir if startdir is not None else str(Path(script).resolve().parent)
@@ -701,19 +715,19 @@ def x_prompt_openfile(**kwargs: Any) -> None:
                 f"Substitution variable {sub_name} set to path and filename {fn} at line {lno} of {script}",
             )
             if sub_name2 is not None:
-                subvarset2 = _state.subvars if sub_name2[0] != "~" else _state.commandliststack[-1].localvars
+                subvarset2 = _state.subvars if sub_name2[0] != "~" else _state.current_localvars()
                 subvarset2.remove_substitution(sub_name2)
                 basefn = Path(fn).name
                 subvarset2.add_substitution(sub_name2, basefn)
             if sub_name3 is not None:
-                subvarset3 = _state.subvars if sub_name3[0] != "~" else _state.commandliststack[-1].localvars
+                subvarset3 = _state.subvars if sub_name3[0] != "~" else _state.current_localvars()
                 subvarset3.remove_substitution(sub_name3)
                 dirname = str(Path(fn).parent)
                 if os.name != "posix":
                     dirname = dirname.replace("/", "\\")
                 subvarset3.add_substitution(sub_name3, dirname)
             if sub_name4 is not None:
-                subvarset4 = _state.subvars if sub_name4[0] != "~" else _state.commandliststack[-1].localvars
+                subvarset4 = _state.subvars if sub_name4[0] != "~" else _state.current_localvars()
                 subvarset4.remove_substitution(sub_name4)
                 ext = Path(fn).suffix
                 if ext is None:
@@ -722,7 +736,7 @@ def x_prompt_openfile(**kwargs: Any) -> None:
                     ext = ext[1:]
                     subvarset4.add_substitution(sub_name4, ext)
             if sub_name5 is not None:
-                subvarset5 = _state.subvars if sub_name5[0] != "~" else _state.commandliststack[-1].localvars
+                subvarset5 = _state.subvars if sub_name5[0] != "~" else _state.current_localvars()
                 subvarset5.remove_substitution(sub_name5)
                 subvarset5.add_substitution(sub_name5, Path(fn).stem)
     except (ErrInfo, SystemExit):
@@ -737,7 +751,7 @@ def x_prompt_directory(**kwargs: Any) -> None:
     fullpath = kwargs["fullpath"]
     startdir = kwargs["startdir"]
     try:
-        subvarset = _state.subvars if sub_name[0] != "~" else _state.commandliststack[-1].localvars
+        subvarset = _state.subvars if sub_name[0] != "~" else _state.current_localvars()
         subvarset.remove_substitution(sub_name)
         script, lno = current_script_line()
         working_dir = startdir if startdir is not None else str(Path(script).resolve().parent)
@@ -878,7 +892,7 @@ def x_ask(**kwargs: Any) -> None:
             exit_now(2, None)
         else:
             respstr = "Yes" if resp == "y" else "No"
-    subvarset = _state.subvars if subvar[0] != "~" else _state.commandliststack[-1].localvars
+    subvarset = _state.subvars if subvar[0] != "~" else _state.current_localvars()
     subvarset.add_substitution(subvar, respstr)
     _state.exec_log.log_status_info(
         f"Question {{{message}}} answered {respstr} on line {lno} of script {script}",

execsql/metacommands/script_ext.py

@@ -1,59 +1,88 @@
 from __future__ import annotations
 
 """
-Script extension metacommand handlers for execsql.
+Script-block extension and dispatch handlers for execsql.
 
-Implements metacommands that extend or augment a running script:
+Handlers for the named-script invocation and dynamic-extension
+metacommands. Used by both the AST executor and legacy command paths:
 
-- ``x_extendscript`` — EXTEND SCRIPT (append additional commands from
-  a file into the current script stream)
-- Other substitution-variable and script-modification helpers.
+- ``x_executescript`` — ``EXECUTE SCRIPT <name>`` / ``RUN SCRIPT <name>``
+  (look up a previously-registered ``BEGIN SCRIPT`` block and run it,
+  optionally with parameter bindings and a WHILE / UNTIL loop).
+- ``x_extendscript`` — ``EXTEND SCRIPT <name> WITH SCRIPT|FILE …``
+  (append additional commands to an existing named script block from
+  an inline source).
+- ``x_extendscript_metacommand`` — ``EXTEND SCRIPT … WITH METACOMMAND …``.
+- ``x_extendscript_sql`` — ``EXTEND SCRIPT … WITH SQL …``.
+
+Registration of ``BEGIN SCRIPT … END SCRIPT`` blocks themselves is
+handled by the AST parser (block boundaries) and executor (registering
+the block on ``ctx.ast_scripts``); this module is only the call-site /
+extension handlers.
 """
 
+import copy
+from dataclasses import replace
 from typing import Any
 
 import execsql.state as _state
 from execsql.exceptions import ErrInfo
-from execsql.script import MetacommandStmt, ScriptCmd, SqlStmt, current_script_line
+from execsql.script import current_script_line
+
+
+def _get_ast_script(name: str):
+    """Return the AST :class:`ScriptBlock` for ``name`` or raise ErrInfo."""
+    block = _state.ast_scripts.get(name.lower())
+    if block is None:
+        raise ErrInfo("cmd", other_msg=f"There is no SCRIPT named {name}.")
+    return block
+
+
+def _new_span(source: str, line_no: int):
+    """Construct a SourceSpan for a synthetic AST node created at runtime."""
+    from execsql.script.ast import SourceSpan
+
+    return SourceSpan(file=source, start_line=line_no, end_line=line_no)
 
 
 def x_extendscript(**kwargs: Any) -> None:
-    script1 = kwargs["script1"].lower()
-    if script1 not in _state.savedscripts:
-        raise ErrInfo("cmd", other_msg=f"There is no SCRIPT named {script1}.")
-    script2 = kwargs["script2"].lower()
-    if script2 not in _state.savedscripts:
-        raise ErrInfo("cmd", other_msg=f"There is no SCRIPT named {script2}.")
-    s1 = _state.savedscripts[script1]
-    s2 = _state.savedscripts[script2]
-    for cmd in s1.cmdlist:
-        s2.add(cmd)
-    if s1.paramnames is not None:
-        if s2.paramnames is None:
-            s2.paramnames = []
-        for param in s1.paramnames:
-            if param not in s2.paramnames:
-                s2.paramnames.append(param)
+    """Append the body of one SCRIPT to another, merging parameter names."""
+    target = _get_ast_script(kwargs["script2"])
+    source = _get_ast_script(kwargs["script1"])
+
+    # Append a deep copy of the source body so future mutations don't bleed.
+    target.body.extend(copy.deepcopy(source.body))
+
+    # Merge parameter definitions, preserving the target's existing order and
+    # adding any new params from the source.
+    if source.param_defs:
+        existing = list(target.param_defs or [])
+        existing_names = {p.name for p in existing}
+        for pdef in source.param_defs:
+            if pdef.name not in existing_names:
+                existing.append(replace(pdef))
+                existing_names.add(pdef.name)
+        target.param_defs = existing
 
 
 def x_extendscript_metacommand(**kwargs: Any) -> None:
-    script = kwargs["script"].lower()
-    if script not in _state.savedscripts:
-        raise ErrInfo("cmd", other_msg=f"There is no SCRIPT named {script}.")
+    """Append a single metacommand line to an existing SCRIPT body."""
+    from execsql.script.ast import MetaCommandStatement
+
+    block = _get_ast_script(kwargs["script"])
     script_file, script_line_no = current_script_line()
-    _state.savedscripts[script].add(
-        ScriptCmd(script_file, script_line_no, "cmd", MetacommandStmt(kwargs["cmd"])),
-    )
+    span = _new_span(script_file, script_line_no or 0)
+    block.body.append(MetaCommandStatement(span=span, command=kwargs["cmd"]))
 
 
 def x_extendscript_sql(**kwargs: Any) -> None:
-    script = kwargs["script"].lower()
-    if script not in _state.savedscripts:
-        raise ErrInfo("cmd", other_msg=f"There is no SCRIPT named {script}.")
+    """Append a single SQL statement to an existing SCRIPT body."""
+    from execsql.script.ast import SqlStatement
+
+    block = _get_ast_script(kwargs["script"])
     script_file, script_line_no = current_script_line()
-    _state.savedscripts[script].add(
-        ScriptCmd(script_file, script_line_no, "sql", SqlStmt(kwargs["sql"])),
-    )
+    span = _new_span(script_file, script_line_no or 0)
+    block.body.append(SqlStatement(span=span, text=kwargs["sql"]))
 
 
 def x_executescript(**kwargs: Any) -> None:

execsql/metacommands/system.py

@@ -3,9 +3,10 @@ from __future__ import annotations
 """
 System and shell metacommand handlers for execsql.
 
-Implements ``x_shell`` (SHELL — execute an OS command via ``subprocess``)
-and related system-interaction metacommands that allow SQL scripts to
-invoke external programs, set environment variables, or query the OS.
+Implements ``x_system_cmd`` (SYSTEM_CMD — execute an OS command via
+``subprocess``) and related system-interaction metacommands that allow
+SQL scripts to invoke external programs, set environment variables, or
+query the OS.
 """
 
 import os

execsql/script/__init__.py

@@ -1,55 +1,49 @@
 from __future__ import annotations
 
 """
-Core script-execution engine for execsql.
+Core script-execution data types and helpers for execsql.
 
-This module contains the data structures and functions that load, parse, and
-drive execution of execsql ``.sql`` script files.  It is the heart of the
-runtime.
+This package re-exports the data structures, dispatch primitives, and AST
+machinery that drive execution of execsql ``.sql`` script files. Script
+parsing lives in :mod:`execsql.script.parser`; tree-walking execution
+lives in :mod:`execsql.script.executor`.
 
 Key classes:
 
 - :class:`BatchLevels` — tracks which databases are used in nested BEGIN/END
   BATCH blocks for commit/rollback handling.
-- :class:`IfItem` / :class:`IfLevels` — stack-based IF/ELSE/ENDIF nesting.
-- :class:`CounterVars` — named integer counters (``@NAME``).
-- :class:`SubVarSet` — global ``!!$VAR!!`` substitution-variable store, plus
-  ``&ENV``, ``@COUNTER``, ``~LOCAL``, and ``#ARG`` prefixes.
+- :class:`CounterVars` — named integer counters (``$COUNTER_N``).
+- :class:`SubVarSet` — substitution-variable store covering all sigils
+  (no prefix, ``$``, ``&``, ``@``).
 - :class:`LocalSubVarSet` / :class:`ScriptArgSubVarSet` — per-script-scope
-  variable overlays.
+  variable overlays for ``~`` local and ``#`` argument variables. Stored
+  on the active :class:`~execsql.state.ExecFrame` and retrieved via
+  ``ctx.current_localvars()`` / ``ctx.current_paramvals()``.
 - :class:`MetaCommand` — one entry in the metacommand dispatch table (regex +
   handler function + flags).
-- :class:`MetaCommandList` — ordered list of :class:`MetaCommand` entries;
-  ``get_match()`` finds the first matching entry for a given line.
-- :class:`SqlStmt` — wraps a single SQL string; ``run()`` executes it via the
-  active database connection.
-- :class:`MetacommandStmt` — wraps a metacommand line; ``run()`` dispatches
-  through :attr:`execsql.state.metacommandlist`.
-- :class:`ScriptCmd` — pairs a statement with its source-file location.
-- :class:`CommandList` — ordered list of :class:`ScriptCmd` objects plus an
-  execution cursor; ``run_next()`` drives one step of execution.
-- :class:`CommandListWhileLoop` / :class:`CommandListUntilLoop` — loop
-  variants of :class:`CommandList` that re-evaluate a condition each pass.
-- :class:`ScriptFile` — reads and tokenises a ``.sql`` file into
-  :class:`ScriptCmd` objects.
-- :class:`ScriptExecSpec` — specification for deferred script execution.
+- :class:`MetaCommandList` — ordered list of :class:`MetaCommand` entries
+  with a keyword index for fast dispatch.
+- :class:`SqlStmt` / :class:`MetacommandStmt` / :class:`ScriptCmd` —
+  statement wrappers carried in the AST and used by ``ctx.last_command``
+  for source-location tracking.
+- :class:`ScriptExecSpec` — specification for deferred script execution
+  (used by ``ON ERROR_HALT`` / ``ON CANCEL_HALT EXECUTE SCRIPT``).
 
 Key functions:
 
-- :func:`set_system_vars` — populates built-in ``$VARNAME`` system variables.
-- :func:`substitute_vars` — performs ``!!$VAR!!`` and ``!{$var}!`` expansion.
-- :func:`runscripts` — central execution loop; pops the top
-  :class:`CommandList` from ``_state.commandliststack`` and drives
-  ``run_next()`` until the stack is empty.
-- :func:`current_script_line` — returns the source location of the currently
-  executing command.
-- :func:`read_sqlfile` — parses a SQL script file into a new
-  :class:`CommandList` and pushes it onto ``_state.commandliststack``.
+- :func:`set_system_vars` — populates built-in ``$VARNAME`` system variables
+  (calls the static + dynamic helpers).
+- :func:`substitute_vars` — performs ``!!$VAR!!`` / ``!'!var!'!`` /
+  ``!"!var!"!`` / ``!{$var}!`` expansion.
+- :func:`current_script_line` — returns the ``(file, line_no)`` of the
+  currently executing command.
+- :func:`parse_script` / :func:`parse_string` — produce a
+  :class:`~execsql.script.ast.Script` AST tree from a file or string,
+  consumed by :func:`execsql.script.executor.execute`.
 """
 
-from execsql.script.control import BatchLevels, IfItem, IfLevels
+from execsql.script.control import BatchLevels
 from execsql.script.engine import (
-    CommandList,
     MetaCommand,
     MetaCommandList,
     MetacommandStmt,
@@ -84,8 +78,6 @@ from execsql.script.variables import CounterVars, LocalSubVarSet, ScriptArgSubVa
 
 __all__ = [
     "BatchLevels",
-    "IfItem",
-    "IfLevels",
     "CounterVars",
     "SubVarSet",
     "LocalSubVarSet",
@@ -95,7 +87,6 @@ __all__ = [
     "SqlStmt",
     "MetacommandStmt",
     "ScriptCmd",
-    "CommandList",
     "ScriptExecSpec",
     "set_dynamic_system_vars",
     "set_static_system_vars",

execsql/script/ast.py

@@ -1,12 +1,12 @@
 """Abstract Syntax Tree node definitions for execsql scripts.
 
-This module defines the node types that make up the execsql AST.  A parser
-(to be added in a later phase) will convert raw ``.sql`` script text into a
-tree of these nodes; an executor will walk the tree to run the script.
+Defines the node types that make up the execsql AST.
+:func:`execsql.script.parser.parse_script` produces trees of these nodes;
+:func:`execsql.script.executor.execute` walks them to run the script.
 
 Design principles:
-    - Every node carries a :class:`SourceSpan` so that error messages, the
-      LSP, and ``--lint`` can report precise source locations.
+    - Every node carries a :class:`SourceSpan` so that error messages,
+      ``--lint``, and the formatter can report precise source locations.
     - Block structures (IF, LOOP, BATCH, SCRIPT) are represented as nodes
       whose ``body`` (and optional ``else_body``, ``elseif_clauses``) contain
       child nodes, forming the tree structure.
@@ -14,8 +14,8 @@ Design principles:
       :class:`Comment`) have no children.
     - All nodes inherit from :class:`Node`, which provides a uniform
       ``children()`` iterator for tree traversal.
-    - The tree is meant to be *walked* for execution — nodes are data, not
-      behavior.  Execution logic will live in a separate executor module.
+    - The tree is data, not behavior — execution logic lives in
+      :mod:`execsql.script.executor`.
 
 Node hierarchy::
 

execsql/script/control.py

@@ -4,15 +4,14 @@ from __future__ import annotations
 
 Classes:
 - :class:`BatchLevels` — tracks which databases are used in nested BEGIN/END BATCH blocks.
-- :class:`IfItem` — one level of a nested IF/ELSE/ENDIF condition.
-- :class:`IfLevels` — stack of boolean IF-level states.
+
+IF/ELSE/ENDIF condition handling is structural under the AST executor;
+the legacy ``IfItem`` / ``IfLevels`` classes were removed.
 """
 
 from typing import Any
 
-from execsql.exceptions import ErrInfo
-
-__all__ = ["BatchLevels", "IfItem", "IfLevels"]
+__all__ = ["BatchLevels"]
 
 
 # ---------------------------------------------------------------------------
@@ -66,99 +65,3 @@ class BatchLevels:
         b = self.batchlevels.pop()
         for db in b.dbs_used:
             db.commit()
-
-
-# ---------------------------------------------------------------------------
-# IfItem / IfLevels
-# ---------------------------------------------------------------------------
-
-
-class IfItem:
-    """One level of a nested IF/ELSE/ENDIF condition, paired with its source location."""
-
-    # An object representing an 'if' level, with context data.
-    def __init__(self, tf_value: bool) -> None:
-        self.tf_value = tf_value
-        # Import from the package (not engine directly) so that test patches on
-        # execsql.script.current_script_line are effective.
-        from execsql.script import current_script_line
-
-        self.scriptname, self.scriptline = current_script_line()
-
-    def value(self) -> bool:
-        return self.tf_value
-
-    def invert(self) -> None:
-        self.tf_value = not self.tf_value
-
-    def change_to(self, tf_value: bool) -> None:
-        self.tf_value = tf_value
-
-    def script_line(self) -> tuple:
-        return (self.scriptname, self.scriptline)
-
-
-class IfLevels:
-    """Stack of boolean IF-level states for nested conditional execution.
-
-    Each :meth:`nest` call corresponds to an IF statement; each
-    :meth:`unnest` call corresponds to an ENDIF.  :meth:`all_true` drives
-    the execution gate — commands are skipped unless every level is ``True``.
-    """
-
-    # A stack of True/False values corresponding to a nested set of conditionals,
-    # with methods to manipulate and query the set of conditional states.
-    def __init__(self) -> None:
-        self.if_levels: list[IfItem] = []
-
-    def nest(self, tf_value: bool) -> None:
-        """Push a new IF level onto the stack with the given boolean value."""
-        self.if_levels.append(IfItem(tf_value))
-
-    def unnest(self) -> None:
-        """Pop the innermost IF level; raise ErrInfo if the stack is empty."""
-        if len(self.if_levels) == 0:
-            raise ErrInfo(type="error", other_msg="Can't exit an IF block; no IF block is active.")
-        else:
-            self.if_levels.pop()
-
-    def invert(self) -> None:
-        if len(self.if_levels) == 0:
-            raise ErrInfo(type="error", other_msg="Can't change the IF state; no IF block is active.")
-        else:
-            self.if_levels[-1].invert()
-
-    def replace(self, tf_value: bool) -> None:
-        if len(self.if_levels) == 0:
-            raise ErrInfo(type="error", other_msg="Can't change the IF state; no IF block is active.")
-        else:
-            self.if_levels[-1].change_to(tf_value)
-
-    def current(self) -> bool:
-        if len(self.if_levels) == 0:
-            raise ErrInfo(type="error", other_msg="No IF block is active.")
-        else:
-            return self.if_levels[-1].value()
-
-    def all_true(self) -> bool:
-        """Return True if every active IF level is true (or the stack is empty)."""
-        if self.if_levels == []:
-            return True
-        return all(tf.value() for tf in self.if_levels)
-
-    def only_current_false(self) -> bool:
-        # Returns True if the current if level is false and all higher levels are True.
-        if len(self.if_levels) == 0:
-            return False
-        elif len(self.if_levels) == 1:
-            return not self.if_levels[-1].value()
-        else:
-            return not self.if_levels[-1].value() and all(tf.value() for tf in self.if_levels[:-1])
-
-    def script_lines(self, top_n: int) -> list[tuple]:
-        # Returns a list of tuples containing the script name and line number
-        # for the topmost 'top_n' if levels, in bottom-up order.
-        if len(self.if_levels) < top_n:
-            raise ErrInfo(type="error", other_msg="Invalid IF stack depth reference.")
-        levels = self.if_levels[len(self.if_levels) - top_n :]
-        return [lvl.script_line() for lvl in levels]