Merge pull request #30 from javecs/feature/string-template

StringTemplateを使って、結果を表示しました。

Author: javecs

build.gradle

@@ -16,7 +16,7 @@ plugins {
 }
 
 group 'xyz.javecs.tools'
-version '0.0.10'
+version '0.1.0'
 
 apply plugin: 'kotlin'
 apply plugin: 'antlr'
@@ -39,6 +39,7 @@ dependencies {
     compile "xyz.javecs.tools:expr:0.2.3"
     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.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

@@ -14,11 +14,15 @@ class Text2Expr(rulePath: String = "rules") {
         resources(rulePath).forEach { rules.add(RuleBuilder(read(it))) }
     }
 
-    fun eval(text: String): String {
+    fun eval(text: String, rendered: Boolean = false): String {
         rules.forEach {
             try {
                 val evaluation = it.eval(text)
-                if (evaluation.value != Double.NaN) return evaluation.value.toString()
+                if (evaluation.value != Double.NaN) return if (rendered) {
+                    evaluation.rendered
+                } else {
+                    evaluation.value.toString()
+                }
             } catch (e: Exception) {
             }
         }

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

@@ -2,15 +2,17 @@ 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 Evaluation(val value: Number = Double.NaN)
-class RuleBuilder(source: String) {
+data class Evaluation(val value: Number = Double.NaN, val rendered: String = "")
+class RuleBuilder(source: String, template: String = printValue) {
     private val parser = RuleParser()
-
+    private val renderer = ST(template)
     init {
         parser.visit(parser(source).text2expr())
     }
@@ -61,9 +63,11 @@ class RuleBuilder(source: String) {
         return if (matches(norm, { (key, value) -> args.add("$key = $value") })) {
             args.forEach { calc.eval(it) }
             expr().forEach { calc.eval(it) }
-            Evaluation(calc.value)
+            renderer.add("value", calc.value)
+            Evaluation(calc.value, renderer.render())
         } else {
             Evaluation()
         }
     }
+
 }

src/test/java/xyz/javecs/tools/text2expr/test/java/Text2ExprTest.java

@@ -8,7 +8,7 @@ public class Text2ExprTest {
     @Test
     public void testExpr() {
         Text2Expr text2Expr = new Text2Expr();
-        Assert.assertEquals("5", text2Expr.eval("3+2"));
+        Assert.assertEquals("5", text2Expr.eval("3+2", false));
     }
 
 }

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

@@ -17,4 +17,9 @@ class Text2ExprTest {
         assertEquals("1", Text2Expr().eval("1"))
     }
 
+    @Test fun eval2() {
+        assertEquals("2", Text2Expr().eval("1足す1"))
+        assertEquals("これかな？\n2", Text2Expr().eval("1足す1", rendered = true))
+    }
+
 }