proper directory/module structure

grammarware · Jun 1, 2012 · 2ed2dbd · 2ed2dbd
1 parent 98cdd59
commit 2ed2dbd
Show file tree

Hide file tree

Showing 7 changed files with 61 additions and 47 deletions.
diff --git a/shared/rascal/.project b/shared/rascal/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>xbgf</name>
+	<name>slps</name>
 	<comment></comment>
 	<projects>
 	</projects>

diff --git a/shared/rascal/META-INF/MANIFEST.MF b/shared/rascal/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: xbgf
-Bundle-SymbolicName: xbgf
+Bundle-SymbolicName: slps
 Bundle-Version: 1.0.0
 Require-Bundle: org.eclipse.imp.pdb.values,
  rascal

diff --git a/shared/rascal/README.txt b/shared/rascal/README.txt
@@ -0,0 +1 @@
+this directory contains a Rascal Project called "slps"
diff --git a/shared/rascal/src/Main.rsc b/shared/rascal/src/Main.rsc
@@ -0,0 +1,26 @@
+@contributor{Vadim Zaytsev - vadim@grammarware.net - CWI}
+module Main
+
+import IO;
+import syntax::BGF;
+import syntax::XBGF;
+import io::ReadXBGF;
+//import lang::xml::DOM;
+
+public void main()
+{
+	println(readXBGF(|project://slps/tests/undefine1.xbgf|));
+}
+
+public bool tryAll()
+{
+	loc base = |project://slps/tests|;
+	for (f <- listEntries(base))
+	{
+		if (f == ".gitignore") continue;
+		println(f);
+		println(readXBGF(base+f));
+	}
+	return true;
+}
+
diff --git a/shared/rascal/src/XBGF.rsc → shared/rascal/src/io/ReadXBGF.rsc b/shared/rascal/src/XBGF.rsc → shared/rascal/src/io/ReadXBGF.rsc
@@ -1,28 +1,11 @@
 @contributor{Vadim Zaytsev - vadim@grammarware.net - CWI}
-module XBGF
+module io::ReadXBGF
 
 import IO;
-import XBGFSyntax;
+import syntax::BGF;
+import syntax::XBGF;
 import lang::xml::DOM;
 
-public void main()
-{
-	println(readXBGF(|project://xbgf/tests/undefine1.xbgf|));
-}
-
-public bool tryAll()
-{
-	loc base = |project://xbgf/tests|;
-	for (f <- listEntries(base))
-	{
-		if (f == ".gitignore") continue;
-		println(f);
-		println(readXBGF(base+f));
-	}
-	return true;
-}
-
-
 public XBGFSequence readXBGF(loc f)
 {
 	Node N = parseXMLDOMTrim(readFile(f));

diff --git a/shared/rascal/src/syntax/BGF.rsc b/shared/rascal/src/syntax/BGF.rsc
@@ -0,0 +1,26 @@
+@contributor{Vadim Zaytsev - vadim@grammarware.net - CWI}
+module syntax::BGF
+
+data BGFProduction =
+	production (str label, str lhs, BGFExpression rhs)
+;
+
+data BGFExpression =
+	  epsilon()
+	| empty()
+	| val(BGFValue v)
+	| anything()
+	| terminal(str t)
+	| nonterminal(str t)
+	| selectable(str selector, BGFExpression expr)
+	| sequence(list[BGFExpression] exprs)
+	| choice(list[BGFExpression] exprs)
+	| marked(BGFExpression expr)
+	| optional(BGFExpression expr)
+	| plus(BGFExpression expr)
+	| star(BGFExpression expr)
+	| starsepplus(BGFExpression expr, BGFExpression sep)
+	| starsepstar(BGFExpression expr, BGFExpression sep)
+;
+
+data BGFValue = string() | integer();
diff --git a/shared/rascal/src/XBGFSyntax.rsc → shared/rascal/src/syntax/XBGF.rsc b/shared/rascal/src/XBGFSyntax.rsc → shared/rascal/src/syntax/XBGF.rsc
@@ -1,5 +1,7 @@
 @contributor{Vadim Zaytsev - vadim@grammarware.net - CWI}
-module XBGFSyntax
+module syntax::XBGF
+
+import syntax::BGF;
 
 alias XBGFSequence = list[XBGFCommand];
 
@@ -68,27 +70,3 @@ data XBGFCommand =
 data BGFContext =
 	globally()
 ;
-
-data BGFProduction =
-	production (str label, str lhs, BGFExpression rhs)
-;
-
-data BGFExpression =
-	  epsilon()
-	| empty()
-	| val(BGFValue v)
-	| anything()
-	| terminal(str t)
-	| nonterminal(str t)
-	| selectable(str selector, BGFExpression expr)
-	| sequence(list[BGFExpression] exprs)
-	| choice(list[BGFExpression] exprs)
-	| marked(BGFExpression expr)
-	| optional(BGFExpression expr)
-	| plus(BGFExpression expr)
-	| star(BGFExpression expr)
-	| starsepplus(BGFExpression expr, BGFExpression sep)
-	| starsepstar(BGFExpression expr, BGFExpression sep)
-;
-
-data BGFValue = string() | integer();