Permalink
Browse files

entry_noindent_noeol may also contain comment_eol

  • Loading branch information...
1 parent 648f707 commit efe3230747bbcafb559dcea62f59f72f84e2751f @raphink raphink committed Nov 13, 2012
Showing with 3 additions and 1 deletion.
  1. +3 −1 bacula.aug
View
4 bacula.aug
@@ -37,13 +37,15 @@ module Bacula =
let semicolon = del /([ \t]*;)?/ ""
let eol = del /[ \t]*(;|(#[ \t]*)?\n)/ "\n"
let comment_or_eol = Util.comment_eol | eol
+ let comment_or_semicolon = Util.comment_eol | semicolon
let line (sto:lens) = [ sto . comment_or_eol ]
+ let line_noeol (sto:lens) = [ sto . comment_or_semicolon ]
let directive =
let entry = Util.empty | (indent . (line keyvalue|line include))
in let entry_noindent = line keyvalue|line include
- in let entry_noindent_noeol = ([keyvalue] | [include]) . semicolon
+ in let entry_noindent_noeol = line_noeol keyvalue | line_noeol include
in let entry_noeol = indent . entry_noindent_noeol
in [ key /[a-zA-Z]+/
. Build.block_generic

0 comments on commit efe3230

Please sign in to comment.