chemql-python 1.2.3__tar.gz → 1.2.4__tar.gz

{chemql_python-1.2.3/src/chemql_python.egg-info → chemql_python-1.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chemql-python
-Version: 1.2.3
+Version: 1.2.4
 Summary: A chemistry-focused query language and REPL
 Author-email: Mohammad Rakibul Islam <rakibulofficial1017@gmail.com>
 Requires-Python: >=3.10

{chemql_python-1.2.3 → chemql_python-1.2.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "chemql-python"
-version = "1.2.3"
+version = "1.2.4"
 authors = [
     { name = "Mohammad Rakibul Islam", email = "rakibulofficial1017@gmail.com" }
 ]

{chemql_python-1.2.3 → chemql_python-1.2.4}/src/chemql/__init__.py

@@ -47,7 +47,7 @@ __all__ = [
     "__version__"
 ]
 
-__version__ = "1.2.3"
+__version__ = "1.2.4"
 
 # Persistent preprocessor/function state for the current ChemQL session.
 DEFINITIONS = {}
@@ -108,6 +108,18 @@ def _split_function_arguments(source):
     if tail or source.strip():
         args.append(tail)
     return args
+def is_block_header(line):
+    """Return True only for actual ChemQL block headers."""
+    if not (line.startswith("[") and line.endswith("]")):
+        return False
+
+    code = line[1:-1].strip()
+
+    return (
+        code.startswith("if ")
+        or code.startswith("for ")
+        or code.startswith("while ")
+    )
 
 def _call_function(name, arguments):
     """Call a ChemQL function, including let assignments and block syntax."""
@@ -194,13 +206,13 @@ def _call_function(name, arguments):
 
             # Recognize block headers generically, while excluding
             # closing and branch markers from being treated as headers.
-            generic_header = re.match(
-                r"^\[\s*(?!endblock\b|else\b|elif\b)"
-                r"[A-Za-z_]\w*\b.*\]\s*$",
-                line,
-            )
+            # generic_header = re.match(
+            #     r"^\[\s*(?!endblock\b|else\b|elif\b)"
+            #     r"[A-Za-z_]\w*\b.*\]\s*$",
+            #     line,
+            # )
 
-            if is_python_block_header(line) or generic_header:
+            if is_block_header(line):
                 end = find_endblock(lines, i + 1)
 
                 block_body = [
@@ -2509,15 +2521,30 @@ def find_endblock(lines, start):
     for i in range(start, len(lines)):
         stripped = lines[i].strip()
 
-        if is_python_block_header(stripped):
-            depth += 1
-
-        elif stripped == "[endblock]":
+        # Closing block.
+        if stripped == "[endblock]":
             depth -= 1
 
             if depth == 0:
                 return i
 
+            continue
+
+        # Branch markers do not start new blocks.
+        if stripped in ("[else]", "[endif]", "[endfor]", "[endwhile]"):
+            continue
+
+        # Recognize both validated Python headers and generic
+        # ChemQL block headers, consistently with _call_function().
+        generic_header = re.match(
+            r"^\[\s*(?!endblock\b|else\b|elif\b)"
+            r"[A-Za-z_]\w*\b.*\]\s*$",
+            stripped,
+        )
+
+        if is_block_header(stripped):
+            depth += 1
+
     raise SyntaxError("Missing `[endblock]`")
 
 def remove_comments(line):

{chemql_python-1.2.3 → chemql_python-1.2.4/src/chemql_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chemql-python
-Version: 1.2.3
+Version: 1.2.4
 Summary: A chemistry-focused query language and REPL
 Author-email: Mohammad Rakibul Islam <rakibulofficial1017@gmail.com>
 Requires-Python: >=3.10