Prefix token_type_str function

Author: st0012

ext/rbs_extension/main.c

@@ -23,7 +23,7 @@ static NORETURN(void) raise_error(rbs_error_t *error, VALUE buffer) {
   }
 
   VALUE location = rbs_new_location(buffer, error->token.range);
-  VALUE type = rb_str_new_cstr(token_type_str(error->token.type));
+  VALUE type = rb_str_new_cstr(rbs_token_type_str(error->token.type));
 
   VALUE rb_error = rb_funcall(
     RBS_ParsingError,
@@ -112,7 +112,7 @@ static VALUE parse_type_try(VALUE a) {
   if (RB_TEST(arg->require_eof)) {
     parser_advance(parser);
     if (parser->current_token.type != pEOF) {
-      set_error(parser, parser->current_token, true, "expected a token `%s`", token_type_str(pEOF));
+      set_error(parser, parser->current_token, true, "expected a token `%s`", rbs_token_type_str(pEOF));
       raise_error(parser->error, arg->buffer);
     }
   }
@@ -202,7 +202,7 @@ static VALUE parse_method_type_try(VALUE a) {
   if (RB_TEST(arg->require_eof)) {
     parser_advance(parser);
     if (parser->current_token.type != pEOF) {
-      set_error(parser, parser->current_token, true, "expected a token `%s`", token_type_str(pEOF));
+      set_error(parser, parser->current_token, true, "expected a token `%s`", rbs_token_type_str(pEOF));
       raise_error(parser->error, arg->buffer);
     }
   }
@@ -292,7 +292,7 @@ static VALUE rbsparser_lex(VALUE self, VALUE buffer, VALUE end_pos) {
   rbs_token_t token = NullToken;
   while (token.type != pEOF) {
     token = rbsparser_next_token(lexer);
-    VALUE type = ID2SYM(rb_intern(token_type_str(token.type)));
+    VALUE type = ID2SYM(rb_intern(rbs_token_type_str(token.type)));
     VALUE location = rbs_new_location(buffer, token.range);
     VALUE pair = rb_ary_new3(2, type, location);
     rb_ary_push(results, pair);

include/rbs/lexer.h

@@ -149,7 +149,7 @@ int rbs_token_bytes(rbs_token_t tok);
 #define rbs_nonnull_pos_or(pos1, pos2) (rbs_null_position_p(pos1) ? pos2 : pos1)
 #define RBS_RANGE_BYTES(range) (range.end.byte_pos - range.start.byte_pos)
 
-const char *token_type_str(enum RBSTokenType type);
+const char *rbs_token_type_str(enum RBSTokenType type);
 
 /**
  * Read next character.

src/lexstate.c

@@ -93,7 +93,7 @@ rbs_token_t NullToken = { .type = NullType, .range = {} };
 rbs_position_t NullPosition = { -1, -1, -1, -1 };
 rbs_range_t NULL_RANGE = { { -1, -1, -1, -1 }, { -1, -1, -1, -1 } };
 
-const char *token_type_str(enum RBSTokenType type) {
+const char *rbs_token_type_str(enum RBSTokenType type) {
   return RBS_TOKENTYPE_NAMES[type];
 }
 

src/parser.c

@@ -73,7 +73,7 @@ void rbs_parser_private_thing(rbs_parser_t *parser) {
 
 #define ASSERT_TOKEN(parser, expected_type) \
   if (parser->current_token.type != expected_type) { \
-    set_error(parser, parser->current_token, true, "expected a token `%s`", token_type_str(expected_type)); \
+    set_error(parser, parser->current_token, true, "expected a token `%s`", rbs_token_type_str(expected_type)); \
     return false; \
   }
 
@@ -3299,10 +3299,10 @@ bool parser_insert_typevar(rbs_parser_t *parser, rbs_constant_id_t id) {
 }
 
 void print_parser(rbs_parser_t *parser) {
-  printf("  current_token = %s (%d...%d)\n", token_type_str(parser->current_token.type), parser->current_token.range.start.char_pos, parser->current_token.range.end.char_pos);
-  printf("     next_token = %s (%d...%d)\n", token_type_str(parser->next_token.type), parser->next_token.range.start.char_pos, parser->next_token.range.end.char_pos);
-  printf("    next_token2 = %s (%d...%d)\n", token_type_str(parser->next_token2.type), parser->next_token2.range.start.char_pos, parser->next_token2.range.end.char_pos);
-  printf("    next_token3 = %s (%d...%d)\n", token_type_str(parser->next_token3.type), parser->next_token3.range.start.char_pos, parser->next_token3.range.end.char_pos);
+  printf("  current_token = %s (%d...%d)\n", rbs_token_type_str(parser->current_token.type), parser->current_token.range.start.char_pos, parser->current_token.range.end.char_pos);
+  printf("     next_token = %s (%d...%d)\n", rbs_token_type_str(parser->next_token.type), parser->next_token.range.start.char_pos, parser->next_token.range.end.char_pos);
+  printf("    next_token2 = %s (%d...%d)\n", rbs_token_type_str(parser->next_token2.type), parser->next_token2.range.start.char_pos, parser->next_token2.range.end.char_pos);
+  printf("    next_token3 = %s (%d...%d)\n", rbs_token_type_str(parser->next_token3.type), parser->next_token3.range.start.char_pos, parser->next_token3.range.end.char_pos);
 }
 
 void parser_advance(rbs_parser_t *parser) {
@@ -3332,7 +3332,7 @@ void parser_advance(rbs_parser_t *parser) {
 void rbs_print_token(rbs_token_t tok) {
   printf(
     "%s char=%d...%d\n",
-    token_type_str(tok.type),
+    rbs_token_type_str(tok.type),
     tok.range.start.char_pos,
     tok.range.end.char_pos
   );