From 7ad99fffa59dcba5d4937fa503be16d743bb3441 Mon Sep 17 00:00:00 2001
From: Erez Shinan <erezshin+git@gmail.com>
Date: Thu, 16 Nov 2017 12:46:20 +0200
Subject: [PATCH] Fixed Python grammars

---
 examples/python2.g   | 5 ++---
 examples/python3.g   | 8 ++------
 lark/load_grammar.py | 2 +-
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/examples/python2.g b/examples/python2.g
index aa5dd9e..b9f93dc 100644
--- a/examples/python2.g
+++ b/examples/python2.g
@@ -152,9 +152,8 @@ _NEWLINE: ( /\r?\n[\t ]*/ | COMMENT )+
 %ignore /\\[\t \f]*\r?\n/   // LINE_CONT 
 %ignore COMMENT
 
-
-STRING : /[ub]?r?("(?!"").*?(?<!\\\\)(\\\\\\\\)*?"|'(?!'').*?(?<!\\\\)(\\\\\\\\)*?')/i
-LONG_STRING.2: /[ub]?r?(""".*?(?<!\\\\)(\\\\\\\\)*?"""|'''.*?(?<!\\\\)(\\\\\\\\)*?''')/is
+STRING : /[ubf]?r?("(?!"").*?(?<!\\)(\\\\)*?"|'(?!'').*?(?<!\\)(\\\\)*?')/i
+LONG_STRING.2: /[ubf]?r?(""".*?(?<!\\)(\\\\)*?"""|'''.*?(?<!\\)(\\\\)*?''')/is
 
 DEC_NUMBER: /[1-9]\d*l?/i
 HEX_NUMBER: /0x[\da-f]*l?/i
diff --git a/examples/python3.g b/examples/python3.g
index 27b0ab4..afba789 100644
--- a/examples/python3.g
+++ b/examples/python3.g
@@ -173,12 +173,8 @@ _NEWLINE: ( /\r?\n[\t ]*/ | COMMENT )+
 %ignore /\\[\t \f]*\r?\n/   // LINE_CONT
 %ignore COMMENT
 
-
-
-// STRING : /[ub]?r?("(?!"").*?(?<!\\)(\\\\)*?"|'(?!'').*?(?<!\\)(\\\\)*?')/
-// LONG_STRING: /(?s)[ub]?r?(""".*?(?<!\\)(\\\\)*?"""|'''.*?(?<!\\)(\\\\)*?''')/
-STRING : /[ubf]?r?("(?!"").*?(?<!\\\\)(\\\\\\\\)*?"|'(?!'').*?(?<!\\\\)(\\\\\\\\)*?')/i
-LONG_STRING: /[ubf]?r?(""".*?(?<!\\\\)(\\\\\\\\)*?"""|'''.*?(?<!\\\\)(\\\\\\\\)*?''')/is
+STRING : /[ubf]?r?("(?!"").*?(?<!\\)(\\\\)*?"|'(?!'').*?(?<!\\)(\\\\)*?')/i
+LONG_STRING: /[ubf]?r?(""".*?(?<!\\)(\\\\)*?"""|'''.*?(?<!\\)(\\\\)*?''')/is
 
 DEC_NUMBER: /[1-9]\d*l?/i
 HEX_NUMBER: /0x[\da-f]*l?/i
diff --git a/lark/load_grammar.py b/lark/load_grammar.py
index 93025b8..76caaaa 100644
--- a/lark/load_grammar.py
+++ b/lark/load_grammar.py
@@ -293,7 +293,7 @@ def _rfind(s, choices):
 
 
 def _fix_escaping(s):
-    s = s.replace('\\"', '"')
+    s = s.replace('\\"', '"').replace("'", "\\'")
     w = ''
     i = iter(s)
     for n in i: