Merge pull request #33 from javecs/feature/rule-renderer

計算結果を表示する機能を別のクラスに分けました。

Author: javecs

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

@@ -2,25 +2,31 @@ package xyz.javecs.tools.text2expr
 
 import xyz.javecs.tools.expr.Calculator
 import xyz.javecs.tools.text2expr.parsers.RuleBuilder
+import xyz.javecs.tools.text2expr.parsers.RuleRenderer
+import xyz.javecs.tools.text2expr.parsers.Variable
 import xyz.javecs.tools.text2expr.utils.normalize
 import xyz.javecs.tools.text2expr.utils.read
 import xyz.javecs.tools.text2expr.utils.resources
 
 class Text2Expr(rulePath: String = "rules") {
     private val rules = ArrayList<RuleBuilder>()
     private val calc = Calculator()
+    private val renderer = RuleRenderer(read("templates/reply.st"))
 
     init {
-        val reply = read("templates/reply.st")
-        resources(rulePath).forEach { rules.add(RuleBuilder(read(it), reply)) }
+        resources(rulePath).forEach { rules.add(RuleBuilder(read(it))) }
     }
 
     fun eval(text: String, rendered: Boolean = false): String {
         rules.forEach {
             try {
                 val evaluation = it.eval(text)
                 if (evaluation.value != Double.NaN) return if (rendered) {
-                    evaluation.rendered
+                    renderer.add("variables", evaluation.variables.map { Variable(it.key, it.value) }.toList())
+                    renderer.add("expr", evaluation.expr)
+                    renderer.add("text", text)
+                    renderer.add("value", evaluation.value)
+                    renderer.render()
                 } else {
                     evaluation.value.toString()
                 }

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

@@ -2,18 +2,14 @@ package xyz.javecs.tools.text2expr.parsers
 
 import com.atilika.kuromoji.ipadic.Token
 import com.atilika.kuromoji.ipadic.Tokenizer
-import org.stringtemplate.v4.ST
 import xyz.javecs.tools.expr.Calculator
 import xyz.javecs.tools.text2expr.utils.normalize
 
 private val tokenizer = Tokenizer()
-private val printValue = "これかな？\n<value>"
-
-data class Variable(val key:String, val value:Double)
-data class Evaluation(val value: Number = Double.NaN, val rendered: String = "")
-class RuleBuilder(source: String, template: String = printValue) {
+data class Evaluation(val value: Number = Double.NaN, val expr: List<String> = ArrayList(), val variables: Map<String, Double> = HashMap())
+class RuleBuilder(source: String) {
     private val parser = RuleParser()
-    private val renderer = ST(template)
+
     init {
         parser.visit(parser(source).text2expr())
     }
@@ -64,11 +60,7 @@ class RuleBuilder(source: String, template: String = printValue) {
         return if (matches(norm, { (key, value) -> args.add("$key = $value") })) {
             args.forEach { calc.eval(it) }
             expr().forEach { calc.eval(it) }
-            renderer.add("variables", calc.variables().map { Variable(it.key, it.value) }.toList())
-            renderer.add("expr", expr())
-            renderer.add("text", text)
-            renderer.add("value", calc.value)
-            Evaluation(calc.value, renderer.render())
+            Evaluation(calc.value, expr().toList(), calc.variables())
         } else {
             Evaluation()
         }

src/main/kotlin/xyz/javecs/tools/text2expr/parsers/RuleRenderer.kt

@@ -0,0 +1,12 @@
+package xyz.javecs.tools.text2expr.parsers
+
+import org.stringtemplate.v4.ST
+
+data class Variable(val key:String, val value:Double)
+class RuleRenderer(template: String) {
+    private val renderer = ST(template)
+    fun add(name: String, value: Any) {
+        renderer.add(name, value)
+    }
+    fun render(): String = renderer.render()
+}

src/main/kotlin/xyz/javecs/tools/text2expr/utils/Resources.kt

@@ -8,6 +8,6 @@ import kotlin.streams.toList
 
 private val reflections = Reflections(null, ResourcesScanner())
 fun read(path: String) = Resources.toString(Resources.getResource(path), Charsets.UTF_8)!!
-fun resources(prefix: String) = reflections.getResources(Pattern.compile(".+\\.txt")).stream()
+fun resources(prefix: String, extension: String = "txt") = reflections.getResources(Pattern.compile(".+\\.$extension")).stream()
         .filter { it.startsWith("$prefix/") }
         .toList()

src/test/kotlin/xyz/javecs/tools/text2expr/test/kotlin/RuleRendererTest.kt

@@ -0,0 +1,32 @@
+package xyz.javecs.tools.text2expr.test.kotlin
+
+import org.junit.Test
+import xyz.javecs.tools.text2expr.Text2Expr
+import xyz.javecs.tools.text2expr.parsers.RuleBuilder
+import xyz.javecs.tools.text2expr.parsers.RuleRenderer
+import xyz.javecs.tools.text2expr.parsers.Variable
+import xyz.javecs.tools.text2expr.utils.read
+import kotlin.test.assertEquals
+import kotlin.test.assertTrue
+
+class RuleRendererTest {
+    @Test fun renderer1() {
+        val expected = """
+            |x = 1.0
+            |y = 1.0
+            |
+            |こうだから、
+            |x+y
+            |
+            |答えは、
+            |2
+            |
+            """.trimMargin("|")
+        val template = read("test-templates/template1.st")
+        val renderer = RuleRenderer(template)
+        renderer.add("variables", listOf(Variable("x", 1.0), Variable("y", 1.0)))
+        renderer.add("expr", listOf("x+y"))
+        renderer.add("value", 2)
+        assertEquals(expected, renderer.render())
+    }
+}

src/test/resources/test-templates/template1.st

@@ -0,0 +1,11 @@
+<if(variables)>
+<variables:{v|<v.key> = <v.value>
+}>
+<endif>
+<if(expr)>
+こうだから、
+<expr:{e|<e>
+}>
+<endif>
+答えは、
+<value>