From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B1CDFC433B4 for ; Tue, 27 Apr 2021 09:04:27 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0CFBE610FA for ; Tue, 27 Apr 2021 09:04:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0CFBE610FA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:52870 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lbJdq-00029G-11 for qemu-devel@archiver.kernel.org; Tue, 27 Apr 2021 05:04:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47862) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lbJcs-0001b1-Gv for qemu-devel@nongnu.org; Tue, 27 Apr 2021 05:03:27 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:44400) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lbJco-0005Z9-5D for qemu-devel@nongnu.org; Tue, 27 Apr 2021 05:03:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619514200; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=L9SDQBVdqQ+QvH4lnuq/SKvRC4O3YgYQCPAZXeqwM+s=; b=aZlDPKKfS9pssY3+OdZbxCKxrpu4yc/pHvYR9RynIS0UC57nSH2vAtSJJVhoSQgNH8Yn9k Rah6J7IUVNg0smr5gDLpnwVnqWPqJENQwkvkHyFEmKHFHghMq2pk1nYkc5Knn8PNM+kfa9 0qmZg6+kSGg/UyjsG0a9AIA6PUDccUQ= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-79-Ttvngt4aPb-P7mW4fUhVew-1; Tue, 27 Apr 2021 05:03:15 -0400 X-MC-Unique: Ttvngt4aPb-P7mW4fUhVew-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DAF1F1898296; Tue, 27 Apr 2021 09:03:14 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-114-17.ams2.redhat.com [10.36.114.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6F19219801; Tue, 27 Apr 2021 09:03:14 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 0026E113525D; Tue, 27 Apr 2021 11:03:12 +0200 (CEST) From: Markus Armbruster To: John Snow Subject: Re: [PATCH 16/22] qapi/parser: add docstrings References: <20210422030720.3685766-1-jsnow@redhat.com> <20210422030720.3685766-17-jsnow@redhat.com> <877dkq5w9x.fsf@dusky.pond.sub.org> <6ea6efc8-0506-326c-ee57-eb81fd61dfae@redhat.com> Date: Tue, 27 Apr 2021 11:03:12 +0200 In-Reply-To: <6ea6efc8-0506-326c-ee57-eb81fd61dfae@redhat.com> (John Snow's message of "Mon, 26 Apr 2021 14:26:05 -0400") Message-ID: <87lf942j73.fsf@dusky.pond.sub.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain Received-SPF: pass client-ip=216.205.24.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.219, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Roth , Cleber Rosa , qemu-devel@nongnu.org, Eduardo Habkost Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" John Snow writes: > On 4/25/21 9:27 AM, Markus Armbruster wrote: >> John Snow writes: >> >>> Signed-off-by: John Snow >>> >>> --- >>> >>> My hubris is infinite. >> >> Score one of the three principal virtues of a programmer ;) >> > > It was written before the prior review, but I promise I am slowing down > on adding these. I just genuinely left them to help remind myself how > these modules are actually structured and work so that I will be able to > "pop in" quickly in the future and make a tactical, informed edit. > >>> OK, I only added a few -- to help me remember how the parser works at a glance. >>> >>> Signed-off-by: John Snow >>> --- >>> scripts/qapi/parser.py | 66 ++++++++++++++++++++++++++++++++++++++++++ >>> 1 file changed, 66 insertions(+) >>> >>> diff --git a/scripts/qapi/parser.py b/scripts/qapi/parser.py >>> index dbbd0fcbc2f..8fc77808ace 100644 >>> --- a/scripts/qapi/parser.py >>> +++ b/scripts/qapi/parser.py >>> @@ -51,7 +51,24 @@ def __init__(self, parser: 'QAPISchemaParser', msg: str): >>> >>> >>> class QAPISchemaParser: >>> + """ >>> + Performs parsing of a QAPI schema source file. >> >> Actually, this parses one of two layers, see qapi-code-gen.txt section >> "Schema syntax". Pointing there might help. >> > > It sort of parses one-and-a-half layers, but yes ... I know the > distinction you're drawing here. This is *mostly* the JSON/AST level. > > (With some upper-level or mid-level parsing for Pragmas and Includes.) True. I chose simplicity over purity. >>> >>> + :param fname: Path to the source file >> >> Either "Source file name" or "Source pathname", please. I prefer "file >> name" for additional distance to "path" in the sense of a search path, >> i.e. a list of directory names. >> > > OK, I am not sure I have any ... prejudice about when to use which kind > of description for these sorts of things. I'm happy to defer to you, but > if there's some kind of existing standard vocabulary I'm trampling all > over, feel free to point me to your preferred hacker dictionary. > > Anyway, happy to adopt your phrasing here. > >>> + :param previously_included: >>> + The absolute paths of previously included source files. >> >> Either "absolute file name" or "absulute pathname". >> > > OK. > >>> + Only used by recursive calls to avoid re-parsing files. >> >> Feels like detail, not sure it's needed here. >> > > You're probably right, but I suppose I wanted to hint/suggest that it > was not necessary to feed it this argument for the root schema, but it > was crucial for the recursive calls. To me "if root schema, then nothing was previously included" feels obvious enough :) But if you want to spell out proper use of the parameter, I recommend to stick to the interface, i.e. when to pass it, not what the function does with it (in the hope that the reader can then guess when to pass it). > (Earlier I mentioned possibly just passing the parent parser in: that > helps eliminate some of this ambiguity, too.) > >>> + :param incl_info: >>> + `QAPISourceInfo` for the parent document. >>> + This may be None if this is the root schema document. >> >> Recommend s/This maybe //. >> >> qapi-code-gen.txt calls a QAPI schema that uses include directives >> "modular", and the included files "sub-modules". s/root schema >> document/root module/? >> > > Sure. All in favor of phrasing consistency. > > (By the way: I did write up a draft for converting qapi-code-gen.txt to > ReST format, and if I had finished that, it might be nice to hotlink to > it here. I stopped for now because I wanted to solidify some conventions > on how to markup certain constructs first, and wanted ... not to > overwhelm you with more doc-wrangling.) Appreciated :) >>> + >>> + :ivar exprs: Resulting parsed expressions. >>> + :ivar docs: Resulting parsed documentation blocks. >> >> Uh, why are these here? A doc string is interface documentation... >> > > These *are* interface. It is how callers are expected to get the results > of parsing. You're right, but is the constructor the right place to document attributes? > We could change that, of course, but that is absolutely how this class > works today. > >>> + >>> + :raise OSError: For problems opening the root schema document. >>> + :raise QAPIParseError: For JSON or QAPIDoc syntax problems. >>> + :raise QAPISemError: For various semantic issues with the schema. >> >> Should callers care for the difference between QAPIParseError and >> QAPISemError? >> > > That's up to the caller, I suppose. I just dutifully reported the truth > of the matter here. > > (That's a real non-answer, I know.) > > I could always document QAPISourceError instead, with a note about the > subclasses used for completeness. > > (The intent is that QAPIError is always assumed/implied to be sufficient > for capturing absolutely everything raised directly by this package, if > you want to ignore the meanings behind them.) I honestly can't think of a reason for catching anything but QAPIError. The other classes exist only to give us more convenient ways to construct instances of QAPIError. We could replace them all by functions returning QAPIError. >>> + """ >>> def __init__(self, >>> fname: str, >>> previously_included: Optional[Set[str]] = None, >>> @@ -77,6 +94,11 @@ def __init__(self, >>> self._parse() >>> >>> def _parse(self) -> None: >>> + """ >>> + Parse the QAPI schema document. >>> + >>> + :return: None; results are stored in ``exprs`` and ``docs``. >> >> Another ignorant doc string markup question... how am I supposed to see >> that exprs and docs are attributes, and not global variables? >> > > I don't know, it's an unsolved mystery for me too. I need more time in > the Sphinx dungeon to figure out how this stuff is supposed to work. > You're right to wonder. Use self.exprs and self.docs meanwhile? >>> + """ >>> cur_doc = None >>> >>> with open(self._fname, 'r', encoding='utf-8') as fp: >>> @@ -197,6 +219,50 @@ def _check(name: str, value: object) -> List[str]: >>> raise QAPISemError(info, "unknown pragma '%s'" % name) >>> >>> def accept(self, skip_comment: bool = True) -> None: >>> + """ >>> + Read the next lexeme and process it into a token. >>> + >>> + :Object state: >>> + :tok: represents the token type. See below for values. >>> + :pos: is the position of the first character in the lexeme. >>> + :cursor: is the position of the next character. >> >> Define "position" :) It's an index in self.src. >> > > Good call. > >> self.cursor and self.pos are not used outside accept(). Not sure thet >> belong into interface documentation. >> > > Fair point, though I was on a mission to document exactly how the parser > works even at the internal level, because accept(), despite being > "public", is really more of an internal function here. > > I am somewhat partial to documenting these state variables for my own > sake so that I can remember the way this lexer behaves. I understand why you want to document how they work. Since they're internal to accept(), a comment in accept() seems more proper than accept() doc string. Admittedly doesn't matter that much, as accept() is internal to the class. >>> + :val: is the variable value of the token, if any. >> >> Missing: self.info, which *is* used outside accept(). >> > > Oh, yes. > >>> + >>> + Single-character tokens: >>> + >>> + These include ``LBRACE``, ``RBRACE``, ``COLON``, ``COMMA``, >>> + ``LSQB``, and ``RSQB``. >> >> "These include ..." is misleading. This is the complete list of >> single-character tokens. >> > > I'm just testing your ability to recognize the difference between proper > and improper subsets. > > (Joking. I'll reword to avoid that ambiguity.) > >>> + ``LSQB``, and ``RSQB``. ``tok`` holds the single character >>> + lexeme. ``val`` is ``None``. >>> + >>> + Multi-character tokens: >>> + >>> + - ``COMMENT``: >>> + >>> + - This token is not normally yielded by the lexer, but it >>> + can be when ``skip_comment`` is False. >>> + - ``tok`` is the value ``"#"``. >>> + - ``val`` is a string including all chars until end-of-line. >>> + >>> + - ``STRING``: >>> + >>> + - ``tok`` is the ``"'"``, the single quote. >>> + - ``value`` is the string, *excluding* the quotes. >>> + >>> + - ``TRUE`` and ``FALSE``: >>> + >>> + - ``tok`` is either ``"t"`` or ``"f"`` accordingly. >>> + - ``val`` is either ``True`` or ``False`` accordingly. >>> + >>> + - ``NEWLINE`` and ``SPACE``: >>> + >>> + - These are consumed by the lexer directly. ``line_pos`` and >>> + ``info`` are advanced when ``NEWLINE`` is encountered. >>> + ``tok`` is set to ``None`` upon reaching EOF. >>> + >>> + :param skip_comment: >>> + When false, return ``COMMENT`` tokens. >>> + This is used when reading documentation blocks. >> >> The doc string mostly describes possible state on return of accept(). >> *Within* accept(), self.tok may be any character. >> >> "Mostly" because item ``NEWLINE`` and ``SPACE`` is about something that >> happens within accept(). >> > > Almost kinda-sorta. The value of "tok" is important there, too. --verbose? >> Perhaps phrasing it as a postcondition would be clearer: >> >> Read and store the next token. >> >> On return, self.tok is the token type, self.info is describes its >> source location, and self.value is the token's value. >> >> The possible token types and their values are >> >> ... >> > > OK, I will play with this suggestion while I try to clean up the docs. > >>> + """ >>> while True: >>> self.tok = self.src[self.cursor] >>> self.pos = self.cursor > > Thanks for taking a look at this one. Thank *you* for documenting my[*] code! [*] Some of it mine in the sense I wrote it, some of it mine in the sense I maintain it.