From bf0cdbe71ea99d88624335f9257c0063a421fde3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Blanc?= <regwblanc@gmail.com>
Date: Wed, 24 Oct 2012 17:31:40 -0700
Subject: [PATCH] use reporter to print option information
---
src/main/scala/leon/Main.scala | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/main/scala/leon/Main.scala b/src/main/scala/leon/Main.scala
index 960e81ab3..b7681eaf9 100644
--- a/src/main/scala/leon/Main.scala
+++ b/src/main/scala/leon/Main.scala
@@ -25,12 +25,12 @@ object Main {
LeonOptionDef("help", true, "--help This help")
)
- def displayHelp() {
- println("usage: leon [--xlang] [--help] [--synthesis] [--help] [--debug=<N>] [..] <files>")
- println
- println("Leon options are:")
+ def displayHelp(reporter: Reporter) {
+ reporter.info("usage: leon [--xlang] [--help] [--synthesis] [--help] [--debug=<N>] [..] <files>")
+ reporter.info("")
+ reporter.info("Leon options are:")
for (opt <- allOptions.toSeq.sortBy(_.name)) {
- println(" "+opt.description)
+ reporter.info(" "+opt.description)
}
sys.exit(1)
}
@@ -62,12 +62,12 @@ object Main {
case (false, LeonValueOption(name, value)) =>
Some(leonOpt)
case _ =>
- System.err.println("Invalid option usage: "+opt)
- displayHelp()
+ reporter.error("Invalid option usage: "+opt)
+ displayHelp(reporter)
None
}
} else {
- System.err.println("leon: '"+opt+"' is not a valid option. See 'leon --help'")
+ reporter.error("leon: '"+opt+"' is not a valid option. See 'leon --help'")
None
}
}
@@ -83,7 +83,7 @@ object Main {
case LeonFlagOption("parse") =>
settings = settings.copy(synthesis = false, xlang = false, analyze = false)
case LeonFlagOption("help") =>
- displayHelp()
+ displayHelp(reporter)
case _ =>
}
--
GitLab