add ../languages/lua/library/?.pbc as first path.

This allows to : - load languages/lua/library/uuid.pbc which loads library/uuid.pbc
fperrad · Sep 21, 2009 · 0fd29ff · 0fd29ff
1 parent 16f2b05
commit 0fd29ff
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/lib/luapackage.pir b/src/lib/luapackage.pir
@@ -65,7 +65,7 @@ LIST
     _loaders[$P2] = loader_PBCroot
 
     setpath(_package, 'path', 'LUA_PATH', './?.lua')
-    setpath(_package, 'pbcpath', 'LUA_PBCPATH', 'library/?.pbc;./?.pbc;./?.pir')
+    setpath(_package, 'pbcpath', 'LUA_PBCPATH', '../languages/lua/library/?.pbc;library/?.pbc;./?.pbc;./?.pir')
 
     .local pmc _lua__REGISTRY
     _lua__REGISTRY = get_hll_global '_REGISTRY'

diff --git a/t/package.t b/t/package.t
@@ -284,7 +284,7 @@ print(type(package.pbcpath))
 print(package.pbcpath)
 CODE
 string
-library/?.pbc;./?.pbc;./?.pir
+../languages/lua/library/?.pbc;library/?.pbc;./?.pbc;./?.pir
 OUTPUT
 
 $ENV{LUA_PBCPATH} = "?.pbc";
@@ -298,7 +298,7 @@ $ENV{LUA_PBCPATH} = ";;languages/lua/?.pbc";
 language_output_is( 'lua', << 'CODE', << 'OUTPUT', 'table package.pbcpath' );
 print(package.pbcpath)
 CODE
-;library/?.pbc;./?.pbc;./?.pir;languages/lua/?.pbc
+;../languages/lua/library/?.pbc;library/?.pbc;./?.pbc;./?.pir;languages/lua/?.pbc
 OUTPUT
 
 delete $ENV{LUA_PBCPATH};