From e0b9e48f46d625e598961daaa842cd8d53849448 Mon Sep 17 00:00:00 2001 From: anon Date: Wed, 29 Nov 2023 22:15:24 +0100 Subject: [PATCH] fixed escaping bugs --- source/csml.l | 9 +++------ source/xml.l | 4 ++++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/source/csml.l b/source/csml.l index 6f481b0..867520c 100644 --- a/source/csml.l +++ b/source/csml.l @@ -69,7 +69,7 @@ void pop_tag() { ws [ \t\r\v\f] wsnl [ \t\r\v\f\n] nwsnl [^ \t\r\v\f\n] -identifier [A-z][A-z0-9]* +identifier [A-Za-z][A-Za-z0-9]* unicode [\300-\364] %% @@ -150,11 +150,6 @@ unicode [\300-\364] } } } -\< { - FLUSH_CANDIDATE; - ECHOS("<"); - -} \> { FLUSH_CANDIDATE; ECHOS(">"); @@ -316,6 +311,8 @@ unicode [\300-\364] <*>{ \\[(){},:;] { + ECHO_CANDIDATE; + tag_candidate = ""; ECHOC(yytext[1]); } } diff --git a/source/xml.l b/source/xml.l index 73b1b95..ea5b89d 100644 --- a/source/xml.l +++ b/source/xml.l @@ -70,6 +70,10 @@ identifier [A-z][A-z0-9]* &[0-9]+; { ECHOS(html_special_to_utf8(yytext)); } +[(){};] { + ECHOC('\\'); + ECHOC(yytext[0]); +} .|\n { ECHO; }