test-sfl-istream.c

Show log
Commit

Hash : 9a26e704
Author :
Date : 2025-01-02T13:54:54

string-desc, xstring-desc, string-desc-quotearg: Rename functions.

* lib/string-desc.h (sd_equals): Renamed from string_desc_equals.
(sd_startswith): Renamed from string_desc_startswith.
(sd_endswith): Renamed from string_desc_endswith.
(sd_cmp): Renamed from string_desc_cmp.
(sd_c_casecmp): Renamed from string_desc_c_casecmp.
(sd_index): Renamed from string_desc_index.
(sd_last_index): Renamed from string_desc_last_index.
(sd_contains): Renamed from string_desc_contains.
(sd_new_empty): Renamed from string_desc_new_empty.
(sd_new_addr): Renamed from string_desc_new_addr.
(sd_from_c): Renamed from string_desc_from_c.
(sd_substring): Renamed from string_desc_substring.
(sd_write): Renamed from string_desc_write.
(sd_fwrite): Renamed from string_desc_fwrite.
(sd_new): Renamed from string_desc_new.
(sd_new_filled): Renamed from string_desc_new_filled.
(sd_copy): Renamed from string_desc_copy.
(sd_concat): Renamed from string_desc_concat.
(sd_c): Renamed from string_desc_c.
(sd_set_char_at): Renamed from string_desc_set_char_at.
(sd_fill): Renamed from string_desc_fill.
(sd_overwrite): Renamed from string_desc_overwrite.
(sd_free): Renamed from string_desc_free.
(sd_length): Renamed from string_desc_length.
(sd_char_at): Renamed from string_desc_char_at.
(sd_data): Renamed from string_desc_data.
(sd_is_empty): Renamed from string_desc_is_empty.
* lib/string-desc.c (sd_equals): Renamed from string_desc_equals.
(sd_startswith): Renamed from string_desc_startswith.
(sd_endswith): Renamed from string_desc_endswith.
(sd_cmp): Renamed from string_desc_cmp.
(sd_c_casecmp): Renamed from string_desc_c_casecmp.
(sd_index): Renamed from string_desc_index.
(sd_last_index): Renamed from string_desc_last_index.
(sd_new_empty): Renamed from string_desc_new_empty.
(sd_new_addr): Renamed from string_desc_new_addr.
(sd_from_c): Renamed from string_desc_from_c.
(sd_substring): Renamed from string_desc_substring.
(sd_write): Renamed from string_desc_write.
(sd_fwrite): Renamed from string_desc_fwrite.
(sd_new): Renamed from string_desc_new.
(sd_new_filled): Renamed from string_desc_new_filled.
(sd_copy): Renamed from string_desc_copy.
(sd_concat): Renamed from string_desc_concat.
(sd_c): Renamed from string_desc_c.
(sd_set_char_at): Renamed from string_desc_set_char_at.
(sd_fill): Renamed from string_desc_fill.
(sd_overwrite): Renamed from string_desc_overwrite.
(sd_free): Renamed from string_desc_free.
* lib/xstring-desc.h (xsd_concat): Renamed from xstring_desc_concat.
(xsd_new): Renamed from xstring_desc_new.
(xsd_new_filled): Renamed from xstring_desc_new_filled.
(xsd_copy): Renamed from xstring_desc_copy.
(xsd_c): Renamed from xstring_desc_c.
* lib/xstring-desc.c (xsd_concat): Renamed from xstring_desc_concat.
* lib/string-desc-quotearg.h (sd_quotearg_buffer): Renamed from
string_desc_quotearg_buffer.
(sd_quotearg_alloc): Renamed from string_desc_quotearg_alloc.
(sd_quotearg_n): Renamed from string_desc_quotearg_n.
(sd_quotearg): Renamed from string_desc_quotearg.
(sd_quotearg_n_style): Renamed from string_desc_quotearg_n_style.
(sd_quotearg_style): Renamed from string_desc_quotearg_style.
(sd_quotearg_char): Renamed from string_desc_quotearg_char.
(sd_quotearg_colon): Renamed from string_desc_quotearg_colon.
(sd_quotearg_n_custom): Renamed from string_desc_quotearg_n_custom.
(sd_quotearg_custom): Renamed from sd_quotearg_n_custom.
* lib/string-desc-contains.c (sd_contains): Renamed from
string_desc_contains.
* lib/string-buffer.h: Update.
* lib/string-buffer.c (sb_append_desc, sb_contents, sb_dupfree): Update.
* lib/xstring-buffer.c (sb_xdupfree): Update.
* lib/sf-istream.c (sf_istream_init_from_string_desc): Update.
* tests/test-string-desc.c (main): Update.
* tests/test-string-desc.sh: Update.
* tests/test-xstring-desc.c (main): Update.
* tests/test-string-desc-quotearg.c (main): Update.
* tests/test-string-buffer.c (main): Update.
* tests/test-sf-istream.c (main): Update.
* tests/test-sfl-istream.c (main): Update.
* doc/string-desc.texi: Update.
* doc/strings.texi: Update.
* NEWS: Mention the change.

Download

tests/test-sfl-istream.c

/* Test of string or file based input stream with line number.
   Copyright (C) 2024-2025 Free Software Foundation, Inc.

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2, or (at your option)
   any later version.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.

   You should have received a copy of the GNU General Public License
   along with this program; if not, see <https://www.gnu.org/licenses/>.  */

/* Written by Bruno Haible <bruno@clisp.org>, 2024.  */

#include <config.h>

/* Specification.  */
#include "sfl-istream.h"

#include <unistd.h>

#include "macros.h"

#define CONTENTS_LEN 9
#define CONTENTS "Hello\377\n\nW"

static void
test_open_stream (sfl_istream_t *stream)
{
  int c;

  ASSERT (sfl_get_line_number (stream) == 1);
  c = sfl_getc (stream);
  ASSERT (c == 'H');
  ASSERT (sfl_get_line_number (stream) == 1);
  c = sfl_getc (stream);
  ASSERT (c == 'e');
  ASSERT (sfl_get_line_number (stream) == 1);
  c = sfl_getc (stream);
  ASSERT (c == 'l');
  ASSERT (sfl_get_line_number (stream) == 1);
  c = sfl_getc (stream);
  ASSERT (c == 'l');
  ASSERT (sfl_get_line_number (stream) == 1);
  c = sfl_getc (stream);
  ASSERT (c == 'o');
  ASSERT (sfl_get_line_number (stream) == 1);
  sfl_ungetc (stream, c);
  c = sfl_getc (stream);
  ASSERT (c == 'o');
  ASSERT (sfl_get_line_number (stream) == 1);
  c = sfl_getc (stream);
  ASSERT (c == 0xff);
  ASSERT (sfl_get_line_number (stream) == 1);
  sfl_ungetc (stream, c);
  c = sfl_getc (stream);
  ASSERT (c == 0xff);
  ASSERT (sfl_get_line_number (stream) == 1);
  c = sfl_getc (stream);
  ASSERT (c == '\n');
  ASSERT (sfl_get_line_number (stream) == 2);
  c = sfl_getc (stream);
  ASSERT (c == '\n');
  ASSERT (sfl_get_line_number (stream) == 3);
  sfl_ungetc (stream, c);
  ASSERT (sfl_get_line_number (stream) == 2);
  c = sfl_getc (stream);
  ASSERT (c == '\n');
  ASSERT (sfl_get_line_number (stream) == 3);
  c = sfl_getc (stream);
  ASSERT (c == 'W');
  ASSERT (sfl_get_line_number (stream) == 3);
  c = sfl_getc (stream);
  ASSERT (c == EOF);
  ASSERT (sfl_get_line_number (stream) == 3);
  c = sfl_getc (stream);
  ASSERT (c == EOF);
  ASSERT (sfl_get_line_number (stream) == 3);
  sfl_ungetc (stream, c);
  c = sfl_getc (stream);
  ASSERT (c == EOF);
  ASSERT (sfl_get_line_number (stream) == 3);
  ASSERT (!sfl_ferror (stream));
}

int
main ()
{
  char const contents[CONTENTS_LEN] = CONTENTS;

  /* Test reading from a file.  */
  {
    const char *filename = "test-sfl-istream.tmp";
    unlink (filename);
    {
      FILE *fp = fopen (filename, "wb");
      ASSERT (fwrite (contents, 1, CONTENTS_LEN, fp) == CONTENTS_LEN);
      ASSERT (fclose (fp) == 0);
    }
    {
      FILE *fp = fopen (filename, "rb");
      sfl_istream_t stream;
      sfl_istream_init_from_file (&stream, fp);
      test_open_stream (&stream);
      sfl_free (&stream);
    }
    unlink (filename);
  }

  /* Test reading from a string in memory.  */
  {
    sfl_istream_t stream;
    sfl_istream_init_from_string_desc (&stream,
                                       sd_new_addr (CONTENTS_LEN,
                                                    (char *) contents));
    test_open_stream (&stream);
    sfl_free (&stream);
  }

  /* Test reading from a NUL-terminated string in memory.  */
  {
    sfl_istream_t stream;
    sfl_istream_init_from_string (&stream, CONTENTS);
    test_open_stream (&stream);
    sfl_free (&stream);
  }

  return 0;
}

Download

kc3-lang/gnulib/tests/test-sfl-istream.c

Commit

tests/test-sfl-istream.c