parser now parses true/false directly into boolean values

tonyhffong · Dec 5, 2015 · 2063c0e · 2063c0e · tonyhffong · Dec 5, 2015
1 parent 30eaec9
commit 2063c0e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/controls.jl b/src/controls.jl
@@ -149,10 +149,13 @@ function lintboolean( ex, ctx::LintContext )
         if gt != Any && gt != Bool
             msg( ctx, 2, "Variable " * string( ex ) * " has apparent non-Bool type." )
         end
-    else
+    elseif typeof( ex ) != Bool
         msg( ctx, 2, "Lint doesn't understand " * string( ex ) * " in a boolean context" )
     end
-    lintexpr( ex, ctx )
+
+    if typeof( ex ) <: Expr || typeof( ex ) == Symbol
+        lintexpr( ex, ctx )
+    end
 end
 
 function lintcomparison( ex::Expr, ctx::LintContext )

diff --git a/test/ifstmt.jl b/test/ifstmt.jl
@@ -130,3 +130,13 @@ end
 """
 msgs = lintstr(s )
 @test( isempty( msgs ) )
+
+s = """
+1==1 && true
+true && 1==1
+1==1 || true || 1==1
+1==1 || 1==1 || true
+true || 1==1 || 1==1
+"""
+msgs = lintstr(s )
+@test( isempty( msgs ) )