Fixes #155

musictheory · Sep 25, 2018 · 38254a1 · 38254a1
1 parent db5a56a
commit 38254a1
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 31 deletions.
diff --git a/README.md b/README.md
@@ -907,7 +907,6 @@ warn-this-in-methods      | Boolean  | Warn about usage of 'this' in NilScript m
 warn-self-in-non-methods  | Boolean  | Warn about usage of 'self' in non-NilScript methods
 warn-unknown-ivars        | Boolean  | Warn about unknown ivars
 warn-unknown-selectors    | Boolean  | Warn about usage of unknown selectors
-warn-unknown-superclasses | Boolean  | Warn about usage of unknown selectors
 warn-unused-ivars         | Boolean  | Warn about unused ivars
 
 Valid properties for each `file` or `defs` object:

diff --git a/src/Compiler.js b/src/Compiler.js
@@ -73,7 +73,6 @@ const sPublicOptions = [
     "warn-self-in-non-methods",  // Boolean, warn about usage of 'self' in non-methods
     "warn-unknown-ivars",        // Boolean, warn about unknown ivars
     "warn-unknown-selectors",    // Boolean, warn about usage of unknown selectors
-    "warn-unknown-superclasses", // Boolean, warn about usage of unknown superclasses
     "warn-unused-ivars",         // Boolean, warn about unused ivars
 
     // Private / Development

diff --git a/src/Errors.js b/src/Errors.js
@@ -33,11 +33,11 @@ NSError.VariableAlreadyDeclared        = "NilScriptVariableAlreadyDeclaredError"
 NSError.VariableNotYetDeclared         = "NilScriptVariableNotYetDeclaredError";
 NSError.RestrictedUsage                = "NilScriptRestrictedUsageError";
 NSError.APIMisuse                      = "NilScriptAPIMisuseError";
+NSError.CircularClassHierarchy         = "NilScriptCircularClassHierarchyError";
+NSError.UnknownSuperclass              = "NilScriptUnknownSuperclassError";
 
 const NSWarning = { };
 
-NSWarning.CircularClassHierarchy       = "NilScriptCircularClassHierarchyWarning";
-NSWarning.UnknownSuperclass            = "NilScriptUnknownSuperclassWarning";
 NSWarning.UnknownSelector              = "NilScriptUnknownSelectorWarning";
 NSWarning.UseOfThisInMethod            = "NilScriptUseOfThisInMethodWarning";
 NSWarning.UseOfSelfInNonMethod         = "NilScriptUseOfSelfInNonMethodWarning";

diff --git a/src/Generator.js b/src/Generator.js
@@ -123,7 +123,6 @@ generate()
     let optionWarnSelfInNonMethod     = options["warn-self-in-non-methods"];
     let optionWarnUnknownIvars        = options["warn-unknown-ivars"];
     let optionWarnUnknownSelectors    = options["warn-unknown-selectors"];
-    let optionWarnUnknownSuperclasses = options["warn-unknown-superclasses"];
     let optionWarnUnusedIvars         = options["warn-unused-ivars"];
     let optionStrictFunctions         = options["strict-functions"];
     let optionStrictObjectLiterals    = options["strict-object-literals"];
@@ -524,14 +523,6 @@ generate()
         if (superName) {
             constructorCallSuper = getClassAsRuntimeVariable(superName) + ".call(this);";
             superSelector        = "{" + symbolTyper.getSymbolForClassName(superName) + ":1}";
-
-            if (optionWarnUnknownSuperclasses) {
-                let superclass = model.classes[superName];
-
-                if (!superclass || superclass.placeholder == true) {
-                    warnings.push(Utils.makeError(NSWarning.UnknownSuperclass, "Use of unknown superclass '" + superName + "'.", node.superClass));
-                }
-            }
         }
 
         let constructorSetIvars = generateIvarAssignments(currentClass);

diff --git a/src/model/NSClass.js b/src/model/NSClass.js
@@ -42,6 +42,7 @@ constructor(location, name, superclassName, protocolNames)
 
     // Warnings during the prepare() phase
     this.prepareWarnings = [ ];
+    this.superclass      = null;
 
     // All selectors the class responds to (inherited + synthesized). *not archived*
     this._knownSelectors = null;
@@ -184,20 +185,24 @@ _doAutomaticSynthesis()
 }
 
 
-_checkForCircularHierarchy(model)
+_checkHierarchy(model)
 {
     let visited = [ this.name ];
-    let superclass = this.superclassName ? model.classes[this.superclassName] : null;
+    let superclassName = this.superclassName;
+
+    if (superclassName && (!this.superclass || this.superclass.placeholder)) {
+        throw Utils.makeError(NSError.UnknownSuperclass, "Unknown superclass: '" + this.superclassName + "'", this.location);
+    }
 
-    while (superclass) {
-        if (visited.indexOf(superclass.name) >= 0) {
-             this.prepareWarnings.push(Utils.makeError(NSWarning.CircularClassHierarchy, "Circular class hierarchy detected: '" + visited.join(",") + "'", this.location));
-             break;
+    let currentSuperclass = this.superclass;
+    while (currentSuperclass) {
+        if (visited.indexOf(currentSuperclass.name) >= 0) {
+             throw Utils.makeError(NSError.CircularClassHierarchy, "Circular class hierarchy detected: '" + visited.join("', '") + "'");
         }
 
-        visited.push(superclass.name);
+        visited.push(currentSuperclass.name);
 
-        superclass = model.classes[superclass.superclassName];
+        currentSuperclass = model.classes[currentSuperclass.superclassName];
     }
 }
 
@@ -237,8 +242,10 @@ prepare(model)
 
     this.prepareWarnings = [ ];
 
+    this.superclass = this.superclassName ? model.classes[this.superclassName] : null;
+    this._checkHierarchy(model);
+
     this._doAutomaticSynthesis();
-    this._checkForCircularHierarchy(model);
 
     this._knownSelectors = { };
 

diff --git a/test/multi/TestErrors.oj b/test/multi/TestErrors.oj
@@ -318,27 +318,29 @@ function test() {
 
 // --------------------------------------------------------------------
 // @name Circular Class 1
+// @error-no-line NilScriptCircularClassHierarchyError
 
-@class CircularClassA : CircularClassB //@warning NilScriptCircularClassHierarchyWarning
+@class CircularClassA : CircularClassB
 @end
 
 
-@class CircularClassB : CircularClassA //@warning NilScriptCircularClassHierarchyWarning
+@class CircularClassB : CircularClassA
 @end
 
 // --------------------------------------------------------------------
 // @name Circular Class 2
+// @error-no-line NilScriptCircularClassHierarchyError
 
-@class CircularClassA : CircularClassB //@warning NilScriptCircularClassHierarchyWarning
+@class CircularClassA : CircularClassB
 @end
 
-@class CircularClassB : CircularClassC //@warning NilScriptCircularClassHierarchyWarning
+@class CircularClassB : CircularClassC
 @end
 
-@class CircularClassC : CircularClassD //@warning NilScriptCircularClassHierarchyWarning
+@class CircularClassC : CircularClassD
 @end
 
-@class CircularClassD : CircularClassA //@warning NilScriptCircularClassHierarchyWarning
+@class CircularClassD : CircularClassA
 @end
 
 // --------------------------------------------------------------------
@@ -456,10 +458,9 @@ var arr = [,,,,];  //@warning NilScriptUseOfEmptyArrayElementWarning
 
 
 // --------------------------------------------------------------------
-// @name Unknown Class
-// @opts { "warn-unknown-superclasses": true  }
+// @name Unknown Super Class
 
-@class Foo : NonExistantSuperClass //@warning NilScriptUnknownSuperclassWarning
+@class Foo : NonExistantSuperClass //@error NilScriptUnknownSuperclassError
 
 @end