Merge pull request #32 from javecs/feature/template-reply

変数を表示するテンプレートを作成しました。

Author: javecs

build.gradle

@@ -16,7 +16,7 @@ plugins {
 }
 
 group 'xyz.javecs.tools'
-version '0.1.0'
+version '0.1.1'
 
 apply plugin: 'kotlin'
 apply plugin: 'antlr'
@@ -36,10 +36,10 @@ repositories {
 
 dependencies {
     antlr "org.antlr:antlr4:$antlr_version"
-    compile "xyz.javecs.tools:expr:0.2.3"
+    compile "xyz.javecs.tools:expr:0.2.4"
     compile "com.google.guava:guava:21.0"
     compile "com.atilika.kuromoji:kuromoji-ipadic:0.9.0"
-    compile "org.antlr:stringtemplate:4.0.2"
+    compile "org.antlr:ST4:4.0.8"
     compile "org.reflections:reflections:0.9.11"
     compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version"
     testCompile 'junit:junit:4.12'

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

@@ -11,7 +11,8 @@ class Text2Expr(rulePath: String = "rules") {
     private val calc = Calculator()
 
     init {
-        resources(rulePath).forEach { rules.add(RuleBuilder(read(it))) }
+        val reply = read("templates/reply.st")
+        resources(rulePath).forEach { rules.add(RuleBuilder(read(it), reply)) }
     }
 
     fun eval(text: String, rendered: Boolean = false): String {

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

@@ -9,6 +9,7 @@ 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) {
     private val parser = RuleParser()
@@ -63,6 +64,9 @@ 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())
         } else {

src/main/resources/templates/reply.st

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

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

@@ -18,8 +18,19 @@ class Text2ExprTest {
     }
 
     @Test fun eval2() {
+        val reply = """
+            |x = 1.0
+            |y = 1.0
+            |
+            |こうだから、
+            |x+y
+            |
+            |答えは、
+            |2
+            |
+            """.trimMargin("|")
         assertEquals("2", Text2Expr().eval("1足す1"))
-        assertEquals("これかな？\n2", Text2Expr().eval("1足す1", rendered = true))
+        assertEquals(reply, Text2Expr().eval("1足す1", rendered = true))
     }
 
 }