Skip to content

Commit f2ed0a3

Browse files
committed
imporve @require_declaration handling
1 parent 018fcf6 commit f2ed0a3

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

src/dsl.jl

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -735,13 +735,9 @@ function read_equations_options(options, syms_declared; requiredec = false)
735735
end
736736

737737
# Any undecalred symbolic variables encountered should be extracted as variables.
738-
# Additional step required to handle `requiredec = true` (to be improved later).
739-
prev_vars_extracted = deepcopy(vars_extracted)
740738
add_syms_from_expr!(vars_extracted, eq, excluded_syms)
741-
if requiredec && length(prev_vars_extracted) < length(vars_extracted)
742-
throw(UndeclaredSymbolicError(
743-
"Unrecognized symbols $(setdiff(vars_extracted, prev_vars_extracted)) was used in an equation: \"$eq\". Since the flag @require_declaration is set, all variables must be declared with the @species, @parameters, or @variables macros."))
744-
end
739+
(!isempty(vars_extracted) && requiredec) && throw(UndeclaredSymbolicError(
740+
"Unrecognized symbolic variables $(join(vars_extracted, ", ")) detected in equation expression: \"$(string(eq))\". Since the flag @require_declaration is declared, all symbolic variables must be explicitly declared with the @species, @variables, and @parameters options."))
745741
end
746742

747743
return collect(vars_extracted), add_default_diff, equations

0 commit comments

Comments
 (0)