# HG changeset patch
# User Arun Giridhar <arungiridhar@gmail.com>
# Date 1654901837 14400
# Node ID 1779a64b2510558b0d40489d5cee5dc5b3ccdd72
# Parent  9da8bb2974d758273361c28d185f466ee3fc0a1b# Parent  4b6f03d7264a717b04c77ccef612de59dafdbd35
maint: Merge stable to default

diff -r 9da8bb2974d7 -r 1779a64b2510 libinterp/parse-tree/lex.ll
--- a/libinterp/parse-tree/lex.ll	Fri Jun 10 14:46:45 2022 -0700
+++ b/libinterp/parse-tree/lex.ll	Fri Jun 10 18:57:17 2022 -0400
@@ -2927,6 +2927,14 @@
     return kw->tok;
   }
 
+/*
+
+## check if magic file and line keywords are working
+%!assert <*62587> (ischar (__FILE__))
+%!assert <*62587> (isnumeric (__LINE__))
+
+*/
+
   bool
   base_lexer::fq_identifier_contains_keyword (const std::string& s)
   {
diff -r 9da8bb2974d7 -r 1779a64b2510 libinterp/parse-tree/oct-parse.yy
--- a/libinterp/parse-tree/oct-parse.yy	Fri Jun 10 14:46:45 2022 -0700
+++ b/libinterp/parse-tree/oct-parse.yy	Fri Jun 10 18:57:17 2022 -0400
@@ -6477,12 +6477,6 @@
 %! [a,] = gcd (1,2);
 %! [a,b,] = gcd (1, 2);
 
-%!test <*62587>
-%! assert (ischar (__FILE__))
-
-%!test <*62587>
-%! assert (isnumeric (__LINE__))
-
 ## Can't assign to a keyword
 %!error eval ("switch = 13;")