[augeas-devel] [PATCH 1 of 2] Allow the entry keyword regexp to be passed as parameter by modules making os of spacevars.aug, modified ldap.aug accordingly

[Free Ekanayaka]

# HG changeset patch
# User Free Ekanayaka <free at 64studio.com>
# Date 1220361346 -7200
# Node ID bc15db596f09c3e7317792ba91c924c57679b173
# Parent  08b746ffd79b7ba7b247dc138481b3c7fb279944
Allow the entry keyword regexp to be passed as parameter by modules making os of spacevars.aug, modified ldap.aug accordingly

diff -r 08b746ffd79b -r bc15db596f09 lenses/ldap.aug
--- a/lenses/ldap.aug	Sat Aug 30 13:02:36 2008 +0200
+++ b/lenses/ldap.aug	Tue Sep 02 15:15:46 2008 +0200
@@ -5,10 +5,12 @@ module Ldap =
 module Ldap =
   autoload xfm
 
+  (* plain spacevars lens *)
+  let entry = Spacevars.entry Spacevars.entry_re
+  let lns   = Spacevars.lns entry
+
   let filter = Util.stdexcl .
       incl "/etc/ldap.conf" .
       incl "/etc/ldap/ldap.conf"
 
-  let lns = Spacevars.lns
-
   let xfm = transform lns filter
diff -r 08b746ffd79b -r bc15db596f09 lenses/spacevars.aug
--- a/lenses/spacevars.aug	Sat Aug 30 13:02:36 2008 +0200
+++ b/lenses/spacevars.aug	Tue Sep 02 15:15:46 2008 +0200
@@ -18,16 +18,19 @@ let comment = Util.comment
 let comment = Util.comment
 let empty   = Util.empty
 
+let sto_to_eol = store /([^ \t\n].*[^ \t\n]|[^ \t\n])/
+
 (************************************************************************
  *                               ENTRIES
  *************************************************************************)
 
-let keyword = key /[A-Za-z0-9\._-]+(\[[0-9]+\])?/
-let value   = store /([^ \t\n].*[^ \t\n]|[^ \t\n])/
-let entry   = [ keyword . spc . value . eol ]
+
+let entry (kw:regexp)
+               = [ key kw . spc . sto_to_eol . eol ]
+let entry_re   = /[A-Za-z0-9\._-]+(\[[0-9]+\])?/
 
 (************************************************************************
  *                                LENS
  *************************************************************************)
 
-let lns     = (comment|empty|entry) *
+let lns (entry:lens) = (comment|empty|entry) *