@@ -16,7 +16,9 @@ class Node(ABC):
1616 """
1717
1818 @abstractmethod
19- def validate_symbol_refs (self , * , symbols : set [str ]) -> None : # pragma: no cover
19+ def validate_symbol_refs (
20+ self , * , symbols : set [str ], symbol_types : Any = None
21+ ) -> None : # pragma: no cover
2022 """Verifies that the expression rooted at this node is valid
2123 given the definitions of symbols in a symbol table.
2224
@@ -74,7 +76,7 @@ class FullNameNode(Node):
7476
7577 name : str
7678
77- def validate_symbol_refs (self , * , symbols : set [str ]) -> None :
79+ def validate_symbol_refs (self , * , symbols : set [str ], symbol_types : Any = None ) -> None :
7880 if self .name not in symbols :
7981 msg = f"Variable { self .name } does not exist at this location."
8082 distance , closest_matches = closest (symbols , self .name )
@@ -120,11 +122,45 @@ def __init__(self, expr: str) -> None:
120122 if not self ._parsed .accessed_symbols :
121123 static_validate_symbol_free (expr )
122124
123- def validate_symbol_refs (self , * , symbols : set [str ]) -> None :
125+ @property
126+ def called_functions (self ) -> set :
127+ """Names of functions invoked by this expression."""
128+ return set (self ._parsed .called_functions )
129+
130+ def validate_symbol_refs (self , * , symbols : set [str ], symbol_types : Any = None ) -> None :
131+ accessed = set (self ._parsed .accessed_symbols )
132+
133+ # Typed validation: if every accessed symbol resolves to a defined
134+ # symbol prefix whose EXPR type is known (e.g. job parameters), validate
135+ # the whole expression against those types. This catches type mismatches
136+ # and resolves method/property access (e.g. Param.File.name on a PATH).
137+ # Only attempted when ALL accessed prefixes are typed-known, so an
138+ # unknown-typed symbol (e.g. a `let` name) safely falls back to the
139+ # name-only check below rather than risking a wrong-type rejection.
140+ if symbol_types and accessed :
141+ from ._expr_support import (
142+ longest_defined_prefix ,
143+ validate_typed_expression ,
144+ )
145+
146+ prefix_types : dict = {}
147+ fully_typed = True
148+ for name in accessed :
149+ prefix = longest_defined_prefix (name , symbols )
150+ if prefix is None or prefix not in symbol_types :
151+ fully_typed = False
152+ break
153+ prefix_types [prefix ] = symbol_types [prefix ]
154+ if fully_typed :
155+ # Raises model ExpressionError on a type/method error.
156+ validate_typed_expression (self ._parsed , typed_symbols = prefix_types )
157+ self ._check_comprehension_shadowing (symbols )
158+ return
159+
124160 # accessed_symbols are the free variable references in full dotted
125161 # spelling (e.g. "Param.X"); local let-bound names are excluded by the
126162 # engine. Compare against the set of symbols visible at this location.
127- missing = set ( self . _parsed . accessed_symbols ) - symbols
163+ missing = accessed - symbols
128164 if missing :
129165 from ._edit_distance import closest
130166
@@ -137,6 +173,18 @@ def validate_symbol_refs(self, *, symbols: set[str]) -> None:
137173 elif len (closest_matches ) > 1 :
138174 msg += f" Did you mean one of: { ', ' .join (sorted (closest_matches ))} "
139175 raise ValueError (msg )
176+ self ._check_comprehension_shadowing (symbols )
177+
178+ def _check_comprehension_shadowing (self , symbols : set ) -> None :
179+ # Comprehension/local-binding variables may not shadow a variable that
180+ # is in scope (RFC 0007 §3.6). `local_bindings` are the names bound by
181+ # comprehensions/let-expressions inside this expression.
182+ shadowed = set (self ._parsed .local_bindings ) & symbols
183+ if shadowed :
184+ raise ValueError (
185+ f"Variable { sorted (shadowed )[0 ]!r} bound by a comprehension shadows "
186+ "a variable that already exists at this location."
187+ )
140188
141189 def evaluate (self , * , symtab : SymbolTable , path_format : Any = None ) -> Any :
142190 from ._expr_support import (
0 commit comments