Newresolver

src/builtin/builtin.c

@@ -17,6 +17,8 @@
 #include "sparse.h"
 #include "geometry.h"
 
+extern objecttypedefn objectmetafunctiondefn;
+
 /* **********************************************************************
  * Global data
  * ********************************************************************** */
@@ -52,7 +54,7 @@ void builtin_init(objectbuiltinfunction *func) {
 
 /** Clear an objectbuiltinfunction */
 void builtin_clear(objectbuiltinfunction *func) {
-    morpho_freeobject(func->name);
+    if (MORPHO_ISOBJECT(func->name)) object_freeifunmanaged(MORPHO_GETOBJECT(func->name));
     signature_clear(&func->sig);
 }
 
@@ -126,15 +128,6 @@ bool builtin_options(vm *v, int nargs, value *args, int *nfixed, int noptions, .
     return true;
 }
 
-/** Tests whether an object is callable */
-bool builtin_iscallable(value val) {
-    return (MORPHO_ISOBJECT(val) && (MORPHO_ISFUNCTION(val) ||
-                                     MORPHO_ISCLOSURE(val) ||
-                                     MORPHO_ISINVOCATION(val) ||
-                                     MORPHO_ISBUILTINFUNCTION(val) ||
-                                     MORPHO_ISMETAFUNCTION(val)));
-}
-
 /* **********************************************************************
  * object_builtinfunction definition
  * ********************************************************************** */
@@ -294,10 +287,16 @@ bool morpho_addfunction(char *name, char *signature, builtinfunction func, built
     new->flags=flags;
 
     new->name=object_stringfromcstring(name, strlen(name));
-    if (!name) goto morpho_addfunction_cleanup;
+    if (!MORPHO_ISSTRING(new->name)) goto morpho_addfunction_cleanup;
 
     // Parse function signature if provided
     if (signature) builtin_addparsesignature(signature, &new->sig);
+
+    value selector = dictionary_intern(&builtin_symboltable, new->name);
+    if (MORPHO_ISNIL(selector)) goto morpho_addfunction_cleanup;
+    if (!MORPHO_ISSAME(selector, new->name)) morpho_freeobject(new->name);
+    new->name=selector;
+    builtin_bindobject(MORPHO_GETOBJECT(selector));
 
     value newfn = MORPHO_OBJECT(new);
 
@@ -313,7 +312,6 @@ bool morpho_addfunction(char *name, char *signature, builtinfunction func, built
 
 morpho_addfunction_cleanup:
     if (new) {
-        builtin_clear(new);
         object_free((object *) new);
     }
 
@@ -369,10 +367,19 @@ bool morpho_addclass(char *name, builtinclassentry desc[], int nparents, value *
             newmethod->function=desc[i].function;
             newmethod->klass=new;
             newmethod->name=object_stringfromcstring(desc[i].name, strlen(desc[i].name));
+            if (!MORPHO_ISSTRING(newmethod->name)) { success=false; break; }
             newmethod->flags=desc[i].flags;
             if (desc[i].signature) builtin_addparsesignature(desc[i].signature, &newmethod->sig);
 
-            dictionary_intern(&builtin_symboltable, newmethod->name);
+            value selector = dictionary_intern(&builtin_symboltable, newmethod->name);
+            if (MORPHO_ISNIL(selector)) {
+                object_free((object *) newmethod);
+                success=false;
+                break;
+            }
+            if (!MORPHO_ISSAME(selector, newmethod->name)) morpho_freeobject(newmethod->name);
+            newmethod->name=selector;
+            builtin_bindobject(MORPHO_GETOBJECT(selector));
             value method = MORPHO_OBJECT(newmethod);
 
             builtin_bindobject((object *) newmethod);
@@ -456,6 +463,7 @@ void builtin_initialize(void) {
     objectclasstype=object_addtype(&objectclassdefn);
     objectstringtype=object_addtype(&objectstringdefn);
     objectbuiltinfunctiontype=object_addtype(&objectbuiltinfunctiondefn);
+    objectmetafunctiontype=object_addtype(&objectmetafunctiondefn);
 
     varray__sigparseinit(&sigparseworklist);
 
@@ -514,7 +522,7 @@ void builtin_initialize(void) {
         UNREACHABLE("Unable to finalize builtin metafunctions.");
     }
     error_clear(&err);
-
+    
     morpho_addfinalizefn(builtin_finalize);
 }
 

src/builtin/builtin.h

@@ -26,13 +26,34 @@ bool builtin_parsesignatures(void);
 /** Flags that describe properties of the built in function */
 typedef unsigned int builtinfunctionflags;
 
-#define BUILTIN_FLAGSEMPTY    0
-
-#define MORPHO_FN_FLAGSEMPTY  (0)
-#define MORPHO_FN_PUREFN      (1<<1)  // Pure function: no side effects
-#define MORPHO_FN_CONSTRUCTOR (1<<2)  // Constructor function
-#define MORPHO_FN_REENTRANT   (1<<3)  // Function that re-enters the vm, e.g. but using morph_call
-#define MORPHO_FN_OPTARGS     (1<<4)  // Function that has optional arguments
+/* Annotation policy:
+ * - MORPHO_FN_FLAGSEMPTY means unknown or legacy-unreviewed; optimizers should stay conservative.
+ * - MORPHO_FN_NONE means the function has been reviewed and has no special semantic annotation.
+ * - MORPHO_FN_PUREFN means pure on normal return: deterministic for constant inputs with no mutation,
+ *   I/O, VM re-entry, thread-local dependence, or multithreaded execution.
+ * - Functions that allocate returned objects should generally carry MORPHO_FN_ALLOCATES|MORPHO_FN_THROWS,
+ *   because object construction / wrap-and-bind may fail.
+ * - MORPHO_FN_MUTATES is reserved for externally observable mutation, not internal caching.
+ * - MORPHO_FN_IO includes reads from process, filesystem, or platform state.
+ * - MORPHO_FN_NONDETERMINISTIC is reserved for genuinely unstable results such as RNG-like behavior.
+ */
+
+#define MORPHO_FN_FLAGSEMPTY  (0)       // Unknown or legacy-unreviewed flags: optimizer should assume any annotation may apply
+#define MORPHO_FN_NONE        (1<<0)    // Function has been reviewed and has no special semantic annotations
+
+#define BUILTIN_FLAGSEMPTY    MORPHO_FN_FLAGSEMPTY
+
+#define MORPHO_FN_PUREFN      (1<<1)    // Pure on normal return: deterministic for constant inputs, no mutation, I/O or re-entry
+#define MORPHO_FN_CONSTRUCTOR (1<<2)    // Constructor function
+#define MORPHO_FN_REENTRANT   (1<<3)    // Function that re-enters the vm, e.g. by using morpho_call
+#define MORPHO_FN_OPTARGS     (1<<4)    // Function reads VM optional/named arguments
+#define MORPHO_FN_THROWS      (1<<5)    // Function may raise a runtime error
+#define MORPHO_FN_ALLOCATES   (1<<6)    // Function may allocate and return/bind new objects
+#define MORPHO_FN_MUTATES     (1<<7)    // Function may mutate receiver, arguments, or runtime-visible state
+#define MORPHO_FN_IO          (1<<8)    // Function performs externally observable I/O or system interaction
+#define MORPHO_FN_NONDETERMINISTIC (1<<9) // Function may return different results for the same inputs
+#define MORPHO_FN_THREADLOCAL (1<<10)   // Function depends on or mutates VM thread-local state
+#define MORPHO_FN_MULTITHREADED (1<<11) // Function may execute work across multiple threads
 
 /** Type of C function that implements a built in Morpho function */
 typedef value (*builtinfunction) (vm *v, int nargs, value *args);
@@ -139,8 +160,6 @@ value builtin_internsymbolascstring(char *symbol);
 bool builtin_checksymbol(value symbol);
 
 bool builtin_options(vm *v, int nargs, value *args, int *nfixed, int noptions, ...);
-bool builtin_iscallable(value val);
-
 bool builtin_enumerateloop(vm *v, value obj, builtin_loopfunction fn, void *ref);
 
 /* -------------------------------------------------------