refactor: object accessor better error messages

zyrouge · Oct 15, 2023 · 161a760 · 161a760
1 parent 41e08a7
commit 161a760
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/packages/beize_vm/lib/vm/interpreter.dart b/packages/beize_vm/lib/vm/interpreter.dart
@@ -449,15 +449,25 @@ class BeizeInterpreter {
 
       case BeizeOpCodes.opGetProperty:
         final BeizeValue name = stack.pop();
-        final BeizePrimitiveObjectValue obj = stack.pop();
+        final BeizeValue obj = stack.pop();
+        if (obj is! BeizePrimitiveObjectValue) {
+          return handleInvalidMemberAccess(
+            'Cannot use member accessor on "${obj.kind.code}"',
+          );
+        }
         final BeizeValue value = obj.get(name);
         stack.push(value);
         break;
 
       case BeizeOpCodes.opSetProperty:
         final BeizeValue value = stack.pop();
         final BeizeValue name = stack.pop();
-        final BeizePrimitiveObjectValue obj = stack.pop();
+        final BeizeValue obj = stack.pop();
+        if (obj is! BeizePrimitiveObjectValue) {
+          return handleInvalidMemberAccess(
+            'Cannot do member assign on "${obj.kind.code}"',
+          );
+        }
         obj.set(name, value);
         stack.push(value);
         break;
@@ -516,6 +526,9 @@ class BeizeInterpreter {
     return handleException(err);
   }
 
+  BeizeInterpreterResult handleInvalidMemberAccess(final String message) =>
+      handleCustomException('InvalidMemberAccess', message);
+
   BeizeInterpreterResult handleInvalidUnary(final String message) =>
       handleCustomException('InvalidUnaryOperation', message);