Merge pull request #320 from ndykman/issue307

Fix for issue #307
microsoft · Jan 23, 2016 · a89d166 · a89d166
2 parents 6bcd424 + b760e12
commit a89d166
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/Foxtrot/Foxtrot/Extraction/ExtractorVisitor.cs b/Foxtrot/Foxtrot/Extraction/ExtractorVisitor.cs
@@ -3534,4 +3534,4 @@ public override void VisitMethodCall(MethodCall call)
             }
         }
     }
-}
+}
diff --git a/Microsoft.Research/CCDoc/BooleanExpressionHelper.cs b/Microsoft.Research/CCDoc/BooleanExpressionHelper.cs
@@ -341,5 +341,23 @@ public override IExpression Rewrite(IConditional conditional) {
       }
       return base.Rewrite(conditional);
     }
+
+      public override IExpression Rewrite(IGreaterThan greaterThan)
+      {
+          // Catch use of the x > null idiom used by Roslyn as generated
+          // code for x != null statements.
+          if (ExpressionHelper.IsNullLiteral(greaterThan.RightOperand))
+          {
+              var c = new NotEquality
+              {
+                  LeftOperand = greaterThan.LeftOperand,
+                  RightOperand = greaterThan.RightOperand,
+                  Type = greaterThan.Type
+              };
+              return c;
+          }
+
+          return base.Rewrite(greaterThan);
+      }
   }
 }