try some more memoize

winitzki · Jul 20, 2024 · d0ea8b1 · d0ea8b1
1 parent 3ca1519
commit d0ea8b1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/how_to_deduplicate_strings.sh b/how_to_deduplicate_strings.sh
@@ -0,0 +1 @@
+java -Xlog:stringdedup*=debug -XX:+UseG1GC -XX:+UseStringDeduplication -jar dhall.jar --file scall-cli/src/test/resources/yaml-perftest/create_yaml.dhall yaml
diff --git a/scall-core/src/main/scala/io/chymyst/dhall/Grammar.scala b/scall-core/src/main/scala/io/chymyst/dhall/Grammar.scala
@@ -308,7 +308,7 @@ object Grammar {
       | (escaped_interpolation ~ single_quote_continue).map { case (a, b) => a ++ b }
       | P("''").map(_ => TextLiteral.empty) // End of text literal.
       | (single_quote_char ~ single_quote_continue).map { case (char, tail) => TextLiteral.ofString[Expression](char) ++ tail }
-  )// Do not memoize here: stack overflow!
+  ) // Do not memoize here: stack overflow!
 
   def escaped_quote_pair[$: P]: P[TextLiteral[Expression]] = P(
     "'''".!.map(_ => TextLiteral.ofString(s"''"))
@@ -419,6 +419,7 @@ object Grammar {
   //def keywordOrBuiltin[$: P]: P[String] = concatKeywords(simpleKeywords ++ builtinSymbolNames)
 
   def keyword[$: P]: P[String] = concatKeywords(simpleKeywords)
+    .memoize
 
   val builtinSymbolNames = SyntaxConstants.Builtin.namesToValuesMap.keys.toSeq
   val builtinSymbolNamesSet = SyntaxConstants.Builtin.namesToValuesMap.keySet
@@ -434,7 +435,7 @@ object Grammar {
     (concatKeywords(builtinSymbolNames).map(SyntaxConstants.Builtin.withName).map(ExprBuiltin)
       | concatKeywords(constantSymbolNames).map(SyntaxConstants.Constant.withName).map(ExprConstant)
       ).map(Expression.apply)
-  }
+  }.memoize
 
   def combine[$: P] = P(
     "\u2227" | "/\\"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		java -Xlog:stringdedup*=debug -XX:+UseG1GC -XX:+UseStringDeduplication -jar dhall.jar --file scall-cli/src/test/resources/yaml-perftest/create_yaml.dhall yaml