Merge pull request #5942 from DmitryOlshansky/faster-compile-regex

dlang-bot · web-flow · commit a00bd106279d · 2017-12-18T18:28:09.000+01:00
Faster to import std.regex, by lazy eval of wordMatcher
merged-on-behalf-of: Petar Kirov &lt;ZombineDev@users.noreply.github.com&gt;
diff --git a/std/regex/internal/ir.d b/std/regex/internal/ir.d
@@ -47,7 +47,11 @@ CharMatcher[CodepointSet] matcherCache;
     }
 }
 
-static CharMatcher wordMatcher = CharMatcher(wordCharacter);
+@property ref wordMatcher()()
+{
+    static CharMatcher matcher = CharMatcher(wordCharacter);
+    return matcher;
+}
 
 // some special Unicode white space characters
 private enum NEL = '\u0085', LS = '\u2028', PS = '\u2029';

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,11 @@ CharMatcher[CodepointSet] matcherCache;`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`
`50`		`-static CharMatcher wordMatcher = CharMatcher(wordCharacter);`
	`50`	`+@property ref wordMatcher()()`
	`51`	`+{`
	`52`	`+ static CharMatcher matcher = CharMatcher(wordCharacter);`
	`53`	`+ return matcher;`
	`54`	`+}`
`51`	`55`
`52`	`56`	`// some special Unicode white space characters`
`53`	`57`	`private enum NEL = '\u0085', LS = '\u2028', PS = '\u2029';`