NOT(..) is a safe evaluation

pmd-visualforce/etc/grammar/VfParser.jjt

@@ -145,7 +145,7 @@ PARSER_END(VfParser)
 	| <GE: ">=" >
 	| <LT: "<" >
 	| <GT: ">" >
-	| <EXCL: ("!"|"~"|"NOT") >
+	| <EXCL: ("!"|"~") >
 	| <PIPE_PIPE: "||" >
 	| <STRING_LITERAL: <QUOTED_STRING> >
 	| <DIGITS: (<NUM_CHAR>)+ (<DOT> (<NUM_CHAR>)+)? >
@@ -476,10 +476,10 @@ void UnaryExpression()  #void :
 {}
 {
 	  ( <PLUS> | <MINUS> ) UnaryExpression()
-	|  UnaryExpressionNotPlusMinus()
+	|  NegationExpression()
 }
 
-void UnaryExpressionNotPlusMinus() #void :
+void NegationExpression() #void :
 {}
 {
   ( <EXCL> ) UnaryExpression()

pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/VfParserVisitorAdapter.java

@@ -93,5 +93,5 @@ public class VfParserVisitorAdapter implements VfParserVisitor {
     public Object visit(ASTContent node, Object data) {
         return visit((VfNode) node, data);
     }
-
+    
 }

pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/rule/security/VfUnescapeElRule.java

@@ -230,20 +230,24 @@ public class VfUnescapeElRule extends AbstractVfRule {
         if (expression != null) {
             final ASTIdentifier id = expression.getFirstChildOfType(ASTIdentifier.class);
             if (id != null) {
-                switch (id.getImage().toLowerCase()) {
+                List<ASTArguments> args = expression.findChildrenOfType(ASTArguments.class);
-                case "$component":
+                if (!args.isEmpty()) {
-                case "$objecttype":
+                    switch (id.getImage().toLowerCase()) {
-                case "$label":
+                    case "$component":
-                case "$resource":
+                    case "$objecttype":
-                case "urlfor":
+                    case "$label":
-                case "$site":
+                    case "$resource":
-                case "$page":
+                    case "urlfor":
-                case "$action":
+                    case "$site":
-                case "casesafeid":
+                    case "$page":
-                case "$remoteaction":
+                    case "$action":
-                    return true;
+                    case "casesafeid":
+                    case "not":
+                    case "$remoteaction":
+                        return true;
 
-                default:
+                    default:
+                    }
                 }
             }
 

pmd-visualforce/src/test/resources/net/sourceforge/pmd/lang/vf/rule/security/xml/VfUnescapeEl.xml

@@ -557,5 +557,20 @@ Safe unquoted followed by safe quoted
 ]]></code>
 		<source-type>vf</source-type>
 	</test-code>
+	<test-code>
+		<description><![CDATA[
+NOT method evaluates to safe boolean
+     ]]></description>
+		<expected-problems>0</expected-problems>
+		<code><![CDATA[
+<apex:page>
+	<script>
+		if({!NOT(yes)}) { maskFormEls(); }
+	</script>
+</apex:page>
+]]></code>
+		<source-type>vf</source-type>
+	</test-code>
+
 
 </test-data>