Merge branch 'fix/issue279'

jsx · Oct 13, 2013 · 5374130 · 5374130
2 parents 56dae7e + 414f047
commit 5374130
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/src/classdef.jsx b/src/classdef.jsx
@@ -882,7 +882,7 @@ class ClassDefinition implements Stashable {
 			}
 			if (! Util.typesAreEqual((this._members[i] as MemberFunctionDefinition).getArgumentTypes(), member.getArgumentTypes()))
 				continue;
-			if ((! isCheckingInterface) && (member.flags() & ClassDefinition.IS_OVERRIDE) == 0) {
+			if ((! isCheckingInterface) && ((member.flags() | this._members[i].flags()) & ClassDefinition.IS_STATIC) == 0 && (member.flags() & ClassDefinition.IS_OVERRIDE) == 0) {
 				var error = new CompileError(member.getNameToken(), "overriding functions must have 'override' attribute set");
 				error.addCompileNote(new CompileNote(this._members[i].getNameToken(), Util.format("defined in base class '%1'", [this.classFullName()])));
 				context.errors.push(error);

diff --git a/t/run/357.issue279-static-method.jsx b/t/run/357.issue279-static-method.jsx
@@ -0,0 +1,21 @@
+/*EXPECTED
+ok
+*/
+
+class StaticParent
+{
+    static function f() : void { }
+}
+
+class StaticInstanceChild extends StaticParent
+{
+    function f() : void { }
+}
+
+class _Main {
+  static function main(args : string[]):void {
+    log "ok";
+  }
+}
+
+// vim: set expandtab tabstop=2 shiftwidth=2 ft=jsx: