Enhance the utils/read-rif.sh script

Rework the lutin tutorial.

_oasis

 OASISFormat: 0.4
 Name:        Lutin
-Version:     2.21
+Version:     2.22
 Authors:     Erwan Jahier
 Maintainers: erwan.jahier@imag.fr
 License:     PROP

doc/lutin-tuto/lutin-tuto-html.html

@@ -7,7 +7,7 @@
 <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1"/>
 <meta name="title" content="A Lutin Tutorial"/>
 <meta name="generator" content="Org-mode"/>
-<meta name="generated" content="2017-03-21 14:36:48 CET"/>
+<meta name="generated" content="2017-03-22 14:17:49 CET"/>
 <meta name="author" content="Erwan Jahier"/>
 <meta name="description" content=""/>
 <meta name="keywords" content=""/>
@@ -809,8 +809,8 @@ can  use  two  tools  that  are part  of  the  <code>lutin</code>  distribution:
 
 
 
-<pre class="src src-sh">&lt;prompt&gt; lurette -sut <span style="color: #CC9393;">"lutin decr.lut -n incr"</span> -env <span style="color: #CC9393;">"lutin decr.lut -n decr"</span> ; <span style="color: #CC9393;">\\</span>
-cat rdbg.rif | sim2chrogtk -ecran &gt; /dev/null 
+<pre class="src src-sh">&lt;prompt&gt; lurette -sut <span style="color: #CC9393;">"lutin decr.lut -n incr"</span> -env <span style="color: #CC9393;">"lutin decr.lut -n decr"</span>
+&lt;prompt&gt; cat rdbg.rif | sim2chrogtk -ecran &gt; /dev/null 
 </pre>
 
 

doc/lutin-tuto/lutin-tuto-html.org

@@ -349,8 +349,8 @@ can  use  two  tools  that  are part  of  the  ~lutin~  distribution:
 #+end_src
 
 {{{run(./sh/lurette-demo.sh, 
-lurette -sut "lutin decr.lut -n incr" -env "lutin decr.lut -n decr" ; \\
-cat rdbg.rif | sim2chrogtk -ecran > /dev/null 
+lurette -sut "lutin decr.lut -n incr" -env "lutin decr.lut -n decr"
+<prompt> cat rdbg.rif | sim2chrogtk -ecran > /dev/null 
 )}}}
 
 

doc/lutin-tuto/lutin-tuto-pdf.org

@@ -219,8 +219,8 @@ It is  possible to store the lutin  RIF output into a  file using the
 #+end_src
 
 {{{run(./sh/lurette-demo.sh, 
-lurette -sut "lutin decr.lut -n incr" -env "lutin decr.lut -n decr" ; \\
-cat rdbg.rif | sim2chrogtk -ecran > /dev/null 
+lurette -sut "lutin decr.lut -n incr" -env "lutin decr.lut -n decr"
+<prompt> cat rdbg.rif | sim2chrogtk -ecran > /dev/null 
 )}}}
 
 

doc/lutin-tuto/main.org

@@ -302,8 +302,8 @@ html.
 #+end_src
 
 {{{run(./sh/lurette-demo.sh, 
-lurette -sut "lutin decr.lut -n incr" -env "lutin decr.lut -n decr" ; \\
-cat rdbg.rif | sim2chrogtk -ecran > /dev/null 
+lurette -sut "lutin decr.lut -n incr" -env "lutin decr.lut -n decr"
+<prompt> cat rdbg.rif | sim2chrogtk -ecran > /dev/null 
 )}}}
 
 

examples/lutin/xlurette/call-luciole/Makefile

@@ -15,7 +15,8 @@ test.rif:
 	export GCC="/usr/bin/gcc -fPIC"
 	$(LURETTE) --test-length 2  --output test.rif0 && \
 	grep -v "lurette chronogram" test.rif0  | \
-	grep -v "This is lurette Version" test.rif0  | grep -v "#seed " | \
+	grep -v "Rdbg Version"   | \
+	grep -v "This is lurette Version"   | grep -v "#seed " | \
 	grep -v "The execution lasted"| sed -e "s/^M//" > test.rif
 
 test:test.rif $(EXPDIR)

lutin/src/version.ml

-let str="2.21"
-let sha="c7a6f55"
+let str="2.22"
+let sha="43f8d5b"

utils/read-rif.sh

@@ -7,6 +7,8 @@ riffile=$1
 cat  $riffile | \
     grep -e '#outs' -e '#step' | \
     sed -e 's/True[ \t$]/1 /g'  -e 's/true[ \t$]/1 /g'   -e 's/t[ \t$]/1 /g' -e 's/T[ \t$]/1 /g' | \
+    sed -e 's/[ \t]True/1 /g'  -e 's/[ \t]true/1 /g'   -e 's/[ \t]t/1 /g' -e 's/[ \t]T/1 /g' | \
     sed -e 's/False[ \t$]/0 /g' -e 's/false[ \t$]/0 /g'  -e 's/f[ \t$]/0 /g' -e 's/F[ \t$]/0 /g' | \
+    sed -e 's/[ \t]False/0 /g' -e 's/[ \t]false/0 /g'  -e 's/[ \t]f/0 /g' -e 's/[ \t]F/0 /g' | \
     sed -e 'N; s/#step \([0-9]*\)\([^0-9]*\)\(.*\)#outs\(.*\)/\1 \3 \4/g'