From 3f372cfae8ed373a7caf8afea66bb13a6e463425 Mon Sep 17 00:00:00 2001
From: grammarware <vadim@grammarware.net>
Date: Thu, 10 Jan 2013 15:16:27 +0100
Subject: [PATCH] coevolve with Rascal & Rascalware (not yet complete)

---
 shared/rascal/src/transform/NegotiatedXBGF.rsc | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/shared/rascal/src/transform/NegotiatedXBGF.rsc b/shared/rascal/src/transform/NegotiatedXBGF.rsc
index 93803665..7bca5183 100644
--- a/shared/rascal/src/transform/NegotiatedXBGF.rsc
+++ b/shared/rascal/src/transform/NegotiatedXBGF.rsc
@@ -1,15 +1,11 @@
 @contributor{Vadim Zaytsev - vadim@grammarware.net - SWAT, CWI}
 module transform::NegotiatedXBGF
 
+import lib::Rascalware;
 import IO;
 import syntax::BGF;
 import syntax::XBGF;
-//import diff::GDT;
-import List;
-import String;
-import Integer;
 import normal::BGF;
-import transform::library::Core;
 import transform::library::Util;
 import transform::XBGF;
 
@@ -142,7 +138,7 @@ Advice adviseUsedNonterminal(str x, set[str] nts)
 	int minl = 9000;
 	str mins = "";
 	good = {z | z <- nts, levenshtein(z,x) == min([levenshtein(s,x) | s <- nts])};
-	if (good == {})
+	if (isEmpty(good))
 		return noadvice();
 	else
 		return setadvice("Did you mean",good);
@@ -164,11 +160,11 @@ Advice adviseFreshNonterminal(str x, set[str] nts)
 	adv += s;
 	// expr -> shjk
 	s = "";
-	for (c <- [stringChar(charAt(x,i)) | i <- [0..size(x)-1]])
+	for (c <- [stringChar(charAt(x,i)) | i <- [0..len(x)-1]])
 		if (c in low)
-			s += low[arbInt(size(low))];
+			s += low[arbInt(len(low))];
 		elseif (c in upp)
-			s += upp[arbInt(size(upp))];
+			s += upp[arbInt(len(upp))];
 		else
 			s += stringChar(c);
 	adv += s;