Merge pull request #53 from javecs/feature/reformat

コードを整理しました。

Author: javecs

src/main/kotlin/xyz/javecs/tools/text2expr/Text2Expr.kt

@@ -22,20 +22,15 @@ class Text2Expr(rulePath: String = "rules") {
                 .filterNot { it.value == Double.NaN }
                 .sortedByDescending { it.coverage }
                 .toList()
-        return if (evaluated.isEmpty()) {
-            Calculator().eval(normalize(text)).value.toString()
-        } else {
+        return if (evaluated.isNotEmpty()) {
             val bestMatch = evaluated.first()
-            if (rendered) {
-                RuleRenderer(templates.templateOf(bestMatch.rule)).apply {
-                    add("variables", bestMatch.variables.map { Variable(it.key, it.value) }.toList())
-                    add("expr", bestMatch.expr)
-                    add("text", text)
-                    add("value", bestMatch.value)
-                }.render()
-            } else {
-                bestMatch.value.toString()
-            }
-        }
+            if (rendered) RuleRenderer(templates.templateOf(bestMatch.rule)).apply {
+                add("variables", bestMatch.variables.map { Variable(it.key, it.value) }.toList())
+                add("expr", bestMatch.expr)
+                add("text", text)
+                add("value", bestMatch.value)
+            }.render()
+            else bestMatch.value.toString()
+        } else Calculator().eval(normalize(text)).value.toString()
     }
 }

src/main/kotlin/xyz/javecs/tools/text2expr/rules/RuleBuilder.kt

@@ -75,9 +75,6 @@ class RuleBuilder(source: String, val name: String = "") {
             args.forEach { calc.eval(it) }
             expr().forEach { calc.eval(it) }
             Evaluation(calc.value, expr().toList(), calc.variables(), coverage, name)
-        } else {
-            Evaluation(rule = name)
-        }
+        } else Evaluation(rule = name)
     }
-
 }

src/main/kotlin/xyz/javecs/tools/text2expr/templates/TemplateLoader.kt

@@ -3,19 +3,15 @@ package xyz.javecs.tools.text2expr.templates
 import org.yaml.snakeyaml.Yaml
 import xyz.javecs.tools.text2expr.utils.read
 
+private val printValue = "<if(value)><value><endif>"
+
 data class Templates(var templates: List<RuleTemplate> = ArrayList<RuleTemplate>())
 data class RuleTemplate(var rule: String = "", var template: String = "")
 
-private val printValue = "<if(value)><value><endif>"
-
 class TemplateLoader(path: String = "rule-template.yml", val defaultTemplate: String = printValue) {
     private val config = Yaml().loadAs(read(path), Templates::class.java)
     fun templateOf(rule: String): String {
         val item = config.templates.find { it.rule == rule }
-        return if (item == null) {
-            defaultTemplate
-        } else {
-            read(item.template)
-        }
+        return if (item == null) defaultTemplate else read(item.template)
     }
 }