Revert "fix Maybe(jckarter#1)"

This reverts commit 7759f3f.
sudison · Mar 30, 2013 · 1a0975a · 1a0975a
1 parent 7759f3f
commit 1a0975a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 13 deletions.
diff --git a/compiler/evaluator_op.cpp b/compiler/evaluator_op.cpp
@@ -90,14 +90,9 @@ static size_t valueToStaticSizeTOrInt(MultiEValuePtr args, unsigned index)
 static TypePtr valueToType(MultiEValuePtr args, unsigned index)
 {
     ObjectPtr obj = valueToStatic(args->values[index]);
-    if (!obj) {
+    if (!obj || (obj->objKind != TYPE))
         argumentError(index, "expecting a type");
-    }
-
-    if (obj->objKind == TYPE)
-        return (Type *)obj.ptr();
-    else
-        return staticType(obj);
+    return (Type *)obj.ptr();
 }
 
 static TypePtr valueToNumericType(MultiEValuePtr args, unsigned index)

diff --git a/lib-clay/core/variants/variants.clay b/lib-clay/core/variants/variants.clay
@@ -16,7 +16,7 @@ overload __operators__.variantReprType(#V) = VariantRepr[..VariantMembers(V)];
 
 [V,M when Variant?(V)]
 VariantMember?(#V, #M) =
-    VariantMemberIndex(V, #M) < VariantMemberCount(V);
+    VariantMemberIndex(V, M) < VariantMemberCount(V);
 
 
 /// @section  construct from value of member type 
@@ -35,7 +35,7 @@ alias initializeVariant(#V, x:T) --> returned:V {
 [V,T when Variant?(V) and VariantMember?(V, T)]
 alias overload V(x:T) = initializeVariant(V, x);
 
-[V,T,..AA when Variant?(V) and VariantMember?(V, #T) and CallDefined?(T, ..AA)]
+[V,T,..AA when Variant?(V) and VariantMember?(V, T) and CallDefined?(T, ..AA)]
 alias overload V(#T, ..args:AA) = V(T(..args));
 
 private abortInvalidTag(tag:Int) {

diff --git a/test/lib-clay/core/maybe/test.clay b/test/lib-clay/core/maybe/test.clay
@@ -64,8 +64,4 @@ main() = testMain(TestSuite("core.maybe", array(
         TestCase("require returns rvalue", -> {
             expectTrue(RValue?(require(nothing(Int))));
         }),
-
-        TestCase("static", -> {
-            expectEqual(#1, just(Maybe(#1)));
-        }),
     )));