Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9
This commit is contained in:
Jo Shields
2015-04-07 09:35:12 +01:00
parent 283343f570
commit 3c1f479b9d
22469 changed files with 2931443 additions and 869343 deletions

View File

@ -597,14 +597,10 @@ namespace System.Web.Compilation
tokenizer.ExpectAttrValue = old;
bool varname;
bool databinding;
#if NET_4_0
bool codeRenderEncode;
#endif
varname = Eat ('=');
databinding = !varname && Eat ('#');
#if NET_4_0
codeRenderEncode = !databinding && !varname && Eat (':');
#endif
string odds = tokenizer.Odds;
tokenizer.Verbatim = true;
@ -624,10 +620,8 @@ namespace System.Web.Compilation
tagtype = TagType.DataBinding;
else if (varname)
tagtype = TagType.CodeRenderExpression;
#if NET_4_0
else if (codeRenderEncode)
tagtype = TagType.CodeRenderEncode;
#endif
else
tagtype = TagType.CodeRender;
}