natas_hw
/
mps-coderules
mirror of https://github.com/JetBrains/mps-coderules
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid infinite recursion: replace the variables without calling the method recursively

This commit is contained in:
Fedor Isakov 2015-02-03 18:33:21 +01:00
parent 928f0cb273
commit 4e1abad452
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
reactor/code/src/jetbrains/mps/unification/Unification.java
View File

@ -82,15 +82,15 @@ public class Unification {
private void union(Node s, Node t) {
Integer ssize = getSize(s);
Integer tsize = getSize(t);
// keep the order
if (ssize < tsize) {
union(t, s);
return;
Node tmp = t; t = s; s = tmp;
}
if (ssize == tsize && s.isVar() && t.isVar()) {
else if (ssize == tsize && s.isVar() && t.isVar()) {
// ensure proper order of variables in the substitution
if(s.asVar().compareTo(t.asVar()) < 0) {
union(t, s);
return;
Node tmp = t; t = s; s = tmp;
}
}