summaryrefslogtreecommitdiff
path: root/giscanner/scannerlexer.l
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2008-10-02 16:21:40 +0000
committerDan Winship <danw@src.gnome.org>2008-10-02 16:21:40 +0000
commit5d4f1ef99ff5c57d4d047fa8ea71cc193f8555d8 (patch)
tree7393e796a66e4089bef363c31ebfa54a9c721c84 /giscanner/scannerlexer.l
parent3aef69345ba1a59fb312c1a287357a3b05c8dbad (diff)
downloadgobject-introspection-5d4f1ef99ff5c57d4d047fa8ea71cc193f8555d8.tar.gz
Bug 554490: g-ir-scanner gets confused by '\\'
* giscanner/scannerlexer.l (chartext, stringtext): fix use of backslashes so it will correctly parse '\\' and "\\" * tests/scanner/annotation.c: add a use of '\\' to make sure that this stays fixed * giscanner/glibtransformer.py (GLibTransformer.count_type): typo svn path=/trunk/; revision=646
Diffstat (limited to 'giscanner/scannerlexer.l')
-rw-r--r--giscanner/scannerlexer.l4
1 files changed, 2 insertions, 2 deletions
diff --git a/giscanner/scannerlexer.l b/giscanner/scannerlexer.l
index 4f3a0c13..a3efbf5b 100644
--- a/giscanner/scannerlexer.l
+++ b/giscanner/scannerlexer.l
@@ -51,8 +51,8 @@ intsuffix ([uU][lL]?[lL]?)|([lL][lL]?[uU]?)
fracconst ([0-9]*\.[0-9]+)|([0-9]+\.)
exppart [eE][-+]?[0-9]+
floatsuffix [fFlL]
-chartext ([^\'])|(\\.)
-stringtext ([^\"])|(\\.)
+chartext ([^\\\'])|(\\.)
+stringtext ([^\\\"])|(\\.)
%%