isa evaluates the left argument if it's not a name.

Author: christianp

runtime/scripts/jme-builtins.js

@@ -1193,6 +1193,7 @@ newBuiltin('isa',['?',TString],TBool, null, {
         if(tok.type=='name' && scope.getVariable(tok.name)==undefined ) {
             return new TBool(kind=='name');
         }
+        tok = scope.evaluate(args[0]);
         var match = false;
         if(kind=='complex') {
             match = jme.isType(tok,'number') && tok.value.complex || false;

tests/jme-runtime.js

@@ -15666,6 +15666,7 @@ newBuiltin('isa',['?',TString],TBool, null, {
         if(tok.type=='name' && scope.getVariable(tok.name)==undefined ) {
             return new TBool(kind=='name');
         }
+        tok = scope.evaluate(args[0]);
         var match = false;
         if(kind=='complex') {
             match = jme.isType(tok,'number') && tok.value.complex || false;

tests/jme/jme-tests.mjs

@@ -657,11 +657,12 @@ Numbas.queueScript('jme_tests',['qunit','jme','jme-rules','jme-display','jme-cal
         closeEqual(assert, evaluate('1 isa "number"').value,true,'1 isa "number"');
         closeEqual(assert, evaluate('1 isa "complex"').value,false,'1 isa "complex"');
         closeEqual(assert, evaluate('i isa "complex"').value,true,'i isa "complex"');
-        closeEqual(assert, evaluate('1+i isa "complex"').value,false,'1+i isa "complex"');
+        closeEqual(assert, evaluate('1+i isa "complex"').value,true,'1+i isa "complex"');
         closeEqual(assert, evaluate('"1" isa "number"').value,false,'"1" isa "number"');
         closeEqual(assert, evaluate('"1" isa "string"').value,true,'"1" isa "string"');
         closeEqual(assert, evaluate('[] isa "list"').value,true,'[] isa "list"');
         closeEqual(assert, evaluate('xy isa "name"').value,true,'xy isa "name"');
+        closeEqual(assert, evaluate('vector(1,2)[0] isa "number"').value,true,'vector(1,2)[0] isa "name"');
     });
 
     QUnit.test('Arithmetic',function(assert) {

tests/numbas-runtime.js

@@ -15002,6 +15002,7 @@ newBuiltin('isa',['?',TString],TBool, null, {
         if(tok.type=='name' && scope.getVariable(tok.name)==undefined ) {
             return new TBool(kind=='name');
         }
+        tok = scope.evaluate(args[0]);
         var match = false;
         if(kind=='complex') {
             match = jme.isType(tok,'number') && tok.value.complex || false;