From 1f146fd4e445355d5ead58e80f3f0dd18c03b124 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=A6=E5=A2=83=E8=BF=B7=E7=A6=BB?= Date: Thu, 3 Nov 2022 15:41:09 +0800 Subject: [PATCH] fix some --- .../main/scala/org/bitlap/tools/internal/elapsedMacro.scala | 5 +++++ .../src/main/scala/org/bitlap/tools/internal/logMacro.scala | 5 +---- .../src/main/scala/org/bitlap/tools/logs/LogType.scala | 5 ++++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/smt-annotations/src/main/scala/org/bitlap/tools/internal/elapsedMacro.scala b/smt-annotations/src/main/scala/org/bitlap/tools/internal/elapsedMacro.scala index d8ddfb7..e937eed 100644 --- a/smt-annotations/src/main/scala/org/bitlap/tools/internal/elapsedMacro.scala +++ b/smt-annotations/src/main/scala/org/bitlap/tools/internal/elapsedMacro.scala @@ -68,6 +68,11 @@ object elapsedMacro { case "info" => getLog(classNameAndMethodName, q"${log.get}.info") case "debug" => getLog(classNameAndMethodName, q"${log.get}.debug") case "warn" => getLog(classNameAndMethodName, q"${log.get}.warn") + case _ => + c.abort( + c.enclosingPosition, + s"${extractOptions._2.toLowerCase} is not in the supported list: info,debug,warn" + ) } } } diff --git a/smt-annotations/src/main/scala/org/bitlap/tools/internal/logMacro.scala b/smt-annotations/src/main/scala/org/bitlap/tools/internal/logMacro.scala index ae7afcb..2c4cda9 100644 --- a/smt-annotations/src/main/scala/org/bitlap/tools/internal/logMacro.scala +++ b/smt-annotations/src/main/scala/org/bitlap/tools/internal/logMacro.scala @@ -44,10 +44,7 @@ object logMacro { evalTree(logType.asInstanceOf[Tree]) case q"new log()" => LogType.JLog case _ => - c.abort( - c.enclosingPosition, - s"${ErrorMessage.UNEXPECTED_PATTERN}, only support: ${LogType.values.mkString(",")}" - ) + c.abort(c.enclosingPosition, s"${ErrorMessage.UNEXPECTED_PATTERN}") } private def logTree(annottees: Seq[c.universe.Expr[Any]]): c.universe.Tree = { diff --git a/smt-annotations/src/main/scala/org/bitlap/tools/logs/LogType.scala b/smt-annotations/src/main/scala/org/bitlap/tools/logs/LogType.scala index 744e92d..79966d2 100644 --- a/smt-annotations/src/main/scala/org/bitlap/tools/logs/LogType.scala +++ b/smt-annotations/src/main/scala/org/bitlap/tools/logs/LogType.scala @@ -47,6 +47,9 @@ object LogType { val values = types.keySet def getLogImpl(logType: String): BaseLog = - types.getOrElse(logType.toLowerCase, default = throw new Exception(s"Not support log type: $logType")) + types.getOrElse( + logType.toLowerCase, + default = throw new Exception(s"$logType is not in the supported list: ${values.mkString(",")}") + ) } -- GitLab