Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1uScJc-00AOIh-Ve for pgsql-hackers@arkaria.postgresql.org; Fri, 20 Jun 2025 14:02:01 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.94.2) (envelope-from ) id 1uScJb-001mKm-2p for pgsql-hackers@arkaria.postgresql.org; Fri, 20 Jun 2025 14:01:59 +0000 Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29]) by malur.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1uScJa-001mKe-NB for pgsql-hackers@lists.postgresql.org; Fri, 20 Jun 2025 14:01:59 +0000 Received: from mail-oo1-xc35.google.com ([2607:f8b0:4864:20::c35]) by magus.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.96) (envelope-from ) id 1uScJY-0038Pj-1y for pgsql-hackers@lists.postgresql.org; Fri, 20 Jun 2025 14:01:58 +0000 Received: by mail-oo1-xc35.google.com with SMTP id 006d021491bc7-605ff8aa9d2so428548eaf.0 for ; Fri, 20 Jun 2025 07:01:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=timescale.com; s=google; t=1750428114; x=1751032914; darn=lists.postgresql.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=RldLMIMVT7a+xgEj2A0xFJ3PJM/za2csMH8DRMrNtJM=; b=mcO+BRfXjEZY/1ZlFr92CkVpLjY9eiepfPckEuIzuHTTffumaUrrSTCSHwGlV5KXDr XKYJt+mNE2gtz82qWra7RcRmJ6Xz5o8miKYxEzd/6yfNWMIRJ049yAz8qUODKGXODK4K n+Ld4/uCRhDWZT7sK3WIYO+e8HLafXojXDgtapz+KDU9g3tHKqvg9+/VcHVrhYIICK7n EgIFOhTdmNDSOwQ4mR7ABrlVbVunZJZ9Tt7HacsmxuH7otxsUHuPMR8/A4ZmbKKeU2Rf qoHDwhxpLnZwSj4If0iWqlhKAL/NwDBqwq3shtMMj9uBPGeYRvONyquQDSinbcu/RnMR AiJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750428114; x=1751032914; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=RldLMIMVT7a+xgEj2A0xFJ3PJM/za2csMH8DRMrNtJM=; b=lfdXZy38wiboPR/yBOWBmZ2u4yK2i6GDoOncoOKKgr6/Y94REcIPjJJUdr8obM4sbt mipLns3BYxOXGAnrA69SGptLkrSZ8glpAcER0Dp3FiZo/sniTNPKydHcX6THbr8ftJmT sOGMQeLpERqIZdUZXesTD4zyG/cOZY2KhPJJx9W5ZAuicKlojGy+YnoFSVXdJmryWLyM pPskPt0RuZOMigzSrl2pNY8GicSyo6P3TkyacpWbb8UVFSum7wei/bNKQn02I27wqSmm Hmv8S5WyVwv3e84ocMt3sglW5eUn4N8S+/ktKxjYFYDKTsPmZ+4gg+S9fCsdzRNci1lM 0Y4g== X-Gm-Message-State: AOJu0Yw++a826HapCHYDivMKdgxqGuy4TKst7n9WBu2Z/QbI/1fPdS1I HqdhxKIMRCe634Wt8iJ6ZKErWYtrCO1b+bHSwSkKnxxE2/1020PK5XH17jLOoPZJd54YvdBvq/X J5V0+qjWRcsVrRcYQnTXmGhwr4Frzu12YPg2pvQLJVJYPGuRoCn4gb3UMlQ== X-Gm-Gg: ASbGncsYCU6D3CT7d5mvuAQ6+MPcvesVDvKYIy8lM4DJ7HnSRLzNt5jjwuuKs2Lq6xQ TUCWoxO+EYS8tGAXenPaCqGYjajkBicZnobX7seiZX/WaB2/UCpoZ5lAP1QO1lR5CwBUAKYdkmv joaNLCpW0PaFjurNxgp97iKHm2wCGZ0oeb4j/6n4pUSw== X-Google-Smtp-Source: AGHT+IGB2WuqHbGacicIWIm9bk5uUPnok5awC6+1sJbv/EXOgkDPxdNODB7TG5ut+nbRHY98wEatTjwdFbX1L62qGSw= X-Received: by 2002:a4a:ee04:0:b0:611:3eb5:728d with SMTP id 006d021491bc7-6115b733bf9mr2059355eaf.0.1750428113870; Fri, 20 Jun 2025 07:01:53 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Aleksander Alekseev Date: Fri, 20 Jun 2025 17:01:41 +0300 X-Gm-Features: Ac12FXziCSfBScbKoSrlLQ7LR0ZWBh8v43BlAUDOWrsDjmEKgjpvipulsEMnmyk Message-ID: Subject: Re: [PATCH] pg_bsd_indent: improve formatting of multiline comments To: PostgreSQL Hackers Cc: Bruce Momjian , Arseniy Mukhin , Michael Paquier Content-Type: multipart/mixed; boundary="000000000000eedfc50638014daa" List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Archived-At: Precedence: bulk --000000000000eedfc50638014daa Content-Type: text/plain; charset="UTF-8" Hi, > Given the quality of BSD indent code, I have _always_ found it easier to > modify pgindent. ;- :D Initially I thought that the problem was simple enough to solve it in C, but this turned out not to be true. > It's going to be simpler to modify pgindent then. PFA the updated patch. I noticed a mistake in v2. Here is the corrected patch. Changes comparing to the previous version: ``` - $lines[-1] =~ s!/(.+)\*/!/$1\n \*/!; + $lines[-1] =~ s!(.+) \*/!$1\n \*/!; ``` -- Best regards, Aleksander Alekseev --000000000000eedfc50638014daa Content-Type: application/octet-stream; name="v3-0001-pgindent-improve-formatting-of-multiline-comments.patch" Content-Disposition: attachment; filename="v3-0001-pgindent-improve-formatting-of-multiline-comments.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_mc4vnuo40 RnJvbSA5N2JmZDY0NWE5MzEzYjg4OTJkNjRmYzlhY2MwNjNkOWU5ODJlOWQ3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGVrc2FuZGVyIEFsZWtzZWV2IDxhbGVrc2FuZGVyQHRpbWVz Y2FsZS5jb20+CkRhdGU6IEZyaSwgMjAgSnVuIDIwMjUgMTY6MzE6MzYgKzAzMDAKU3ViamVjdDog W1BBVENIIHYzXSBwZ2luZGVudDogaW1wcm92ZSBmb3JtYXR0aW5nIG9mIG11bHRpbGluZSBjb21t ZW50cwoKRm9ybWF0IG11bHRpbGluZSBjb21tZW50cyBsaWtlIHRoaXM6CgovKiBsaW5lIDEKICog bGluZSAyCiAqLwoKLi4uIGludG86CgovKgogKiBsaW5lIDEKICogbGluZSAyCiAqLwoKVGhpcyBp cyBtb3JlIGNvbnNpc3RlbnQgd2l0aCB3aGF0IHdlIGN1cnJlbnRseSBoYXZlIGluIHRoZSB0cmVl LgoKQXV0aG9yOiBBbGVrc2FuZGVyIEFsZWtzZWV2ClJlcG9ydGVkLWJ5OiBNaWNoYWVsIFBhcXVp ZXIKUmV2aWV3ZWQtYnk6IEFyc2VuaXkgTXVraGluCkRpc2N1c3Npb246IGh0dHBzOi8vcG9zdGdy LmVzL20vQ0FKN2M2VFBRMGtrSFFHLUFxZUFKM1BWX1l0bUR6Y2M3cyUyQl9WNCUzRHQlMkJ4Z1Nu Wm0xY0Z3JTQwbWFpbC5nbWFpbC5jb20KLS0tCiBzcmMvdG9vbHMvcGdpbmRlbnQvcGdpbmRlbnQg fCAzNCArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrCiAxIGZpbGUgY2hhbmdlZCwg MzQgaW5zZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBhL3NyYy90b29scy9wZ2luZGVudC9wZ2luZGVu dCBiL3NyYy90b29scy9wZ2luZGVudC9wZ2luZGVudAppbmRleCBiN2Q3MTgwODkyNC4uMTM5NDQ3 MzBhMzkgMTAwNzU1Ci0tLSBhL3NyYy90b29scy9wZ2luZGVudC9wZ2luZGVudAorKysgYi9zcmMv dG9vbHMvcGdpbmRlbnQvcGdpbmRlbnQKQEAgLTI4MSw2ICsyODEsOSBAQCBzdWIgcG9zdF9pbmRl bnQKIAkjIEZpeCBydW4tdG9nZXRoZXIgY29tbWVudHMgdG8gaGF2ZSBhIHRhYiBiZXR3ZWVuIHRo ZW0KIAkkc291cmNlID1+IHMhXCovKC9cKi4qXCovKSQhKi9cdCQxIWdtOwogCisJIyBQb3N0cHJv Y2VzcyBtdWx0aWxpbmUgY29tbWVudHMKKwkkc291cmNlID1+IHMhXigvXCouKj9cKi8pIXBvc3Rw cm9jZXNzX211bHRpbGluZV9jb21tZW50KCQxKSFtZ3NlOworCiAJIyMgRnVuY3Rpb25zCiAKIAkj IFVzZSBhIHNpbmdsZSBzcGFjZSBiZWZvcmUgJyonIGluIGZ1bmN0aW9uIHJldHVybiB0eXBlcwpA QCAtMjg5LDYgKzI5MiwzNyBAQCBzdWIgcG9zdF9pbmRlbnQKIAlyZXR1cm4gJHNvdXJjZTsKIH0K IAorc3ViIHBvc3Rwcm9jZXNzX211bHRpbGluZV9jb21tZW50Cit7CisgICAgbXkgJHNvdXJjZSA9 IHNoaWZ0OworICAgIG15IEBsaW5lcyA9IHNwbGl0ICJcbiIsICRzb3VyY2U7CisKKyAgICBpZigk bGluZXNbMF0gbmUgIi8qIiAmJiAkbGluZXNbLTFdIG5lICIgKi8iKQorICAgIHsKKyAgICAgICAg IyBEb24ndCBjaGFuZ2UgY29tbWVudHMgbGlrZToKKyAgICAgICAgIyAvKiBsaW5lIDEKKyAgICAg ICAgIyAgICBsaW5lIDIgKi8KKyAgICAgICAgIyBhbmQgc2ltaWxhci4KKyAgICAgICAgcmV0dXJu ICRzb3VyY2U7CisgICAgfQorCisgICAgaWYoJGxpbmVzWzBdID1+IG0hL1wqKFwtfFwqKSEpCisg ICAgeworICAgICAgICAjIERvbid0IGNoYW5nZSBjb21tZW50cyB0aGF0IHN0YXJ0IHdpdGg6Cisg ICAgICAgICMgLyoqKioKKyAgICAgICAgIyBvcjoKKyAgICAgICAgIyAvKi0tLQorICAgICAgICBy ZXR1cm4gJHNvdXJjZTsKKyAgICB9CisKKyAgICAkbGluZXNbMF0gPX4gcyEvXCooLispIS9cKlxu ICokMSE7CisgICAgJGxpbmVzWy0xXSA9fiBzISguKykgXCovISQxXG4gXCovITsKKworICAgICRz b3VyY2UgPSBqb2luICJcbiIsIEBsaW5lczsKKworICAgIHJldHVybiAkc291cmNlOworfQorCiBz dWIgcnVuX2luZGVudAogewogCW15ICRzb3VyY2UgPSBzaGlmdDsKLS0gCjIuNDkuMAoK --000000000000eedfc50638014daa--