tuna2134/sbv2-v2
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Replace union type to Optional (for Python <3.10)

Browse Source
This commit is contained in:
litagin02
2024-01-09 20:48:12 +09:00
parent 0a79eb4f10
commit a4898c6573
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
text/japanese_mora_list.py
View File

@@ -45,11 +45,12 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE. POSSIBILITY OF SUCH DAMAGE.
""" """
from typing import Optional
# (カタカナ, 子音, 母音)の順。子音がない場合はNoneを入れる。 # (カタカナ, 子音, 母音)の順。子音がない場合はNoneを入れる。
# 但し「ン」と「ッ」は母音のみという扱いで、「ン」は「n」、「ッ」は「q」に変更 # 但し「ン」と「ッ」は母音のみという扱いで、「ン」は「n」、「ッ」は「q」に変更
# （元々はそれぞれ「N」「cl」） # （元々はそれぞれ「N」「cl」）
_mora_list_minimum: list[tuple[str, str | None, str]] = [ _mora_list_minimum: list[tuple[str, Optional[str], str]] = [
("ヴォ", "v", "o"), ("ヴォ", "v", "o"),
("ヴェ", "v", "e"), ("ヴェ", "v", "e"),
("ヴィ", "v", "i"), ("ヴィ", "v", "i"),
@@ -196,7 +197,7 @@ _mora_list_minimum: list[tuple[str, str | None, str]] = [
("イ", None, "i"), ("イ", None, "i"),
("ア", None, "a"), ("ア", None, "a"),
] ]
_mora_list_additional: list[tuple[str, str | None, str]] = [ _mora_list_additional: list[tuple[str, Optional[str], str]] = [
("ヴョ", "by", "o"), ("ヴョ", "by", "o"),
("ヴュ", "by", "u"), ("ヴュ", "by", "u"),
("ヴャ", "by", "a"), ("ヴャ", "by", "a"),
@@ -223,7 +224,7 @@ mora_phonemes_to_mora_kata: dict[str, str] = {
} }
# 例: "ヴォ" -> ("v", "o"), "ア" -> (None, "a") # 例: "ヴォ" -> ("v", "o"), "ア" -> (None, "a")
mora_kata_to_mora_phonemes: dict[str, tuple[str | None, str]] = { mora_kata_to_mora_phonemes: dict[str, tuple[Optional[str], str]] = {
kana: (consonant, vowel) kana: (consonant, vowel)
for [kana, consonant, vowel] in _mora_list_minimum + _mora_list_additional for [kana, consonant, vowel] in _mora_list_minimum + _mora_list_additional
} }