Merge pull request #44 from javecs/feature/visibility-internal

公開しないモジュールを隠しました。

Author: javecs

build.gradle

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

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

@@ -1,6 +1,6 @@
 package xyz.javecs.tools.expr
 
-interface EvalContext {
+internal interface EvalContext {
     fun getSymbol(name: String): Double
     fun putSymbol(name:String, value: Double)
 }

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

@@ -3,7 +3,7 @@ package xyz.javecs.tools.expr
 import xyz.javecs.tools.expr.parser.ExprBaseVisitor
 import xyz.javecs.tools.expr.parser.ExprParser
 
-class EvalVisitor(val context: EvalContext) : ExprBaseVisitor<Expression>() {
+internal class EvalVisitor(val context: EvalContext) : ExprBaseVisitor<Expression>() {
     override fun visitParens(ctx: ExprParser.ParensContext?) = visit(ctx!!.expr())!!
     override fun visitNumber(ctx: ExprParser.NumberContext?) = Expression(ctx!!.NUMBER().text.toDouble())
     override fun visitAdd(ctx: ExprParser.AddContext?) = Expression(visit(ctx!!.expr(0)).value + visit(ctx.expr(1)).value)

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

@@ -7,14 +7,14 @@ import org.antlr.v4.runtime.CommonTokenStream
 import xyz.javecs.tools.expr.parser.ExprLexer
 import xyz.javecs.tools.expr.parser.ExprParser
 
-fun parser(expr: String): ExprParser {
+internal fun parser(expr: String): ExprParser {
     val input = ANTLRInputStream(expr.byteInputStream())
     val lexer = ExprLexer(input)
     val tokens = CommonTokenStream(lexer)
     return ExprParser(tokens)
 }
 
-fun parserTree(expr: String): String {
+internal fun parserTree(expr: String): String {
     val parser = parser(expr)
     val tree = parser.start()
     return tree.toStringTree(parser)

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

@@ -1,16 +1,12 @@
 package xyz.javecs.tools.expr
 
-class Expression(var value: Double = Double.NaN, var expr: String = "", var id: String = "") {
-    fun getValue(): Number {
-        return if (value == Math.floor(value)) {
-            when {
-                value < Int.MAX_VALUE -> value.toInt()
-                else -> value.toLong()
-            }
-        } else value
-    }
+internal class Expression(var value: Double = Double.NaN, var expr: String = "", var id: String = "") {
+    fun getValue(): Number = if (value == Math.floor(value)) {
+        when {
+            value < Int.MAX_VALUE -> value.toInt()
+            else -> value.toLong()
+        }
+    } else value
 
-    override fun toString(): String {
-        return if (id.isEmpty()) getValue().toString() else "$id = ${getValue()}"
-    }
+    override fun toString(): String = if (id.isEmpty()) getValue().toString() else "$id = ${getValue()}"
 }