X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=userv.git;a=blobdiff_plain;f=lexer.l.m4;h=22ad0e0ead615ba0f4becb522d88a60c8e655b74;hp=20a5e9f44698a9cc7a91fa5710dc5172f2eefce9;hb=f01eaa6588a9dc2673bd35d1c1be043976b9c09a;hpb=26cf1562f35e53b9c54be0887650feef48550343 diff --git a/lexer.l.m4 b/lexer.l.m4 index 20a5e9f..22ad0e0 100644 --- a/lexer.l.m4 +++ b/lexer.l.m4 @@ -1,7 +1,7 @@ dnl userv - lexer.l.m4 dnl lexer, passed through m4 with defs from langauge.i4 /* - * Copyright (C)1996-1997,9 Ian Jackson + * Copyright (C)1996-1997,1999 Ian Jackson * * This is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by @@ -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,11 +187,16 @@ changequote({*,*}) parseerrprint("misquoted or unterminated string"); return tokv_error; } -[^\ \t\n]+ return tokv_barestring; +[^\ \t\n\\]+ return tokv_barestring; <> return tokv_eof; *} changequote(`,') %% + +const char *const builtinservicehelpstrings[]= { +undivert(5)dnl + 0 +}; ` #include "parser.c" '