From 3ead73f4a63dfea9b1b0cf76c1581181778e6739 Mon Sep 17 00:00:00 2001
From: grammarware <spider.vz@gmail.com>
Date: Sun, 8 Jul 2012 12:33:04 +0200
Subject: [PATCH] Fixed a bug in the algebratic data type extractor

---
 shared/rascal/src/extract/RascalADT2BGF.rsc | 5 +++--
 topics/convergence/guided/bgf/rascal-a.bgf  | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/shared/rascal/src/extract/RascalADT2BGF.rsc b/shared/rascal/src/extract/RascalADT2BGF.rsc
index ac366388..1884f9d3 100644
--- a/shared/rascal/src/extract/RascalADT2BGF.rsc
+++ b/shared/rascal/src/extract/RascalADT2BGF.rsc
@@ -7,6 +7,7 @@ import String;
 import syntax::BGF;
 import normal::BGF;
 import io::WriteBGF;
+import export::BNF;
 
 layout LAYOUTLIST = LAYOUT* !>> [\ \t\n\r/];
 lexical LAYOUT
@@ -32,7 +33,7 @@ public void main(list[str] args)
 
 public void main()
 {
-	iprintln(process(|project://fl/src/Abstract.rsc|));
+	println(pp(process(|project://fl/src/Abstract.rsc|)));
 }
 
 BGFGrammar process(loc src)
@@ -59,7 +60,7 @@ BGFExpression type2expr((Name)`str`) = val(string());
 BGFExpression type2expr((Name)`int`) = val(integer());
 default BGFExpression type2expr(Name n) = nonterminal("<n>");
 
-BGFExpression expr2expr((DataExpr)`<Name t>`) = nonterminal("<t>");
+BGFExpression expr2expr((DataExpr)`<Name t>`) = type2expr(t);
 BGFExpression expr2expr((DataExpr)`<Name t><Name n>`) = selectable("<n>",type2expr(t));
 BGFExpression expr2expr((DataExpr)`<Name n>()`) = selectable("<n>",epsilon());
 BGFExpression expr2expr((DataExpr)`<Name n>(<DataExpr e>)`) = selectable("<n>",expr2expr(e));
diff --git a/topics/convergence/guided/bgf/rascal-a.bgf b/topics/convergence/guided/bgf/rascal-a.bgf
index bcbf71e3..6a9b0a8d 100644
--- a/topics/convergence/guided/bgf/rascal-a.bgf
+++ b/topics/convergence/guided/bgf/rascal-a.bgf
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bgf:grammar xmlns:bgf="http://planet-sl.org/bgf"><bgf:production><label>prg</label><nonterminal>FLPrg</nonterminal><bgf:expression><selectable><selector>fs</selector><bgf:expression><star><bgf:expression><nonterminal>FLFun</nonterminal></bgf:expression></star></bgf:expression></selectable></bgf:expression></bgf:production><bgf:production><label>fun</label><nonterminal>FLFun</nonterminal><bgf:expression><sequence><bgf:expression><selectable><selector>f</selector><bgf:expression><value>string</value></bgf:expression></selectable></bgf:expression><bgf:expression><selectable><selector>args</selector><bgf:expression><star><bgf:expression><nonterminal>str</nonterminal></bgf:expression></star></bgf:expression></selectable></bgf:expression><bgf:expression><selectable><selector>body</selector><bgf:expression><nonterminal>FLExpr</nonterminal></bgf:expression></selectable></bgf:expression></sequence></bgf:expression></bgf:production><bgf:production><nonterminal>FLExpr</nonterminal><bgf:expression><choice><bgf:expression><selectable><selector>binary</selector><bgf:expression><sequence><bgf:expression><selectable><selector>e1</selector><bgf:expression><nonterminal>FLExpr</nonterminal></bgf:expression></selectable></bgf:expression><bgf:expression><selectable><selector>op</selector><bgf:expression><nonterminal>FLOp</nonterminal></bgf:expression></selectable></bgf:expression><bgf:expression><selectable><selector>e2</selector><bgf:expression><nonterminal>FLExpr</nonterminal></bgf:expression></selectable></bgf:expression></sequence></bgf:expression></selectable></bgf:expression><bgf:expression><selectable><selector>apply</selector><bgf:expression><sequence><bgf:expression><selectable><selector>f</selector><bgf:expression><value>string</value></bgf:expression></selectable></bgf:expression><bgf:expression><selectable><selector>vargs</selector><bgf:expression><star><bgf:expression><nonterminal>FLExpr</nonterminal></bgf:expression></star></bgf:expression></selectable></bgf:expression></sequence></bgf:expression></selectable></bgf:expression><bgf:expression><selectable><selector>ifThenElse</selector><bgf:expression><sequence><bgf:expression><selectable><selector>c</selector><bgf:expression><nonterminal>FLExpr</nonterminal></bgf:expression></selectable></bgf:expression><bgf:expression><selectable><selector>t</selector><bgf:expression><nonterminal>FLExpr</nonterminal></bgf:expression></selectable></bgf:expression><bgf:expression><selectable><selector>e</selector><bgf:expression><nonterminal>FLExpr</nonterminal></bgf:expression></selectable></bgf:expression></sequence></bgf:expression></selectable></bgf:expression><bgf:expression><selectable><selector>argument</selector><bgf:expression><selectable><selector>a</selector><bgf:expression><value>string</value></bgf:expression></selectable></bgf:expression></selectable></bgf:expression><bgf:expression><selectable><selector>literal</selector><bgf:expression><selectable><selector>i</selector><bgf:expression><value>int</value></bgf:expression></selectable></bgf:expression></selectable></bgf:expression></choice></bgf:expression></bgf:production><bgf:production><nonterminal>FLOp</nonterminal><bgf:expression><choice><bgf:expression><selectable><selector>minus</selector><bgf:expression><epsilon /></bgf:expression></selectable></bgf:expression><bgf:expression><selectable><selector>plus</selector><bgf:expression><epsilon /></bgf:expression></selectable></bgf:expression><bgf:expression><selectable><selector>equal</selector><bgf:expression><epsilon /></bgf:expression></selectable></bgf:expression></choice></bgf:expression></bgf:production></bgf:grammar>
+<bgf:grammar xmlns:bgf="http://planet-sl.org/bgf"><bgf:production><label>prg</label><nonterminal>FLPrg</nonterminal><bgf:expression><selectable><selector>fs</selector><bgf:expression><star><bgf:expression><nonterminal>FLFun</nonterminal></bgf:expression></star></bgf:expression></selectable></bgf:expression></bgf:production><bgf:production><label>fun</label><nonterminal>FLFun</nonterminal><bgf:expression><sequence><bgf:expression><selectable><selector>f</selector><bgf:expression><value>string</value></bgf:expression></selectable></bgf:expression><bgf:expression><selectable><selector>args</selector><bgf:expression><star><bgf:expression><value>string</value></bgf:expression></star></bgf:expression></selectable></bgf:expression><bgf:expression><selectable><selector>body</selector><bgf:expression><nonterminal>FLExpr</nonterminal></bgf:expression></selectable></bgf:expression></sequence></bgf:expression></bgf:production><bgf:production><nonterminal>FLExpr</nonterminal><bgf:expression><choice><bgf:expression><selectable><selector>binary</selector><bgf:expression><sequence><bgf:expression><selectable><selector>e1</selector><bgf:expression><nonterminal>FLExpr</nonterminal></bgf:expression></selectable></bgf:expression><bgf:expression><selectable><selector>op</selector><bgf:expression><nonterminal>FLOp</nonterminal></bgf:expression></selectable></bgf:expression><bgf:expression><selectable><selector>e2</selector><bgf:expression><nonterminal>FLExpr</nonterminal></bgf:expression></selectable></bgf:expression></sequence></bgf:expression></selectable></bgf:expression><bgf:expression><selectable><selector>apply</selector><bgf:expression><sequence><bgf:expression><selectable><selector>f</selector><bgf:expression><value>string</value></bgf:expression></selectable></bgf:expression><bgf:expression><selectable><selector>vargs</selector><bgf:expression><star><bgf:expression><nonterminal>FLExpr</nonterminal></bgf:expression></star></bgf:expression></selectable></bgf:expression></sequence></bgf:expression></selectable></bgf:expression><bgf:expression><selectable><selector>ifThenElse</selector><bgf:expression><sequence><bgf:expression><selectable><selector>c</selector><bgf:expression><nonterminal>FLExpr</nonterminal></bgf:expression></selectable></bgf:expression><bgf:expression><selectable><selector>t</selector><bgf:expression><nonterminal>FLExpr</nonterminal></bgf:expression></selectable></bgf:expression><bgf:expression><selectable><selector>e</selector><bgf:expression><nonterminal>FLExpr</nonterminal></bgf:expression></selectable></bgf:expression></sequence></bgf:expression></selectable></bgf:expression><bgf:expression><selectable><selector>argument</selector><bgf:expression><selectable><selector>a</selector><bgf:expression><value>string</value></bgf:expression></selectable></bgf:expression></selectable></bgf:expression><bgf:expression><selectable><selector>literal</selector><bgf:expression><selectable><selector>i</selector><bgf:expression><value>int</value></bgf:expression></selectable></bgf:expression></selectable></bgf:expression></choice></bgf:expression></bgf:production><bgf:production><nonterminal>FLOp</nonterminal><bgf:expression><choice><bgf:expression><selectable><selector>minus</selector><bgf:expression><epsilon /></bgf:expression></selectable></bgf:expression><bgf:expression><selectable><selector>plus</selector><bgf:expression><epsilon /></bgf:expression></selectable></bgf:expression><bgf:expression><selectable><selector>equal</selector><bgf:expression><epsilon /></bgf:expression></selectable></bgf:expression></choice></bgf:expression></bgf:production></bgf:grammar>