Smarter code generation in constraint macros (#917)

jump-dev · Dec 12, 2016 · 3dd548e · 3dd548e
1 parent 4dd662a
commit 3dd548e
Showing 1 changed file with 16 additions and 4 deletions.
diff --git a/src/macros.jl b/src/macros.jl
@@ -463,8 +463,14 @@ macro constraint(args...)
     end
     return assert_validmodel(m, quote
         $(getloopedcode(variable, code, condition, idxvars, idxsets, idxpairs, :ConstraintRef))
-        !$anonvar && registercon($m, $quotvarname, $variable)
-        $(anonvar ? variable : :($escvarname = $variable))
+        $(if anonvar
+            variable
+        else
+            quote
+                registercon($m, $quotvarname, $variable)
+                $escvarname = $variable
+            end
+        end)
     end)
 end
 
@@ -1143,8 +1149,14 @@ macro NLconstraint(m, x, extra...)
         initNLP($m)
         $m.internalModelLoaded = false
         $looped
-        !$anonvar && registercon($m, $quotvarname, $variable)
-        $(anonvar ? variable : :($escvarname = $variable))
+        $(if anonvar
+            variable
+        else
+            quote
+                registercon($m, $quotvarname, $variable)
+                $escvarname = $variable
+            end
+        end)
     end)
 end