changing naming scheme to avoid angled brackets

Author: d-netto

src/ast.c

@@ -215,14 +215,12 @@ static value_t fl_current_module_counter(fl_context_t *fl_ctx, value_t *args, ui
     jl_ast_context_t *ctx = jl_ast_ctx(fl_ctx);
     jl_module_t *m = ctx->module;
     assert(m != NULL);
-    // Create a string of the form <$outermost_func_name>$counter
     // Get the outermost function name from the `parsed_method_stack` top
     char *funcname = NULL;
     value_t funcname_v = parsed_method_stack.len > 0 ? (value_t)parsed_method_stack.items[0] : fl_ctx->NIL;
     if (funcname_v != fl_ctx->NIL) {
         funcname = symbol_name(fl_ctx, funcname_v);
     }
-    // Create the string
     char buf[(funcname != NULL ? strlen(funcname) : 0) + 20];
     if (funcname != NULL && funcname[0] != '#') {
         uint32_t nxt;
@@ -242,7 +240,7 @@ static value_t fl_current_module_counter(fl_context_t *fl_ctx, value_t *args, ui
         // to avoid the counter being 0 or 1, which are reserved
         ptrhash_put(mod_table, funcname, (void*)(uintptr_t)((nxt + 1) << 2 | 3));
         jl_mutex_unlock_nogc(&m->lock);
-        snprintf(buf, sizeof(buf), "<%s>%d", funcname, nxt);
+        snprintf(buf, sizeof(buf), "%s_%d", funcname, nxt);
     }
     else {
         snprintf(buf, sizeof(buf), "%d", jl_module_next_counter(ctx->module));

src/datatype.c

@@ -25,6 +25,50 @@ static int is10digit(char c) JL_NOTSAFEPOINT
     return (c >= '0' && c <= '9');
 }
 
+// return whether this is a canonicalized anonymous function name
+// we will basically check if the name starts with `#` and the first character after `#` is a digit
+// or is of the form `#f_...#f..._` where the two `f`s are the same and the ... are digits
+static int is_canonicalized_anonfn_typename(char *name) JL_NOTSAFEPOINT
+{
+    assert(strlen(name) > 1);
+    assert(name[0] == '#');
+    // first character after '#' is a digit: canonicalized anonymous function name
+    if (is10digit(name[1])) {
+        return 1;
+    }
+    char *outermost_func_name2 = NULL;
+    // go backwards from name + strlen(name) to find the first `_`
+    for (char *c = name + strlen(name); c > name; c--) {
+        if (*c == '_') {
+            outermost_func_name2 = c;
+            break;
+        }
+    }
+    if (outermost_func_name2 == NULL) {
+        return 0;
+    }
+    char *end = strrchr(name, '#');
+    char *outermost_func_name = NULL;
+    // go backwards from end to find the first `_`
+    for (char *c = end; c > name; c--) {
+        if (*c == '_') {
+            outermost_func_name = c;
+            break;
+        }
+    }
+    if (outermost_func_name == NULL) {
+        return 0;
+    }
+    char *s1 = name;
+    char *s2 = end;
+    for (; s1 < outermost_func_name && s2 < outermost_func_name2; s1++, s2++) {
+        if (*s1 != *s2) {
+            return 0;
+        }
+    }
+    return 1;
+}
+
 static jl_sym_t *jl_demangle_typename(jl_sym_t *s) JL_NOTSAFEPOINT
 {
     char *n = jl_symbol_name(s);
@@ -36,7 +80,7 @@ static jl_sym_t *jl_demangle_typename(jl_sym_t *s) JL_NOTSAFEPOINT
         len = strlen(n) - 1;
     else
         len = (end-n) - 1;  // extract `f` from `#f#...`
-    if (is10digit(n[1]) || n[1] == '<') {
+    if (is_canonicalized_anonfn_typename(n)) {
         return _jl_symbol(n, len+1);
     }
     return _jl_symbol(&n[1], len);