Merge pull request #118 from iamgio/regex-recompile-fix

Author: iamgio

quarkdown-core/src/main/kotlin/com/quarkdown/core/flavor/base/BaseMarkdownFlavor.kt

@@ -10,7 +10,7 @@ import com.quarkdown.core.flavor.TreeIteratorFactory
  * The vanilla [CommonMark](https://spec.commonmark.org) Markdown with several [GFM](https://github.github.com/gfm) features and extensions.
  */
 object BaseMarkdownFlavor : MarkdownFlavor {
-    override val lexerFactory: LexerFactory = BaseMarkdownLexerFactory()
+    override val lexerFactory: LexerFactory = BaseMarkdownLexerFactory
     override val parserFactory: ParserFactory = BaseMarkdownParserFactory()
     override val rendererFactory: RendererFactory = BaseMarkdownRendererFactory
     override val treeIteratorFactory: TreeIteratorFactory = BaseMarkdownTreeIteratorFactory()

quarkdown-core/src/main/kotlin/com/quarkdown/core/flavor/base/BaseMarkdownLexerFactory.kt

@@ -10,9 +10,12 @@ import com.quarkdown.core.lexer.tokens.PlainTextToken
 /**
  * [BaseMarkdownFlavor] lexer factory.
  */
-class BaseMarkdownLexerFactory : LexerFactory {
+object BaseMarkdownLexerFactory : LexerFactory {
+    private val blockPatterns = BaseMarkdownBlockTokenRegexPatterns()
+    private val inlinePatterns = BaseMarkdownInlineTokenRegexPatterns()
+
     override fun newBlockLexer(source: CharSequence): StandardRegexLexer =
-        with(BaseMarkdownBlockTokenRegexPatterns()) {
+        with(blockPatterns) {
             StandardRegexLexer(
                 source,
                 listOf(
@@ -35,7 +38,7 @@ class BaseMarkdownLexerFactory : LexerFactory {
         }
 
     override fun newListLexer(source: CharSequence): StandardRegexLexer =
-        with(BaseMarkdownBlockTokenRegexPatterns()) {
+        with(blockPatterns) {
             StandardRegexLexer(
                 source,
                 listOf(listItem, newline),
@@ -44,7 +47,7 @@ class BaseMarkdownLexerFactory : LexerFactory {
 
     override fun newInlineLexer(source: CharSequence): StandardRegexLexer =
         newLinkLabelInlineLexer(source).updatePatterns { patterns ->
-            with(BaseMarkdownInlineTokenRegexPatterns()) {
+            with(inlinePatterns) {
                 listOf(
                     diamondAutolink,
                     link,
@@ -55,7 +58,7 @@ class BaseMarkdownLexerFactory : LexerFactory {
         }
 
     override fun newLinkLabelInlineLexer(source: CharSequence): StandardRegexLexer =
-        with(BaseMarkdownInlineTokenRegexPatterns()) {
+        with(inlinePatterns) {
             StandardRegexLexer(
                 source,
                 listOf(

quarkdown-core/src/main/kotlin/com/quarkdown/core/flavor/quarkdown/QuarkdownFlavor.kt

@@ -17,7 +17,7 @@ import com.quarkdown.core.flavor.TreeIteratorFactory
  * And more.
  */
 object QuarkdownFlavor : MarkdownFlavor {
-    override val lexerFactory: LexerFactory = QuarkdownLexerFactory()
+    override val lexerFactory: LexerFactory = QuarkdownLexerFactory
     override val parserFactory: ParserFactory = QuarkdownParserFactory()
     override val rendererFactory: RendererFactory = QuarkdownRendererFactory()
     override val treeIteratorFactory: TreeIteratorFactory = QuarkdownTreeIteratorFactory()

quarkdown-core/src/main/kotlin/com/quarkdown/core/flavor/quarkdown/QuarkdownLexerFactory.kt

@@ -11,8 +11,10 @@ import com.quarkdown.core.lexer.tokens.PlainTextToken
 /**
  * [QuarkdownFlavor] lexer factory.
  */
-class QuarkdownLexerFactory : LexerFactory {
-    private val base = BaseMarkdownLexerFactory()
+object QuarkdownLexerFactory : LexerFactory {
+    private val blockPatterns = QuarkdownBlockTokenRegexPatterns()
+    private val inlinePatterns = QuarkdownInlineTokenRegexPatterns()
+    private val base = BaseMarkdownLexerFactory
 
     /**
      * Inserts patterns of Quarkdown's inline extensions into the base inline lexer (produced by [BaseMarkdownLexerFactory]).
@@ -21,7 +23,7 @@ class QuarkdownLexerFactory : LexerFactory {
     private fun StandardRegexLexer.insertInlineExtensions(): Lexer {
         // New inline patterns introduced by this flavor on top of the base patterns.
         val inlineExtensions =
-            with(QuarkdownInlineTokenRegexPatterns()) {
+            with(inlinePatterns) {
                 listOf(
                     inlineFunctionCall,
                     inlineMath,
@@ -36,7 +38,7 @@ class QuarkdownLexerFactory : LexerFactory {
     }
 
     override fun newBlockLexer(source: CharSequence): Lexer =
-        with(QuarkdownBlockTokenRegexPatterns()) {
+        with(blockPatterns) {
             StandardRegexLexer(
                 source,
                 listOf(
@@ -72,7 +74,7 @@ class QuarkdownLexerFactory : LexerFactory {
         source: CharSequence,
         allowBlockFunctionCalls: Boolean,
     ): Lexer =
-        with(QuarkdownInlineTokenRegexPatterns()) {
+        with(inlinePatterns) {
             // A function call argument contains textual content (string/number/...)
             // and possibly other nested function calls.
             StandardRegexLexer(