refactor: is instance operator

zyrouge · Dec 10, 2024 · d7fd64b · d7fd64b
1 parent a6fc775
commit d7fd64b
Show file tree

Hide file tree

Showing 39 changed files with 418 additions and 225 deletions.
diff --git a/packages/beize_compiler/example/project/dev.beize b/packages/beize_compiler/example/project/dev.beize
@@ -7,4 +7,4 @@ main := -> async {
 };
 
 main().await;
-print();
+print(Function is null);
diff --git a/packages/beize_compiler/lib/compiler/parser/parser.dart b/packages/beize_compiler/lib/compiler/parser/parser.dart
@@ -450,6 +450,9 @@ abstract class BeizeParser {
       case BeizeTokens.caret:
         compiler.emitOpCode(BeizeOpCodes.opBitwiseXor);
 
+      case BeizeTokens.isKw:
+        compiler.emitOpCode(BeizeOpCodes.opIs);
+
       default:
         throw UnreachableException();
     }

diff --git a/packages/beize_compiler/lib/compiler/parser/precedence.dart b/packages/beize_compiler/lib/compiler/parser/precedence.dart
@@ -14,7 +14,6 @@ enum BeizePrecedence {
   unary, // ! ~ + -
   call, // () . [] ?.
   grouping, // (...)
-  kekw,
 }
 
 extension BeizePrecedenceUtils on BeizePrecedence {

diff --git a/packages/beize_compiler/lib/compiler/parser/rules.dart b/packages/beize_compiler/lib/compiler/parser/rules.dart
@@ -74,6 +74,10 @@ class BeizeParseRule {
       precedence: BeizePrecedence.comparison,
       infix: BeizeParser.parseBinaryExpression,
     ),
+    BeizeTokens.isKw: BeizeParseRule(
+      precedence: BeizePrecedence.comparison,
+      infix: BeizeParser.parseBinaryExpression,
+    ),
     BeizeTokens.plus: BeizeParseRule(
       precedence: BeizePrecedence.sum,
       prefix: BeizeParser.parseUnaryExpression,

diff --git a/packages/beize_compiler/lib/scanner/rules/identifier.dart b/packages/beize_compiler/lib/scanner/rules/identifier.dart
@@ -30,6 +30,7 @@ abstract class BeizeIdentifierScanner {
     BeizeTokens.asyncKw,
     BeizeTokens.awaitKw,
     BeizeTokens.onlyKw,
+    BeizeTokens.isKw,
   };
 
   static final Map<String, BeizeTokens> keywordsMap = keywords.asNameMap().map(

diff --git a/packages/beize_compiler/lib/token/tokens.dart b/packages/beize_compiler/lib/token/tokens.dart
@@ -80,6 +80,7 @@ enum BeizeTokens {
   asyncKw, // async
   awaitKw, // await
   onlyKw, // only
+  isKw, // is
 }
 
 const Map<BeizeTokens, String> _tokensCodeMap = <BeizeTokens, String>{
@@ -161,6 +162,7 @@ const Map<BeizeTokens, String> _tokensCodeMap = <BeizeTokens, String>{
   BeizeTokens.asyncKw: 'async',
   BeizeTokens.awaitKw: 'await',
   BeizeTokens.onlyKw: 'only',
+  BeizeTokens.isKw: 'is',
 };
 
 extension OutreTokensUtils on BeizeTokens {

diff --git a/packages/beize_shared/lib/bytecode/op_codes.dart b/packages/beize_shared/lib/bytecode/op_codes.dart
@@ -23,6 +23,7 @@ enum BeizeOpCodes {
   opBitwiseOr,
   opBitwiseXor,
   opBitwiseNot,
+  opIs,
   opDeclare,
   opAssign,
   opLookup,

diff --git a/packages/beize_vm/lib/values/boolean/boolean.dart b/packages/beize_vm/lib/values/boolean/boolean.dart
@@ -10,7 +10,7 @@ class BeizeBooleanValue extends BeizeNativeObjectValue {
   final BeizeValueKind kind = BeizeValueKind.boolean;
 
   @override
-  BeizeBooleanValue kClone() => BeizeBooleanValue(value);
+  BeizeBooleanValue kClone() => BeizeBooleanValue(value)..kCopyFrom(this);
 
   @override
   String kToString() => value.toString();

diff --git a/packages/beize_vm/lib/values/boolean/boolean_class.dart b/packages/beize_vm/lib/values/boolean/boolean_class.dart
@@ -1,6 +1,9 @@
 import '../exports.dart';
 
 class BeizeBooleanClassValue extends BeizeNativeClassValue {
+  @override
+  bool kInstance(final BeizeObjectValue value) => value is BeizeBooleanValue;
+
   @override
   BeizeBooleanValue kInstantiate(final BeizeCallableCall call) {
     final BeizeValue value = call.argumentAt(0);

diff --git a/packages/beize_vm/lib/values/class/class.dart b/packages/beize_vm/lib/values/class/class.dart
@@ -3,6 +3,8 @@ import '../exports.dart';
 
 abstract class BeizeClassValue extends BeizeNativeObjectValue
     implements BeizeCallableValue {
+  bool kInstance(final BeizeObjectValue value);
+
   BeizeObjectValue kInstantiate(final BeizeCallableCall call);
 
   @override

diff --git a/packages/beize_vm/lib/values/class/class_class.dart b/packages/beize_vm/lib/values/class/class_class.dart
@@ -3,17 +3,32 @@ import '../exports.dart';
 // what the fuck is this naming
 class BeizeClassClassValue extends BeizeNativeClassValue {
   BeizeClassClassValue() {
-    set(
-      BeizeStringValue('of'),
+    setField(
+      'of',
       BeizeNativeFunctionValue.sync(
         (final BeizeCallableCall call) {
           final BeizeObjectValue value = call.argumentAt(0);
-          return value.kClassInternal(call.frame.vm) ?? value.kClass;
+          return BeizeClassValueUtils.getClass(call.frame.vm, value);
+        },
+      ),
+    );
+    setField(
+      'isInstance',
+      BeizeNativeFunctionValue.sync(
+        (final BeizeCallableCall call) {
+          final BeizeClassValue clazz = call.argumentAt(0);
+          final BeizeValue value = call.argumentAt(1);
+          return BeizeClassValueUtils.isClassInstance(clazz, value)
+              ? call.frame.vm.globals.trueValue
+              : call.frame.vm.globals.falseValue;
         },
       ),
     );
   }
 
+  @override
+  bool kInstance(final BeizeObjectValue value) => value is BeizeClassValue;
+
   @override
   BeizeClassValue kInstantiate(final BeizeCallableCall call) {
     final BeizeClassValue value = call.argumentAt(0);

diff --git a/packages/beize_vm/lib/values/class/exports.dart b/packages/beize_vm/lib/values/class/exports.dart
@@ -1,4 +1,5 @@
 export 'class.dart';
 export 'class_class.dart';
 export 'native_class.dart';
+export 'utils.dart';
 export 'vm_class.dart';
diff --git a/packages/beize_vm/lib/values/class/utils.dart b/packages/beize_vm/lib/values/class/utils.dart
@@ -0,0 +1,18 @@
+import '../../vm/exports.dart';
+import '../exports.dart';
+
+class BeizeClassValueUtils {
+  static BeizeClassValue getClass(
+    final BeizeVM vm,
+    final BeizeObjectValue value,
+  ) =>
+      value.kClassInternal(vm) ?? value.kClass;
+
+  static bool isClassInstance(
+    final BeizeValue clazz,
+    final BeizeValue value,
+  ) =>
+      clazz is BeizeClassValue &&
+      value is BeizeObjectValue &&
+      clazz.kInstance(value);
+}
diff --git a/packages/beize_vm/lib/values/class/vm_class.dart b/packages/beize_vm/lib/values/class/vm_class.dart
@@ -9,13 +9,16 @@ class BeizeVMClassValue extends BeizeClassValue {
   @override
   final BeizeValueKind kind = BeizeValueKind.clazz;
 
+  @override
+  bool kInstance(final BeizeObjectValue value) => value is BeizeClassValue;
+
   @override
   BeizeObjectValue kInstantiate(final BeizeCallableCall call) {
     throw UnimplementedError();
   }
 
   @override
-  BeizeVMClassValue kClone() => BeizeVMClassValue(constant);
+  BeizeVMClassValue kClone() => BeizeVMClassValue(constant)..kCopyFrom(this);
 
   @override
   String kToString() => '<class>';

diff --git a/packages/beize_vm/lib/values/exception/exception.dart b/packages/beize_vm/lib/values/exception/exception.dart
@@ -29,7 +29,7 @@ class BeizeExceptionValue extends BeizeNativeObjectValue {
 
   @override
   BeizeExceptionValue kClone() =>
-      BeizeExceptionValue(message, stackTrace, dartStackTrace);
+      BeizeExceptionValue(message, stackTrace, dartStackTrace)..kCopyFrom(this);
 
   @override
   String kToString() => 'Exception: $message\nStack Trace:\n$stackTrace';

diff --git a/packages/beize_vm/lib/values/exception/exception_class.dart b/packages/beize_vm/lib/values/exception/exception_class.dart
@@ -1,6 +1,9 @@
 import '../exports.dart';
 
 class BeizeExceptionClassValue extends BeizeNativeClassValue {
+  @override
+  bool kInstance(final BeizeObjectValue value) => value is BeizeExceptionValue;
+
   @override
   BeizeExceptionValue kInstantiate(final BeizeCallableCall call) {
     final BeizeStringValue message = call.argumentAt(0);

diff --git a/packages/beize_vm/lib/values/function/function.dart b/packages/beize_vm/lib/values/function/function.dart
@@ -37,10 +37,9 @@ class BeizeFunctionValue extends BeizeNativeObjectValue
   }
 
   @override
-  BeizeFunctionValue kClone() => BeizeFunctionValue(
-        constant: constant,
-        namespace: namespace,
-      );
+  BeizeFunctionValue kClone() =>
+      BeizeFunctionValue(constant: constant, namespace: namespace)
+        ..kCopyFrom(this);
 
   @override
   String kToString() => '<function>';

diff --git a/packages/beize_vm/lib/values/function/function_class.dart b/packages/beize_vm/lib/values/function/function_class.dart
@@ -2,8 +2,8 @@ import '../exports.dart';
 
 class BeizeFunctionClassValue extends BeizeNativeClassValue {
   BeizeFunctionClassValue() {
-    set(
-      BeizeStringValue('call'),
+    setField(
+      'call',
       BeizeNativeFunctionValue(
         (final BeizeCallableCall call) {
           final BeizeCallableValue function = call.argumentAt(0);
@@ -14,10 +14,13 @@ class BeizeFunctionClassValue extends BeizeNativeClassValue {
     );
   }
 
+  @override
+  bool kInstance(final BeizeObjectValue value) => value is BeizeCallableValue;
+
   @override
   BeizeCallableValue kInstantiate(final BeizeCallableCall call) {
     final BeizeCallableValue value = call.argumentAt(0);
-    return value;
+    return value.kClone() as BeizeCallableValue;
   }
 
   @override

diff --git a/packages/beize_vm/lib/values/function/native/native_async_function.dart b/packages/beize_vm/lib/values/function/native/native_async_function.dart
@@ -32,10 +32,7 @@ class BeizeNativeAsyncFunctionValue extends BeizeNativeFunctionValue {
 
   @override
   BeizeNativeAsyncFunctionValue kClone() =>
-      BeizeNativeAsyncFunctionValue(function);
-
-  @override
-  BeizeClassValue get kClass => throw UnimplementedError();
+      BeizeNativeAsyncFunctionValue(function)..kCopyFrom(this);
 
   @override
   bool get isTruthy => true;

diff --git a/packages/beize_vm/lib/values/function/native/native_execute_function.dart b/packages/beize_vm/lib/values/function/native/native_execute_function.dart
@@ -18,10 +18,7 @@ class BeizeNativeExecuteFunctionValue extends BeizeNativeFunctionValue {
 
   @override
   BeizeNativeFunctionValue kClone() =>
-      BeizeNativeExecuteFunctionValue(function);
-
-  @override
-  BeizeClassValue get kClass => throw UnimplementedError();
+      BeizeNativeExecuteFunctionValue(function)..kCopyFrom(this);
 
   @override
   bool get isTruthy => true;

diff --git a/packages/beize_vm/lib/values/function/native/native_function.dart b/packages/beize_vm/lib/values/function/native/native_function.dart
@@ -26,6 +26,9 @@ abstract class BeizeNativeFunctionValue extends BeizeNativeObjectValue
   @override
   String kToString() => '<native function>';
 
+  @override
+  BeizeClassValue get kClass => throw UnimplementedError();
+
   @override
   BeizeClassValue kClassInternal(final BeizeVM vm) => vm.globals.functionClass;
 }
diff --git a/packages/beize_vm/lib/values/function/native/native_sync_function.dart b/packages/beize_vm/lib/values/function/native/native_sync_function.dart
@@ -26,10 +26,7 @@ class BeizeNativeSyncFunctionValue extends BeizeNativeFunctionValue {
 
   @override
   BeizeNativeSyncFunctionValue kClone() =>
-      BeizeNativeSyncFunctionValue(function);
-
-  @override
-  BeizeClassValue get kClass => throw UnimplementedError();
+      BeizeNativeSyncFunctionValue(function)..kCopyFrom(this);
 
   @override
   bool get isTruthy => true;

diff --git a/packages/beize_vm/lib/values/list/list.dart b/packages/beize_vm/lib/values/list/list.dart
@@ -360,7 +360,7 @@ class BeizeListValue extends BeizeNativeObjectValue {
   final BeizeValueKind kind = BeizeValueKind.list;
 
   @override
-  BeizeListValue kClone() => BeizeListValue(elements.toList());
+  BeizeListValue kClone() => BeizeListValue(elements.toList())..kCopyFrom(this);
 
   @override
   String kToString() =>

diff --git a/packages/beize_vm/lib/values/list/list_class.dart b/packages/beize_vm/lib/values/list/list_class.dart
@@ -3,8 +3,8 @@ import '../exports.dart';
 
 class BeizeListClassValue extends BeizeNativeClassValue {
   BeizeListClassValue() {
-    set(
-      BeizeStringValue('generate'),
+    setField(
+      'generate',
       BeizeNativeFunctionValue.sync(
         (final BeizeCallableCall call) {
           final int length = call.argumentAt<BeizeNumberValue>(0).intValue;
@@ -23,8 +23,8 @@ class BeizeListClassValue extends BeizeNativeClassValue {
         },
       ),
     );
-    set(
-      BeizeStringValue('filled'),
+    setField(
+      'filled',
       BeizeNativeFunctionValue.sync(
         (final BeizeCallableCall call) {
           final int length = call.argumentAt<BeizeNumberValue>(0).intValue;
@@ -37,6 +37,9 @@ class BeizeListClassValue extends BeizeNativeClassValue {
     );
   }
 
+  @override
+  bool kInstance(final BeizeObjectValue value) => value is BeizeListValue;
+
   @override
   BeizeListValue kInstantiate(final BeizeCallableCall call) {
     final BeizeListValue value = call.argumentAt(0);