Misc cleanup and small fixes

runtime/src/main/java/dev/ionfusion/fusion/FusionSexp.java

@@ -421,46 +421,6 @@ static List<Object> unsafeSexpToJavaList(Evaluator eval, Object sexp)
     }
 
 
-    /**
-     * @param sexp must be a proper sexp; it is not type-checked!
-     */
-    static IonSexp unsafeCopyToIonSexp(Evaluator eval,
-                                       Object sexp,
-                                       ValueFactory factory,
-                                       boolean throwOnConversionFailure)
-        throws FusionException
-    {
-        BaseSexp base = (BaseSexp) sexp;
-        return base.copyToIonValue(eval, factory, throwOnConversionFailure);
-    }
-
-    /**
-     * @param sexp must be a proper sexp; it is not type-checked!
-     */
-    static IonSexp unsafeCopyToIonSexp(Evaluator eval,
-                                       Object sexp,
-                                       ValueFactory factory)
-        throws FusionException
-    {
-        BaseSexp base = (BaseSexp) sexp;
-        return base.copyToIonValue(eval, factory, true);
-    }
-
-    /**
-     * @param sexp must be a proper sexp; it is not type-checked!
-     *
-     * @return null if the sexp and its contents cannot be ionized.
-     */
-    static IonSexp unsafeCopyToIonSexpMaybe(Evaluator eval,
-                                            Object sexp,
-                                            ValueFactory factory)
-        throws FusionException
-    {
-        BaseSexp base = (BaseSexp) sexp;
-        return base.copyToIonValue(eval, factory, false);
-    }
-
-
     //========================================================================
 
 

runtime/src/main/java/dev/ionfusion/fusion/ModuleNamespace.java

@@ -431,7 +431,12 @@ Binding resolveMaybe(BaseSymbol name,
 
     //==================================================================================
 
-
+    /**
+     * For each storage slot, hold a symbol for reporting its name.
+     * These are only used for reporting forward reference errors and are not unique.
+     * From here it is attached to an expanded `module` form as a syntax property,
+     * and from there to {@link dev.ionfusion.fusion.ModuleForm.CompiledModule}.
+     */
     private final List<BaseSymbol> myDefinedNames = new ArrayList<>();
 
     private final SyntaxWrap myWrap = new ModuleWrap();
@@ -570,13 +575,14 @@ public Object doEval(Evaluator eval, Store store)
 
 
     /**
-     * A reference to a module-level variable in the lexically enclosing
-     * namespace.
+     * A reference to a module-level variable in the lexically enclosing namespace.
      */
     static final class CompiledModuleVariableReference
         implements CompiledForm
     {
         private final int              myAddress;
+
+        /** Used to make an identifier for forward-reference errors. */
         private final ResourcePosition myPosition;
 
         CompiledModuleVariableReference(int address, ResourcePosition position)

runtime/src/main/java/dev/ionfusion/fusion/NamedValue.java

@@ -14,14 +14,14 @@
 interface NamedValue <T>
 {
     /**
-     * Suggests a name for the given value, if it can accept it.
+     * Suggests a name for the given value if it can accept it.
      */
     @SuppressWarnings("unchecked")
-    static void inferObjectName(Object value, Object name)
+    static <T> void inferObjectName(Object value, T name)
     {
         if (value instanceof NamedValue)
         {
-            ((NamedValue<Object>)value).inferObjectName(name);
+            ((NamedValue<T>)value).inferObjectName(name);
         }
     }
 
@@ -35,8 +35,7 @@ default void inferObjectName(T name)
     }
 
     /**
-     * Produces a Fusion value that's the object's name for the purpose of the
-     * {@code object_name} function.
+     * Returns a Fusion value that's the result for the {@code object_name} function.
      * The result must not change between invocations.
      *
      * @return the object name. If null, {@code object_name} returns void.

runtime/src/main/java/dev/ionfusion/fusion/NamespaceStore.java

@@ -10,6 +10,9 @@ interface NamespaceStore
 {
     ModuleRegistry getRegistry();
 
+    /**
+     * Provides runtime access to module-level definitions from outside the module.
+     */
     Object lookupImport(int moduleAddress, int bindingAddress);
 
     /**

runtime/src/main/java/dev/ionfusion/fusion/ObjectNameProc.java

@@ -9,8 +9,7 @@
  * Implements {@code object_name}.
  *
  * @see NamedValue
- * @see <a href="http://tinyurl.com/object-name">Racket Reference for
- *        object-name</a>
+ * @see <a href="http://tinyurl.com/object-name">Racket Reference for object-name</a>
  */
 class ObjectNameProc
     extends Procedure1
@@ -21,7 +20,7 @@ Object doApply(Evaluator eval, Object arg)
     {
         if (arg instanceof NamedValue)
         {
-            Object o = ((NamedValue) arg).objectName();
+            Object o = ((NamedValue<?>) arg).objectName();
             if (o != null)
             {
                 return o;

runtime/src/main/java/dev/ionfusion/fusion/SyntaxSexp.java

@@ -231,7 +231,7 @@ int size(Evaluator eval)
 
 
     @Override
-    SyntaxValue get(Evaluator eval, int index)
+    SyntaxValue<?> get(Evaluator eval, int index)
         throws FusionException
     {
         return (SyntaxValue) unsafePairDot(eval, unwrap(eval), index);

runtime/src/main/java/dev/ionfusion/fusion/SyntaxValue.java

@@ -128,7 +128,10 @@ final boolean isAnyNull()
     final void write(Evaluator eval, Appendable out)
         throws IOException, FusionException
     {
-        Object content = unwrap(eval);
+        // Be careful not to propagate context here! This is called from `toString()`,
+        // which is called asynchronously by debuggers, which can cause context loss if
+        // it happens at the wrong time.
+        Object content = getContent();
 
         // When possible, only write the explicit wrapper on the outside edge.
         if (eval != null && (boolean) WRITE_EXPLICIT_SYNTAX.currentValue(eval))

runtime/src/main/java/dev/ionfusion/fusion/SyntaxWraps.java

@@ -61,7 +61,7 @@ SyntaxWraps addWraps(SyntaxWraps wraps)
         int prefixLen = wraps.myWraps.length;
         int suffixLen =  this.myWraps.length;
 
-        if (suffixLen == 0) return this; // Nothing to add
+        if (prefixLen == 0) return this; // Nothing to prepend
 
         int len = prefixLen + suffixLen;