fix: fix class extends without super

axetroy · Mar 7, 2018 · 9a6b3be · 9a6b3be
1 parent 60da1e2
commit 9a6b3be
Show file tree

Hide file tree

Showing 3 changed files with 233 additions and 190 deletions.
diff --git a/src/error.ts b/src/error.ts
@@ -33,3 +33,7 @@ export class ErrInvalidIterable extends ErrIsNot {
     super(name, "iterable");
   }
 }
+
+export const ErrNoSuper = new ReferenceError(
+  `Uncaught ReferenceError: Must call super constructor in derived class before accessing 'this' or returning from derived constructor`
+);
diff --git a/src/evaluate.ts b/src/evaluate.ts
@@ -4,7 +4,8 @@ import {
   ErrNotSupport,
   ErrDuplicateDeclard,
   ErrUnexpectedToken,
-  ErrInvalidIterable
+  ErrInvalidIterable,
+  ErrNoSuper
 } from "./error";
 import {Scope, ScopeVar, Kind} from "./scope";
 import {
@@ -832,7 +833,24 @@ const evaluate_map = {
             }
           });
 
-          evaluate(constructor, newScope, {SuperClass});
+          if (node.superClass) {
+            // make sure super exist in first line
+            const superCallExpression: types.ExpressionStatement = <types.ExpressionStatement>(<any>constructor).body.body.shift();
+
+            if (
+              !types.isExpressionStatement(superCallExpression) ||
+              !types.isCallExpression(superCallExpression.expression) ||
+              !types.isSuper(superCallExpression.expression.callee)
+            ) {
+              throw ErrNoSuper;
+            } else {
+              // TODO: run super
+            }
+          }
+
+          constructor.body.body.forEach(n =>
+            evaluate(n, newScope, {SuperClass})
+          );
         }
 
         return __this;