From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca (simark.ca [158.69.221.121]) by sourceware.org (Postfix) with ESMTPS id DECE53858D20 for ; Thu, 25 Apr 2024 17:26:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DECE53858D20 Authentication-Results: sourceware.org; dmarc=fail (p=none dis=none) header.from=efficios.com Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=efficios.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org DECE53858D20 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=158.69.221.121 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1714065983; cv=none; b=ISeCwr/RvMmVvODP+J1K+lcdnwD3dSDaXlc9lSlf71OaLe7+FrZ2w6sci3dp0j40KhXHDB1fnBPG7OR6ASQpLZ45J/dGi6P3DmSKijQO9NTzludkLZefgHNTffH+wxEVZR783tRndMerrch7goy6RWsJRSllfKG6K12XelTCOlY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1714065983; c=relaxed/simple; bh=ZWSQdBaDDt7j61wu1ckoomTQe4KmVHHffU0PpHdGRTA=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=dJq9WDrC2BHubGKrZZnISTUMSr0BaBhEuHhhR2D+zB2zHA2HefBAoBa20/TCCjjEWg+9srLtn66mNVz+KJ+yN0DCL0tYIWicfxmAduyko8IxqresBcmQbXgzlVUKdi3Cnc9YCDc6TutMU4EExBhF2LuR52Xdl0XhN1JRaIPTKlE= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from smarchi-efficios.internal.efficios.com (192-222-143-198.qc.cable.ebox.net [192.222.143.198]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPSA id 32E6F1E092; Thu, 25 Apr 2024 13:26:20 -0400 (EDT) From: Simon Marchi To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH] gdb: add type annotations to ada-unicode.py Date: Thu, 25 Apr 2024 13:26:11 -0400 Message-ID: <20240425172618.44739-1-simon.marchi@efficios.com> X-Mailer: git-send-email 2.44.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3496.3 required=5.0 tests=BAYES_00,GIT_PATCH_0,KAM_DMARC_NONE,KAM_DMARC_STATUS,SPF_HELO_PASS,SPF_SOFTFAIL,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Add type annotations to ada-unicode.py, just enough to make pyright happy: $ pyright --version pyright 1.1.359 $ pyright ada-unicode.py 0 errors, 0 warnings, 0 informations Introduce a `Range` class instead of using separate variables and tuples, to make the code and type annotations a bit cleaner. When running ada-unicode.py, I get a diff for ada-casefold.h, but I get the same diff before and after this patch, so that is a separate issue. Change-Id: I0d8975a57f9fb115703178ae197dc6b6b8b4eb7a --- gdb/ada-unicode.py | 98 +++++++++++++++++++++++++++++----------------- 1 file changed, 61 insertions(+), 37 deletions(-) diff --git a/gdb/ada-unicode.py b/gdb/ada-unicode.py index 06c5de0f6e55..f128dee69f54 100755 --- a/gdb/ada-unicode.py +++ b/gdb/ada-unicode.py @@ -25,41 +25,59 @@ import gdbcopyright -# The start of the current range of case-conversions we are -# processing. If RANGE_START is None, then we're outside of a range. -range_start = None -# End of the current range. -range_end = None -# The delta between RANGE_START and the upper-case variant of that -# character. -upper_delta = None -# The delta between RANGE_START and the lower-case variant of that -# character. -lower_delta = None + +class Range: + def __init__(self, range_start: int, upper_delta: int, lower_delta: int): + self._range_start = range_start + self._range_end = range_start + self._upper_delta = upper_delta + self._lower_delta = lower_delta + + # The start of the range. + @property + def range_start(self): + return self._range_start + + # The end of the range. + @property + def range_end(self): + return self._range_end + + @range_end.setter + def range_end(self, val: int): + self._range_end = val + + # The delta between RANGE_START and the upper-case variant of that + # character. + @property + def upper_delta(self): + return self._upper_delta + + # The delta between RANGE_START and the lower-case variant of that + # character. + @property + def lower_delta(self): + return self._lower_delta + + +# The current range we are processing. If None, then we're outside of a range. +current_range: Range | None = None # All the ranges found and completed so far. -# Each entry is a tuple of the form (START, END, UPPER_DELTA, LOWER_DELTA). -all_ranges = [] +all_ranges: list[Range] = [] def finish_range(): - global range_start - global range_end - global upper_delta - global lower_delta - if range_start is not None: - all_ranges.append((range_start, range_end, upper_delta, lower_delta)) - range_start = None - range_end = None - upper_delta = None - lower_delta = None - - -def process_codepoint(val): - global range_start - global range_end - global upper_delta - global lower_delta + global current_range + + if current_range is not None: + all_ranges.append(current_range) + current_range = None + + +def process_codepoint(val: int): + global current_range + c = chr(val) low = c.lower() up = c.upper() @@ -74,13 +92,16 @@ def process_codepoint(val): return updelta = ord(up) - val lowdelta = ord(low) - val - if range_start is not None and (updelta != upper_delta or lowdelta != lower_delta): + + if current_range is not None and ( + updelta != current_range.upper_delta or lowdelta != current_range.lower_delta + ): finish_range() - if range_start is None: - range_start = val - upper_delta = updelta - lower_delta = lowdelta - range_end = val + + if current_range is None: + current_range = Range(val, updelta, lowdelta) + + current_range.range_end = val for c in range(0, 0x10FFFF): @@ -93,4 +114,7 @@ with open("ada-casefold.h", "w") as f: ) print("", file=f) for r in all_ranges: - print(f" {{{r[0]}, {r[1]}, {r[2]}, {r[3]}}},", file=f) + print( + f" {{{r.range_start}, {r.range_end}, {r.upper_delta}, {r.lower_delta}}},", + file=f, + ) base-commit: 5b9707eb872ad4cb50c98d396d16f110070a44ca -- 2.44.0