diff --git a/src/Compiler/FSComp.txt b/src/Compiler/FSComp.txt index 26699fa4d9b..78f1177d19c 100644 --- a/src/Compiler/FSComp.txt +++ b/src/Compiler/FSComp.txt @@ -37,7 +37,6 @@ buildUnexpectedTypeArgs,"The non-generic type '%s' does not expect any type argu returnUsedInsteadOfReturnBang,"Consider using 'return!' instead of 'return'." yieldUsedInsteadOfYieldBang,"Consider using 'yield!' instead of 'yield'." tupleRequiredInAbstractMethod,"\nA tuple type is required for one or more arguments. Consider wrapping the given arguments in additional parentheses or review the definition of the interface." -10,parsUnexpectedSymbolDot,"Unexpected symbol '.' in member definition. Expected 'with', '=' or other token." 201,tcNamespaceCannotContainValues,"Namespaces cannot contain values. Consider using a module to hold your value declarations." 202,unsupportedAttribute,"This attribute is currently unsupported by the F# compiler. Applying it will not achieve its intended effect." 203,buildInvalidWarningNumber,"Invalid warning number '%s'" @@ -1563,7 +1562,6 @@ optsAlwaysInline,"Always inline 'inline' functions" nativeResourceFormatError,"Stream does not begin with a null resource and is not in '.RES' format." nativeResourceHeaderMalformed,"Resource header beginning at offset %s is malformed." formatDashItem," - %s" -featureSingleUnderscorePattern,"single underscore pattern" featureWildCardInForLoop,"wild card in for loop" featureRelaxWhitespace,"whitespace relaxation" featureNameOf,"nameof" diff --git a/src/Compiler/Facilities/LanguageFeatures.fs b/src/Compiler/Facilities/LanguageFeatures.fs index ad170712e4a..202d87a27cb 100644 --- a/src/Compiler/Facilities/LanguageFeatures.fs +++ b/src/Compiler/Facilities/LanguageFeatures.fs @@ -16,7 +16,6 @@ module internal FSharp.Compiler.Features [] type LanguageFeature = - | SingleUnderscorePattern | WildCardInForLoop | RelaxWhitespace | RelaxWhitespace2 @@ -152,7 +151,6 @@ type LanguageVersion(versionText, ?disabledFeaturesArray: LanguageFeature array) dict [ // F# 4.7 - LanguageFeature.SingleUnderscorePattern, languageVersion47 LanguageFeature.WildCardInForLoop, languageVersion47 LanguageFeature.RelaxWhitespace, languageVersion47 LanguageFeature.ImplicitYield, languageVersion47 @@ -364,7 +362,6 @@ type LanguageVersion(versionText, ?disabledFeaturesArray: LanguageFeature array) /// Get a string name for the given feature. static member GetFeatureString feature = match feature with - | LanguageFeature.SingleUnderscorePattern -> FSComp.SR.featureSingleUnderscorePattern () | LanguageFeature.WildCardInForLoop -> FSComp.SR.featureWildCardInForLoop () | LanguageFeature.RelaxWhitespace -> FSComp.SR.featureRelaxWhitespace () | LanguageFeature.RelaxWhitespace2 -> FSComp.SR.featureRelaxWhitespace2 () diff --git a/src/Compiler/Facilities/LanguageFeatures.fsi b/src/Compiler/Facilities/LanguageFeatures.fsi index 8c7ebd7e3c3..cb7127caf03 100644 --- a/src/Compiler/Facilities/LanguageFeatures.fsi +++ b/src/Compiler/Facilities/LanguageFeatures.fsi @@ -6,7 +6,6 @@ module internal FSharp.Compiler.Features /// LanguageFeature enumeration [] type LanguageFeature = - | SingleUnderscorePattern | WildCardInForLoop | RelaxWhitespace | RelaxWhitespace2 diff --git a/src/Compiler/pars.fsy b/src/Compiler/pars.fsy index b83bcaefefd..1f87aadb00f 100644 --- a/src/Compiler/pars.fsy +++ b/src/Compiler/pars.fsy @@ -2250,10 +2250,7 @@ opt_typ: atomicPatternLongIdent: | UNDERSCORE DOT pathOp - { if not (parseState.LexBuffer.SupportsFeature LanguageFeature.SingleUnderscorePattern) then - raiseParseErrorAt (rhs parseState 2) (FSComp.SR.parsUnexpectedSymbolDot()) - - let underscore = ident("_", rhs parseState 1) + { let underscore = ident("_", rhs parseState 1) let mDot = rhs parseState 2 None, prependIdentInLongIdentWithTrivia (SynIdent(underscore, None)) mDot $3 } @@ -2266,10 +2263,7 @@ atomicPatternLongIdent: { (None, $1) } | access UNDERSCORE DOT pathOp - { if not (parseState.LexBuffer.SupportsFeature LanguageFeature.SingleUnderscorePattern) then - raiseParseErrorAt (rhs parseState 3) (FSComp.SR.parsUnexpectedSymbolDot()) - - let underscore = ident("_", rhs parseState 2) + { let underscore = ident("_", rhs parseState 2) let mDot = rhs parseState 3 Some($1), prependIdentInLongIdentWithTrivia (SynIdent(underscore, None)) mDot $4 } diff --git a/src/Compiler/xlf/FSComp.txt.cs.xlf b/src/Compiler/xlf/FSComp.txt.cs.xlf index 8cb70b4c49e..fa077c412f0 100644 --- a/src/Compiler/xlf/FSComp.txt.cs.xlf +++ b/src/Compiler/xlf/FSComp.txt.cs.xlf @@ -662,11 +662,6 @@ omezení vlastního typu - - single underscore pattern - vzor s jedním podtržítkem - - Allow static let bindings in union, record, struct, non-incremental-class types Povolit vazby statického let v typech union, record, struct a non-incremental-class @@ -1292,11 +1287,6 @@ Neočekávaný konec vstupu ve větvi else if nebo elif podmíněného výrazu Očekávalo se elif <expr> then <expr> nebo else if <expr> then <expr>. - - Unexpected symbol '.' in member definition. Expected 'with', '=' or other token. - Neočekávaný symbol . v definici členu. Očekávalo se with, = nebo jiný token. - - Specify algorithm for calculating source file checksum stored in PDB. Supported values are: SHA1 or SHA256 (default) Zadejte algoritmus pro výpočet kontrolního součtu zdrojového souboru uloženého v PDB. Podporované hodnoty jsou: SHA1 nebo SHA256 (výchozí). diff --git a/src/Compiler/xlf/FSComp.txt.de.xlf b/src/Compiler/xlf/FSComp.txt.de.xlf index 5686312be6b..1011a0f649a 100644 --- a/src/Compiler/xlf/FSComp.txt.de.xlf +++ b/src/Compiler/xlf/FSComp.txt.de.xlf @@ -662,11 +662,6 @@ Selbsttypeinschränkungen - - single underscore pattern - Muster mit einzelnem Unterstrich - - Allow static let bindings in union, record, struct, non-incremental-class types Statische let-Bindungen in den Typen "union", "record", "struct" und "non-incremental-class" zulassen @@ -1292,11 +1287,6 @@ Unerwartetes Ende der Eingabe im "else if"- oder "elif"-Branch des bedingten Ausdrucks. Erwartet wird: "elif <expr> then <expr>" oder "else if <expr> then <expr>". - - Unexpected symbol '.' in member definition. Expected 'with', '=' or other token. - Unerwartetes Symbol "." in der Memberdefinition. Erwartet wurde "with", "=" oder ein anderes Token. - - Specify algorithm for calculating source file checksum stored in PDB. Supported values are: SHA1 or SHA256 (default) Geben Sie einen Algorithmus für die Berechnung der Quelldateiprüfsumme an, welcher in PDB gespeichert ist. Unterstützte Werte sind: SHA1 oder SHA256 (Standard) diff --git a/src/Compiler/xlf/FSComp.txt.es.xlf b/src/Compiler/xlf/FSComp.txt.es.xlf index a3b4cfce50b..c2819c057a3 100644 --- a/src/Compiler/xlf/FSComp.txt.es.xlf +++ b/src/Compiler/xlf/FSComp.txt.es.xlf @@ -662,11 +662,6 @@ restricciones de tipo propio - - single underscore pattern - patrón de subrayado simple - - Allow static let bindings in union, record, struct, non-incremental-class types Permitir enlaces let estáticos en tipos de clase de unión, registro, estructura y no incremental @@ -1292,11 +1287,6 @@ Fin de entrada inesperado en la rama "else if" o "elif" de una expresión condicional. Se espera "elif <expr> then <expr>" o "else if <expr> then <expr>". - - Unexpected symbol '.' in member definition. Expected 'with', '=' or other token. - Símbolo inesperado "." en la definición de miembro. Se esperaba "with", "=" u otro token. - - Specify algorithm for calculating source file checksum stored in PDB. Supported values are: SHA1 or SHA256 (default) Especifique el algoritmo para calcular la suma de comprobación del archivo de origen almacenada en PDB. Los valores admitidos son SHA1 o SHA256 (predeterminado) diff --git a/src/Compiler/xlf/FSComp.txt.fr.xlf b/src/Compiler/xlf/FSComp.txt.fr.xlf index bf46f5ee12b..f2f59f2b0ba 100644 --- a/src/Compiler/xlf/FSComp.txt.fr.xlf +++ b/src/Compiler/xlf/FSComp.txt.fr.xlf @@ -662,11 +662,6 @@ contraintes d’auto-type - - single underscore pattern - modèle de trait de soulignement unique - - Allow static let bindings in union, record, struct, non-incremental-class types Autoriser les liaisons let statiques dans les types union, record, struct et classes non incrémentielles @@ -1292,11 +1287,6 @@ Fin d'entrée inattendue dans la branche 'else if' ou 'elif' de l'expression conditionnelle. Attendu 'elif <expr> then <expr>' ou 'else if <expr> then <expr>'. - - Unexpected symbol '.' in member definition. Expected 'with', '=' or other token. - Symbole '.' inattendu dans la définition du membre. 'with','=' ou autre jeton attendu. - - Specify algorithm for calculating source file checksum stored in PDB. Supported values are: SHA1 or SHA256 (default) Spécifiez l'algorithme pour calculer la somme de contrôle du fichier source stocké au format PDB. Les valeurs prises en charge sont : SHA1 ou SHA256 (par défaut) diff --git a/src/Compiler/xlf/FSComp.txt.it.xlf b/src/Compiler/xlf/FSComp.txt.it.xlf index 6d705cdc2d1..5d6ee502997 100644 --- a/src/Compiler/xlf/FSComp.txt.it.xlf +++ b/src/Compiler/xlf/FSComp.txt.it.xlf @@ -662,11 +662,6 @@ vincoli di tipo automatico - - single underscore pattern - criterio per carattere di sottolineatura singolo - - Allow static let bindings in union, record, struct, non-incremental-class types Consenti binding statici let in tipi di classe non incrementali, union, record, struct @@ -1292,11 +1287,6 @@ Fine dell'input imprevista nel ramo 'else if' o 'elif' dell'espressione condizionale. È previsto 'elif <expr> then <expr>' o 'else if <expr> then <expr>'. - - Unexpected symbol '.' in member definition. Expected 'with', '=' or other token. - Simbolo '.' imprevisto nella definizione di membro. È previsto 'with', '=' o un altro token. - - Specify algorithm for calculating source file checksum stored in PDB. Supported values are: SHA1 or SHA256 (default) Consente di specificare l'algoritmo per calcolare il checksum del file di origine archiviato nel file PDB. I valori supportati sono SHA1 e SHA256 (predefinito). diff --git a/src/Compiler/xlf/FSComp.txt.ja.xlf b/src/Compiler/xlf/FSComp.txt.ja.xlf index 0b35b8e6dac..d82f19c1334 100644 --- a/src/Compiler/xlf/FSComp.txt.ja.xlf +++ b/src/Compiler/xlf/FSComp.txt.ja.xlf @@ -662,11 +662,6 @@ 自己型制約 - - single underscore pattern - 単一のアンダースコア パターン - - Allow static let bindings in union, record, struct, non-incremental-class types 共用体型、レコード型、構造体型、非増分クラス型の静的 let バインドを許可する @@ -1292,11 +1287,6 @@ 条件式の 'else if' または 'elif' 分岐の入力が予期しない形式で終了しています。'elif <expr> then <expr>' または 'else if <expr> then <expr>' が必要でした。 - - Unexpected symbol '.' in member definition. Expected 'with', '=' or other token. - メンバー定義に予期しない記号 '.' があります。'with'、'=' またはその他のトークンが必要です。 - - Specify algorithm for calculating source file checksum stored in PDB. Supported values are: SHA1 or SHA256 (default) PDB に格納されているソース ファイル チェックサムを計算するためのアルゴリズムを指定します。サポートされる値は次のとおりです: SHA1 または SHA256 (既定) diff --git a/src/Compiler/xlf/FSComp.txt.ko.xlf b/src/Compiler/xlf/FSComp.txt.ko.xlf index b00f54bfa76..bf1a23e8723 100644 --- a/src/Compiler/xlf/FSComp.txt.ko.xlf +++ b/src/Compiler/xlf/FSComp.txt.ko.xlf @@ -662,11 +662,6 @@ 자체 형식 제약 조건 - - single underscore pattern - 단일 밑줄 패턴 - - Allow static let bindings in union, record, struct, non-incremental-class types union, record, struct, non-incremental 클래스 형식에서 정적 let 바인딩 허용 @@ -1292,11 +1287,6 @@ 조건식의 'else if' 또는 'elif' 분기에서 입력이 예기치 않게 끝났습니다. 'elif <expr> then <expr>' 또는 'else if <expr> then <expr>'이 필요합니다. - - Unexpected symbol '.' in member definition. Expected 'with', '=' or other token. - 멤버 정의의 예기치 않은 기호 '.'입니다. 'with', '=' 또는 기타 토큰이 필요합니다. - - Specify algorithm for calculating source file checksum stored in PDB. Supported values are: SHA1 or SHA256 (default) PDB에 저장된 소스 파일 체크섬을 계산하기 위한 알고리즘을 지정합니다. 지원되는 값은 SHA1 또는 SHA256(기본값)입니다. diff --git a/src/Compiler/xlf/FSComp.txt.pl.xlf b/src/Compiler/xlf/FSComp.txt.pl.xlf index b6d4b78a2d8..164ece7516e 100644 --- a/src/Compiler/xlf/FSComp.txt.pl.xlf +++ b/src/Compiler/xlf/FSComp.txt.pl.xlf @@ -662,11 +662,6 @@ ograniczenia typu własnego - - single underscore pattern - wzorzec z pojedynczym podkreśleniem - - Allow static let bindings in union, record, struct, non-incremental-class types Zezwalaj na statyczne powiązania let w typach związku, rekordu, struktur, nieprzyrostowych klas @@ -1292,11 +1287,6 @@ Nieoczekiwane zakończenie danych wejściowych w gałęzi „else” wyrażenia warunkowego. Oczekiwano konstrukcji „elif <expr> then <expr>” lub „else if <expr> then <expr>”. - - Unexpected symbol '.' in member definition. Expected 'with', '=' or other token. - Nieoczekiwany symbol „.” w definicji składowej. Oczekiwano ciągu „with”, znaku „=” lub innego tokenu. - - Specify algorithm for calculating source file checksum stored in PDB. Supported values are: SHA1 or SHA256 (default) Określ algorytm obliczania sumy kontrolnej pliku źródłowego przechowywanej w pliku PDB. Obsługiwane wartości to SHA1 lub SHA256 (domyślnie) diff --git a/src/Compiler/xlf/FSComp.txt.pt-BR.xlf b/src/Compiler/xlf/FSComp.txt.pt-BR.xlf index ba46752a529..7cf4cfb8086 100644 --- a/src/Compiler/xlf/FSComp.txt.pt-BR.xlf +++ b/src/Compiler/xlf/FSComp.txt.pt-BR.xlf @@ -662,11 +662,6 @@ restrições de auto-tipo - - single underscore pattern - padrão de sublinhado simples - - Allow static let bindings in union, record, struct, non-incremental-class types Permitir associações let estáticas em tipos de união, registro, struct e não incremental @@ -1292,11 +1287,6 @@ Fim inesperado de entrada no branch 'else if' ou 'elif' da expressão condicional. Esperado 'elif <expr> em seguida, <expr>' ou 'else if <expr> then <expr>'. - - Unexpected symbol '.' in member definition. Expected 'with', '=' or other token. - Símbolo inesperado '.' na definição de membro. Esperado 'com', '=' ou outro token. - - Specify algorithm for calculating source file checksum stored in PDB. Supported values are: SHA1 or SHA256 (default) Especifique o algoritmo para calcular a soma de verificação do arquivo de origem armazenada no PDB. Os valores suportados são: SHA1 ou SHA256 (padrão) diff --git a/src/Compiler/xlf/FSComp.txt.ru.xlf b/src/Compiler/xlf/FSComp.txt.ru.xlf index 4a13225bc33..bebdaa4d3eb 100644 --- a/src/Compiler/xlf/FSComp.txt.ru.xlf +++ b/src/Compiler/xlf/FSComp.txt.ru.xlf @@ -662,11 +662,6 @@ ограничения самостоятельного типа - - single underscore pattern - шаблон с одним подчеркиванием - - Allow static let bindings in union, record, struct, non-incremental-class types Разрешить статические привязки "let" в типах union, record, struct, non-incremental-class @@ -1292,11 +1287,6 @@ Неожиданное завершение входных данных ветви "else if" или "elif" условного выражения. Ожидается "elif <expr> then <expr> " или "else if <expr> then <expr>" - - Unexpected symbol '.' in member definition. Expected 'with', '=' or other token. - Неожиданный символ "." в определении члена. Ожидаемые инструкции: "with", "=" или другие токены. - - Specify algorithm for calculating source file checksum stored in PDB. Supported values are: SHA1 or SHA256 (default) Укажите алгоритм для вычисления контрольной суммы исходного файла, хранящейся в файле PDB. Поддерживаемые значения: SHA1 или SHA256 (по умолчанию) diff --git a/src/Compiler/xlf/FSComp.txt.tr.xlf b/src/Compiler/xlf/FSComp.txt.tr.xlf index 0d880a3f23a..24eceea5fe8 100644 --- a/src/Compiler/xlf/FSComp.txt.tr.xlf +++ b/src/Compiler/xlf/FSComp.txt.tr.xlf @@ -662,11 +662,6 @@ kendi kendine tür kısıtlamaları - - single underscore pattern - tek alt çizgi deseni - - Allow static let bindings in union, record, struct, non-incremental-class types Birleşim, kayıt, yapı ve artımlı olmayan sınıf türlerinde statik let bağlamalarına izin ver @@ -1292,11 +1287,6 @@ Koşullu ifadenin 'else if' veya 'elif' dalında beklenmeyen giriş sonu. 'elif <expr> then <expr>' veya 'else if <expr> then <expr>' bekleniyordu. - - Unexpected symbol '.' in member definition. Expected 'with', '=' or other token. - Üye tanımında '.' sembolü beklenmiyordu. 'with', '=' veya başka bir belirteç bekleniyordu. - - Specify algorithm for calculating source file checksum stored in PDB. Supported values are: SHA1 or SHA256 (default) PDB içinde depolanan kaynak dosyası sağlama toplamını hesaplama algoritmasını belirtin. Desteklenen değerler: SHA1 veya SHA256 (varsayılan) diff --git a/src/Compiler/xlf/FSComp.txt.zh-Hans.xlf b/src/Compiler/xlf/FSComp.txt.zh-Hans.xlf index ce2c173e893..50ca402303c 100644 --- a/src/Compiler/xlf/FSComp.txt.zh-Hans.xlf +++ b/src/Compiler/xlf/FSComp.txt.zh-Hans.xlf @@ -662,11 +662,6 @@ 自类型约束 - - single underscore pattern - 单下划线模式 - - Allow static let bindings in union, record, struct, non-incremental-class types 允许在联合、记录、结构、非增量类类型中使用静态 let 绑定 @@ -1292,11 +1287,6 @@ 条件表达式的 "else if" 或 "elif" 分支中的输入意外结束。应为 "elif <expr> then <expr>" 或 "else if <expr> then <expr>"。 - - Unexpected symbol '.' in member definition. Expected 'with', '=' or other token. - 成员定义中有意外的符号 "."。预期 "with"、"+" 或其他标记。 - - Specify algorithm for calculating source file checksum stored in PDB. Supported values are: SHA1 or SHA256 (default) 指定用于计算存储在 PDB 中的源文件校验的算法。支持的值是:SHA1 或 SHA256(默认) diff --git a/src/Compiler/xlf/FSComp.txt.zh-Hant.xlf b/src/Compiler/xlf/FSComp.txt.zh-Hant.xlf index 09d5f37bea9..719aba2adc6 100644 --- a/src/Compiler/xlf/FSComp.txt.zh-Hant.xlf +++ b/src/Compiler/xlf/FSComp.txt.zh-Hant.xlf @@ -662,11 +662,6 @@ 自我類型限制式 - - single underscore pattern - 單一底線模式 - - Allow static let bindings in union, record, struct, non-incremental-class types 允許在等位、記錄、結構、非累加類別類型中使用靜態 let 繫結 @@ -1292,11 +1287,6 @@ 條件運算式的 'else if' 或 'elif' 分支中出現未預期的輸入結尾。 預期為 'elif <expr> then <expr>' 或 'else if <expr> then <expr>'. - - Unexpected symbol '.' in member definition. Expected 'with', '=' or other token. - 成員定義中的非預期符號 '.'。預期為 'with'、'=' 或其他語彙基元。 - - Specify algorithm for calculating source file checksum stored in PDB. Supported values are: SHA1 or SHA256 (default) 請指定用來計算 PDB 中所儲存來源檔案總和檢查碼的演算法。支援的值為: SHA1 或 SHA256 (預設)