before re-engineering

grammarware · Jan 4, 2013 · e7dad39 · e7dad39
1 parent 5f2739d
commit e7dad39
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 7 deletions.
diff --git a/shared/rascal/src/transform/NegotiatedXBGF.rsc b/shared/rascal/src/transform/NegotiatedXBGF.rsc
@@ -97,6 +97,26 @@ public tuple[Problem,Advice,BGFGrammar] attemptTransform(XBGFSequence xbgf, BGFG
 	return <noproblem(),noadvice(),normalise(g1)>;
 }
 
+tuple[Problem,Advice,BGFGrammar] runAbridge(BGFProduction prod, grammar(rs, ps))
+{
+	if (production(_,x,nonterminal(x)) !:= prod)
+		return
+		<
+			error("Production <prod> cannot be abridged."),
+			adviseDetouredProd(prod,ps), // NOT IMPLEMENTED YET
+			grammar(rs,ps)
+		>;
+	if (!inProds(prod,ps))
+		return
+		<
+			error("Production <prod> not found."),
+			setadvice("Consider the nonterminal <prod.lhs> already abridged.",[]),
+			grammar(rs,ps)
+		>;
+	return <noproblem(),noadvice(),grammar(rs, ps - prod)>;
+}
+
+
 tuple[Problem,Advice,BGFGrammar] runRenameN(str x, str y, grammar(rs, ps))
 {
 	ns = allNs(ps);

diff --git a/shared/rascal/src/transform/XBGF.rsc b/shared/rascal/src/transform/XBGF.rsc
@@ -131,13 +131,6 @@ BGFGrammar runAddV(BGFProduction p1, grammar(rs, ps))
 	}
 }
 
-bool inProds(BGFProduction p, []) = false;
-bool inProds(BGFProduction p, list[BGFProduction] ps)
-{
-	if (eqP(normalise(p),normalise(ps[0]))) return true;
-	else return inProds(p,slice(ps,1,len(ps)-1));
-}
-
 BGFGrammar runAnonymize(BGFProduction p1, grammar(rs, ps))
 {
 	p2 = unmark(p1);

diff --git a/shared/rascal/src/transform/library/Util.rsc b/shared/rascal/src/transform/library/Util.rsc
@@ -143,3 +143,6 @@ public int levenshtein(str x, str y)
 	} 
 	return prow[size(prow)-1];
 }
+
+public bool inProds(BGFProduction p, []) = false;
+public bool inProds(BGFProduction p, list[BGFProduction] ps) = eqP(normalise(p),normalise(ps[0])) || inProds(p,tail(ps));