diff --git a/src/org/rascalmpl/library/analysis/formalconcepts/FCA.rsc b/src/org/rascalmpl/library/analysis/formalconcepts/FCA.rsc index 4e9807e257a..a686a722d77 100644 --- a/src/org/rascalmpl/library/analysis/formalconcepts/FCA.rsc +++ b/src/org/rascalmpl/library/analysis/formalconcepts/FCA.rsc @@ -147,19 +147,14 @@ map[Concept[&Object, &Attribute], int] makeNodes(ConceptLattice[&Object, &Attrib return r; } -set[&Attribute] newAdded1(ConceptLattice[&Object, &Attribute] q, Concept[&Object, &Attribute] c) { +set[&Attribute] addConcept(ConceptLattice[&Object, &Attribute] q, Concept[&Object, &Attribute] c) { set[Concept[&Object, &Attribute]] parents = range(domainR(q, {c})); return c[1] - union({p[1]|Concept[&Object, &Attribute] p <-parents}); - } +} -set[Concept[&Object, &Attribute]] newAdded0(ConceptLattice[&Object, &Attribute] q, Concept[&Object, &Attribute] c) { - set[Concept[&Object, &Attribute]] parents = domain(rangeR(q, {c})); - return c[0] - union({p[0]|Concept[&Object, &Attribute] p <-parents}); - } - Stm compose(Concept[&Object, &Attribute] c, map[Concept[&Object, &Attribute], int] z, bool lab) { return N("\"\"", lab?[<"label", "">]:[]); - } +} diff --git a/src/org/rascalmpl/library/lang/box/util/Box2Text.rsc b/src/org/rascalmpl/library/lang/box/util/Box2Text.rsc index 4eac5aba5a8..6bf248dd32b 100644 --- a/src/org/rascalmpl/library/lang/box/util/Box2Text.rsc +++ b/src/org/rascalmpl/library/lang/box/util/Box2Text.rsc @@ -71,7 +71,7 @@ public text box2html(Box b) { } @synopsis{Converts boxes into list of lines (ASCII)} - public text box2text(Box b) { +public text box2text(Box b) { text q = []; if (box2textmap[b]?) q = box2textmap[b]; else { diff --git a/src/org/rascalmpl/library/lang/yaml/Model.rsc b/src/org/rascalmpl/library/lang/yaml/Model.rsc index cd540308230..9897d0ca962 100644 --- a/src/org/rascalmpl/library/lang/yaml/Model.rsc +++ b/src/org/rascalmpl/library/lang/yaml/Model.rsc @@ -65,7 +65,7 @@ public Node BAD_YAML = scalar("unsupported")[\tag=#node], reference(anchor=4), sequence([])[anchor=4] - ])[@anchor=2]))[anchor=2]; + ])[anchor=2]))[anchor=2]; public test bool testLoadDump() { Node n = loadYAML(TEST_YAML); diff --git a/src/org/rascalmpl/library/util/Validator.rsc b/src/org/rascalmpl/library/util/Validator.rsc index db2f1215507..b100b6b550f 100644 --- a/src/org/rascalmpl/library/util/Validator.rsc +++ b/src/org/rascalmpl/library/util/Validator.rsc @@ -34,8 +34,8 @@ private data RuntimeException = none(); Symbol unlabel(label(_, Symbol sym)) = sym; default Symbol unlabel(Symbol sym) = sym; - if (expected.symbol == \node()) { - return v; + if (expected.symbol == \node(), &T vv := v) { + return vv; } if (def:adt(_, _) := expected.symbol, grammar := expected.definitions) {