X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Flexer%2Ftoken.c;h=718f3d07f3d480a1580d59714ee8348e63a38e5e;hb=012b9e4ecf47d844aea352b2c0b7dda80a7194bd;hp=80c6615c5a5015048ed7e4767ada3e135c26262f;hpb=4881184f738deb7a4c5b843a361d4225f4e3d6c0;p=pspp

diff --git a/src/language/lexer/token.c b/src/language/lexer/token.c
index 80c6615c5a..718f3d07f3 100644
--- a/src/language/lexer/token.c
+++ b/src/language/lexer/token.c
@@ -42,7 +42,7 @@ token_init (struct token *token)
 
 /* Frees the string that TOKEN contains. */
 void
-token_destroy (struct token *token)
+token_uninit (struct token *token)
 {
   if (token != NULL)
     ss_dealloc (&token->string);
@@ -135,8 +135,6 @@ string_representation (struct substring ss)
 char *
 token_to_string (const struct token *token)
 {
-  const char *name;
-
   switch (token->type)
     {
     case T_POS_NUM:
@@ -144,14 +142,15 @@ token_to_string (const struct token *token)
       return number_token_to_string (token);
 
     case T_ID:
+    case T_MACRO_ID:
+    case T_MACRO_PUNCT:
       return ss_xstrdup (token->string);
 
     case T_STRING:
       return string_representation (token->string);
 
     default:
-      name = token_type_to_name (token->type);
-      return name != NULL ? xstrdup (name) : NULL;
+      return xstrdup_if_nonnull (token_type_to_name (token->type));
     }
 }