bookkeeping and fixing small problems

.travis.ym

@@ -0,0 +1,7 @@
+script: "make test"
+notifications:
+  email:
+    recipients:
+      - vadim@grammarware.net
+    on_success: never
+    on_failure: always

Makefile

@@ -8,7 +8,7 @@ rebuild-xbgf:
 	cd topics/transformation/xbgf; make rebuild
 
 test:
-	make build
+	cd topics/transformation/xbgf/tests && make testfull
 
 clean:
 	rm -f *~

shared/rascal/src/normal/ANF.rsc

@@ -69,7 +69,7 @@ CBGFSequence normAllStages(BGFGrammar gr)
 		}
 	}
 	//iprintln(c1);
-	// now we can have constuctions like this:
+	// now we can have constructions like this:
 	//   expression ::= (expression1 | expression2 | expression3 | expression | id | number) ;
 	// with cleverly hidden reflexive chain rules
 	//for (p <- g.prods, production(str l,str n,choice(L)) := p, [*L1,nonterminal(n),*L2] := L)

topics/implementation/busses/Koblenz.dot

@@ -1,49 +1,49 @@
 digraph Metro { node [shape=box]
 
- "Peter-Klöckner-Straße" -> "Verwaltungszentrum"
- "Langemarckplatz" -> "Johannesstraße"
- "Rübenacher Straße" -> "Im Acker"
- "Eduard-Müller-Straße" -> "In der Goldgrube"
- "Blücherstraße" -> "Marienhof"
- "Am Alten Schütenplatz" -> "Eulenhorst"
- "Closterbrauerei" -> "Rübenacher Straße"
- "Balduinbrücke" -> "Schüllerplatz"
- "Johannesstraße" -> "Bubenheimer Weg"
- "Saarplatz" -> "Franz-Weis-Straße"
- "Kirmesplatz" -> "Raiffaisenstraße"
- "Brüderhaus" -> "Roonstraße"
- "St-Elisabeth-Kirche" -> "Blücherstraße"
- "Pfaffengasse" -> "Bienenstück"
- "Franz-Weis-Straße" -> "St-Elisabeth-Kirche"
+ "Peter-Kl?ckner-Stra?e" -> "Verwaltungszentrum"
+ "Langemarckplatz" -> "Johannesstra?e"
+ "R?benacher Stra?e" -> "Im Acker"
+ "Eduard-M?ller-Stra?e" -> "In der Goldgrube"
+ "Bl?cherstra?e" -> "Marienhof"
+ "Am Alten Sch?tenplatz" -> "Eulenhorst"
+ "Closterbrauerei" -> "R?benacher Stra?e"
+ "Balduinbr?cke" -> "Sch?llerplatz"
+ "Johannesstra?e" -> "Bubenheimer Weg"
+ "Saarplatz" -> "Franz-Weis-Stra?e"
+ "Kirmesplatz" -> "Raiffaisenstra?e"
+ "Br?derhaus" -> "Roonstra?e"
+ "St-Elisabeth-Kirche" -> "Bl?cherstra?e"
+ "Pfaffengasse" -> "Bienenst?ck"
+ "Franz-Weis-Stra?e" -> "St-Elisabeth-Kirche"
  "Hauptbahnhof" -> "Christuskirche"
- "Lindenstraße" -> "Brüderhaus"
- "Kurt-Schumacher-Brücke" -> "Winninger Straße"
+ "Lindenstra?e" -> "Br?derhaus"
+ "Kurt-Schumacher-Br?cke" -> "Winninger Stra?e"
  "Oberweiher" -> "Uni"
  "Sportplatz" -> "Kirmesplatz"
- "Closterbrauerei" -> "In der Weglänge"
- "Schüllerplatz" -> "An der Ringmauer"
+ "Closterbrauerei" -> "In der Wegl?nge"
+ "Sch?llerplatz" -> "An der Ringmauer"
  "Trifter Weg" -> "Pfaffengasse"
  "Christuskirche" -> "Zentralplatz"
  "An der Ringmauer" -> "Langemarckplatz"
- "Roonstraße" -> "Christuskirche"
+ "Roonstra?e" -> "Christuskirche"
  "Bubenheimer Weg" -> "Closterbrauerei"
- "Löhr-Center" -> "Ludwig-Erhard-Straße"
- "Winninger Straße" -> "Oberweiher"
- "In der Weglänge" -> "Trifter Weg"
+ "L?hr-Center" -> "Ludwig-Erhard-Stra?e"
+ "Winninger Stra?e" -> "Oberweiher"
+ "In der Wegl?nge" -> "Trifter Weg"
  "Marienhof" -> "Verwaltungszentrum"
- "Löhr-Center" -> "Saarplatz"
+ "L?hr-Center" -> "Saarplatz"
  "Im Acker" -> "Sportplatz"
- "Verwaltungszentrum" -> "Kurt-Schumacher-Brücke"
- "Christuskirche" -> "Löhr-Center"
- "Löhr-Center" -> "Balduinbrücke"
+ "Verwaltungszentrum" -> "Kurt-Schumacher-Br?cke"
+ "Christuskirche" -> "L?hr-Center"
+ "L?hr-Center" -> "Balduinbr?cke"
  "Eulenhorst" -> "Oberweiher"
- "Zentralplatz" -> "Löhr-Center"
- "Overbergplatz" -> "Eduard-Müller-Straße"
- "Raiffaisenstraße" -> "Am Alten Schütenplatz"
- "Ludwig-Erhard-Straße" -> "Peter-Klöckner-Straße"
- "In der Goldgrube" -> "Lindenstraße"
+ "Zentralplatz" -> "L?hr-Center"
+ "Overbergplatz" -> "Eduard-M?ller-Stra?e"
+ "Raiffaisenstra?e" -> "Am Alten Sch?tenplatz"
+ "Ludwig-Erhard-Stra?e" -> "Peter-Kl?ckner-Stra?e"
+ "In der Goldgrube" -> "Lindenstra?e"
 
  "Closterbrauerei" [shape=ellipse]
- "Löhr-Center" [shape=ellipse]
+ "L?hr-Center" [shape=ellipse]
  "Christuskirche" [shape=ellipse]
 }

topics/implementation/busses/src/Busses.rsc

@@ -10,7 +10,7 @@ import ParseTree;
 start syntax System = Line+;
 syntax Line = Num ":" {Id ","}+ "." ;
 layout WS = [\ \t\n\r]* !>> [\ \t\n\r];
-lexical Id = [A-Za-z][A-Za-zŸŠš\-\ ]+[A-Za-z] !>> [A-Za-z];
+lexical Id = [A-Za-z][A-Za-zŸŠš§\-\ ]+[A-Za-z] !>> [A-Za-z];
 lexical Num = [0-9]+ !>> [0-9];
 
 rel[Id,Id] extractGraph(loc source) = 
@@ -32,7 +32,6 @@ void synthesizeDotGraph(loc source, loc target)
 
 public void main()
 {
-	//parse(#start[System],|home:///projects/slps/topics/implementation/busses/Koblenz.bus|);
 	synthesizeDotGraph(	|home:///projects/slps/topics/implementation/busses/Koblenz.bus|,
 						|home:///projects/slps/topics/implementation/busses/Koblenz.dot|);
 }

topics/transformation/xbgf/Makefile

@@ -1,7 +1,7 @@
 build:
 	cd tests && make build
 	cd apps && make build
-	cd ../../convergence/fl && make build
+	cd ../../convergence/xbgf/fl && make build
 
 rebuild:
 	make clean
@@ -10,11 +10,11 @@ rebuild:
 test:
 	cd apps && make test
 	cd tests && make test
-	cd ../../convergence/fl && make test
+	cd ../../convergence/xbgf/fl && make test
 
 clean:
 	rm -f *~
 	cd tests && make clean
 	cd apps && make clean
-	cd ../../convergence/fl && make clean
+	cd ../../convergence/xbgf/fl && make clean