From patchwork Tue Nov 17 16:21:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nathan Sidwell X-Patchwork-Id: 1401633 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=acm.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=h7rcmK+S; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CbB6F3wT1z9sT6 for ; Wed, 18 Nov 2020 03:21:56 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 155973973008; Tue, 17 Nov 2020 16:21:54 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-qt1-x82d.google.com (mail-qt1-x82d.google.com [IPv6:2607:f8b0:4864:20::82d]) by sourceware.org (Postfix) with ESMTPS id 27138386EC66 for ; Tue, 17 Nov 2020 16:21:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 27138386EC66 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=acm.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=nathanmsidwell@gmail.com Received: by mail-qt1-x82d.google.com with SMTP id z3so12395051qtw.9 for ; Tue, 17 Nov 2020 08:21:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:to:from:subject:message-id:date:user-agent:mime-version :content-language; bh=bA9Ub6swOTpGi8pJXcG08Zo79RbH30FY8Tqk8x+qPf4=; b=h7rcmK+S/nkz23ho1tkOB2MRqRg2QNl2cJyiW7brAOmhlMi0XEF5TjEqIJm0shXyim xs9vypJGl5+kEdVTsNuAT9KrfyFLG/Cv+llIRu1xVZGynbR/215ZJV+ea42x2EKgPwPn cAlCSe2w7tUQ8/AT4P4lETDsWScST5H1RZUyWu12wCL0NjYrFvdcj/M8Fi2Dar7lBE5E UJQf639AXtwWibuY2mzLbOnCe5yudsjYcnpNdPGBXAg5I+QfffM6C0fBEQiw32AlWy81 VBqAH7JZOHGL7BtbgZYL/7lO50u6CHh8NfHSZJq4UAXJWuyJn0/gzXQmhYEBMbvgZe6y H+Vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:to:from:subject:message-id:date :user-agent:mime-version:content-language; bh=bA9Ub6swOTpGi8pJXcG08Zo79RbH30FY8Tqk8x+qPf4=; b=oFxG/yitdfhgIuz/McaNqn22Dlg9yQyHuCU2L2y4qvrdGeTBG+ScRzVH7r4SEDIKux jKaotLfXZo54mCvFZk3XszY7qNNmgqi7lgzQa944GsSUlehMI48Qdk19UlX0DMbl6WNY IczW0xmh8r89/H+wMPbYQHUmXxYQUMOROQBuaxCOipPbgn1u4+vyUzYHWB+NSa4/2bKw RKndYVkJf6/n1wvn02r5HoalMAAUs3TNcA+ESkfxCpf+b9Q91xvH3bqL9cPxEvpePe9K ka32DylNy1nWZJyXW37/6aHfLoySujuXXxbYqMc259gjbLsWzybskxTkNCWl6D1k11DM aR/Q== X-Gm-Message-State: AOAM533UNGx+eWvUm1EsdGysE1VVFBn89ERj1fgTS6JswKgM1fnf99Ry wlWH12SoKhxwiR3FKSC2deQ= X-Google-Smtp-Source: ABdhPJwl8+gp5BKhrTyuJtqW29wuldQ80YkXcxDoeoH0qfwB7euGaw+TScVN5mYh3Tr2aSqaP5ELdg== X-Received: by 2002:ac8:5c4e:: with SMTP id j14mr414322qtj.241.1605630110213; Tue, 17 Nov 2020 08:21:50 -0800 (PST) Received: from ?IPv6:2620:10d:c0a8:1102:81bf:d41:8bba:9858? ([2620:10d:c091:480::1:113e]) by smtp.googlemail.com with ESMTPSA id w27sm13801837qtv.29.2020.11.17.08.21.47 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 17 Nov 2020 08:21:48 -0800 (PST) To: GCC Patches From: Nathan Sidwell Subject: preprocessor: new callbacks Message-ID: Date: Tue, 17 Nov 2020 11:21:47 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 Content-Language: en-US X-Spam-Status: No, score=-11.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_EF, FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" These two callbacks are needed for C++ modules. The first is for handling macros from header-units. These are resolved lazily. The second is for include-translation -- whether a #include gets turned into a header-unit import. libcpp/ * include/cpplib.h (struct cpp_callbacks): Add user_deferred_macro & translate_include. pushing to trunk diff --git c/libcpp/include/cpplib.h w/libcpp/include/cpplib.h index 8e398863cf6..81be6457951 100644 --- c/libcpp/include/cpplib.h +++ w/libcpp/include/cpplib.h @@ -680,6 +695,9 @@ struct cpp_callbacks /* Callback that can change a user lazy into normal macro. */ void (*user_lazy_macro) (cpp_reader *, cpp_macro *, unsigned); + /* Callback to handle deferred cpp_macros. */ + cpp_macro *(*user_deferred_macro) (cpp_reader *, location_t, cpp_hashnode *); + /* Callback to parse SOURCE_DATE_EPOCH from environment. */ time_t (*get_source_date_epoch) (cpp_reader *); @@ -698,6 +716,11 @@ struct cpp_callbacks /* Callback for filename remapping in __FILE__ and __BASE_FILE__ macro expansions. */ const char *(*remap_filename) (const char*); + + /* Maybe translate a #include into something else. Return a + cpp_buffer containing the translation if translating. */ + char *(*translate_include) (cpp_reader *, line_maps *, location_t, + const char *path); }; #ifdef VMS