From 5cad9b5b0513199dc27565888f595f37691752c4 Mon Sep 17 00:00:00 2001
From: Dorel Lucanu <ducanu@info.uaic.ro>
Date: Tue, 3 Jun 2014 12:28:14 +0300
Subject: [PATCH] fixed ltlmc/config.xml and .out files

---
 ltlmc/config.xml                        |   4 +-
 ltlmc/programs/peterson-wrong1.cink.out | 256 ++++----------
 ltlmc/programs/peterson-wrong2.cink.out | 436 ++++++------------------
 3 files changed, 175 insertions(+), 521 deletions(-)

diff --git a/ltlmc/config.xml b/ltlmc/config.xml
index b4068e7..9b34d00 100644
--- a/ltlmc/config.xml
+++ b/ltlmc/config.xml
@@ -40,8 +40,8 @@
       <kompile-option name="--directory" value="cink-kompiled-symbolic" />
       <program name="sums.cink">
         <krun-option name="--ltlmc" value="[]Ltl (L ->Ltl eqToSum(s,i)) " />
-        <krun-option name="--cIN" value="ListItem(#symInt(n))" />
-        <krun-option name="--cPC" value="#symInt(n) &lt;Int 3"  />
+        <krun-option name="-cIN" value="ListItem(#symInt(n))" />
+        <krun-option name="-cPC" value="#symInt(n) &lt;Int 3"  />
         <krun-option name="--directory" value="cink-kompiled-symbolic" />
       </program>
     </test>
diff --git a/ltlmc/programs/peterson-wrong1.cink.out b/ltlmc/programs/peterson-wrong1.cink.out
index cf532c1..1523396 100644
--- a/ltlmc/programs/peterson-wrong1.cink.out
+++ b/ltlmc/programs/peterson-wrong1.cink.out
@@ -1,10 +1,8 @@
 Vertices:<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -47,11 +45,9 @@ Vertices:<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -95,11 +91,9 @@ Vertices:<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -144,11 +138,9 @@ Vertices:<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -203,11 +195,9 @@ Vertices:<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -288,11 +278,9 @@ Vertices:<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -381,11 +369,9 @@ Vertices:<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -482,11 +468,9 @@ Vertices:<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -581,11 +565,9 @@ Vertices:<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -679,11 +661,9 @@ Vertices:<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -777,11 +757,9 @@ Vertices:<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -878,11 +856,9 @@ Vertices:<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -977,11 +953,9 @@ Vertices:<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -1075,11 +1049,9 @@ Vertices:<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -1173,11 +1145,9 @@ Vertices:<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -1269,11 +1239,9 @@ Vertices:<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -1366,11 +1334,9 @@ Vertices:<T>
 Edges:
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -1413,11 +1379,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -1462,11 +1426,9 @@ Unlabelled rule [<T>
 </T>] 
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -1510,11 +1472,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -1560,11 +1520,9 @@ Unlabelled rule [<T>
 </T>] 
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -1609,11 +1567,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -1669,11 +1625,9 @@ Unlabelled rule [<T>
 </T>] 
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -1728,11 +1682,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -1814,11 +1766,9 @@ Unlabelled rule [<T>
 </T>] 
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -1899,11 +1849,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -1993,11 +1941,9 @@ Unlabelled rule [<T>
 </T>] 
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -2086,11 +2032,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -2188,11 +2132,9 @@ Unlabelled rule [<T>
 </T>] 
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -2289,11 +2231,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -2389,11 +2329,9 @@ Unlabelled rule [<T>
 </T>] 
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -2488,11 +2426,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -2587,11 +2523,9 @@ Unlabelled rule [<T>
 </T>] 
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -2685,11 +2619,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -2784,11 +2716,9 @@ Unlabelled rule [<T>
 </T>] 
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -2882,11 +2812,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -2984,11 +2912,9 @@ Unlabelled rule [<T>
 </T>] 
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -3085,11 +3011,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -3185,11 +3109,9 @@ Unlabelled rule [<T>
 </T>] 
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -3284,11 +3206,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -3383,11 +3303,9 @@ Unlabelled rule [<T>
 </T>] 
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -3481,11 +3399,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -3580,11 +3496,9 @@ Unlabelled rule [<T>
 </T>] 
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -3678,11 +3592,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -3775,11 +3687,9 @@ Unlabelled rule [<T>
 </T>] 
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -3871,11 +3781,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -3967,11 +3875,9 @@ Unlabelled rule [<T>
 </T>] 
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -4062,11 +3968,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -4161,11 +4065,9 @@ Unlabelled rule [<T>
 </T>] 
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -4259,11 +4161,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -4358,11 +4258,9 @@ Unlabelled rule [<T>
 </T>] 
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -4456,11 +4354,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -4558,11 +4454,9 @@ Unlabelled rule [<T>
 </T>] 
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -4659,11 +4553,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -4759,11 +4651,9 @@ Unlabelled rule [<T>
 </T>] 
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -4858,11 +4748,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -4957,11 +4845,9 @@ Unlabelled rule [<T>
 </T>] 
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -5055,11 +4941,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -5154,11 +5038,9 @@ Unlabelled rule [<T>
 </T>] 
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -5252,11 +5134,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -5354,11 +5234,9 @@ Unlabelled rule [<T>
 </T>] 
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -5455,11 +5333,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -5555,11 +5431,9 @@ Unlabelled rule [<T>
 </T>] 
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -5654,11 +5528,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
diff --git a/ltlmc/programs/peterson-wrong2.cink.out b/ltlmc/programs/peterson-wrong2.cink.out
index 7ae0154..91776bc 100644
--- a/ltlmc/programs/peterson-wrong2.cink.out
+++ b/ltlmc/programs/peterson-wrong2.cink.out
@@ -1,10 +1,8 @@
 Vertices:<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -50,11 +48,9 @@ Vertices:<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -102,11 +98,9 @@ Vertices:<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -155,11 +149,9 @@ Vertices:<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -209,11 +201,9 @@ Vertices:<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -273,11 +263,9 @@ Vertices:<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -364,11 +352,9 @@ Vertices:<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -465,11 +451,9 @@ Vertices:<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -568,11 +552,9 @@ Vertices:<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -681,11 +663,9 @@ Vertices:<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -796,11 +776,9 @@ Vertices:<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -910,11 +888,9 @@ Vertices:<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -1025,11 +1001,9 @@ Vertices:<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -1136,11 +1110,9 @@ Vertices:<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -1247,11 +1219,9 @@ Vertices:<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -1357,11 +1327,9 @@ Vertices:<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -1470,11 +1438,9 @@ Vertices:<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -1581,11 +1547,9 @@ Vertices:<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -1694,11 +1658,9 @@ Vertices:<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -1803,11 +1765,9 @@ Vertices:<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -1912,11 +1872,9 @@ Vertices:<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -2020,11 +1978,9 @@ Vertices:<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -2130,11 +2086,9 @@ Vertices:<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -2236,11 +2190,9 @@ Vertices:<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -2345,11 +2297,9 @@ Vertices:<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -2454,11 +2404,9 @@ Vertices:<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -2562,11 +2510,9 @@ Vertices:<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -2672,11 +2618,9 @@ Vertices:<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -2778,11 +2722,9 @@ Vertices:<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -2886,11 +2828,9 @@ Vertices:<T>
 Edges:
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -2936,11 +2876,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -2989,11 +2927,9 @@ Unlabelled rule [<T>
 </T>] 
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -3041,11 +2977,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -3095,11 +3029,9 @@ Unlabelled rule [<T>
 </T>] 
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -3148,11 +3080,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -3203,11 +3133,9 @@ Unlabelled rule [<T>
 </T>] 
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -3257,11 +3185,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -3322,11 +3248,9 @@ Unlabelled rule [<T>
 </T>] 
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -3386,11 +3310,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -3478,11 +3400,9 @@ Unlabelled rule [<T>
 </T>] 
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -3569,11 +3489,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -3671,11 +3589,9 @@ Unlabelled rule [<T>
 </T>] 
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -3772,11 +3688,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -3876,11 +3790,9 @@ Unlabelled rule [<T>
 </T>] 
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -3979,11 +3891,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -4093,11 +4003,9 @@ Unlabelled rule [<T>
 </T>] 
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -4206,11 +4114,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -4322,11 +4228,9 @@ Unlabelled rule [<T>
 </T>] 
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -4437,11 +4341,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -4552,11 +4454,9 @@ Unlabelled rule [<T>
 </T>] 
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -4666,11 +4566,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -4782,11 +4680,9 @@ Unlabelled rule [<T>
 </T>] 
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -4897,11 +4793,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -5009,11 +4903,9 @@ Unlabelled rule [<T>
 </T>] 
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -5120,11 +5012,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -5232,11 +5122,9 @@ Unlabelled rule [<T>
 </T>] 
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -5343,11 +5231,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -5454,11 +5340,9 @@ Unlabelled rule [<T>
 </T>] 
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -5564,11 +5448,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -5678,11 +5560,9 @@ Unlabelled rule [<T>
 </T>] 
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -5791,11 +5671,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -5903,11 +5781,9 @@ Unlabelled rule [<T>
 </T>] 
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -6014,11 +5890,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -6128,11 +6002,9 @@ Unlabelled rule [<T>
 </T>] 
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -6241,11 +6113,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -6351,11 +6221,9 @@ Unlabelled rule [<T>
 </T>] 
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -6460,11 +6328,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -6570,11 +6436,9 @@ Unlabelled rule [<T>
 </T>] 
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -6679,11 +6543,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -6788,11 +6650,9 @@ Unlabelled rule [<T>
 </T>] 
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -6896,11 +6756,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -7007,11 +6865,9 @@ Unlabelled rule [<T>
 </T>] 
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -7117,11 +6973,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -7224,11 +7078,9 @@ Unlabelled rule [<T>
 </T>] 
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -7330,11 +7182,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -7440,11 +7290,9 @@ Unlabelled rule [<T>
 </T>] 
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -7549,11 +7397,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -7659,11 +7505,9 @@ Unlabelled rule [<T>
 </T>] 
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -7768,11 +7612,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -7877,11 +7719,9 @@ Unlabelled rule [<T>
 </T>] 
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -7985,11 +7825,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -8096,11 +7934,9 @@ Unlabelled rule [<T>
 </T>] 
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -8206,11 +8042,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -8313,11 +8147,9 @@ Unlabelled rule [<T>
 </T>] 
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -8419,11 +8251,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -8526,11 +8356,9 @@ Unlabelled rule [<T>
 </T>] 
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -8632,11 +8460,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -8742,11 +8568,9 @@ Unlabelled rule [<T>
 </T>] 
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -8851,11 +8675,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -8960,11 +8782,9 @@ Unlabelled rule [<T>
 </T>] 
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -9068,11 +8888,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -9180,11 +8998,9 @@ Unlabelled rule [<T>
 </T>] 
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -9291,11 +9107,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -9405,11 +9219,9 @@ Unlabelled rule [<T>
 </T>] 
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -9518,11 +9330,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -9634,11 +9444,9 @@ Unlabelled rule [<T>
 </T>] 
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -9749,11 +9557,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -9864,11 +9670,9 @@ Unlabelled rule [<T>
 </T>] 
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -9978,11 +9782,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -10094,11 +9896,9 @@ Unlabelled rule [<T>
 </T>] 
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -10209,11 +10009,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -10321,11 +10119,9 @@ Unlabelled rule [<T>
 </T>] 
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -10432,11 +10228,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -10544,11 +10338,9 @@ Unlabelled rule [<T>
 </T>] 
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -10655,11 +10447,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -10766,11 +10556,9 @@ Unlabelled rule [<T>
 </T>] 
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -10876,11 +10664,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -10990,11 +10776,9 @@ Unlabelled rule [<T>
 </T>] 
 Unlabelled rule [<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>
@@ -11103,11 +10887,9 @@ Unlabelled rule [<T>
     </genv>
 </T>,<T>
     <in>
-        ListItem(#buffer ( "" ))
-        ListItem(#istream ( 0 ))
+        ListItem(#buffer ( "\n" ))
     </in>
     <out>
-        ListItem(#ostream ( 1 ))
         ListItem(#buffer ( "" ))
     </out>
     <threads>