コミット: 545a23932684bc1c0146fcb40758c5a409cddb9d - mirrg.compile.bromine (hg)

コミットメタ情報

• リビジョン: 545a23932684bc1c0146fcb40758c5a409cddb9d (tree)
• 日時: 2015-11-06 09:57:14
• 作者: MirrgieRiana
• コミッター: MirrgieRiana

ログメッセージ

mirrg.compile.lithiumbromide: ブロックコメントに関するバグを修正

変更サマリ

• 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 6cd27648133a -r 545a23932684 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 06:25:21 2015 +0900
+++ b/projects/mirrg.compile.lithiumbromide/src/main/java/mirrg/compile/lithiumbromide/HLithiumBromide.java	Fri Nov 06 09:57:14 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("/\\*(.|[\\r\\n])*?\\*/", tag -> null)),
 			(node, index, child) -> {} , (node, index) -> {});
 
 		Syntax<NodeString> syntaxString = h.regex("'([^\\']|\\.)*'",

diff -r 6cd27648133a -r 545a23932684 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 06:25:21 2015 +0900
+++ b/projects/mirrg.compile.lithiumbromide/src/test/java/mirrg/compile/lithiumbromide/TestLithiumBromide.java	Fri Nov 06 09:57:14 2015 +0900
@@ -181,6 +181,21 @@
 			3, 0, 0.001);
 
 		assert1(compiler,
+			"1+/**/2",
+			"1 + 2",
+			3, 0, 0.001);
+
+		assert1(compiler,
+			"1+/*/*/2",
+			"1 + 2",
+			3, 0, 0.001);
+
+		assert1(compiler,
+			"1+/* \r\n */2",
+			"1 + 2",
+			3, 0, 0.001);
+
+		assert1(compiler,
 			"1+// 500\n2",
 			"1 + 2",
 			3, 0, 0.001);

diff -r 6cd27648133a -r 545a23932684 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 06:25:21 2015 +0900
+++ b/projects/mirrg.compile.lithiumbromide/src/test/resources/mirrg/compile/lithiumbromide/test.libr	Fri Nov 06 09:57:14 2015 +0900
@@ -2,7 +2,7 @@
 // コメント
 comment    := { "[ \t\r\n]+"
               | "//[^\r\n]*"
-              | "/\*((.|\r|\n)(?<!\*/))*\*/"
+              | "/\*(.|[\r\n])*?\*/"
               };
 
 // リテラル