auto merge of #2225 : Ms2ger/servo/any-dictionary, r=jdm

This commit is contained in:
bors-servo 2014-04-24 17:22:16 -04:00
commit 2abd46a7b3
2 changed files with 3 additions and 4 deletions

View file

@ -765,10 +765,6 @@ def getJSToNativeConversionTemplate(type, descriptorProvider, failureCode=None,
if type.isAny():
assert not isEnforceRange and not isClamp
if isMember:
raise TypeError("Can't handle member 'any'; need to sort out "
"rooting issues")
declType = CGGeneric("JSVal")
value = CGGeneric("${val}")
if isOptional:
@ -4236,6 +4232,8 @@ class CGDictionary(CGThing):
return '~""'
elif ty.startswith("Option"):
return "None"
elif ty == "JSVal":
return "UndefinedValue()"
else:
return "/* uh oh: %s */" % ty

View file

@ -36,6 +36,7 @@ dictionary TestDictionaryDefaults {
// double doubleValue = 7.0;
DOMString stringValue = "";
// TestEnum enumValue = "bar";
any anyValue = null;
// boolean? nullableBooleanValue = false;
// byte? nullableByteValue = 7;