fixed xmatch extension

[metalua.git] / src / lib / metalua / extension / xmatch.mlua

diff --git a/src/lib/metalua/extension/xmatch.mlua b/src/lib/metalua/extension/xmatch.mlua
index ce2e204f5760059926abfe509d25635deff6fca3..29dccd87ab5cb3473e69bb7085029e0163c21e1f 100644 (file)
--- a/src/lib/metalua/extension/xmatch.mlua
+++ b/src/lib/metalua/extension/xmatch.mlua
@@ -1,9 +1,15 @@
+
 require 'metalua.extension.match'
+
 module ('spmatch', package.seeall)
+
+require 'metalua.walk.id'
+
 -{extension 'log'}
 
 ----------------------------------------------------------------------
--- Back-end for "match function ..." and "local match function..."
+-- Back-end for statements
+-- "match function ..." and "local match function...".
 -- Tag must be either "Localrec" or "Set".
 ----------------------------------------------------------------------
 named_match_function_builder = |tag| function (x)
@@ -34,7 +40,7 @@ mlp.stat:add{ 'match',
       ----------------------------------------------------------------
       { 'function', mlp.expr, gg.optkeyword '|',
          match_cases_list_parser, 'end',
-         builder = match_function_builder 'Set' },
+         builder = named_match_function_builder 'Set' },
 
       ----------------------------------------------------------------
       -- Reintroduce the original match statement:
@@ -51,7 +57,7 @@ mlp.stat:add{ 'match',
 mlp.stat:get'local'[2]:add{
    'match', 'function', mlp.expr, gg.optkeyword '|',
    match_cases_list_parser, 'end',
-   builder = match_function_builder 'Localrec' }
+   builder = named_match_function_builder 'Localrec' }
 
 ----------------------------------------------------------------------
 -- "match...with" expressions and "match function..."
@@ -103,8 +109,6 @@ mlp.expr:add{ 'match', builder = |x| x[1], gg.multisequence{
             return `Stat{ { `Local{{v}}; m }, v }
          end } } }
 
-require 'walk.id'
-
 function bind (x)
    local patterns, values = unpack(x)