up

Author: TorkelE

src/dsl.jl

@@ -444,14 +444,13 @@ function push_reactions!(reactions::Vector{ReactionInternal}, subs::ExprValues,
             push!(metadata_i.args, :(only_use_rate = $(in(arrow, pure_rate_arrows))))
         end
 
-        # Checks that metadata fields are unqiue.
+        # Checks that metadata fields are unique.
         if !allunique(arg.args[1] for arg in metadata_i.args)
             error("Some reaction metadata fields where repeated: $(metadata_entries)")
         end
 
-        push!(reactions,
-            ReactionStruct(get_tup_arg(sub_line, i),
-                get_tup_arg(prod_line, i), get_tup_arg(rate, i), metadata_i))
+        push!(reactions, ReactionInternal(get_tup_arg(subs, i),
+            get_tup_arg(prods, i), get_tup_arg(rate, i), metadata_i))
     end
 end
 

src/expression_utils.jl

@@ -14,7 +14,7 @@ function esc_dollars!(ex)
         end
     end
 
-    return ex
+    ex
 end
 
 # Checks if an expression is an escaped expression (e.g. on the form `$(Expr(:escape, :Y))`)
@@ -42,9 +42,8 @@ end
 
 # Checks that no symbol was sued for multiple purposes.
 function unique_symbol_check(syms)
-    if !allunique(syms)
-        error("Reaction network independent variables, parameters, species, and variables must all have distinct names, but a duplicate has been detected. ")
-    end
+    allunique(syms) && return
+    error("Reaction network independent variables, parameters, species, and variables must all have distinct names, but a duplicate has been detected. ")
 end
 
 ### Catalyst-specific Expressions Manipulation ###