fix stacktrace & misc tests

src/ast.c

@@ -228,7 +228,7 @@ static value_t fl_current_module_counter(fl_context_t *fl_ctx, value_t *args, ui
     }
     // Create the string
     char buf[(funcname != NULL ? strlen(funcname) : 0) + 20];
-    if (funcname != NULL && funcname[0] != '#') {
+    if (funcname != NULL && funcname[0] != '#' && !isdigit(funcname[strlen(funcname)-1])) {
         uint32_t nxt;
         uv_mutex_lock(&counter_table_lock);
         // try to find the module name in the counter table, if it's not create a symbol table for it
@@ -250,7 +250,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));
         uv_mutex_unlock(&counter_table_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

@@ -36,7 +36,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]) || is_anonfn_typename(n))
+    if (is10digit(n[1]) || (end != n && is10digit(end[-1])))
         return _jl_symbol(n, len+1);
     return _jl_symbol(&n[1], len);
 }