From 72b2edcf0729b778cf4f6634122b701aee62d38f Mon Sep 17 00:00:00 2001
From: oabrivard <olivier@abrivard.fr>
Date: Fri, 28 Jun 2024 11:12:34 +0200
Subject: [PATCH] Corrected compiler warning for simple Expr visitor

---
 src/main/ExprGenerator.ws.kts      | 10 +++++-----
 src/main/fr/celticinfo/lox/Expr.kt |  2 +-
 src/main/fr/celticinfo/lox/Lox.kt  |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/ExprGenerator.ws.kts b/src/main/ExprGenerator.ws.kts
index 677965a..d3ad083 100644
--- a/src/main/ExprGenerator.ws.kts
+++ b/src/main/ExprGenerator.ws.kts
@@ -3,7 +3,7 @@ import java.util.*
 val types = listOf(
     "Binary   : Expr left, Token operator, Expr right",
     "Grouping : Expr expression",
-    "Literal  : Any value",
+    "Literal  : Any? value",
     "Unary    : Token operator, Expr right"
 )
 
@@ -32,11 +32,11 @@ for (type in types) {
     println()
     println("data class $name(")
     for (field in fields) {
-        val parts = field.split(" ")
-        val type = parts[0]
-        val name = parts[1]
+        val fparts = field.split(" ")
+        val ftype = fparts[0]
+        val fname = fparts[1]
         val sep = if (field == fields.last()) "" else ","
-        println("    val $name: $type$sep")
+        println("    val $fname: $ftype$sep")
     }
     println(") : Expr() {")
     println("    override fun <R> accept(visitor: ExprVisitor<R>): R {")
diff --git a/src/main/fr/celticinfo/lox/Expr.kt b/src/main/fr/celticinfo/lox/Expr.kt
index a3c623f..596ce3d 100644
--- a/src/main/fr/celticinfo/lox/Expr.kt
+++ b/src/main/fr/celticinfo/lox/Expr.kt
@@ -32,7 +32,7 @@ data class Grouping(
 }
 
 data class Literal(
-    val value: Any
+    val value: Any?
 ) : Expr() {
     override fun <R> accept(visitor: ExprVisitor<R>): R {
         return visitor.visitLiteral(this)
diff --git a/src/main/fr/celticinfo/lox/Lox.kt b/src/main/fr/celticinfo/lox/Lox.kt
index dd2a1f6..62b00be 100644
--- a/src/main/fr/celticinfo/lox/Lox.kt
+++ b/src/main/fr/celticinfo/lox/Lox.kt
@@ -48,7 +48,7 @@ class Lox {
             report(line, "", s)
         }
 
-        fun report(line: Int, where: String, message: String) {
+        private fun report(line: Int, where: String, message: String) {
             System.err.println("[line $line] Error$where: $message")
         }
     }