Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Remove two checks for EXPRFLAG values in Microsoft.CSharp that are never set #22533

Merged
VSadov merged 2 commits into from
Jul 27, 2017
Merged

Remove two checks for EXPRFLAG values in Microsoft.CSharp that are never set #22533

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b358d09
Remove checks for implicit this.
JonHanna Jul 23, 2017
7a2aaf2
Remove check for literal constant.
JonHanna Jul 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Errors/ErrorCode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ internal enum ErrorCode
ERR_CantCallSpecialMethod = 571,
ERR_BogusType = 648,
ERR_MissingPredefinedMember = 656,
ERR_LiteralDoubleCast = 664,
ERR_ConvertToStaticClass = 716,
ERR_GenericArgIsStaticClass = 718,
ERR_PartialMethodToDelegate = 762,
Expand Down
3 changes: 0 additions & 3 deletions src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Errors/ErrorFacts.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,9 +197,6 @@ public static string GetMessage(ErrorCode code)
case ErrorCode.ERR_MissingPredefinedMember:
codeStr = SR.MissingPredefinedMember;
break;
case ErrorCode.ERR_LiteralDoubleCast:
codeStr = SR.LiteralDoubleCast;
break;
case ErrorCode.ERR_ConvertToStaticClass:
codeStr = SR.ConvertToStaticClass;
break;
Expand Down
10 changes: 0 additions & 10 deletions src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Conversion.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,16 +395,6 @@ private Expr mustConvertCore(Expr expr, ExprClass destExpr, CONVERTTYPE flags)
exprResult.SetError();
return exprResult;
}
else if (ftSrc == FUNDTYPE.FT_R8 && (0 != (expr.Flags & EXPRFLAG.EXF_LITERALCONST)) &&
(dest.isPredefType(PredefinedType.PT_FLOAT) || dest.isPredefType(PredefinedType.PT_DECIMAL)))
{
// Tried to assign a literal of type double (the default) to a float or decimal. Suggest use
// of a 'F' or 'M' suffix.
ErrorContext.Error(ErrorCode.ERR_LiteralDoubleCast, dest.isPredefType(PredefinedType.PT_DECIMAL) ? "M" : "F", dest);
exprResult = ExprFactory.CreateCast(0, destExpr, expr);
exprResult.SetError();
return exprResult;
}
}

if (expr.Type is NullType && dest.fundType() != FUNDTYPE.FT_REF)
Expand Down
11 changes: 2 additions & 9 deletions src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/ExpressionBinder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1617,15 +1617,8 @@ private bool IsMatchingStatic(SymWithType swt, Expr pObject)

if (isStatic)
{
// If we're static and we don't have an object, or we have an implicit this,
// then we're ok. The reason implicit this is ok is because if the user is
// just typing something like:
//
// Equals(
//
// then the implicit this can bind to statics.

if (pObject == null || ((pObject.Flags & EXPRFLAG.EXF_IMPLICITTHIS) != 0))
// If we're static and we don't have an object then we're ok.
if (pObject == null)
{
return true;
}
Expand Down
4 changes: 0 additions & 4 deletions src/Microsoft.CSharp/src/MultilingualResources/Microsoft.CSharp.de.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,10 +302,6 @@
<source>Missing compiler required member '{0}.{1}'</source>
<target state="needs-review-translation" state-qualifier="tm-suggestion">Der vom Compiler angeforderte Member "{0}.{1}" fehlt.</target>
</trans-unit>
<trans-unit id="LiteralDoubleCast" translate="yes" xml:space="preserve">
<source>Literal of type double cannot be implicitly converted to type '{1}'; use an '{0}' suffix to create a literal of this type</source>
<target state="needs-review-translation" state-qualifier="tm-suggestion">Literale vom Typ "double" können nicht implizit in den {1}-Typ konvertiert werden. Verwenden Sie ein {0}-Suffix, um ein Literal mit diesem Typ zu erstellen.</target>
</trans-unit>
<trans-unit id="ConvertToStaticClass" translate="yes" xml:space="preserve">
<source>Cannot convert to static type '{0}'</source>
<target state="needs-review-translation" state-qualifier="tm-suggestion">Die Konvertierung in den statischen {0}-Typ ist nicht möglich.</target>
Expand Down
4 changes: 0 additions & 4 deletions src/Microsoft.CSharp/src/MultilingualResources/Microsoft.CSharp.es.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,10 +302,6 @@
<source>Missing compiler required member '{0}.{1}'</source>
<target state="needs-review-translation" state-qualifier="tm-suggestion">Falta el miembro '{0}.{1}' que requiere el compilador.</target>
</trans-unit>
<trans-unit id="LiteralDoubleCast" translate="yes" xml:space="preserve">
<source>Literal of type double cannot be implicitly converted to type '{1}'; use an '{0}' suffix to create a literal of this type</source>
<target state="needs-review-translation" state-qualifier="tm-suggestion">El literal de tipo double no se puede convertir implícitamente en el tipo '{1}'; use un sufijo '{0}' para crear un literal de este tipo</target>
</trans-unit>
<trans-unit id="ConvertToStaticClass" translate="yes" xml:space="preserve">
<source>Cannot convert to static type '{0}'</source>
<target state="needs-review-translation" state-qualifier="tm-suggestion">No se puede convertir en el tipo estático '{0}'</target>
Expand Down
4 changes: 0 additions & 4 deletions src/Microsoft.CSharp/src/MultilingualResources/Microsoft.CSharp.fr.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,10 +302,6 @@
<source>Missing compiler required member '{0}.{1}'</source>
<target state="needs-review-translation" state-qualifier="tm-suggestion">Membre requis par le compilateur '{0}.{1}' manquant</target>
</trans-unit>
<trans-unit id="LiteralDoubleCast" translate="yes" xml:space="preserve">
<source>Literal of type double cannot be implicitly converted to type '{1}'; use an '{0}' suffix to create a literal of this type</source>
<target state="needs-review-translation" state-qualifier="tm-suggestion">Impossible de convertir implicitement un littéral de type double en type '{1}' ; utilisez un suffixe '{0}' pour créer un littéral de ce type</target>
</trans-unit>
<trans-unit id="ConvertToStaticClass" translate="yes" xml:space="preserve">
<source>Cannot convert to static type '{0}'</source>
<target state="needs-review-translation" state-qualifier="tm-suggestion">Impossible de convertir en type static '{0}'</target>
Expand Down
4 changes: 0 additions & 4 deletions src/Microsoft.CSharp/src/MultilingualResources/Microsoft.CSharp.it.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,10 +302,6 @@
<source>Missing compiler required member '{0}.{1}'</source>
<target state="needs-review-translation" state-qualifier="tm-suggestion">Manca il membro '{0}.{1}', necessario per il compilatore.</target>
</trans-unit>
<trans-unit id="LiteralDoubleCast" translate="yes" xml:space="preserve">
<source>Literal of type double cannot be implicitly converted to type '{1}'; use an '{0}' suffix to create a literal of this type</source>
<target state="needs-review-translation" state-qualifier="tm-suggestion">Impossibile convertire in modo implicito il valore letterale di tipo double nel tipo '{1}'. Utilizzare un suffisso '{0}' per creare un valore letterale di questo tipo</target>
</trans-unit>
<trans-unit id="ConvertToStaticClass" translate="yes" xml:space="preserve">
<source>Cannot convert to static type '{0}'</source>
<target state="needs-review-translation" state-qualifier="tm-suggestion">Impossibile convertire nel tipo statico '{0}'</target>
Expand Down
4 changes: 0 additions & 4 deletions src/Microsoft.CSharp/src/MultilingualResources/Microsoft.CSharp.ja.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,10 +302,6 @@
<source>Missing compiler required member '{0}.{1}'</source>
<target state="needs-review-translation" state-qualifier="tm-suggestion">コンパイラが必要とするメンバー '{0}.{1}' がありません</target>
</trans-unit>
<trans-unit id="LiteralDoubleCast" translate="yes" xml:space="preserve">
<source>Literal of type double cannot be implicitly converted to type '{1}'; use an '{0}' suffix to create a literal of this type</source>
<target state="needs-review-translation" state-qualifier="tm-suggestion">型 double のリテラルを暗黙的に型 '{1}' に変換することはできません。'{0}' サフィックスを使用して、この型のリテラルを作成してください</target>
</trans-unit>
<trans-unit id="ConvertToStaticClass" translate="yes" xml:space="preserve">
<source>Cannot convert to static type '{0}'</source>
<target state="needs-review-translation" state-qualifier="tm-suggestion">スタティック型 '{0}' へ変換できません</target>
Expand Down
4 changes: 0 additions & 4 deletions src/Microsoft.CSharp/src/MultilingualResources/Microsoft.CSharp.ko.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,10 +302,6 @@
<source>Missing compiler required member '{0}.{1}'</source>
<target state="needs-review-translation" state-qualifier="tm-suggestion">'{0}.{1}' 멤버를 필요로 하는 컴파일러가 없습니다.</target>
</trans-unit>
<trans-unit id="LiteralDoubleCast" translate="yes" xml:space="preserve">
<source>Literal of type double cannot be implicitly converted to type '{1}'; use an '{0}' suffix to create a literal of this type</source>
<target state="needs-review-translation" state-qualifier="tm-suggestion">double 형식의 리터럴을 암시적으로 '{1}' 형식으로 변환할 수 없습니다. 이 형식의 리터럴을 만들려면 '{0}' 접미사를 사용하십시오.</target>
</trans-unit>
<trans-unit id="ConvertToStaticClass" translate="yes" xml:space="preserve">
<source>Cannot convert to static type '{0}'</source>
<target state="needs-review-translation" state-qualifier="tm-suggestion">'{0}' 정적 형식으로 변환할 수 없습니다.</target>
Expand Down
4 changes: 0 additions & 4 deletions src/Microsoft.CSharp/src/MultilingualResources/Microsoft.CSharp.ru.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,10 +302,6 @@
<source>Missing compiler required member '{0}.{1}'</source>
<target state="needs-review-translation" state-qualifier="tm-suggestion">Отсутствует обязательный для компилятора член "{0}.{1}"</target>
</trans-unit>
<trans-unit id="LiteralDoubleCast" translate="yes" xml:space="preserve">
<source>Literal of type double cannot be implicitly converted to type '{1}'; use an '{0}' suffix to create a literal of this type</source>
<target state="needs-review-translation" state-qualifier="tm-suggestion">Литерал с типом double не может быть неявно преобразован к типу "{1}"; для создания литерала этого типа следует воспользоваться суффиксом "{0}"</target>
</trans-unit>
<trans-unit id="ConvertToStaticClass" translate="yes" xml:space="preserve">
<source>Cannot convert to static type '{0}'</source>
<target state="needs-review-translation" state-qualifier="tm-suggestion">Не удается выполнить преобразование к статическому типу "{0}"</target>
Expand Down
4 changes: 0 additions & 4 deletions src/Microsoft.CSharp/src/MultilingualResources/Microsoft.CSharp.zh-Hans.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,10 +302,6 @@
<source>Missing compiler required member '{0}.{1}'</source>
<target state="needs-review-translation" state-qualifier="tm-suggestion">缺少编译器要求的成员“{0}.{1}”</target>
</trans-unit>
<trans-unit id="LiteralDoubleCast" translate="yes" xml:space="preserve">
<source>Literal of type double cannot be implicitly converted to type '{1}'; use an '{0}' suffix to create a literal of this type</source>
<target state="needs-review-translation" state-qualifier="tm-suggestion">无法将 Double 类型隐式转换为“{1}”类型；请使用“{0}”后缀创建此类型</target>
</trans-unit>
<trans-unit id="ConvertToStaticClass" translate="yes" xml:space="preserve">
<source>Cannot convert to static type '{0}'</source>
<target state="needs-review-translation" state-qualifier="tm-suggestion">无法转换为静态类型“{0}”</target>
Expand Down
4 changes: 0 additions & 4 deletions src/Microsoft.CSharp/src/MultilingualResources/Microsoft.CSharp.zh-Hant.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,10 +302,6 @@
<source>Missing compiler required member '{0}.{1}'</source>
<target state="needs-review-translation" state-qualifier="tm-suggestion">遺漏編譯器所需的成員 '{0}.{1}'</target>
</trans-unit>
<trans-unit id="LiteralDoubleCast" translate="yes" xml:space="preserve">
<source>Literal of type double cannot be implicitly converted to type '{1}'; use an '{0}' suffix to create a literal of this type</source>
<target state="needs-review-translation" state-qualifier="tm-suggestion">不能隱含將型別 double 的常值轉換為型別 '{1}'; 請使用 '{0}' 後置字元來建立此型別的常值</target>
</trans-unit>
<trans-unit id="ConvertToStaticClass" translate="yes" xml:space="preserve">
<source>Cannot convert to static type '{0}'</source>
<target state="needs-review-translation" state-qualifier="tm-suggestion">無法轉換為靜態型別 '{0}'</target>
Expand Down
3 changes: 0 additions & 3 deletions src/Microsoft.CSharp/src/Resources/Strings.de.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,9 +234,6 @@
<data name="MissingPredefinedMember" xml:space="preserve">
<value>Der vom Compiler angeforderte Member "{0}.{1}" fehlt.</value>
</data>
<data name="LiteralDoubleCast" xml:space="preserve">
<value>Literale vom Typ "double" können nicht implizit in den {1}-Typ konvertiert werden. Verwenden Sie ein {0}-Suffix, um ein Literal mit diesem Typ zu erstellen.</value>
</data>
<data name="ConvertToStaticClass" xml:space="preserve">
<value>Die Konvertierung in den statischen {0}-Typ ist nicht möglich.</value>
</data>
Expand Down
3 changes: 0 additions & 3 deletions src/Microsoft.CSharp/src/Resources/Strings.es.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,9 +234,6 @@
<data name="MissingPredefinedMember" xml:space="preserve">
<value>Falta el miembro '{0}.{1}' que requiere el compilador.</value>
</data>
<data name="LiteralDoubleCast" xml:space="preserve">
<value>El literal de tipo double no se puede convertir implícitamente en el tipo '{1}'; use un sufijo '{0}' para crear un literal de este tipo</value>
</data>
<data name="ConvertToStaticClass" xml:space="preserve">
<value>No se puede convertir en el tipo estático '{0}'</value>
</data>
Expand Down
3 changes: 0 additions & 3 deletions src/Microsoft.CSharp/src/Resources/Strings.fr.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,9 +234,6 @@
<data name="MissingPredefinedMember" xml:space="preserve">
<value>Membre requis par le compilateur '{0}.{1}' manquant</value>
</data>
<data name="LiteralDoubleCast" xml:space="preserve">
<value>Impossible de convertir implicitement un littéral de type double en type '{1}' ; utilisez un suffixe '{0}' pour créer un littéral de ce type</value>
</data>
<data name="ConvertToStaticClass" xml:space="preserve">
<value>Impossible de convertir en type static '{0}'</value>
</data>
Expand Down
3 changes: 0 additions & 3 deletions src/Microsoft.CSharp/src/Resources/Strings.it.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,9 +234,6 @@
<data name="MissingPredefinedMember" xml:space="preserve">
<value>Manca il membro '{0}.{1}', necessario per il compilatore.</value>
</data>
<data name="LiteralDoubleCast" xml:space="preserve">
<value>Impossibile convertire in modo implicito il valore letterale di tipo double nel tipo '{1}'. Utilizzare un suffisso '{0}' per creare un valore letterale di questo tipo</value>
</data>
<data name="ConvertToStaticClass" xml:space="preserve">
<value>Impossibile convertire nel tipo statico '{0}'</value>
</data>
Expand Down
3 changes: 0 additions & 3 deletions src/Microsoft.CSharp/src/Resources/Strings.ja.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,9 +234,6 @@
<data name="MissingPredefinedMember" xml:space="preserve">
<value>コンパイラが必要とするメンバー '{0}.{1}' がありません</value>
</data>
<data name="LiteralDoubleCast" xml:space="preserve">
<value>型 double のリテラルを暗黙的に型 '{1}' に変換することはできません。'{0}' サフィックスを使用して、この型のリテラルを作成してください</value>
</data>
<data name="ConvertToStaticClass" xml:space="preserve">
<value>スタティック型 '{0}' へ変換できません</value>
</data>
Expand Down
3 changes: 0 additions & 3 deletions src/Microsoft.CSharp/src/Resources/Strings.ko.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,9 +234,6 @@
<data name="MissingPredefinedMember" xml:space="preserve">
<value>'{0}.{1}' 멤버를 필요로 하는 컴파일러가 없습니다.</value>
</data>
<data name="LiteralDoubleCast" xml:space="preserve">
<value>double 형식의 리터럴을 암시적으로 '{1}' 형식으로 변환할 수 없습니다. 이 형식의 리터럴을 만들려면 '{0}' 접미사를 사용하십시오.</value>
</data>
<data name="ConvertToStaticClass" xml:space="preserve">
<value>'{0}' 정적 형식으로 변환할 수 없습니다.</value>
</data>
Expand Down
3 changes: 0 additions & 3 deletions src/Microsoft.CSharp/src/Resources/Strings.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,9 +280,6 @@
<data name="MissingPredefinedMember" xml:space="preserve">
<value>Missing compiler required member '{0}.{1}'</value>
</data>
<data name="LiteralDoubleCast" xml:space="preserve">
<value>Literal of type double cannot be implicitly converted to type '{1}'; use an '{0}' suffix to create a literal of this type</value>
</data>
<data name="ConvertToStaticClass" xml:space="preserve">
<value>Cannot convert to static type '{0}'</value>
</data>
Expand Down
3 changes: 0 additions & 3 deletions src/Microsoft.CSharp/src/Resources/Strings.ru.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,9 +234,6 @@
<data name="MissingPredefinedMember" xml:space="preserve">
<value>Отсутствует обязательный для компилятора член "{0}.{1}"</value>
</data>
<data name="LiteralDoubleCast" xml:space="preserve">
<value>Литерал с типом double не может быть неявно преобразован к типу "{1}"; для создания литерала этого типа следует воспользоваться суффиксом "{0}"</value>
</data>
<data name="ConvertToStaticClass" xml:space="preserve">
<value>Не удается выполнить преобразование к статическому типу "{0}"</value>
</data>
Expand Down
3 changes: 0 additions & 3 deletions src/Microsoft.CSharp/src/Resources/Strings.zh-Hans.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,9 +234,6 @@
<data name="MissingPredefinedMember" xml:space="preserve">
<value>缺少编译器要求的成员“{0}.{1}”</value>
</data>
<data name="LiteralDoubleCast" xml:space="preserve">
<value>无法将 Double 类型隐式转换为“{1}”类型；请使用“{0}”后缀创建此类型</value>
</data>
<data name="ConvertToStaticClass" xml:space="preserve">
<value>无法转换为静态类型“{0}”</value>
</data>
Expand Down
3 changes: 0 additions & 3 deletions src/Microsoft.CSharp/src/Resources/Strings.zh-Hant.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,9 +234,6 @@
<data name="MissingPredefinedMember" xml:space="preserve">
<value>遺漏編譯器所需的成員 '{0}.{1}'</value>
</data>
<data name="LiteralDoubleCast" xml:space="preserve">
<value>不能隱含將型別 double 的常值轉換為型別 '{1}'; 請使用 '{0}' 後置字元來建立此型別的常值</value>
</data>
<data name="ConvertToStaticClass" xml:space="preserve">
<value>無法轉換為靜態型別 '{0}'</value>
</data>
Expand Down