Merge pull request #60 from javecs/feature/variables

変数を返す関数を追加しました。

Author: javecs

build.gradle

@@ -16,7 +16,7 @@ plugins {
 }
 
 group 'xyz.javecs.tools'
-version '0.2.3'
+version '0.2.4'
 
 apply plugin: 'kotlin'
 apply plugin: 'antlr'

src/main/kotlin/xyz/javecs/tools/expr/Calculator.kt

@@ -43,6 +43,8 @@ class Calculator(expressions: Array<String> = emptyArray()) : EvalContext {
         expression = Expression()
     }
 
+    fun variables(): Map<String, Double> = variables
+
     override fun toString() = expression.toString()
     override fun isConstant(name: String) = constants.contains(name.toLowerCase())
     override fun call(name: String, args: Array<Double>) = callFunction(name, args)

src/test/kotlin/xyz/javecs/tools/expr/test/kotlin/CalculatorVariablesTest.kt

@@ -0,0 +1,18 @@
+package xyz.javecs.tools.expr.test.kotlin
+
+import kotlin.test.assertEquals
+import org.junit.Test
+import xyz.javecs.tools.expr.Calculator
+
+class CalculatorVariablesTest {
+    @Test fun calcVariables1() {
+        val calc = Calculator()
+        calc.eval("x = 3")
+        calc.eval("y = 4")
+        calc.eval("z = x * y")
+        val variables = calc.variables()
+        assertEquals(variables["x"], 3.0)
+        assertEquals(variables["y"], 4.0)
+        assertEquals(variables["z"], 12.0)
+    }
+}