From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lf1-x134.google.com (mail-lf1-x134.google.com [IPv6:2a00:1450:4864:20::134]) by sourceware.org (Postfix) with ESMTPS id 99FE438582A8 for ; Tue, 30 Jan 2024 12:11:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 99FE438582A8 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=embecosm.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 99FE438582A8 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::134 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706616681; cv=none; b=lv8bQVULhC4/R0uSLs5oJmcxCcjZKRPvMoHhLgDIu/B3NdRJKScpgPdQYtbMlcsajNcvGyzLVR4HwB2BxN+elnFlCFGCifa8Nvmso2ziqA84SfRn5wZ0BcnYZTGJ/hleUELQdgPU0De9nLBK35OWi8wJv/slIX/1U7VWST1DolE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706616681; c=relaxed/simple; bh=UghAqn1zcs0WVMjM9MHB+crbvJZ1+qrzhJDy7ZQ5QqE=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=LAhUMye5teArP2GAc3C2GFkVcv4N9xl1ncx5P/e8Kqu1pLNsBQL6USAzSDeBMQ4CWjd18tGZZgGbmh4vNDyxtu/FgnveNlZNETKEs7F+6BQmcQszXj0mjhxZevf5paKgJ3FxtA2+MWoZ3VBSaof1xBqHw9PwF431SNFoWlW1YS4= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-lf1-x134.google.com with SMTP id 2adb3069b0e04-5111ef545bfso599803e87.1 for ; Tue, 30 Jan 2024 04:11:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; t=1706616669; x=1707221469; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=zAmgzH0sDhe3iFA+EwRaChPi+cFzcmlo8h9H+LYIMVQ=; b=WTQkG6ZUKYNytC10xVFr9CmEEXPWkj9CuKNaV8qZrbBAmHcQQ6LaJ3hM4ZIGGisNnC Dwfg2z2bQiInG77bBVTrQxUFjs1fX0tNd5hKHkJ/BJEN6mBQWgA7Y/wlCtbWTukZhH01 PlRA91TII3pO+s6+WNEGavkemnqAUMFa/x9o6KS+oJLOJasQVrmr75JiaTPzcprWFKuj LaEv9EX/iCvdzDq59YmNPq3HTxZoxdv8LT9+zwxZEaAJU5r/KxbPiqDntJAzKZccKri0 VLWtNy3jT3DQI/a4MMxbrUF974z/8On73Nnfz4zy+OtjV3ZuasYU5Auu8fusFb6uFgdW xlGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706616669; x=1707221469; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=zAmgzH0sDhe3iFA+EwRaChPi+cFzcmlo8h9H+LYIMVQ=; b=KhnSlGxAKMZqWyAHEGie+j7KQM36j5shNj30LAO/3wO9px8HT/rgJQA6+WSJfwmCAE GdqSLOFi0o3o+GbH9jU1xStIjeR1IHUprXcoB7MLHycAFzoytQHHo63JMVmX0x6hxrew eEQxlvE5uuvMLR8tZnCAURMFyecUmn24x/mbwnnLVOOuxtIa6mJCaoa6Uo7R5Mj6lTfS pMzPVJ/k71tZbwiOtSMIi5oIYYLUUPjdoCgQ7mo0/73H+dGmqHfBsDqHKy3tJsiSgcY2 TUfecHuI5TpUnyfY55jzGenUunEo2PREIbW52wjjev7UjWztSV1U/e6iAGF6KyMIg0bg rgUw== X-Gm-Message-State: AOJu0YxCUF4PvWSGdagl+EKZG0HVVSWb/jp2lTeO5ZBkuNwGObVGYKJG 9dGhan6cruMP439OsrEEglSaI1dm70Oo43L1Ov7exvV4TXdapS4w4OaognTS3Q== X-Google-Smtp-Source: AGHT+IHO8GFSKqvQ1riDla6q+kGCSRSjq1iOUKYyP28bDGCMQ4V3XdSih172zU5QfQlJsTtvMYlwyg== X-Received: by 2002:a05:6512:e8f:b0:511:f41:6144 with SMTP id bi15-20020a0565120e8f00b005110f416144mr4988694lfb.61.1706616669163; Tue, 30 Jan 2024 04:11:09 -0800 (PST) Received: from platypus.localdomain ([62.23.166.218]) by smtp.gmail.com with ESMTPSA id f9-20020a056000036900b00339307d9d31sm10569894wrf.112.2024.01.30.04.11.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jan 2024 04:11:08 -0800 (PST) From: arthur.cohen@embecosm.com To: gcc-patches@gcc.gnu.org Cc: gcc-rust@gcc.gnu.org, Pierre-Emmanuel Patry Subject: [COMMITTED 026/101] gccrs: Treat underscore as a keyword Date: Tue, 30 Jan 2024 13:06:42 +0100 Message-ID: <20240130121026.807464-29-arthur.cohen@embecosm.com> X-Mailer: git-send-email 2.42.1 In-Reply-To: <20240130121026.807464-2-arthur.cohen@embecosm.com> References: <20240130121026.807464-2-arthur.cohen@embecosm.com> Reply-To: arthur.cohen@embecosm.com MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-14.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE 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: From: Pierre-Emmanuel Patry Make the underscore token a 2015 keyword. gcc/rust/ChangeLog: * lex/rust-token.h (enum PrimitiveCoreType): Change macro for underscore in token list. Signed-off-by: Pierre-Emmanuel Patry --- gcc/rust/lex/rust-token.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gcc/rust/lex/rust-token.h b/gcc/rust/lex/rust-token.h index df321000511..401452f515c 100644 --- a/gcc/rust/lex/rust-token.h +++ b/gcc/rust/lex/rust-token.h @@ -120,8 +120,6 @@ enum PrimitiveCoreType RS_TOKEN (SCOPE_RESOLUTION, "::") /* dodgy */ \ RS_TOKEN (SINGLE_QUOTE, "'") /* should i differentiate from lifetime? */ \ RS_TOKEN (DOUBLE_QUOTE, "\"") \ - RS_TOKEN (UNDERSCORE, \ - "_") /* TODO: treat as reserved word like mrustc instead? */ \ RS_TOKEN (IDENTIFIER, "identifier") \ RS_TOKEN (INT_LITERAL, \ "integer literal") /* do different int and float types need \ @@ -194,6 +192,7 @@ enum PrimitiveCoreType RS_TOKEN_KEYWORD_2015 (TRY, "try") /* unused */ \ RS_TOKEN_KEYWORD_2015 (TYPE, "type") \ RS_TOKEN_KEYWORD_2015 (TYPEOF, "typeof") /* unused */ \ + RS_TOKEN_KEYWORD_2015 (UNDERSCORE, "_") \ RS_TOKEN_KEYWORD_2015 (UNSAFE, "unsafe") \ RS_TOKEN_KEYWORD_2015 (UNSIZED, "unsized") /* unused */ \ RS_TOKEN_KEYWORD_2015 (USE, "use") \ -- 2.42.1