From 1633cca07a4ab80f301c083a366de5cc9ff1bf11 Mon Sep 17 00:00:00 2001
From: gnembon <gnembonmc@gmail.com>
Date: Wed, 5 May 2021 01:23:17 -0300
Subject: [PATCH] better reporting

---
 src/main/java/carpet/script/CarpetScriptHost.java | 10 +---------
 src/main/java/carpet/script/Expression.java       |  4 ++--
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/main/java/carpet/script/CarpetScriptHost.java b/src/main/java/carpet/script/CarpetScriptHost.java
index 3f002753..a4233666 100644
--- a/src/main/java/carpet/script/CarpetScriptHost.java
+++ b/src/main/java/carpet/script/CarpetScriptHost.java
@@ -1004,15 +1004,7 @@ public class CarpetScriptHost extends ScriptHost
                 return null;
             }
 
-            String shebang = message;
-            if (expr.module != null)
-            {
-                shebang += " in " + expr.module.getName() + "";
-            }
-            else
-            {
-                shebang += " in system chat";
-            }
+            String shebang = message+" in "+expr.getModuleName();
             if (token != null)
             {
                 String[] lines = expr.getCodeString().split("\n");
diff --git a/src/main/java/carpet/script/Expression.java b/src/main/java/carpet/script/Expression.java
index 9b2c1424..2f33ecc2 100644
--- a/src/main/java/carpet/script/Expression.java
+++ b/src/main/java/carpet/script/Expression.java
@@ -66,7 +66,7 @@ public class Expression
 
     public String getModuleName()
     {
-        return module == null?null:module.getName();
+        return module == null?"system chat":module.getName();
     }
 
     public void asATextSource()
@@ -1072,7 +1072,7 @@ public class Expression
         if (!CarpetSettings.scriptsOptimization)
             return root.op;
 
-        CarpetScriptServer.LOG.info("Input code size: " + treeSize(root) + " nodes, " + treeDepth(root) + " deep");
+        CarpetScriptServer.LOG.info("Input code size for "+getModuleName()+": " + treeSize(root) + " nodes, " + treeDepth(root) + " deep");
 
         boolean changed = true;
         while(changed) {