https://svn.lrde.epita.fr/svn/xrm/trunk
Index: ChangeLog
from SIGOURE Benoit <sigoure.benoit(a)lrde.epita.fr>
Use --verbose instead of --statistics.
This cancels the note of the previous commit.
* src/str/log-timed.str: Use --verbose instead of --statistics.
* src/str/xrm-front.str: Change verbosity levels.
log-timed.str | 6 +++---
xrm-front.str | 10 +++++-----
2 files changed, 8 insertions(+), 8 deletions(-)
Index: src/str/log-timed.str
--- src/str/log-timed.str (revision 63)
+++ src/str/log-timed.str (working copy)
@@ -14,7 +14,7 @@
** printed. (default level=1)
*/
log-timed(s | msg, level) =
- if <geq>(<get-config> "--statistics", level) then
+ if <geq>(<verbosity>(), level) then
where(
times => start
; print-log-msg(|msg)
@@ -42,7 +42,7 @@
** Same thing as log-timed but nothing will be printed until s finished.
*/
log-timed-reentrant(s | msg, level) =
- if <geq>(<get-config> "--statistics", level) then
+ if <geq>(<verbosity>(), level) then
where(times => start)
; s
; where(
@@ -68,6 +68,6 @@
<concat-strings>["[ "
, <log-src>
, " | info ] "
- , <align-left>(' ', msg, 40) // 40 = max strlen(msg)
+ , <align-left>(' ', msg, 36) // 36 = max strlen(msg)
]
; log-puts
Index: src/str/xrm-front.str
--- src/str/xrm-front.str (revision 63)
+++ src/str/xrm-front.str (working copy)
@@ -31,14 +31,14 @@
; if not(<get-config> "-b") then
if must-pp-aterm then // output pp-ATerms
log-timed(xtc-transform(!"pp-aterm", pass-verbose)
- | "pretty printed ATerms", 1)
+ | "pretty printed ATerms", 2)
else
if must-parse-pctl then // output PCTL source
log-timed(xtc-transform(!"pp-pctl", pass-verbose)
- | "pretty printed PCTL code", 1)
+ | "pretty printed PCTL code", 2)
else // output PRISM source
log-timed(xtc-transform(!"pp-prism", pass-verbose)
- | "pretty printed PRISM code", 1)
+ | "pretty printed PRISM code", 2)
end
end
end
@@ -48,9 +48,9 @@
/** pipeline of transformations performed by xrm-front */
xrm-front-pipeline =
where(<set-random-seed> (<time>))
- ; log-timed-reentrant(xrm-to-prism | "XRM to PRISM succeeded", 0)
+ ; log-timed-reentrant(xrm-to-prism | "XRM to PRISM succeeded", 2)
; if must-desugar then
- log-timed(prism-desugar | "Additionnal desugarisation (-D)", 0)
+ log-timed(prism-desugar | "Additionnal desugarisation (-D)", 2)
end
/** list of available options for xrm-front */