fixes in extension libs

diff --git a/src/lib/metalua/extension/H.mlua b/src/lib/metalua/extension/H.mlua
index 2012a1261d16755843b46d1d26fb26c5cc9f5939..4f0ac41bda14a6927412f5fb44e8cf78132fdd98 100644 (file)
--- a/src/lib/metalua/extension/H.mlua
+++ b/src/lib/metalua/extension/H.mlua
@@ -1,5 +1,5 @@
 require 'metalua.walk.id'
--{extension 'log'}
+-{ extension 'log' }
 
 mlp.expr.prefix:add{ '!', prec = 5,
    builder = function(_,x)
@@ -17,6 +17,6 @@ mlp.stat:add{ '!', mlp.expr, builder = |x| +{stat: (-{x[1]}).h_boundary=true } }
 --       then 2nd pass only touched those which have a splice
 --       in them.
 
+return +{ require (-{ `String{ package.metalua_extension_prefix .. 'H-runtime' } }) }
 
-+{ require -{ `String{ package.metalua_extension_prefix .. 'H-runtime' } } }
 

diff --git a/src/lib/metalua/extension/trycatch.mlua b/src/lib/metalua/extension/trycatch.mlua
index 4b27412126b57fde2e22c1aa038506cf06c0f912..7c7e4d8e4c60c3805183c2af5fe2b4eff78fa8bb 100644 (file)
--- a/src/lib/metalua/extension/trycatch.mlua
+++ b/src/lib/metalua/extension/trycatch.mlua
@@ -18,7 +18,7 @@ local match_alpha = require 'extension.match'
 local H = H:new{side='inside', alpha = match_alpha }
 
 -- We'll need to track rogue return statements:
-require 'walk'
+require 'metalua.walk'
 
 -- Put a block AST into a pcall():
 local mkpcall = |block| +{pcall(function() -{block} end)}

diff --git a/src/lib/metalua/extension/types.mlua b/src/lib/metalua/extension/types.mlua
index a66be16106a27b986fc88d0e1e02635cf23b3414..1d39565c2a7791be282a1ff06cf1761d9a873119 100644 (file)
--- a/src/lib/metalua/extension/types.mlua
+++ b/src/lib/metalua/extension/types.mlua
@@ -348,4 +348,4 @@ mlp.stat:add{ "newtype", mlp.expr, "=", mlp.expr, builder = newtype_builder }
 --------------------------------------------------------------------------
 --mlp.expr.infix:add{ "::", prec=100, builder = |a, _, b| insert_test(a,b) }
 
-+{ require -{ `String{ package.metalua_extension_prefix .. 'types-runtime' } } }
++{ require (-{ `String{ package.metalua_extension_prefix .. 'types-runtime' } }) }

diff --git a/src/lib/metalua/extension/xglobal.mlua b/src/lib/metalua/extension/xglobal.mlua
index dc1e08f627b6ffc735a5cf63caa1e1bc2a8e7e7d..9ec254e03c45ac528a32600296122e90051ecb01 100644 (file)
--- a/src/lib/metalua/extension/xglobal.mlua
+++ b/src/lib/metalua/extension/xglobal.mlua
@@ -17,4 +17,4 @@ mlp.lexer:add 'global'
 mlp.stat:add{ 'global', mlp.id_list, gg.onkeyword{ '=', mlp.expr_list },
    builder = decl_builder }
 
-+{ require -{ `String{ package.metalua_extension_prefix .. 'xglobal-runtime' } } }
++{ require (-{ `String{ package.metalua_extension_prefix .. 'xglobal-runtime' } }) }

diff --git a/src/lib/metalua/walk/id.mlua b/src/lib/metalua/walk/id.mlua
index ec70abf54f0db53d8a44da5028ef436d155422b5..4de5f18228efa7aa9976ceaf57b4d5ee7ec9ad6e 100644 (file)
--- a/src/lib/metalua/walk/id.mlua
+++ b/src/lib/metalua/walk/id.mlua
@@ -46,8 +46,8 @@
 -{ extension 'match' }
 -{ extension 'log' }
 
-require 'walk'
-require 'walk.scope'
+require 'metalua.walk'
+require 'metalua.walk.scope'
 
 -- variable lists auto-create empty list as values by default.
 local varlist_mt = { __index = function (self, key)