Rename kw() to keyword() also in C++

fish-rust/src/ast.rs

@@ -4031,7 +4031,7 @@ pub mod ast_ffi {
         unsafe fn pointer_eq(self: &NodeFfi<'_>, rhs: &NodeFfi) -> bool;
         unsafe fn has_value(self: &NodeFfi<'_>) -> bool;
 
-        unsafe fn kw(self: &NodeFfi<'_>) -> ParseKeyword;
+        unsafe fn keyword(self: &NodeFfi<'_>) -> ParseKeyword;
         unsafe fn token_type(self: &NodeFfi<'_>) -> ParseTokenType;
         unsafe fn has_source(self: &NodeFfi<'_>) -> bool;
 
@@ -4129,7 +4129,8 @@ pub mod ast_ffi {
 
         fn describe(self: &Statement) -> UniquePtr<CxxWString>;
 
-        fn kw(self: &JobConjunctionDecorator) -> ParseKeyword;
+        #[cxx_name = "keyword"]
+        fn keyword_ffi(self: &JobConjunctionDecorator) -> ParseKeyword;
         fn decoration(self: &DecoratedStatement) -> StatementDecoration;
 
         fn is_argument(self: &ArgumentOrRedirection) -> bool;
@@ -4507,7 +4508,7 @@ impl<'a> NodeFfi<'a> {
     fn pointer_eq(&self, rhs: &NodeFfi) -> bool {
         std::ptr::eq(self.as_node().as_ptr(), rhs.as_node().as_ptr())
     }
-    fn kw(&self) -> ParseKeyword {
+    fn keyword(&self) -> ParseKeyword {
         self.as_node().as_keyword().unwrap().keyword()
     }
     fn token_type(&self) -> ParseTokenType {
@@ -4698,7 +4699,7 @@ impl Statement {
 }
 
 impl JobConjunctionDecorator {
-    fn kw(&self) -> ParseKeyword {
+    fn keyword_ffi(&self) -> ParseKeyword {
         self.keyword()
     }
     fn source_range_ffi(&self) -> SourceRange {

src/highlight.cpp

@@ -898,7 +898,7 @@ static bool range_is_potential_path(const wcstring &src, const source_range_t &r
 
 void highlighter_t::visit_keyword(const ast::node_t *kw) {
     highlight_role_t role = highlight_role_t::normal;
-    switch (kw->kw()) {
+    switch (kw->keyword()) {
         case parse_keyword_t::kw_begin:
         case parse_keyword_t::kw_builtin:
         case parse_keyword_t::kw_case:

src/parse_execution.cpp

@@ -1490,7 +1490,7 @@ end_execution_reason_t parse_execution_context_t::test_and_run_1_job_conjunction
     // Maybe skip the job if it has a leading and/or.
     bool skip = false;
     if (jc.has_decorator()) {
-        switch (jc.decorator().kw()) {
+        switch (jc.decorator().keyword()) {
             case parse_keyword_t::kw_and:
                 // AND. Skip if the last job failed.
                 skip = parser->get_last_status() != 0;

src/parse_util.cpp

@@ -884,10 +884,11 @@ static bool detect_errors_in_backgrounded_job(const ast::job_pipeline_t &job,
         if (const job_conjunction_t *next = jlist->at(index + 1)) {
             if (next->has_decorator()) {
                 const auto &deco = next->decorator();
-                assert(
-                    (deco.kw() == parse_keyword_t::kw_and || deco.kw() == parse_keyword_t::kw_or) &&
-                    "Unexpected decorator keyword");
-                const wchar_t *deco_name = (deco.kw() == parse_keyword_t::kw_and ? L"and" : L"or");
+                assert((deco.keyword() == parse_keyword_t::kw_and ||
+                        deco.keyword() == parse_keyword_t::kw_or) &&
+                       "Unexpected decorator keyword");
+                const wchar_t *deco_name =
+                    (deco.keyword() == parse_keyword_t::kw_and ? L"and" : L"or");
                 errored = append_syntax_error(parse_errors, deco.source_range().start,
                                               deco.source_range().length,
                                               BOOL_AFTER_BACKGROUND_ERROR_MSG, deco_name);