Merge pull request #28 from DanexCodr/copilot/fix-bugs-in-coderive-codebase

Fix ParamSkip-discovered runtime output bugs (float rendering + text literal tokenization)

Author: DanexCodr

.gitignore

@@ -10,3 +10,7 @@ server/build/
 !docs/assets/Coderive.jar
 !gradle/wrapper/gradle-wrapper.jar
 !source_.jar
+
+# Generated runtime artifacts
+src/main/cod/src/bin/
+src/main/cod/src/idx/

src/main/java/cod/lexer/StringLexer.java

@@ -215,9 +215,17 @@ private Token readText() {
 
         extractedStrings.add(fullText.toString());
 
-        // If no interpolations, return a simple text literal
-        if (parts.size() == 1 && parts.get(0).type == TokenType.TEXT_LIT) {
-            return Token.createTextLiteral(fullSource, startPos, length, startLine, startCol);
+        // If no interpolation expressions, return a simple text literal token.
+        // This also preserves escaped characters correctly and handles empty strings.
+        boolean hasInterpolation = false;
+        for (Token part : parts) {
+            if (part.type == TokenType.INTERPOL) {
+                hasInterpolation = true;
+                break;
+            }
+        }
+        if (!hasInterpolation) {
+            return Token.createTextLiteral(fullText.toString(), startLine, startCol);
         }
 
         return new Token(
@@ -522,4 +530,4 @@ public List<String> extractAllStrings() {
 
         return new ArrayList<String>(extractedStrings);
     }
-}
+}

src/main/java/cod/lexer/Token.java

@@ -73,26 +73,15 @@ public Token(
     public String getText() {
         if (cachedText == null && length > 0) {
             if (type == TokenType.TEXT_LIT && length >= 2) {
-                // Find where the actual content starts (skip quotes and pipes)
-                int contentStart = start;
-                int contentEnd = start + length - 1;
-                
-                // Skip leading quote characters
-                while (contentStart <= contentEnd && 
-                       (source[contentStart] == '"' || source[contentStart] == '|')) {
-                    contentStart++;
-                }
-                
-                // Skip trailing quote characters
-                while (contentEnd >= contentStart && 
-                       (source[contentEnd] == '"' || source[contentEnd] == '|')) {
-                    contentEnd--;
-                }
-                
-                if (contentStart <= contentEnd) {
-                    cachedText = new String(source, contentStart, contentEnd - contentStart + 1);
+                int end = start + length - 1;
+                if (length >= 4 &&
+                    source[start] == '|' && source[start + 1] == '"' &&
+                    source[end - 1] == '"' && source[end] == '|') {
+                    cachedText = new String(source, start + 2, length - 4);
+                } else if (source[start] == '"' && source[end] == '"') {
+                    cachedText = new String(source, start + 1, length - 2);
                 } else {
-                    cachedText = "";
+                    cachedText = new String(source, start, length);
                 }
             } else {
                 cachedText = new String(source, start, length);
@@ -290,4 +279,4 @@ public String toString() {
     public void reset() {
         cachedText = null;
     }
-}
+}

src/main/java/cod/math/AutoStackingNumber.java

@@ -2,6 +2,7 @@
 
 import java.io.Serializable;
 import java.util.Arrays;
+import java.math.BigDecimal;
 
 /**
  * Auto-stacking fixed-point number with 1-7 stacks of 64-bit words.
@@ -24,6 +25,7 @@ public class AutoStackingNumber implements Comparable<AutoStackingNumber>, Seria
     private static final int WORD_BITS = 64;
     private static final long WORD_MASK = 0xFFFFFFFFFFFFFFFFL;
     private static final long FRAC_MASK = (1L << 60) - 1;  // 60 bits of ones for fractional parts
+    private static final BigDecimal DECIMAL_COMPARISON_EPSILON = new BigDecimal("0.000000000000001");
 
     // Zero and One constants for each stack level
     private static final AutoStackingNumber[][] CONSTANTS = new AutoStackingNumber[MAX_STACKS + 1][3];
@@ -753,6 +755,30 @@ public String toString() {
                 }
                 if (allZero) break;
             }
+
+            String exact = sb.toString();
+            String pretty = Double.toString(doubleValue());
+            if (pretty.indexOf('E') >= 0 || pretty.indexOf('e') >= 0) {
+                pretty = BigDecimal.valueOf(doubleValue()).stripTrailingZeros().toPlainString();
+            }
+
+            try {
+                if (pretty.length() < exact.length()) {
+                    BigDecimal exactValue = new BigDecimal(exact);
+                    BigDecimal prettyValue = new BigDecimal(pretty);
+                    BigDecimal delta = exactValue.subtract(prettyValue).abs();
+                    BigDecimal relative = exactValue.abs().multiply(DECIMAL_COMPARISON_EPSILON);
+                    BigDecimal tolerance =
+                        relative.compareTo(DECIMAL_COMPARISON_EPSILON) > 0
+                            ? relative
+                            : DECIMAL_COMPARISON_EPSILON;
+                    if (delta.compareTo(tolerance) <= 0) {
+                        return pretty;
+                    }
+                }
+            } catch (Exception ignored) {
+                // Fallback to exact representation from internal stacks
+            }
         }
 
         return sb.toString();

src/main/java/cod/parser/ExpressionParser.java

@@ -141,11 +141,6 @@ public MethodCallNode parse() throws ParseError {
                 methodName = qualifiedNameStr.substring(qualifiedNameStr.lastIndexOf('.') + 1);
             }
 
-            // DEBUG: Only for createMessage
-            if (methodName.equals("createMessage")) {
-                System.err.println("=== DEBUG: createMessage call detected ===");
-            }
-            
             MethodCallNode call = ASTFactory.createMethodCall(methodName, qualifiedNameStr, nameStartToken);
 
             if (!qualifiedNameStr.contains(".") && globalFunctionNames != null && 
@@ -159,21 +154,6 @@ public MethodCallNode parse() throws ParseError {
                 if (isNamedArgument()) {
                     parseNamedArgumentList(call.arguments, call.argNames);
                 } else {
-                    // DEBUG: Parse the argument
-                    if (methodName.equals("createMessage")) {
-                        System.err.println("  Parsing argument for createMessage");
-                        Token argToken = now();
-                        System.err.println("  Argument token type: " + argToken.type);
-                        System.err.println("  Argument token raw slice: '" + 
-                            new String(argToken.source, argToken.start, argToken.length) + "'");
-                        System.err.println("  Argument token getText(): '" + argToken.getText() + "'");
-                        System.err.println("  Argument token start=" + argToken.start + ", length=" + argToken.length);
-                        System.err.println("  First char: '" + argToken.source[argToken.start] + 
-                            "' (" + (int)argToken.source[argToken.start] + ")");
-                        System.err.println("  Last char: '" + argToken.source[argToken.start + argToken.length - 1] + 
-                            "' (" + (int)argToken.source[argToken.start + argToken.length - 1] + ")");
-                    }
-                    
                     call.arguments.add(parseExpr());
                     call.argNames.add(null);
 
@@ -185,10 +165,6 @@ public MethodCallNode parse() throws ParseError {
             }
             expect(RPAREN);
 
-            if (methodName.equals("createMessage")) {
-                System.err.println("=== END createMessage debug ===");
-            }
-            
             return call;
         }
     });
@@ -1527,4 +1503,4 @@ private boolean isComparisonOp(Token t) {
     public GlobalRegistry getGlobalRegistry() {
         return globalRegistry;
     }
-}
+}