@@ -7,7 +7,7 @@

[userv.git] / lexer.l.m4

diff --git a/lexer.l.m4 b/lexer.l.m4
index c55c2e26495dec3ae05f6a1b1aec1f0223b1824b..22ad0e0ead615ba0f4becb522d88a60c8e655b74 100644 (file)
--- a/lexer.l.m4
+++ b/lexer.l.m4
@@ -42,6 +42,7 @@ include(language.i4)
 #include "common.h"
 #include "daemon.h"
 #include "lib.h"
+#include "both.h"
 #include "tokens.h"
 
 #define HYPHEN '-'
@@ -171,7 +172,8 @@ changequote({*,*})
                          lr_max=-1;
                          return tokv_fdstoend;
                        }
-[\ \t]+                        return tokv_lwsp;
+([\ \t]*\\[\ \t]*\n[\ \t]*)+   return tokv_lwsp;
+[\ \t]+                                return tokv_lwsp;
 [\ \t]*\n              cstate->lineno++; return tokv_newline;
 [\ \t]*\#[^\n]*\n      cstate->lineno++; return tokv_newline;
 [\ \t]*\#[^\n]*                {
@@ -185,7 +187,7 @@ changequote({*,*})
                          parseerrprint("misquoted or unterminated string");
                          return tokv_error;
                        }
-[^\ \t\n]+             return tokv_barestring;
+[^\ \t\n\\]+           return tokv_barestring;
 <<EOF>>                        return tokv_eof;
 *}
 changequote(`,')