Merge pull request #307 from jsx/wasabiz/feature/allow-nullable-void

allow Nullable.<void>

Author: nyuichi

src/parser.jsx

@@ -1980,7 +1980,7 @@ class Parser {
 	function _nullableTypeDeclaration () : Type {
 		if (this._expect(".") == null || this._expect("<") == null)
 			return null;
-		var baseType = this._typeDeclaration(false);
+		var baseType = this._typeDeclaration(true);
 		if (baseType == null)
 			return null;
 		if (this._expect(">") == null)

src/type.jsx

@@ -63,7 +63,7 @@ abstract class Type {
 	}
 
 	function toNullableType (force : boolean) : Type {
-		if (force || this instanceof PrimitiveType) {
+		if (force || this instanceof PrimitiveType || this.equals(Type.voidType)) {
 			return new NullableType(this);
 		}
 		return this;
@@ -202,7 +202,7 @@ class VoidType extends Type {
 	}
 
 	override function isConvertibleTo (type : Type) : boolean {
-		return false;
+		return type.equals(Type.voidType);
 	}
 
 	override function getClassDef () : ClassDefinition {
@@ -363,13 +363,11 @@ class NullableType extends Type {
 	function constructor (type : Type) {
 		if (type.equals(Type.variantType))
 			throw new Error("logic flaw, cannot create Nullable.<variant>");
-		if (type.equals(Type.voidType))
-			throw new Error("logic flaw, cannot create Nullable.<void>");
 		this._baseType = type instanceof NullableType ? (type as NullableType)._baseType : type;
 	}
 
 	override function instantiate (instantiationContext : InstantiationContext, allowVoid : boolean) : Type {
-		var baseType = this._baseType.resolveIfNullable().instantiate(instantiationContext, allowVoid);
+		var baseType = this._baseType.resolveIfNullable().instantiate(instantiationContext, true);
 		return baseType.toNullableType();
 	}
 

t/compile_error/218.nullable-void-vs-void.jsx

@@ -0,0 +1,9 @@
+class C {
+
+	var m : Nullable.<void>;
+
+	function constructor() {
+		this.m = (function () : void {})();
+	}
+
+}

t/compile_error/218.nullable-void.jsx

@@ -0,0 +1,12 @@
+/*EXPECTED
+ok
+*/
+class C {
+	var a : Nullable.<void>;
+}
+
+class _Main {
+	static function main (args : string[]) : void {
+		log "ok";
+	}
+}

t/compile_error/219.nullable-void-deduced-from-tmplarg.jsx

@@ -0,0 +1,14 @@
+/*EXPECTED
+ok
+*/
+class C.<T> {
+	var a : Nullable.<T>;
+}
+class C2 {
+	var a : C.<void>;
+}
+class _Main {
+	static function main (args : string[]) : void {
+		log "ok";
+	}
+}

t/run/392.nullable-void.jsx

@@ -0,0 +1,15 @@
+/*EXPECTED
+null
+*/
+
+class C {
+	var m : Nullable.<void>;
+}
+
+class _Main {
+	static function main (args : string[]) : void {
+		var c = new C;
+
+		log c.m;
+	}
+}

t/run/393.nullable-void-deduced-from-tmplarg.jsx

@@ -0,0 +1,13 @@
+/*EXPECTED
+ok
+*/
+
+class _Main {
+	static function main (args : string[]) : void {
+		var a : Nullable.<void>;
+
+		a = null;
+
+		log "ok";
+	}
+}