Merge pull request #2938 from contradict/disallow_duplicate_names

Disallow duplicate names

Author: ChrisRackauckas

src/systems/model_parsing.jl

@@ -282,9 +282,21 @@ function generate_var(a, varclass;
     var
 end
 
+singular(sym) = last(string(sym)) == 's' ? Symbol(string(sym)[1:(end - 1)]) : sym
+
+function check_name_uniqueness(dict, a, newvarclass)
+    for varclass in [:variables, :parameters, :structural_parameters, :constants]
+        dvarclass = get(dict, varclass, nothing)
+        if dvarclass !== nothing && a in keys(dvarclass)
+            error("Cannot create a $(singular(newvarclass)) `$(a)` because there is already a $(singular(varclass)) with that name")
+        end
+    end
+end
+
 function generate_var!(dict, a, varclass;
         indices::Union{Vector{UnitRange{Int}}, Nothing} = nothing,
         type = Real)
+    check_name_uniqueness(dict, a, varclass)
     vd = get!(dict, varclass) do
         Dict{Symbol, Dict{Symbol, Any}}()
     end
@@ -302,6 +314,7 @@ function generate_var!(dict, a, b, varclass, mod;
         iv
     end
     @assert isequal(iv, prev_iv) "Multiple independent variables are used in the model"
+    check_name_uniqueness(dict, a, varclass)
     vd = get!(dict, varclass) do
         Dict{Symbol, Dict{Symbol, Any}}()
     end

test/model_parsing.jl

@@ -854,3 +854,25 @@ end
         @test getdefault(vec_false.n[i]) == 1
     end
 end
+
+@testset "Duplicate names" begin
+    mod = @__MODULE__
+    @test_throws ErrorException ModelingToolkit._model_macro(mod, :ATest,
+        :(begin
+            @variables begin
+                a(t)
+                a(t)
+            end
+        end),
+        false)
+    @test_throws ErrorException ModelingToolkit._model_macro(mod, :ATest,
+        :(begin
+            @variables begin
+                a(t)
+            end
+            @parameters begin
+                a
+            end
+        end),
+        false)
+end