From c618ea173ea96734777092dd36f6b6be341f233f Mon Sep 17 00:00:00 2001 From: Marty Kraimer Date: Wed, 21 Jan 1998 15:01:57 +0000 Subject: [PATCH] Allow quoted strings to contain any ascii character --- src/dbtools/dbLoadRecords_lex.l | 21 +++------------------ src/dbtools/dbLoadTemplate_lex.l | 21 +++------------------ 2 files changed, 6 insertions(+), 36 deletions(-) diff --git a/src/dbtools/dbLoadRecords_lex.l b/src/dbtools/dbLoadRecords_lex.l index c7dd1a6b6..f30772e84 100644 --- a/src/dbtools/dbLoadRecords_lex.l +++ b/src/dbtools/dbLoadRecords_lex.l @@ -1,23 +1,8 @@ pvname [a-zA-Z0-9_~\-:\.\[\]<>;] - -BEL \\a -BS \\b -FF \\f -NL \\n -CR \\r -HT \\t -VT \\v -backSla \\\\ -question \\\? -single \\\' -double \\\" -octal \\[0-7]+ -hexa \\x[a-fA-F0-9]+ -escape {BEL}|{BS}|{FF}|{NL}|{CR}|{HT}|{VT}|{backSla}|{question}|{single}|{double}|{octal}|{question}|{hexa} -spaces [ \t] -regular [a-zA-Z0-9_\,\^~\./\*#\[\]%:;!|\'\-&\(\)@\?\+<>=\$\{\}] -value {regular}|{spaces}|{escape} +notquote [^\"] +escapequote \\\" +value {notquote}|{escapequote} %{ %} diff --git a/src/dbtools/dbLoadTemplate_lex.l b/src/dbtools/dbLoadTemplate_lex.l index 05e679c3a..ef17947bb 100644 --- a/src/dbtools/dbLoadTemplate_lex.l +++ b/src/dbtools/dbLoadTemplate_lex.l @@ -2,24 +2,9 @@ word [a-zA-Z0-9_\.\^~/\*#\[\]%:;!|\-&\$\(\)@\?\+<>] par [\"\'] -BEL \\a -BS \\b -FF \\f -NL \\n -CR \\r -HT \\t -VT \\v -backSla \\\\ -question \\\? -single \\\' -double \\\" -octal \\[0-7]+ -hexa \\x[a-fA-F0-9]+ -escape {BEL}|{BS}|{FF}|{NL}|{CR}|{HT}|{VT}|{backSla}|{question}|{single}|{double}|{octal}|{question}|{hexa} -spaces [ \t] -regular [a-zA-Z0-9_\,\^~\./\*#\[\]%:;!|\'\-&\(\)@\?\+<>=\$\{\}] -value {regular}|{spaces}|{escape} - +notquote [^\"] +escapequote \\\" +value {notquote}|{escapequote} %{ %}