--- freem/src/expr.c	2025/03/09 15:20:18	1.4
+++ freem/src/expr.c	2025/03/22 03:39:23	1.7
@@ -1,23 +1,11 @@
 /*
- *                            *
- *                           * *
- *                          *   *
- *                     ***************
- *                      * *       * *
- *                       *  MUMPS  *
- *                      * *       * *
- *                     ***************
- *                          *   *
- *                           * *
- *                            *
- *
- *   expr.c
+ *   $Id: expr.c,v 1.7 2025/03/22 03:39:23 snw Exp $
  *    expression parser
  *
  *  
  *   Author: Serena Willis <snw@coherent-logic.com>
  *    Copyright (C) 1998 MUG Deutschland
- *    Copyright (C) 2020, 2023 Coherent Logic Development LLC
+ *    Copyright (C) 2020, 2023, 2025 Coherent Logic Development LLC
  *
  *
  *   This file is part of FreeM.
@@ -35,6 +23,19 @@
  *   You should have received a copy of the GNU Affero Public License
  *   along with FreeM.  If not, see <https://www.gnu.org/licenses/>.
  *
+ *   $Log: expr.c,v $
+ *   Revision 1.7  2025/03/22 03:39:23  snw
+ *   Fix reverse query polyfill call-in from C side and make NAME exprs silently truncate long names in obsolete MDC dialects
+ *
+ *   Revision 1.6  2025/03/22 03:05:19  snw
+ *   Comply with X11-96/13 portable length of names
+ *
+ *   Revision 1.5  2025/03/09 19:14:24  snw
+ *   First phase of REUSE compliance and header reformat
+ *
+ *
+ * SPDX-FileCopyrightText:  (C) 2025 Coherent Logic Development LLC
+ * SPDX-License-Identifier: AGPL-3.0-or-later 
  **/
 
 #if !defined(__osf__)
@@ -178,6 +179,15 @@ void expr (short extyp)
     volatile int ch = 0;
     
     short   group;          /* flag to scan grouped patterns */
+
+    int  max_namlen = 255;
+
+    if ((rtn_dialect () == D_MDS) || (rtn_dialect () == D_M5) || (rtn_dialect () == D_FREEM)) {
+        max_namlen = 255;
+    }
+    else {
+        max_namlen = 8;
+    }
     
 #ifdef DEBUG_NEWPTR
     int loop;
@@ -206,14 +216,36 @@ void expr (short extyp)
                       (((ch == '/' && varnam[i - 1] != '/') ||
                         (ch == '%' && varnam[i - 1] == '/')) &&
                        (varnam[1] == '.' || varnam[1] == '/'))))) || (f != '^') && (ch == '.')) {
-                
-                varnam[i++] = ch;
 
-                
+                if ((i + 1) <= max_namlen) {
+                    varnam[i++] = ch;
+                }
+                else {
+                    if ((rtn_dialect () == D_M77) ||
+                        (rtn_dialect () == D_M84) ||
+                        (rtn_dialect () == D_M90) ||
+                        (rtn_dialect () == D_M95)) {
+                        /* silently truncate... yeah, the standard is stupid af */
+                        continue;
+                    }
+                    else {
+                        merr_raise (M56);
+                        return;
+                    }
+                }                
                 
             }
 
-            varnam[i] = EOL;            
+            varnam[i] = EOL;
+
+            #if 0
+            {
+                char gooby[256];
+                stcpy (gooby, varnam);
+                stcnv_m2c (gooby);
+                printf ("name = '%s'\r\n", gooby);
+            }
+            #endif
             
             if (ch == '(') {        /* it's an array */
                 
@@ -2224,7 +2256,7 @@ f20:
                         stcnv_c2m (qryarg_ext);
 
                         /* put the $QUERY argument into the local variable %INT.REVQ */
-                        symtab (set_sym, "%INT.REVQ\201\201", qryarg_ext);
+                        symtab (set_sym, "%INTREVQ\201\201", qryarg_ext);
 
                         /* set up for calling into polyfill wrapper */
                         code[0] = '\201';