From 14aa99a727f0b9841601f1fb33880130e95e961e Mon Sep 17 00:00:00 2001 From: Fedor Isakov Date: Sat, 1 Aug 2015 14:17:53 +0200 Subject: [PATCH] Terminology updated: children renamed to arguments --- .../src/jetbrains/mps/unification/Term.java | 2 +- .../UnionFindTermGraphUnifier.java | 10 +++---- .../test/AssertStructurallyEquivalent.java | 12 ++++---- .../mps/unification/test/MockTerm.java | 16 +++++------ .../mps/unification/test/MockTermsParser.java | 28 +++++++++---------- 5 files changed, 34 insertions(+), 34 deletions(-) diff --git a/reactor/code/src/jetbrains/mps/unification/Term.java b/reactor/code/src/jetbrains/mps/unification/Term.java index a4e6d909..9af4ebe7 100644 --- a/reactor/code/src/jetbrains/mps/unification/Term.java +++ b/reactor/code/src/jetbrains/mps/unification/Term.java @@ -32,7 +32,7 @@ public interface Term extends Comparable { Object symbol(); - Collection children(); + Collection arguments(); Term get(); diff --git a/reactor/code/src/jetbrains/mps/unification/UnionFindTermGraphUnifier.java b/reactor/code/src/jetbrains/mps/unification/UnionFindTermGraphUnifier.java index bcfc04e9..50758b15 100644 --- a/reactor/code/src/jetbrains/mps/unification/UnionFindTermGraphUnifier.java +++ b/reactor/code/src/jetbrains/mps/unification/UnionFindTermGraphUnifier.java @@ -119,15 +119,15 @@ public class UnionFindTermGraphUnifier { union(s, t); } - Iterator scit = zs.children().iterator(); - Iterator tcit = zt.children().iterator(); + Iterator scit = zs.arguments().iterator(); + Iterator tcit = zt.arguments().iterator(); while (scit.hasNext() && tcit.hasNext()) { if (!unifClosure(scit.next(), tcit.next())) { - return false; // children mismatch + return false; // arguments mismatch } } - // fail if different children count + // fail if different arguments count return scit.hasNext() == tcit.hasNext(); } else { @@ -204,7 +204,7 @@ public class UnionFindTermGraphUnifier { if (z.is(FUN)) { setVisited(z, true); - for (Term c : z.children()) { + for (Term c : z.arguments()) { substitution = findSolution(c, substitution); if (!substitution.isSuccessful()) { diff --git a/reactor/tests/src/jetbrains/mps/unification/test/AssertStructurallyEquivalent.java b/reactor/tests/src/jetbrains/mps/unification/test/AssertStructurallyEquivalent.java index 34ad22a7..06887b18 100644 --- a/reactor/tests/src/jetbrains/mps/unification/test/AssertStructurallyEquivalent.java +++ b/reactor/tests/src/jetbrains/mps/unification/test/AssertStructurallyEquivalent.java @@ -36,7 +36,7 @@ public class AssertStructurallyEquivalent { @Override public Collection visit(Term term) throws Exception { signature.label(term); - return term.children(); + return term.arguments(); } } , @@ -56,7 +56,7 @@ public class AssertStructurallyEquivalent { @Override public Collection visit(Term term) throws Exception { signature.appendSignature("@").append(signature.getLabel(term)).append(term.symbol()); - return term.children(); + return term.arguments(); } }, new TermVisitor(Term.Kind.VAR) { @@ -177,12 +177,12 @@ public class AssertStructurallyEquivalent { if (term.is(Term.Kind.FUN)) { visited.put(term, SINGLETON); } - Collection children = switchClass(term); - for (Term child : children) { - if (visited.containsKey(child)) { + Collection arguments = switchClass(term); + for (Term arg : arguments) { + if (visited.containsKey(arg)) { continue; } - walk(child, visited); + walk(arg, visited); } } diff --git a/reactor/tests/src/jetbrains/mps/unification/test/MockTerm.java b/reactor/tests/src/jetbrains/mps/unification/test/MockTerm.java index 3987a2b5..4b902fbf 100644 --- a/reactor/tests/src/jetbrains/mps/unification/test/MockTerm.java +++ b/reactor/tests/src/jetbrains/mps/unification/test/MockTerm.java @@ -28,8 +28,8 @@ public abstract class MockTerm implements Term { public MockTerm() { } - public static Term term(Object sym, Term... children) { - return new MockFun(sym, children); + public static Term term(Object sym, Term... arguments) { + return new MockFun(sym, arguments); } public static Term var(String name) { @@ -54,7 +54,7 @@ public abstract class MockTerm implements Term { } @Override - public Collection children() { + public Collection arguments() { return null; } @@ -72,9 +72,9 @@ public abstract class MockTerm implements Term { private List myArgs; private Object mySymbol; - public MockFun(Object symbol, Term... children) { + public MockFun(Object symbol, Term... arguments) { mySymbol = symbol; - this.myArgs = Arrays.asList(children); + this.myArgs = Arrays.asList(arguments); } @Override @@ -83,7 +83,7 @@ public abstract class MockTerm implements Term { } @Override - public Collection children() { + public Collection arguments() { return Collections.unmodifiableList(myArgs); } @@ -98,9 +98,9 @@ public abstract class MockTerm implements Term { if (!myArgs.isEmpty()) { sb.append("{"); String sep = ""; - for (Term child : myArgs) { + for (Term arg : myArgs) { sb.append(sep); sep = " "; - sb.append(child.toString()); + sb.append(arg.toString()); } sb.append("}"); } diff --git a/reactor/tests/src/jetbrains/mps/unification/test/MockTermsParser.java b/reactor/tests/src/jetbrains/mps/unification/test/MockTermsParser.java index 51215554..99f52049 100644 --- a/reactor/tests/src/jetbrains/mps/unification/test/MockTermsParser.java +++ b/reactor/tests/src/jetbrains/mps/unification/test/MockTermsParser.java @@ -54,7 +54,7 @@ public class MockTermsParser { private Token lastToken; private LinkedList termsStack = new LinkedList(); private LinkedList termLabelsStack = new LinkedList(); - private LinkedList> childrenStack = new LinkedList>(); + private LinkedList> argumentsStack = new LinkedList>(); private int lastLabel = -1; private Map termRefs = new HashMap(); // initialized on the parse finished @@ -67,7 +67,7 @@ public class MockTermsParser { checkFinalState(); checkAllRefsExist(); lookupHelper.setTermRefs(Collections.unmodifiableMap(new HashMap(termRefs))); - return Collections.unmodifiableList(childrenStack.pop()); + return Collections.unmodifiableList(argumentsStack.pop()); } private void loop(String toParse) { @@ -93,7 +93,7 @@ public class MockTermsParser { private void parseNextToken(Token token, String value) { switch (token) { case START: - childrenStack.push(new ArrayList()); + argumentsStack.push(new ArrayList()); break; case END: checkLastTokenOneOf(Token.TERM, Token.VAR, Token.VARREF, Token.RBRACE); @@ -171,13 +171,13 @@ public class MockTermsParser { } private void checkFinalState() { - if (childrenStack.size() != 1 || childrenStack.peek().isEmpty() || !termsStack.isEmpty()) { + if (argumentsStack.size() != 1 || argumentsStack.peek().isEmpty() || !termsStack.isEmpty()) { throw new ParseException("unexpected end of input"); } } private void checkCloseBraceState() { - if (childrenStack.isEmpty() || childrenStack.peek().isEmpty() || termsStack.isEmpty()) { + if (argumentsStack.isEmpty() || argumentsStack.peek().isEmpty() || termsStack.isEmpty()) { throw new ParseException("unexpected closing brace"); } } @@ -200,43 +200,43 @@ public class MockTermsParser { String name = termsStack.pop(); Integer label = termLabelsStack.pop(); Term newTerm = term(name); - childrenStack.peek().add(newTerm); + argumentsStack.peek().add(newTerm); if (label != null) { termRefs.put(label, newTerm); } } private void beginChildren(){ - childrenStack.push(new ArrayList()); + argumentsStack.push(new ArrayList()); } private void endChildren() { - List children = childrenStack.pop(); + List arguments = argumentsStack.pop(); String name = termsStack.pop(); Integer label = termLabelsStack.pop(); - Term newTerm = term(name, children.toArray(new Term[children.size()])); - childrenStack.peek().add(newTerm); + Term newTerm = term(name, arguments.toArray(new Term[arguments.size()])); + argumentsStack.peek().add(newTerm); if (label != null) { termRefs.put(label, newTerm); } } private void addVar(String name) { - childrenStack.peek().add(var(name)); + argumentsStack.peek().add(var(name)); } private void addVarRef(String name) { - childrenStack.peek().add(ref(var(name))); + argumentsStack.peek().add(ref(var(name))); } private void addRef(String ref) { final int label = Integer.parseInt(ref.substring(1)); if (termRefs.containsKey(label) && termRefs.get(label) != null) { - childrenStack.peek().add(ref(termRefs.get(label))); + argumentsStack.peek().add(ref(termRefs.get(label))); } else { termRefs.put(label, null); - childrenStack.peek().add(ref(lookupHelper.lookup(label))); + argumentsStack.peek().add(ref(lookupHelper.lookup(label))); } } }