Get rid of the 'syntax' directory, collect all software languages tog…

…ether
grammarware · Feb 9, 2013 · 470af57 · 470af57
1 parent 803ba00
commit 470af57
Show file tree

Hide file tree

Showing 43 changed files with 156 additions and 139 deletions.
diff --git a/shared/rascal/src/ConvergePython.rsc b/shared/rascal/src/ConvergePython.rsc
@@ -1,8 +1,8 @@
 @contributor{Vadim Zaytsev - vadim@grammarware.net - SWAT, CWI}
 module ConvergePython
 
-import syntax::BGF;
-import syntax::XBGF;
+import language::BGF;
+import language::XBGF;
 import io::ReadBGF;
 import io::WriteXBGF;
 import transform::XBGF;
@@ -37,4 +37,4 @@ void main()
 	gdtv(transform(x1 + x2,g1),g2);
 	writeXBGF(x1,|home:///projects/slps/topics/convergence/xbgf/fl/xbgf/rename-python.xbgf|);
 	writeXBGF(x2,|home:///projects/slps/topics/convergence/xbgf/fl/xbgf/designate-python.xbgf|);
-}
+}
diff --git a/shared/rascal/src/analyse/Associativity.rsc b/shared/rascal/src/analyse/Associativity.rsc
@@ -1,9 +1,9 @@
 @contributor{Vadim Zaytsev - vadim@grammarware.net - SWAT, CWI}
 module analyse::Associativity
 
-import syntax::BGF;
-import syntax::XBGF;
-import syntax::CBGF;
+import language::BGF;
+import language::XBGF;
+import language::CBGF;
 import io::ReadBGF;
 import lib::Rascalware;
 import analyse::Metrics;

diff --git a/shared/rascal/src/analyse/CarveOut.rsc b/shared/rascal/src/analyse/CarveOut.rsc
@@ -1,8 +1,8 @@
 @contributor{Vadim Zaytsev - vadim@grammarware.net - SWAT, CWI}
 module analyse::CarveOut
 
-import syntax::BGF;
-import syntax::CBGF;
+import language::BGF;
+import language::CBGF;
 import analyse::Metrics;
 import lib::Rascalware;
 

diff --git a/shared/rascal/src/analyse/Layers.rsc b/shared/rascal/src/analyse/Layers.rsc
@@ -1,9 +1,9 @@
 @contributor{Vadim Zaytsev - vadim@grammarware.net - SWAT, CWI}
 module analyse::Layers
 
-import syntax::BGF;
-import syntax::XBGF;
-import syntax::CBGF;
+import language::BGF;
+import language::XBGF;
+import language::CBGF;
 import io::ReadBGF;
 import lib::Rascalware;
 import analyse::Metrics;

diff --git a/shared/rascal/src/analyse/Metrics.rsc b/shared/rascal/src/analyse/Metrics.rsc
@@ -1,7 +1,7 @@
 @contributor{Vadim Zaytsev - vadim@grammarware.net - SWAT, CWI}
 module analyse::Metrics
 
-import syntax::BGF;
+import language::BGF;
 import List;
 
 @doc{All nonterminals in a grammar: defined or used}

diff --git a/shared/rascal/src/analyse/Prodsigs.rsc b/shared/rascal/src/analyse/Prodsigs.rsc
@@ -1,7 +1,8 @@
 @contributor{Vadim Zaytsev - vadim@grammarware.net - SWAT, CWI}
 module analyse::Prodsigs
 
-import syntax::BGF;
+import language::BGF;
+import language::Prodsig;
 import analyse::Metrics;
 import lib::Rascalware;
 import Relation; //domain
@@ -10,18 +11,6 @@ import Set;
 import String;
 import export::LaTeX;
 
-data Footprint
-	= fpnt()
-	| fpopt()
-	| fpplus()
-	| fpstar()
-	| fpmany(list[Footprint] fps)
-	| fpempty()
-	;
-
-alias Signature = rel[str,Footprint];
-alias NameMatch = rel[str,str,bool];
-
 Footprint makefp(n, nonterminal(n)) = fpnt();
 Footprint makefp(n, optional(nonterminal(n))) = fpopt();
 Footprint makefp(n, plus(nonterminal(n))) = fpplus();

diff --git a/shared/rascal/src/converge/Guided.rsc b/shared/rascal/src/converge/Guided.rsc
@@ -2,9 +2,9 @@
 @wiki{guided grammar convergence}
 module converge::Guided
 
-import syntax::BGF;
-import syntax::XBGF;
-import syntax::CBGF;
+import language::BGF;
+import language::XBGF;
+import language::CBGF;
 import analyse::Prodsigs;
 import analyse::Metrics;
 import analyse::CarveOut;

diff --git a/shared/rascal/src/demo/IslandBoolean.rsc b/shared/rascal/src/demo/IslandBoolean.rsc
@@ -2,8 +2,8 @@
 module demo::IslandBoolean
 
 import lib::Rascalware;
-import syntax::BGF;
-import syntax::XBGF;
+import language::BGF;
+import language::XBGF;
 import transform::XBGF;
 import diff::GDT;
 import io::ReadBGF;

diff --git a/shared/rascal/src/demo/Negotiated.rsc b/shared/rascal/src/demo/Negotiated.rsc
@@ -3,8 +3,8 @@
 module demo::Negotiated
 
 import lib::Rascalware;
-import syntax::BGF;
-import syntax::XBGF;
+import language::BGF;
+import language::XBGF;
 import transform::NegotiatedXBGF;
 import transform::XBGF;
 import export::XBNF;

diff --git a/shared/rascal/src/diff/GDT.rsc b/shared/rascal/src/diff/GDT.rsc
@@ -3,7 +3,7 @@
 @wiki{Grammar Diff Tool}
 module diff::GDT
 
-import syntax::BGF;
+import language::BGF;
 import normal::BGF;
 import List;
 import IO;
@@ -119,4 +119,4 @@ public bool gdtv(grammar(rs1,ps1), grammar(rs2,ps2))
 	//	println(u);
 	// TODO keep trying?
 	return false;
-}
+}
diff --git a/shared/rascal/src/export/BNF.rsc b/shared/rascal/src/export/BNF.rsc
@@ -2,7 +2,7 @@
 module export::BNF
 
 import lib::Rascalware;
-import syntax::BGF;
+import language::BGF;
 
 public str pp(grammar([],BGFProdList ps)) = "<pp(ps)>\n";
 public default str pp(BGFGrammar bgf) = "Roots: <bgf.roots>\n<pp(bgf.prods)>\n";

diff --git a/shared/rascal/src/export/LaTeX.rsc b/shared/rascal/src/export/LaTeX.rsc
@@ -4,9 +4,9 @@ module export::LaTeX
 import IO;
 import List;
 import String;
-import syntax::BGF;
-import syntax::XBGF;
-import syntax::CBGF;
+import language::BGF;
+import language::XBGF;
+import language::CBGF;
 //import io::ReadBGF;
 import converge::Guided;
 import lib::Rascalware;

diff --git a/shared/rascal/src/export/PNF.rsc b/shared/rascal/src/export/PNF.rsc
@@ -2,7 +2,7 @@
 module export::PNF
 
 import lib::Rascalware;
-import syntax::BGF;
+import language::BGF;
 
 public str ppnf(BGFGrammar bgf) = "<ppnf(ps)>\n";
 

diff --git a/shared/rascal/src/export/Rascal.rsc b/shared/rascal/src/export/Rascal.rsc
@@ -4,7 +4,7 @@
 module export::Rascal
 
 import lib::Rascalware;
-import syntax::BGF;
+import language::BGF;
 import String; //startsWith
 import List; //getOneFrom
 

diff --git a/shared/rascal/src/export/XBNF.rsc b/shared/rascal/src/export/XBNF.rsc
@@ -3,8 +3,8 @@
 module export::XBNF
 
 import lib::Rascalware;
-import syntax::XBGF;
-import syntax::BGF;
+import language::XBGF;
+import language::BGF;
 import export::BNF;
 
 public str ppxs(XBGFSequence xs) = mapjoin(ppx,xs,"\n");

diff --git a/shared/rascal/src/export/XPNF.rsc b/shared/rascal/src/export/XPNF.rsc
@@ -3,8 +3,8 @@
 module export::XPNF
 
 import lib::Rascalware;
-import syntax::XBGF;
-import syntax::BGF;
+import language::XBGF;
+import language::BGF;
 import export::PNF;
 
 public str ppxs(XBGFSequence xs) = "\\begin{align*}\n&<mapjoin(ppx,xs,"; \\\\\n&")>\n\\end{align*}";

diff --git a/shared/rascal/src/extract/Python2BGF.rsc b/shared/rascal/src/extract/Python2BGF.rsc
@@ -7,7 +7,7 @@ import IO;
 import List;
 import String;
 import ParseTree;
-import syntax::BGF;
+import language::BGF;
 import io::WriteBGF;
 import extract::PyParsing;
 import normal::BGF;

diff --git a/shared/rascal/src/extract/RascalADT2BGF.rsc b/shared/rascal/src/extract/RascalADT2BGF.rsc
@@ -5,7 +5,7 @@ module extract::RascalADT2BGF
 import IO;
 import List;
 import String;
-import syntax::BGF;
+import language::BGF;
 import normal::BGF;
 import io::WriteBGF;
 import export::BNF;
@@ -49,7 +49,7 @@ BGFGrammar process(loc src)
 		//println(d);
 		ps += def2prod(parse(#DataDef,trim(d)));
 	}
-	return normalise(syntax::BGF::grammar([],ps));
+	return normalise(language::BGF::grammar([],ps));
 }
 
 BGFProduction def2prod((DataDef)`<Name n> = <DataExpr d> ;`)

diff --git a/shared/rascal/src/extract/RascalSyntax2BGF.rsc b/shared/rascal/src/extract/RascalSyntax2BGF.rsc
@@ -6,7 +6,7 @@ import lang::rascal::\syntax::RascalRascal;
 import lang::rascal::grammar::definition::Modules;
 import Grammar;
 import ParseTree;
-import syntax::BGF;
+import language::BGF;
 import io::WriteBGF;
 import normal::BGF;
 import String;
@@ -31,7 +31,7 @@ public void main()
 }
 
 BGFGrammar grammar2grammar(Grammar::\grammar(set[Symbol] starts, map[Symbol sort, Production def] rules))
- = syntax::BGF::grammar ([symbol2str(s) | s <- starts], [*rule2prods(rules[s]) | s <- rules, sort(_) := s]);
+ = language::BGF::grammar ([symbol2str(s) | s <- starts], [*rule2prods(rules[s]) | s <- rules, sort(_) := s]);
 
 str symbol2str(lex(str s)) = "<s>"; 
 str symbol2str(\start(sort(str s))) = "<s>";
@@ -45,28 +45,28 @@ list[BGFProduction] rule2prods(ParseTree::choice(sort(str s), set[Production] ps
 	= [prod2prod(p) | p <- ps];
 
 default list[BGFProduction] rule2prods(Production def)
-	= [production("", "UNKNOWN", syntax::BGF::terminal("<def>"))];
+	= [production("", "UNKNOWN", language::BGF::terminal("<def>"))];
 
 default BGFProduction prod2prod(prod(label(str lab, sort(str nt)), list[Symbol] rhs, _))
 	= production(lab, nt, rhs2expr(rhs));
 
 default BGFProduction prod2prod(prod(sort(str nt), list[Symbol] rhs, _))
 	= production("", nt, rhs2expr(rhs));
 
-default BGFProduction prod2prod(Production def) = production("", "?", syntax::BGF::epsilon());
+default BGFProduction prod2prod(Production def) = production("", "?", language::BGF::epsilon());
 
 BGFExpression rhs2expr([Symbol s]) = symbol2expr(s);
-BGFExpression rhs2expr(list[Symbol] seq) = syntax::BGF::sequence([symbol2expr(s) | s <- seq, layouts(_) !:= s]);
+BGFExpression rhs2expr(list[Symbol] seq) = language::BGF::sequence([symbol2expr(s) | s <- seq, layouts(_) !:= s]);
 
-BGFExpression symbol2expr(label(str x, Symbol s)) = syntax::BGF::selectable(x,symbol2expr(s));
-BGFExpression symbol2expr(\sort(str x)) = syntax::BGF::nonterminal(x);
-BGFExpression symbol2expr(conditional(\sort(str x),{except(_)})) = syntax::BGF::nonterminal(x); // cannot represent better in BGF
-BGFExpression symbol2expr(\lex(str x)) = syntax::BGF::nonterminal(x);
-BGFExpression symbol2expr(ParseTree::\lit("\n")) = syntax::BGF::terminal("\\n"); //hack?
-BGFExpression symbol2expr(ParseTree::\lit(str x)) = syntax::BGF::terminal(x);
+BGFExpression symbol2expr(label(str x, Symbol s)) = language::BGF::selectable(x,symbol2expr(s));
+BGFExpression symbol2expr(\sort(str x)) = language::BGF::nonterminal(x);
+BGFExpression symbol2expr(conditional(\sort(str x),{except(_)})) = language::BGF::nonterminal(x); // cannot represent better in BGF
+BGFExpression symbol2expr(\lex(str x)) = language::BGF::nonterminal(x);
+BGFExpression symbol2expr(ParseTree::\lit("\n")) = language::BGF::terminal("\\n"); //hack?
+BGFExpression symbol2expr(ParseTree::\lit(str x)) = language::BGF::terminal(x);
 BGFExpression symbol2expr(\iter-seps(Symbol item, list[Symbol] seps)) = iterseps2expr(item,[s | s <- seps, layouts(_) !:= s]);
 default BGFExpression symbol2expr(Symbol s) = epsilon();
 
-BGFExpression iterseps2expr(Symbol item, []) = syntax::BGF::plus(symbol2expr(item));
+BGFExpression iterseps2expr(Symbol item, []) = language::BGF::plus(symbol2expr(item));
 BGFExpression iterseps2expr(Symbol item, [Symbol sep]) = seplistplus(symbol2expr(item), symbol2expr(sep));
-default BGFExpression iterseps2expr(Symbol item, list[Symbol] seps) = seplistplus(symbol2expr(item), syntax::BGF::sequence([symbol2expr(sep) | sep <- seps]));
+default BGFExpression iterseps2expr(Symbol item, list[Symbol] seps) = seplistplus(symbol2expr(item), language::BGF::sequence([symbol2expr(sep) | sep <- seps]));
diff --git a/shared/rascal/src/io/ReadBGF.rsc b/shared/rascal/src/io/ReadBGF.rsc
@@ -3,7 +3,7 @@
 module io::ReadBGF
 
 import IO;
-import syntax::BGF;
+import language::BGF;
 import lang::xml::DOM;
 
 public BGFGrammar readBGF(loc f)

diff --git a/shared/rascal/src/io/ReadXBGF.rsc b/shared/rascal/src/io/ReadXBGF.rsc
@@ -3,8 +3,8 @@
 module io::ReadXBGF
 
 import IO;
-import syntax::BGF;
-import syntax::XBGF;
+import language::BGF;
+import language::XBGF;
 import lang::xml::DOM;
 import io::ReadBGF;
 

diff --git a/shared/rascal/src/io/WriteBGF.rsc b/shared/rascal/src/io/WriteBGF.rsc
@@ -3,7 +3,7 @@
 module io::WriteBGF
 
 import IO;
-import syntax::BGF;
+import language::BGF;
 import lang::xml::DOM;
 
 public void writeBGF(BGFGrammar bgf, loc f)

diff --git a/shared/rascal/src/io/WriteCBGF.rsc b/shared/rascal/src/io/WriteCBGF.rsc
@@ -3,9 +3,9 @@
 module io::WriteCBGF
 
 import IO;
-import syntax::BGF;
-import syntax::XBGF;
-import syntax::CBGF;
+import language::BGF;
+import language::XBGF;
+import language::CBGF;
 import lang::xml::DOM;
 import io::WriteBGF;
 

diff --git a/shared/rascal/src/io/WriteXBGF.rsc b/shared/rascal/src/io/WriteXBGF.rsc
@@ -3,8 +3,8 @@
 module io::WriteXBGF
 
 import IO;
-import syntax::BGF;
-import syntax::XBGF;
+import language::BGF;
+import language::XBGF;
 import lang::xml::DOM;
 import io::WriteBGF;
 

diff --git a/shared/rascal/src/io/json/Main.rsc b/shared/rascal/src/io/json/Main.rsc
@@ -1,7 +1,7 @@
 @contributor{Vadim Zaytsev - vadim@grammarware.net - SWAT, CWI}
 module io::json::Main
 
-import io::json::Syntax;
+import language::JSON;
 import io::json::Parse;
 import IO;
 import ParseTree;

diff --git a/shared/rascal/src/io/json/Parse.rsc b/shared/rascal/src/io/json/Parse.rsc
@@ -1,21 +1,12 @@
 @contributor{Vadim Zaytsev - vadim@grammarware.net - SWAT, CWI}
 module io::json::Parse
 
-import io::json::Syntax;
+import language::JSON;
 import IO;
 import String;
 import ParseTree;
 import util::Math;
 
-data JSO
-	= jsnumber(real n)
-	| jsstring(str s)
-	| jsboolean(bool b)
-	| jsarray(list[JSO] xs)
-	| jsobject(map[JSO,JSO] kvs)
-	| jsnull()
-	;
-
 JSO str2jso(str s)
 {
 	PT = parse(#JSONBasicType,trim(s));

diff --git a/shared/rascal/src/syntax/BGF.rsc → shared/rascal/src/language/BGF.rsc b/shared/rascal/src/syntax/BGF.rsc → shared/rascal/src/language/BGF.rsc
@@ -1,6 +1,6 @@
 @contributor{Vadim Zaytsev - vadim@grammarware.net - SWAT, CWI}
 @wiki{BGF}
-module \syntax::BGF
+module language::BGF
 
 alias BGFProdList = list[BGFProduction];
 alias BGFExprList = list[BGFExpression];

diff --git a/shared/rascal/src/syntax/CBGF.rsc → shared/rascal/src/language/CBGF.rsc b/shared/rascal/src/syntax/CBGF.rsc → shared/rascal/src/language/CBGF.rsc
@@ -1,9 +1,9 @@
 @contributor{Vadim Zaytsev - vadim@grammarware.net - SWAT, CWI}
 @wiki{ΞBGF}
-module syntax::CBGF
+module language::CBGF
 
-import \syntax::BGF;
-import \syntax::XBGF;
+import language::BGF;
+import language::XBGF;
 
 alias CBGFSequence = list[CBGFCommand];