aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMattias EngdegÄrd2023-04-14 12:15:13 +0200
committerMattias EngdegÄrd2023-04-14 13:07:46 +0200
commitf14a3cafb48268eaf9331e908f7512c01d431849 (patch)
tree90aa319aca5ce4506699d6380d52bfd345eb5cc8 /src
parentf9d8cdbdbdd4f49650f2f682db89f302220b43d6 (diff)
downloademacs-f14a3cafb48268eaf9331e908f7512c01d431849.tar.gz
emacs-f14a3cafb48268eaf9331e908f7512c01d431849.zip
Use BASE_EQ in treesit.c
* src/treesit.c (Ftreesit_node_check, Ftreesit_pattern_expand) (Ftreesit_query_capture, treesit_traverse_validate_predicate) (treesit_traverse_match_predicate): Use BASE_EQ instead of EQ where this is obviously correct.
Diffstat (limited to 'src')
-rw-r--r--src/treesit.c36
1 files changed, 18 insertions, 18 deletions
diff --git a/src/treesit.c b/src/treesit.c
index d0d9c50c14f..dbbfa29c19d 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -1962,19 +1962,19 @@ live. */)
1962 TSNode treesit_node = XTS_NODE (node)->node; 1962 TSNode treesit_node = XTS_NODE (node)->node;
1963 bool result; 1963 bool result;
1964 1964
1965 if (EQ (property, Qoutdated)) 1965 if (BASE_EQ (property, Qoutdated))
1966 return treesit_node_uptodate_p (node) ? Qnil : Qt; 1966 return treesit_node_uptodate_p (node) ? Qnil : Qt;
1967 1967
1968 treesit_check_node (node); 1968 treesit_check_node (node);
1969 if (EQ (property, Qnamed)) 1969 if (BASE_EQ (property, Qnamed))
1970 result = ts_node_is_named (treesit_node); 1970 result = ts_node_is_named (treesit_node);
1971 else if (EQ (property, Qmissing)) 1971 else if (BASE_EQ (property, Qmissing))
1972 result = ts_node_is_missing (treesit_node); 1972 result = ts_node_is_missing (treesit_node);
1973 else if (EQ (property, Qextra)) 1973 else if (BASE_EQ (property, Qextra))
1974 result = ts_node_is_extra (treesit_node); 1974 result = ts_node_is_extra (treesit_node);
1975 else if (EQ (property, Qhas_error)) 1975 else if (BASE_EQ (property, Qhas_error))
1976 result = ts_node_has_error (treesit_node); 1976 result = ts_node_has_error (treesit_node);
1977 else if (EQ (property, Qlive)) 1977 else if (BASE_EQ (property, Qlive))
1978 result = treesit_parser_live_p (XTS_NODE (node)->parser); 1978 result = treesit_parser_live_p (XTS_NODE (node)->parser);
1979 else 1979 else
1980 signal_error ("Expecting `named', `missing', `extra', " 1980 signal_error ("Expecting `named', `missing', `extra', "
@@ -2293,19 +2293,19 @@ PATTERN can be
2293See Info node `(elisp)Pattern Matching' for detailed explanation. */) 2293See Info node `(elisp)Pattern Matching' for detailed explanation. */)
2294 (Lisp_Object pattern) 2294 (Lisp_Object pattern)
2295{ 2295{
2296 if (EQ (pattern, QCanchor)) 2296 if (BASE_EQ (pattern, QCanchor))
2297 return Vtreesit_str_dot; 2297 return Vtreesit_str_dot;
2298 if (EQ (pattern, intern_c_string (":?"))) 2298 if (BASE_EQ (pattern, intern_c_string (":?")))
2299 return Vtreesit_str_question_mark; 2299 return Vtreesit_str_question_mark;
2300 if (EQ (pattern, intern_c_string (":*"))) 2300 if (BASE_EQ (pattern, intern_c_string (":*")))
2301 return Vtreesit_str_star; 2301 return Vtreesit_str_star;
2302 if (EQ (pattern, intern_c_string (":+"))) 2302 if (BASE_EQ (pattern, intern_c_string (":+")))
2303 return Vtreesit_str_plus; 2303 return Vtreesit_str_plus;
2304 if (EQ (pattern, QCequal)) 2304 if (BASE_EQ (pattern, QCequal))
2305 return Vtreesit_str_pound_equal; 2305 return Vtreesit_str_pound_equal;
2306 if (EQ (pattern, QCmatch)) 2306 if (BASE_EQ (pattern, QCmatch))
2307 return Vtreesit_str_pound_match; 2307 return Vtreesit_str_pound_match;
2308 if (EQ (pattern, QCpred)) 2308 if (BASE_EQ (pattern, QCpred))
2309 return Vtreesit_str_pound_pred; 2309 return Vtreesit_str_pound_pred;
2310 Lisp_Object opening_delimeter 2310 Lisp_Object opening_delimeter
2311 = VECTORP (pattern) 2311 = VECTORP (pattern)
@@ -2898,7 +2898,7 @@ the query. */)
2898 /* 2. Get predicates and check whether this match can be 2898 /* 2. Get predicates and check whether this match can be
2899 included in the result list. */ 2899 included in the result list. */
2900 Lisp_Object predicates = AREF (predicates_table, match.pattern_index); 2900 Lisp_Object predicates = AREF (predicates_table, match.pattern_index);
2901 if (EQ (predicates, Qt)) 2901 if (BASE_EQ (predicates, Qt))
2902 { 2902 {
2903 predicates = treesit_predicates_for_pattern (treesit_query, 2903 predicates = treesit_predicates_for_pattern (treesit_query,
2904 match.pattern_index); 2904 match.pattern_index);
@@ -3154,7 +3154,7 @@ treesit_traverse_validate_predicate (Lisp_Object pred,
3154 { 3154 {
3155 Lisp_Object car = XCAR (pred); 3155 Lisp_Object car = XCAR (pred);
3156 Lisp_Object cdr = XCDR (pred); 3156 Lisp_Object cdr = XCDR (pred);
3157 if (EQ (car, Qnot)) 3157 if (BASE_EQ (car, Qnot))
3158 { 3158 {
3159 if (!CONSP (cdr)) 3159 if (!CONSP (cdr))
3160 { 3160 {
@@ -3174,7 +3174,7 @@ treesit_traverse_validate_predicate (Lisp_Object pred,
3174 return treesit_traverse_validate_predicate (XCAR (cdr), 3174 return treesit_traverse_validate_predicate (XCAR (cdr),
3175 signal_data); 3175 signal_data);
3176 } 3176 }
3177 else if (EQ (car, Qor)) 3177 else if (BASE_EQ (car, Qor))
3178 { 3178 {
3179 if (!CONSP (cdr) || NILP (cdr)) 3179 if (!CONSP (cdr) || NILP (cdr))
3180 { 3180 {
@@ -3237,10 +3237,10 @@ treesit_traverse_match_predicate (TSTreeCursor *cursor, Lisp_Object pred,
3237 Lisp_Object car = XCAR (pred); 3237 Lisp_Object car = XCAR (pred);
3238 Lisp_Object cdr = XCDR (pred); 3238 Lisp_Object cdr = XCDR (pred);
3239 3239
3240 if (EQ (car, Qnot)) 3240 if (BASE_EQ (car, Qnot))
3241 return !treesit_traverse_match_predicate (cursor, XCAR (cdr), 3241 return !treesit_traverse_match_predicate (cursor, XCAR (cdr),
3242 parser, named); 3242 parser, named);
3243 else if (EQ (car, Qor)) 3243 else if (BASE_EQ (car, Qor))
3244 { 3244 {
3245 FOR_EACH_TAIL (cdr) 3245 FOR_EACH_TAIL (cdr)
3246 { 3246 {