Merge pull request #18 from rdeits/hygiene

fix a missing esc()

.travis.yml

@@ -30,7 +30,5 @@ branches:
 #script:
 #  - julia -e 'Pkg.clone(pwd()); Pkg.build("ConditionalJuMP"); Pkg.test("ConditionalJuMP"; coverage=true)'
 after_success:
-  # push coverage results to Coveralls
-  - julia -e 'cd(Pkg.dir("ConditionalJuMP")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
   # push coverage results to Codecov
   - julia -e 'cd(Pkg.dir("ConditionalJuMP")); Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'

src/macros.jl

@@ -6,7 +6,7 @@ function _conditionalize_recursive!(ex::Expr)
             ex.args[i] = _conditionalize_recursive!(ex.args[i])
         end
         if !(ex.args[1] ∈ (:(=>),))
-            Expr(:call, :_conditional, ex.args[1], ex.args[2:end]...)
+            Expr(:call, :_conditional, esc(ex.args[1]), ex.args[2:end]...)
         else
             Expr(:call, ex.args...)
         end

test/runtests.jl

@@ -4,6 +4,23 @@ using JuMP
 using Cbc
 using Base.Test
 
+# Macro hygiene
+module MacroHygieneTest
+
+using Base.Test
+using ConditionalJuMP
+
+function f(x)
+    x + 1
+end
+
+@testset "macro hygiene" begin
+    x = 5
+    @test @?(f(x) <= 0) == false
+end
+
+end
+
 @testset "bounds" begin
     m = Model()
     @variable m 1 <= x <= 3