Changed equality to consider type

neo4j · May 17, 2016 · 9b6f81f · 9b6f81f
1 parent f6b92a7
commit 9b6f81f
Show file tree

Hide file tree

Showing 7 changed files with 127 additions and 97 deletions.
diff --git a/community/codegen/src/main/java/org/neo4j/codegen/BaseExpressionVisitor.java b/community/codegen/src/main/java/org/neo4j/codegen/BaseExpressionVisitor.java
@@ -85,7 +85,7 @@ public void ternary( Expression test, Expression onTrue, Expression onFalse )
     }
 
     @Override
-    public void eq( Expression lhs, Expression rhs )
+    public void eq( Expression lhs, Expression rhs, TypeReference type )
     {
 
     }

diff --git a/community/codegen/src/main/java/org/neo4j/codegen/Expression.java b/community/codegen/src/main/java/org/neo4j/codegen/Expression.java
@@ -58,14 +58,14 @@ public void accept( ExpressionVisitor visitor )
         };
     }
 
-    public static Expression eq( final Expression lhs, final Expression rhs )
+    public static Expression eq( final Expression lhs, final Expression rhs, TypeReference type )
     {
         return new Expression()
         {
             @Override
             public void accept( ExpressionVisitor visitor )
             {
-                visitor.eq( lhs, rhs );
+                visitor.eq( lhs, rhs, type );
             }
         };
     }

diff --git a/community/codegen/src/main/java/org/neo4j/codegen/ExpressionToString.java b/community/codegen/src/main/java/org/neo4j/codegen/ExpressionToString.java
@@ -133,7 +133,7 @@ public void ternary( Expression test, Expression onTrue, Expression onFalse )
     }
 
     @Override
-    public void eq( Expression lhs, Expression rhs )
+    public void eq( Expression lhs, Expression rhs, TypeReference ignored )
     {
         result.append( "eq(" );
         lhs.accept( this );

diff --git a/community/codegen/src/main/java/org/neo4j/codegen/ExpressionVisitor.java b/community/codegen/src/main/java/org/neo4j/codegen/ExpressionVisitor.java
@@ -41,7 +41,7 @@ public interface ExpressionVisitor
 
     void ternary( Expression test, Expression onTrue, Expression onFalse );
 
-    void eq( Expression lhs, Expression rhs );
+    void eq( Expression lhs, Expression rhs, TypeReference type );
 
     void or( Expression lhs, Expression rhs );
 

diff --git a/community/codegen/src/main/java/org/neo4j/codegen/bytecode/ByteCodeExpressionVisitor.java b/community/codegen/src/main/java/org/neo4j/codegen/bytecode/ByteCodeExpressionVisitor.java
@@ -224,17 +224,10 @@ public void ternary( Expression test, Expression onTrue, Expression onFalse )
     }
 
     @Override
-    public void eq( Expression lhs, Expression rhs )
+    public void eq( Expression lhs, Expression rhs, TypeReference type )
     {
-        TypeReference lhsType = findType( lhs );
-        TypeReference rhsType = findType( rhs );
 
-        if ( !lhsType.equals( rhsType ) )
-        {
-            throw new IllegalStateException( "Cannot compare values of different types" );
-        }
-
-        switch ( lhsType.simpleName() )
+        switch ( type.simpleName() )
         {
         case "int":
         case "byte":

diff --git a/community/codegen/src/main/java/org/neo4j/codegen/source/MethodSourceWriter.java b/community/codegen/src/main/java/org/neo4j/codegen/source/MethodSourceWriter.java
@@ -395,7 +395,7 @@ public void ternary( Expression test, Expression onTrue, Expression onFalse )
     }
 
     @Override
-    public void eq( Expression lhs, Expression rhs )
+    public void eq( Expression lhs, Expression rhs, TypeReference ignored )
     {
         lhs.accept( this );
         append( " == " );

diff --git a/community/codegen/src/test/java/org/neo4j/codegen/CodeGenerationTest.java b/community/codegen/src/test/java/org/neo4j/codegen/CodeGenerationTest.java