Check for namespaces in method dereferences

Author: totalspectrum

Changelog.txt

@@ -1,3 +1,6 @@
+Version 7.6.1
+- Fixed looking up namespaced asm symbols from Spin code
+
 Version 7.6.0
 - Added new Spin2_v52 keywords
 - Added a warning for  missing {Spin2_vXX} comment (very incomplete)

backends/asm/outasm.c

@@ -4131,12 +4131,10 @@ doGetAddress(IRList *irl, AST *expr, bool isField)
     {
         Symbol *sym;
         Operand *res = NULL;
-        const char *name;
         Module *P;
         int off;
 
-        name = GetUserIdentifierName(expr->right);
-        sym = LookupMemberSymbol(expr, ExprType(expr->left), name, &P, NULL);
+        sym = LookupMethodRef(expr, &P, NULL);
         if (sym) {
             if (sym->kind == SYM_VARIABLE) {
                 Operand *base = CompileExpression(irl, expr->left, NULL);
@@ -4153,6 +4151,7 @@ doGetAddress(IRList *irl, AST *expr, bool isField)
             }
         }
         if (!res) {
+            const char *name = GetUserIdentifierName(expr->right);
             ERROR(expr, "Internal error, cannot take address of %s", name);
             res = OPERAND_DUMMY;
         } else if (flags) {
@@ -4594,25 +4593,30 @@ CompileExpression(IRList *irl, AST *expr, Operand *dest)
         int off = 0;
         Module *P;
         const char *name;
+
         objtype = ExprType(expr->left);
-        if (curfunc && IsSpinLang(curfunc->language) && IsRefType(objtype)) {
-            objtype = objtype->left;
-        }
-        name = GetUserIdentifierName(expr->right);
-        if (!objtype) {
-            ERROR(expr, "%s is not accessible in this context", GetIdentifierName(expr->left));
-            return EmptyOperand();
-        } else if (!IsClassType(objtype)) {
-            ERROR(expr, "Request for member %s in something that is not a class", name);
-            return EmptyOperand();
-        }
-        if (expr->left && expr->left->kind == AST_OBJECT) {
-            // FIXME: we could potentially support calls of static class
-            // member functions, but for now, punt
-            ERROR(expr, "Use of class name in method references is not supported yet");
-            return EmptyOperand();
+        if (objtype) {
+            if (curfunc && IsSpinLang(curfunc->language) && IsRefType(objtype)) {
+                objtype = objtype->left;
+            }
+            name = GetUserIdentifierName(expr->right);
+            if (!objtype) {
+                ERROR(expr, "%s is not accessible in this context", GetIdentifierName(expr->left));
+                return EmptyOperand();
+            } else if (!IsClassType(objtype)) {
+                ERROR(expr, "Request for member %s in something that is not a class", name);
+                return EmptyOperand();
+            }
+            if (expr->left && expr->left->kind == AST_OBJECT) {
+                // FIXME: we could potentially support calls of static class
+                // member functions, but for now, punt
+                ERROR(expr, "Use of class name in method references is not supported yet");
+                return EmptyOperand();
+            }
+            sym = LookupMemberSymbol(expr, objtype, name, &P, NULL);
+        } else {
+            sym = LookupMethodRef(expr, &P, NULL);
         }
-        sym = LookupMemberSymbol(expr, objtype, name, &P, NULL);
         if (sym && sym->kind == SYM_FUNCTION) {
             Function *pf = (Function *)sym->v.ptr;
             if (pf->sym_funcptr) {
@@ -4629,7 +4633,11 @@ CompileExpression(IRList *irl, AST *expr, Operand *dest)
                 base = LabelRef(irl, sym);
                 break;
             default:
-                ERROR(expr, "Unable to dereference symbol %s in %s", name, P->classname);
+                if (P) {
+                    ERROR(expr, "Unable to dereference symbol %s in %s", name, P->classname);
+                } else {
+                    ERROR(expr, "Unable to dereference symbol %s", name);
+                }
                 return EmptyOperand();
             }
         }

backends/bytecode/outbc.c

@@ -1,7 +1,8 @@
 //
 // Bytecode compiler for spin2cpp
 //
-// Copyright 2021-2023 Ada Gottensträter and Total Spectrum Software Inc.
+// Copyright 2021-2025 Ada Gottensträter, Total Spectrum Software Inc.,
+//   and contributors
 // see the file COPYING for conditions of redistribution
 //
 
@@ -487,6 +488,12 @@ BCCompileMemOpExEx(BCIRBuffer *irbuf,AST *node,BCContext context, enum MemOpKind
         AST *selector = node->right;
         Module *P = GetClassPtr(ExprType(node->left));
         if (!P) {
+            // check for a namespace reference
+            sym = LookupMethodRef(node, NULL, NULL);
+            if (sym) {
+                ident = node->right;
+                goto found_symbol;
+            }
             ERROR(node,"Unable to find object");
             return;
         }
@@ -640,6 +647,7 @@ BCCompileMemOpExEx(BCIRBuffer *irbuf,AST *node,BCContext context, enum MemOpKind
         goto after_typeinfer;
     }
 
+found_symbol:
     if (!sym) {
         if (node->kind == AST_ARRAYREF && indexExpr && !baseExpr) {
             memOp.attr.memop.base = MEMOP_BASE_POP;

backends/nucode/outnu.c

@@ -750,11 +750,15 @@ static NuIrOpcode NuCompileLhsAddress(NuIrList *irl, AST *lhs)
             return op;
         }
         const char *memberName = GetUserIdentifierName(methodname);
-        if ( !IsClassType(typ) || NULL == (P=GetClassPtr(typ)) ) {
-            ERROR(lhs, "Request for member %s in something not an object", memberName);
-            return op;
+        if (typ) {
+            if ( !IsClassType(typ) || NULL == (P=GetClassPtr(typ)) ) {
+                ERROR(lhs, "Request for member %s in something not an object", memberName);
+                return op;
+            }
+            sym = LookupSymbolInTable(&P->objsyms, memberName);
+        } else {
+            sym = LookupMethodRef(lhs, NULL, NULL);
         }
-        sym = LookupSymbolInTable(&P->objsyms, memberName);
         if (!sym) {
             ERROR(lhs, "unknown symbol %s", memberName);
             return op;