self keyword to const

crates/cairo-lang-semantic/src/expr/inference/infers.rs

@@ -22,6 +22,7 @@ use crate::{
     ConcreteFunction, ConcreteImplLongId, ConcreteTraitId, ConcreteTraitLongId, FunctionId,
     FunctionLongId, GenericArgumentId, GenericParam, TypeId, TypeLongId,
 };
+use crate::resolve::SELF_KW;
 
 /// Functions for embedding generic semantic objects in an existing [Inference] object, by
 /// introducing new variables.
@@ -301,7 +302,7 @@ impl InferenceEmbeddings for Inference<'_> {
         let trait_id = trait_function.trait_id(self.db.upcast());
         let signature = self.db.trait_function_signature(trait_function).ok()?;
         let first_param = signature.params.into_iter().next()?;
-        require(first_param.name == "self")?;
+        require(first_param.name == SELF_KW)?;
 
         let trait_generic_params = self.db.trait_generic_params(trait_id).ok()?;
         let trait_generic_args =

crates/cairo-lang-semantic/src/lsp_helpers.rs

@@ -19,7 +19,7 @@ use crate::expr::inference::InferenceId;
 use crate::items::functions::GenericFunctionId;
 use crate::items::us::SemanticUseEx;
 use crate::items::visibility::peek_visible_in;
-use crate::resolve::{ResolvedGenericItem, Resolver};
+use crate::resolve::{ResolvedGenericItem, Resolver, SELF_KW};
 use crate::types::TypeHead;
 
 /// A filter for types.
@@ -49,7 +49,7 @@ pub fn methods_in_module(
             let Some(first_param) = signature.params.first() else {
                 continue;
             };
-            if first_param.name != "self" {
+            if first_param.name != SELF_KW {
                 continue;
             }
             if let TypeFilter::TypeHead(type_head) = &type_filter {

crates/cairo-lang-semantic/src/resolve/mod.rs

@@ -69,6 +69,7 @@ mod item;
 
 // Remove when these are added as actual keywords.
 pub const SELF_TYPE_KW: &str = "Self";
+pub const SELF_KW: &str = "self";
 pub const SUPER_KW: &str = "super";
 pub const CRATE_KW: &str = "crate";
 // Remove when this becomes an actual crate.

crates/cairo-lang-starknet/src/abi.rs

@@ -28,7 +28,7 @@ use cairo_lang_utils::{Intern, LookupIntern, require, try_extract_matches};
 use itertools::zip_eq;
 use smol_str::SmolStr;
 use thiserror::Error;
-
+use cairo_lang_semantic::resolve::SELF_KW;
 use crate::plugin::aux_data::StarknetEventAuxData;
 use crate::plugin::consts::{
     ABI_ATTR, ABI_ATTR_EMBED_V0_ARG, ABI_ATTR_PER_ITEM_ARG, ACCOUNT_CONTRACT_ENTRY_POINT_SELECTORS,
@@ -477,7 +477,7 @@ impl<'a> AbiBuilder<'a> {
         let Some(first_param) = params.next() else {
             return Err(ABIError::EntrypointMustHaveSelf);
         };
-        require(first_param.name == "self").ok_or(ABIError::EntrypointMustHaveSelf)?;
+        require(first_param.name == SELF_KW).ok_or(ABIError::EntrypointMustHaveSelf)?;
         let is_ref = first_param.mutability == Mutability::Reference;
         let expected_storage_ty = is_ref
             .then_some(storage_type)

crates/cairo-lang-starknet/src/plugin/dispatcher.rs

@@ -9,7 +9,7 @@ use cairo_lang_syntax::node::{Terminal, TypedStablePtr, TypedSyntaxNode};
 use cairo_lang_utils::extract_matches;
 use indoc::formatdoc;
 use itertools::Itertools;
-
+use cairo_lang_semantic::resolve::SELF_KW;
 use super::consts::CALLDATA_PARAM_NAME;
 use super::utils::{AstPathExtract, ParamEx};
 use super::{DEPRECATED_ABI_ATTR, INTERFACE_ATTR, STORE_TRAIT};
@@ -103,7 +103,7 @@ pub fn handle_trait(db: &dyn SyntaxGroup, trait_ast: ast::ItemTrait) -> PluginRe
                     ));
                     continue;
                 };
-                if self_param.name(db).text(db) != "self" {
+                if self_param.name(db).text(db) != SELF_KW {
                     diagnostics.push(PluginDiagnostic::error(
                         self_param.stable_ptr().untyped(),
                         "The first parameter must be named `self`.".to_string(),

crates/cairo-lang-starknet/src/plugin/entry_point.rs

@@ -10,7 +10,7 @@ use cairo_lang_syntax::node::{Terminal, TypedStablePtr, TypedSyntaxNode};
 use cairo_lang_utils::extract_matches;
 use indoc::{formatdoc, indoc};
 use itertools::Itertools;
-
+use cairo_lang_semantic::resolve::SELF_KW;
 use super::consts::{
     CONSTRUCTOR_ATTR, CONSTRUCTOR_MODULE, CONSTRUCTOR_NAME, EXTERNAL_ATTR, EXTERNAL_MODULE,
     IMPLICIT_PRECEDENCE, L1_HANDLER_ATTR, L1_HANDLER_FIRST_PARAM_NAME, L1_HANDLER_MODULE,
@@ -235,7 +235,7 @@ fn generate_entry_point_wrapper(
             "The first parameter of an entry point must be `self`.".into(),
         )]);
     };
-    if first_param.name(db).text(db) != "self" {
+    if first_param.name(db).text(db) != SELF_KW {
         return Err(vec![PluginDiagnostic::error(
             first_param.stable_ptr().untyped(),
             "The first parameter of an entry point must be `self`.".into(),

crates/cairo-lang-starknet/src/plugin/starknet_module/component.rs

@@ -9,7 +9,7 @@ use cairo_lang_syntax::node::{Terminal, TypedStablePtr, TypedSyntaxNode, ast};
 use cairo_lang_utils::{extract_matches, require, try_extract_matches};
 use indoc::{formatdoc, indoc};
 use itertools::chain;
-
+use cairo_lang_semantic::resolve::SELF_KW;
 use super::StarknetModuleKind;
 use super::generation_data::{ComponentGenerationData, StarknetModuleCommonGenerationData};
 use crate::plugin::consts::{
@@ -421,7 +421,7 @@ fn handle_first_param_for_embeddable_as(
     db: &dyn SyntaxGroup,
     param: &ast::Param,
 ) -> Option<(String, String, String)> {
-    require(param.name(db).text(db) == "self")?;
+    require(param.name(db).text(db) == SELF_KW)?;
     if param.is_ref_param(db) {
         return if extract_matches!(param.type_clause(db), OptionTypeClause::TypeClause)
             .ty(db)