From 9edf372fb9e281930eaabd090731f9a5c312f7fb Mon Sep 17 00:00:00 2001 From: "Eric S. Raymond" Date: Tue, 8 Oct 1996 07:26:51 +0000 Subject: Add English-like keywords but don't document them yet. svn path=/trunk/; revision=248 --- rcfile_l.l | 11 +++++++++-- rcfile_y.y | 5 +++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/rcfile_l.l b/rcfile_l.l index ec51c287..07abe7b0 100644 --- a/rcfile_l.l +++ b/rcfile_l.l @@ -26,12 +26,16 @@ int prc_lineno = 1; defaults { return DEFAULTS; } server { return SERVER; } proto(col)? { return PROTOCOL; } -is { return LOCALNAME; } +port { return PORT; } + user(name)? { return USERNAME; } pass(word)? { return PASSWORD; } remote(folder)? { return FOLDER; } smtp(host)? { return SMTPHOST; } mda { return MDA; } +is { return IS; } +here { return HERE; } + keep { yylval.flag = FLAG_TRUE; return KEEP; } flush { yylval.flag = FLAG_TRUE; return FLUSH; } fetchall { yylval.flag = FLAG_TRUE; return FETCHALL; } @@ -42,7 +46,10 @@ noflush { yylval.flag = FLAG_FALSE; return FLUSH; } nofetchall { yylval.flag = FLAG_FALSE; return FETCHALL; } norewrite { yylval.flag = FLAG_TRUE; return REWRITE; } noskip { yylval.flag = FLAG_FALSE; return SKIP; } -port { return PORT; } + +with {/* EMPTY */} +and {/* EMPTY */} +options {/* EMPTY */} (auto)|(AUTO) { yylval.proto = P_AUTO; return PROTO; } (pop2)|(POP2) { yylval.proto = P_POP2; return PROTO; } diff --git a/rcfile_y.y b/rcfile_y.y index ccde88e8..32c5b244 100644 --- a/rcfile_y.y +++ b/rcfile_y.y @@ -29,7 +29,7 @@ int yydebug; /* in case we didn't generate with -- debug */ char *sval; } -%token SERVER PROTOCOL LOCALNAME USERNAME PASSWORD FOLDER SMTPHOST MDA DEFAULTS +%token SERVER PROTOCOL USERNAME PASSWORD FOLDER SMTPHOST MDA DEFAULTS IS HERE %token PROTO %token STRING %token KEEP FLUSH FETCHALL REWRITE PORT SKIP @@ -84,7 +84,8 @@ user1opts : user_option | user1opts user_option ; -user_option : LOCALNAME STRING {prc_setlocal($2);} +user_option : IS STRING {prc_setlocal($2);} + | IS STRING HERE {prc_setlocal($2);} | PASSWORD STRING {prc_setpassword($2);} | FOLDER STRING {prc_setfolder($2);} | SMTPHOST STRING {prc_setsmtphost($2);} -- cgit v1.2.3