Added one more unification case

cqfn · Oct 11, 2022 · 55fac16 · 55fac16 · 0pdd · Oct 11, 2022
1 parent 89add5a
commit 55fac16
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 3 deletions.
diff --git a/src/main/dsl/rules.dsl b/src/main/dsl/rules.dsl
@@ -206,6 +206,7 @@ BinaryExpr(Name(#1), #2)<"||"> -> LogicalOr(Variable(Name(#1)), #2);
 BinaryExpr(#1, Name(#2))<"||"> -> LogicalOr(#1, Variable(Name(#2)));
 
 AssignExpr(#1, #2)<"="> -> SimpleAssignment(Variable(#1), #2);
+AssignExpr(#1, #2)<"="> -> SimpleAssignment(#1, Variable(#2));
 AssignExpr(#1, #2)<"+="> -> AdditionAssignment(Variable(#1), #2);
 AssignExpr(#1, #2)<"-="> -> SubtractionAssignment(Variable(#1), #2);
 AssignExpr(#1, #2)<"*="> -> MultiplicationAssignment(Variable(#1), #2);
@@ -218,7 +219,6 @@ AssignExpr(#1, #2)<">>="> -> RightShiftAssignment(Variable(#1), #2);
 AssignExpr(#1, #2)<">>>="> -> UnsignedRightShiftAssignment(Variable(#1), #2);
 AssignExpr(#1, #2)<"<<="> -> LeftShiftAssignment(Variable(#1), #2);
 
-
 LogicalComplement(Name(#1)) -> LogicalNot(Variable(Name(#1)));
 LogicalComplement(#1) -> LogicalNot(#1);
 
@@ -266,6 +266,7 @@ ArrayType(#1) -> ArrayType(#1, DimensionList(Dimension));
 Parameter(#1, #2) -> Parameter(#1, #2);
 Parameter(Modifier<#1>, #2, #3) -> Parameter(ModifierBlock(Modifier<#1>), #2, #3);
 VoidType -> VoidType;
+Modifier<#1> -> Modifier<#1>;
 
 CompilationUnit(#1) -> Program(#1);
 
@@ -293,6 +294,7 @@ FieldDeclaration(VariableDeclarator(#1, #2)) -> FieldDeclaration(#1, DeclaratorL
 FieldDeclaration(VariableDeclarator(#1, #2, #3)) -> FieldDeclaration(#1, DeclaratorList(Declarator(#2, #3)));
 
 FieldDeclaration(Modifier<#3>, VariableDeclarator(#1, #2)) -> FieldDeclaration(ModifierBlock(Modifier<#3>), #1, DeclaratorList(Declarator(#2)));
+FieldDeclaration(#1, #2, VariableDeclarator(#3, #4)) -> FieldDeclaration(ModifierBlock(#1, #2), #3, DeclaratorList(Declarator(#4)));
 FieldDeclaration(Modifier<#4>, VariableDeclarator(#1, #2, #3)) -> FieldDeclaration(ModifierBlock(Modifier<#4>), #1, DeclaratorList(Declarator(#2, #3)));
 
 // Function declaration FunctionDeclaration <- [modifiers@ModifierBlock], [typename@TypeName], name@Identifier, parameters@ParameterBlock, body@StatementBlock;
@@ -315,6 +317,9 @@ MethodDeclaration(Modifier<#1>, #2, #3, #4, #5, #6, #7) ->
 MethodDeclaration(Modifier<#1>, #2, #3, #4, #5, #6, #7, #8) ->
   FunctionDeclaration(ModifierBlock(Modifier<#1>), #7, #2, ParameterBlock(#3, #4, #5, #6), #8);
 
+ConstructorDeclaration(#1, #2, #3, #4, #5) ->
+    FunctionDeclaration(ModifierBlock(#1), #2, ParameterBlock(#3, #4), #5);
+
 js:
 
 ClassItem <- & | Property;
@@ -528,8 +533,6 @@ formalParameterList(#1...) -> ParameterBlock(#1);
 
 python:
 
-self -> This;
-
 expr(atom(literal<#1>)) -> StringLiteral<#1>;
 expr(atom(name(literal<#1>))) -> Variable(Name(Identifier<#1>));
 expr(atom(integer(literal<#1>))) -> IntegerLiteral<#1>;
@@ -543,6 +546,9 @@ expr(#1, literal<"%">, #2) -> Modulus(#1, #2);
 
 expr(atom(testlist_comp(#1))) -> #1;
 
+atom(name(literal<"self">)) -> This;
+expr(This, trailer(name(literal<#1>))) -> PropertyAccess(This, Identifier<#1>);
+
 comparison(comparison(#1), literal<"==">, comparison(#2)) -> IsEqualTo(#1, #2);
 comparison(comparison(#1), literal<"!=">, comparison(#2)) -> NotEqualTo(#1, #2);
 comparison(comparison(#1), literal<">">, comparison(#2)) -> GreaterThan(#1, #2);

diff --git a/src/test/resources/unification/this_expression/Self.py b/src/test/resources/unification/this_expression/Self.py
@@ -0,0 +1,4 @@
+class Car():
+    def __init__(self, name, year):
+        self.name = name
+        self.year = year
diff --git a/src/test/resources/unification/this_expression/This.js b/src/test/resources/unification/this_expression/This.js
@@ -0,0 +1,6 @@
+class Car {
+    constructor(name, year) {
+        this.name = name;
+        this.year = year;
+    }
+}
diff --git a/src/test/resources/unification/this_expression/ThisInAssignment.java b/src/test/resources/unification/this_expression/ThisInAssignment.java
@@ -0,0 +1,10 @@
+class Car {
+    private final String name;
+
+    private final int year;
+
+    public Car(final String name, final int year) {
+        this.name = name;
+        this.year = year;
+    }
+}
diff --git a/src/test/resources/unification/this_expression/ThisInExpression.java b/src/test/resources/unification/this_expression/ThisInExpression.java
@@ -0,0 +1,7 @@
+class Program {
+    private int result;
+
+    public int count() {
+        return this.result + 10;
+    }
+}