aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--tool/unicode_norm_gen.rb2
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 964fea9a27..c29551fd43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Oct 22 19:18:18 2014 Martin Duerst <duerst@it.aoyama.ac.jp>
+
+ * tool/unicode_norm_gen.rb: Fixed escaping of backslash and
+ double quote ('\\\&' -> "\\\\\\\&"; double quoted string
+ is needed to make \& mean last match; double double
+ backslashes are needed because of two layers of escaping).
+
Wed Oct 22 18:13:29 2014 NAKAMURA Usaku <usa@ruby-lang.org>
* test/test-unicode_normalize.rb: as often said, ruby is sometimes built
diff --git a/tool/unicode_norm_gen.rb b/tool/unicode_norm_gen.rb
index 5f2545075b..766be26dc4 100644
--- a/tool/unicode_norm_gen.rb
+++ b/tool/unicode_norm_gen.rb
@@ -17,7 +17,7 @@ class Integer
elsif self>0x7f
"\\u#{to_s(16).upcase.rjust(4, '0')}"
else
- chr.sub(/[\\\"]/, '\\\&')
+ chr.sub(/[\\\"]/, "\\\\\\\&")
end
end
end