Consolidate quoting style in printed strings.

[pspp] / src / language / lexer / lexer.c

diff --git a/src/language/lexer/lexer.c b/src/language/lexer/lexer.c
index 5ff0b8bcd38d83c2e8c17446c97535e76f7f5ad1..9b879c71ec5d57484bb4105a0540e6db2b6b11d9 100644 (file)
--- a/src/language/lexer/lexer.c
+++ b/src/language/lexer/lexer.c
@@ -176,19 +176,19 @@ lex_get (struct lexer *lexer)
          return;
        }
 
-  /* If a token was pushed ahead, return it. */
-  if (lexer->put_token)
-    {
-      restore_token (lexer);
+      /* If a token was pushed ahead, return it. */
+      if (lexer->put_token)
+        {
+          restore_token (lexer);
 #if DUMP_TOKENS
          dump_token (lexer);
 #endif
-      return;
-    }
+          return;
+        }
 
-  for (;;)
-    {
-      /* Skip whitespace. */
+      for (;;)
+        {
+          /* Skip whitespace. */
          while (c_isspace ((unsigned char) *lexer->prog))
            lexer->prog++;
 
@@ -882,7 +882,6 @@ lex_get_line_raw (struct lexer *lexer)
   if (ok)
     {
       const char *line = ds_cstr (&lexer->line_buffer);
-      journal_write (lex_current_syntax_mode (lexer) == GETL_BATCH, line);
       text_item_submit (text_item_create (TEXT_ITEM_SYNTAX, line));
     }
   return ok;
@@ -1219,13 +1218,6 @@ finish:
   if (type != CHARACTER_STRING)
     convert_numeric_string_to_char_string (lexer, type);
 
-  if (ds_length (&lexer->tokstr) > 255)
-    {
-      msg (SE, _("String exceeds 255 characters in length (%zu characters)."),
-          ds_length (&lexer->tokstr));
-      ds_truncate (&lexer->tokstr, 255);
-    }
-
   return T_STRING;
 }
 \f
@@ -1257,7 +1249,7 @@ dump_token (struct lexer *lexer)
       break;
 
     case T_STRING:
-      fprintf (stderr, "STRING\t\"%s\"\n", ds_cstr (&lexer->tokstr));
+      fprintf (stderr, "STRING\t`%s'\n", ds_cstr (&lexer->tokstr));
       break;
 
     case T_STOP: