Merge branch 'issue-70' of git://github.com/verpeteren/wren into verpeteren-issue-70

2015-02-27 07:41:25 -08:00
parent effa69f64e f05d6143f5
commit 46713a5bb3
9 changed files with 41 additions and 0 deletions
@@ -1094,6 +1094,19 @@ static bool runInterpreter(WrenVM* vm)
      {
        // TODO: Handle the superclass not being a class object!
        superclass = AS_CLASS(PEEK());
+        if (superclass == vm->classClass ||
+            superclass == vm->fiberClass ||
+            superclass == vm->fnClass ||
+            superclass == vm->listClass ||  /* This covers also OBJ_CLOSURE */
+            superclass == vm->mapClass ||
+            superclass == vm->rangeClass ||
+            superclass == vm->stringClass )
+        {
+          char message[70 + MAX_VARIABLE_NAME];
+          sprintf(message,
+              "Class '%s' may not subclass a built-in", name->value);
+          RUNTIME_ERROR(AS_STRING(wrenNewString(vm, message, strlen(message))));
+        }
      }

      int numFields = READ_BYTE();