add capability to load folder/object.pd_lua with same names

pd.lua

@@ -410,7 +410,7 @@ function luax:initialize(sel, atoms)          -- motivation: pd-list 2007-09-23
     end
     self._scriptname = pathname .. '/' .. basename(atoms[1]) .. ".pd_luax" -- mrpeach 20120201
     local atomstail = { }          -- munge for better lua<->luax compatibility
-    for i,_ in ipairs(atoms) do                  
+    for i,_ in ipairs(atoms) do
       if i > 1 then
         atomstail[i-1] = atoms[i]
       end

pdlua.c

@@ -495,7 +495,7 @@ static t_pdlua *pdlua_new
             load_path_save = luaL_ref(__L, LUA_REGISTRYINDEX);
             lua_pushstring(__L, buf);
             lua_setfield(__L, -2, "_loadpath");
-            
+
             PDLUA_DEBUG("pdlua_new (basename load) path is %s", buf);
             //pdlua_setpathname(o, buf);/* change the scriptname to include its path 
             pdlua_setrequirepath(__L, buf);
@@ -603,15 +603,15 @@ static void pdlua_stack_dump (lua_State *L)
             case LUA_TSTRING:  /* strings */
                 printf("`%s'", lua_tostring(L, i));
                 break;
-    
+
             case LUA_TBOOLEAN:  /* booleans */
                 printf(lua_toboolean(L, i) ? "true" : "false");
                 break;
-    
+
             case LUA_TNUMBER:  /* numbers */
                 printf("%g", lua_tonumber(L, i));
                 break;
-    
+
             default:  /* other values */
                 printf("%s", lua_typename(L, t));
                 break;
@@ -1844,21 +1844,38 @@ static int pdlua_loader_pathwise
     const char  *path /**< The directory to search for the script */
 )
 {
-    char                dirbuf[MAXPDSTRING];
+    char                dirbuf[MAXPDSTRING], filename[MAXPDSTRING];
     char                *ptr;
+    const char          *classname;
     int                 fd;
 
     if(!path)
     {
       /* we already tried all paths, so skip this */
       return 0;
     }
+    if ((classname = strrchr(objectname, '/')))
+        classname++;
+    else classname = objectname;
     /* ag: Try loading <path>/<classname>.pd_lua (experimental).
        sys_trytoopenone will correctly find the file in a subdirectory if a
        path is given, and it will then return that subdir in dirbuf. */
-    fd = sys_trytoopenone(path, objectname, ".pd_lua",
-      dirbuf, &ptr, MAXPDSTRING, 1);
-    return pdlua_loader_wrappath(fd, objectname, dirbuf);
+    if ((fd = sys_trytoopenone(path, objectname, ".pd_lua",
+        dirbuf, &ptr, MAXPDSTRING, 1)) >= 0)
+        if(pdlua_loader_wrappath(fd, objectname, dirbuf))
+            return 1;
+
+    /* next try (objectname)/(classname).(sys_dllextent) ... */
+    strncpy(filename, objectname, MAXPDSTRING);
+    filename[MAXPDSTRING-2] = 0;
+    strcat(filename, "/");
+    strncat(filename, classname, MAXPDSTRING-strlen(filename));
+    filename[MAXPDSTRING-1] = 0;
+    if ((fd = sys_trytoopenone(path, filename, ".pd_lua",
+        dirbuf, &ptr, MAXPDSTRING, 1)) >= 0)
+        if(pdlua_loader_wrappath(fd, objectname, dirbuf))
+            return 1;
+    return 0;
 }
 
 
@@ -2007,15 +2024,15 @@ void pdlua_setup(void)
         else
         {
             int maj=0,min=0,bug=0;
-	    sys_getversion(&maj,&min,&bug);
-	    if((maj==0) && (min<47))
-	      /* before Pd<0.47, the loaders had to iterate over each path themselves */
-	      sys_register_loader((loader_t)pdlua_loader_legacy);
-	    else
-	      /* since Pd>=0.47, Pd tries the loaders for each path */
-	      sys_register_loader((loader_t)pdlua_loader_pathwise);
+            sys_getversion(&maj,&min,&bug);
+            if((maj==0) && (min<47))
+            /* before Pd<0.47, the loaders had to iterate over each path themselves */
+            sys_register_loader((loader_t)pdlua_loader_legacy);
+            else
+            /* since Pd>=0.47, Pd tries the loaders for each path */
+            sys_register_loader((loader_t)pdlua_loader_pathwise);
         }
-	close(fd);
+        close(fd);
     }
     else
     {