提交: 2745ab232133cb6f576b58da06dc2f5177b59a90 - mirrg.compile.bromine (hg)

Commit MetaInfo

• 修订版: 2745ab232133cb6f576b58da06dc2f5177b59a90 (tree)
• 时间: 2015-11-06 10:26:34
• 作者: MirrgieRiana
• Commiter: MirrgieRiana

Log Message

mirrg.compile.lithiumbromide: 長いブロックコメントを使用するとStackOverflowになる問題を修正

更改概述

• modified: projects/mirrg.compile.lithiumbromide/src/main/java/mirrg/compile/lithiumbromide/HLithiumBromide.java
• modified: projects/mirrg.compile.lithiumbromide/src/test/java/mirrg/compile/lithiumbromide/TestLithiumBromide.java
• modified: projects/mirrg.compile.lithiumbromide/src/test/resources/mirrg/compile/lithiumbromide/test.libr

差异

diff -r 175869092d3c -r 2745ab232133 projects/mirrg.compile.lithiumbromide/src/main/java/mirrg/compile/lithiumbromide/HLithiumBromide.java
--- a/projects/mirrg.compile.lithiumbromide/src/main/java/mirrg/compile/lithiumbromide/HLithiumBromide.java	Fri Nov 06 09:57:32 2015 +0900
+++ b/projects/mirrg.compile.lithiumbromide/src/main/java/mirrg/compile/lithiumbromide/HLithiumBromide.java	Fri Nov 06 10:26:34 2015 +0900
@@ -55,7 +55,7 @@
 			or((Class<ArrayList<?>>) null)
 				.or(HBromine.regex("[ \\t\\r\\n]+", tag -> null))
 				.or(HBromine.regex("//[^\\r\\n]*", tag -> null))
-				.or(HBromine.regex("/\\*(.|[\\r\\n])*?\\*/", tag -> null)),
+				.or(HBromine.regex("(?s)/\\*.*?\\*/", tag -> null)),
 			(node, index, child) -> {} , (node, index) -> {});
 
 		Syntax<NodeString> syntaxString = h.regex("'([^\\']|\\.)*'",

diff -r 175869092d3c -r 2745ab232133 projects/mirrg.compile.lithiumbromide/src/test/java/mirrg/compile/lithiumbromide/TestLithiumBromide.java
--- a/projects/mirrg.compile.lithiumbromide/src/test/java/mirrg/compile/lithiumbromide/TestLithiumBromide.java	Fri Nov 06 09:57:32 2015 +0900
+++ b/projects/mirrg.compile.lithiumbromide/src/test/java/mirrg/compile/lithiumbromide/TestLithiumBromide.java	Fri Nov 06 10:26:34 2015 +0900
@@ -190,6 +190,19 @@
 			"1 + 2",
 			3, 0, 0.001);
 
+		{
+			String string = "";
+
+			for (int i = 0; i < 1000; i++) {
+				string += "AAAAAAAAAAAAAAAAAA";
+			}
+
+			assert1(compiler,
+				"1+/*" + string + "*/2",
+				"1 + 2",
+				3, 0, 0.001);
+		}
+
 		assert1(compiler,
 			"1+/* \r\n */2",
 			"1 + 2",

diff -r 175869092d3c -r 2745ab232133 projects/mirrg.compile.lithiumbromide/src/test/resources/mirrg/compile/lithiumbromide/test.libr
--- a/projects/mirrg.compile.lithiumbromide/src/test/resources/mirrg/compile/lithiumbromide/test.libr	Fri Nov 06 09:57:32 2015 +0900
+++ b/projects/mirrg.compile.lithiumbromide/src/test/resources/mirrg/compile/lithiumbromide/test.libr	Fri Nov 06 10:26:34 2015 +0900
@@ -2,7 +2,7 @@
 // コメント
 comment    := { "[ \t\r\n]+"
               | "//[^\r\n]*"
-              | "/\*(.|[\r\n])*?\*/"
+              | "(?s)/\*.*?\*/"
               };
 
 // リテラル