From: Fabien Fleutot <fabien@MacFabien.home>
Date: Thu, 25 Dec 2008 13:30:55 +0000 (+0100)
Subject: fixes in extension libs
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=fe5695fa75b34e031fb4708093d249d9a961cc4d;p=metalua.git

fixes in extension libs
---

diff --git a/src/lib/metalua/extension/H.mlua b/src/lib/metalua/extension/H.mlua
index 2012a12..4f0ac41 100644
--- 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 4b27412..7c7e4d8 100644
--- 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 a66be16..1d39565 100644
--- 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 dc1e08f..9ec254e 100644
--- 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 ec70abf..4de5f18 100644
--- 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)