Merge branch 'lh/forget-mnemosyne/OTP-10729'

* lh/forget-mnemosyne/OTP-10729:
  Remove what remains of the Mnemosyne code
  Remove support for the query keyword and query expressions

2 files changed, 2 insertions, 22 deletions

diff --git a/lib/stdlib/test/erl_pp_SUITE.erl b/lib/stdlib/test/erl_pp_SUITE.erl
index db416b03b0..37be61d665 100644
--- a/lib/stdlib/test/erl_pp_SUITE.erl
+++ b/lib/stdlib/test/erl_pp_SUITE.erl
@@ -537,29 +537,9 @@ messages(Config) when is_list(Config) ->
     ?line true = "\n" =:= lists:flatten(erl_pp:form({eof,0})),
     ok.
 
-old_mnemosyne_syntax(suite) ->
-    [];
 old_mnemosyne_syntax(Config) when is_list(Config) ->
-    %% Since we have kept the 'query' syntax and ':-' token,
+    %% Since we have kept the ':-' token,
     %% better test that we can pretty print it.
-    Q = {'query',6,
-         {lc,6,
-          {var,6,'X'},
-          [{generate,6,
-            {var,6,'X'},
-            {call,6,{atom,6,table},[{atom,6,tab}]}},
-           {match,7,
-            {record_field,7,{var,7,'X'},{atom,7,foo}},
-            {atom,7,bar}}]}},
-    ?line "query\n"
-          "    [ \n" % extra space...
-          "     X ||\n"
-          "         X <- table(tab),\n"
-          "         X.foo = bar\n"
-          "    ]\n"
-          "end" =
-        lists:flatten(erl_pp:expr(Q)),
-
     R = {rule,12,sales,2,
          [{clause,12,
            [{var,12,'E'},{atom,12,employee}],
diff --git a/lib/stdlib/test/erl_scan_SUITE.erl b/lib/stdlib/test/erl_scan_SUITE.erl
index 34e1b99abe..9a6b2f8f34 100644
--- a/lib/stdlib/test/erl_scan_SUITE.erl
+++ b/lib/stdlib/test/erl_scan_SUITE.erl
@@ -197,7 +197,7 @@ otp_7810(Config) when is_list(Config) ->
 reserved_words() ->
     L = ['after', 'begin', 'case', 'try', 'cond', 'catch',
          'andalso', 'orelse', 'end', 'fun', 'if', 'let', 'of',
-         'query', 'receive', 'when', 'bnot', 'not', 'div',
+         'receive', 'when', 'bnot', 'not', 'div',
          'rem', 'band', 'and', 'bor', 'bxor', 'bsl', 'bsr',
          'or', 'xor'],
     [begin