diff options
| author | Angelos D. Keromytis <angelos@cvs.openbsd.org> | 2000-08-11 20:51:39 +0000 |
|---|---|---|
| committer | Angelos D. Keromytis <angelos@cvs.openbsd.org> | 2000-08-11 20:51:39 +0000 |
| commit | 545d23798b3e8d39d80bc33ff348e69546cb84a8 (patch) | |
| tree | d7fd94265d407ff8c1bd986a518d8b3529e06c2a /lib/libkeynote | |
| parent | 55153bf510e29d3c92c823716a1928f62c103ad4 (diff) | |
Fix lexer bug (bad handling of escaped double-quote).
Diffstat (limited to 'lib/libkeynote')
| -rw-r--r-- | lib/libkeynote/keynote-ver.l | 4 | ||||
| -rw-r--r-- | lib/libkeynote/keynote.l | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/lib/libkeynote/keynote-ver.l b/lib/libkeynote/keynote-ver.l index 2f9d165e933..3325ea247d2 100644 --- a/lib/libkeynote/keynote-ver.l +++ b/lib/libkeynote/keynote-ver.l @@ -1,5 +1,5 @@ %{ -/* $OpenBSD: keynote-ver.l,v 1.9 2000/06/13 19:16:16 angelos Exp $ */ +/* $OpenBSD: keynote-ver.l,v 1.10 2000/08/11 20:51:38 angelos Exp $ */ /* * The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu) * @@ -53,7 +53,7 @@ static void mystrncpy(char *, char *, int); %} vstring [a-zA-Z0-9][a-zA-Z0-9_]* -litstring \"(([^\"\n])|(\\[\"\n.]))*\" +litstring \"(((\\\n)|(\\.)|(\\\\)|([^\\\n\"]))*)\" comment "#"[^\n]* %s FIRSTPART MIDDLEPART SECONDPART KEYSTATE %pointer diff --git a/lib/libkeynote/keynote.l b/lib/libkeynote/keynote.l index 4be299bbd92..d291d59de45 100644 --- a/lib/libkeynote/keynote.l +++ b/lib/libkeynote/keynote.l @@ -1,5 +1,5 @@ %{ -/* $OpenBSD: keynote.l,v 1.11 2000/06/13 19:16:16 angelos Exp $ */ +/* $OpenBSD: keynote.l,v 1.12 2000/08/11 20:51:38 angelos Exp $ */ /* * The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu) * @@ -69,14 +69,13 @@ specnumber [1-9][0-9]* number {digit}+ flt {digit}+"."{digit}+ vstring [a-zA-Z_][a-zA-Z0-9_]* -litstring \"(([^\"\n])|(\\[\"\n.]))*\" +litstring \"(((\\\n)|(\\.)|([^\\\n\"]))*)\" variable {vstring} comment "#"[^\n]* %s ACTIONSTRING LOCALINIT KEYPREDICATE SIGNERINIT KEYNOTEVERSION %pointer %option noyywrap never-interactive yylineno %% - %{ /* * Return a preset token, so we can have more than one grammars |