From: John Darrington Date: Sat, 10 Apr 2021 06:31:48 +0000 (+0200) Subject: Remove unused module subcommand-list X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp;a=commitdiff_plain;h=869ae197e20b5a5761c79f3f719b7602b6d1600b Remove unused module subcommand-list --- diff --git a/src/language/lexer/automake.mk b/src/language/lexer/automake.mk index 3eb23eb424..4387c3dd22 100644 --- a/src/language/lexer/automake.mk +++ b/src/language/lexer/automake.mk @@ -24,8 +24,6 @@ language_lexer_sources = \ src/language/lexer/include-path.h \ src/language/lexer/lexer.c \ src/language/lexer/lexer.h \ - src/language/lexer/subcommand-list.c \ - src/language/lexer/subcommand-list.h \ src/language/lexer/format-parser.c \ src/language/lexer/format-parser.h \ src/language/lexer/scan.c \ diff --git a/src/language/lexer/subcommand-list.c b/src/language/lexer/subcommand-list.c deleted file mode 100644 index 33deac0bb6..0000000000 --- a/src/language/lexer/subcommand-list.c +++ /dev/null @@ -1,120 +0,0 @@ -/* PSPP - a program for statistical analysis. - Copyright (C) 2004, 2011 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 3 of the License, 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 . */ - - -#include -#include "language/lexer/subcommand-list.h" -#include -#include "language/lexer/lexer.h" -#include "gl/xalloc.h" - -#include "gettext.h" -#define _(msgid) gettext (msgid) - -/* I call these objects `lists' but they are in fact simple dynamic arrays */ - -#define CHUNKSIZE 16 - -/* Create a list */ -void -subc_list_double_create(subc_list_double *l) -{ - l->data = xnmalloc (CHUNKSIZE, sizeof *l->data); - l->sz = CHUNKSIZE; - l->n_data = 0; -} - -void -subc_list_int_create(subc_list_int *l) -{ - l->data = xnmalloc (CHUNKSIZE, sizeof *l->data); - l->sz = CHUNKSIZE; - l->n_data = 0; -} - -/* Push a value onto the list */ -void -subc_list_double_push(subc_list_double *l, double d) -{ - l->data[l->n_data++] = d; - - if (l->n_data >= l->sz) - { - l->sz += CHUNKSIZE; - l->data = xnrealloc (l->data, l->sz, sizeof *l->data); - } - -} - -void -subc_list_int_push(subc_list_int *l, int d) -{ - l->data[l->n_data++] = d; - - if (l->n_data >= l->sz) - { - l->sz += CHUNKSIZE; - l->data = xnrealloc (l->data, l->sz, sizeof *l->data); - } - -} - -/* Return the number of items in the list */ -int -subc_list_double_count(const subc_list_double *l) -{ - return l->n_data; -} - -int -subc_list_int_count(const subc_list_int *l) -{ - return l->n_data; -} - - -/* Index into the list (array) */ -double -subc_list_double_at(const subc_list_double *l, int idx) -{ - return l->data[idx]; -} - -int -subc_list_int_at(const subc_list_int *l, int idx) -{ - return l->data[idx]; -} - -/* Free up the list */ -void -subc_list_double_destroy(subc_list_double *l) -{ - free(l->data); -} - -void -subc_list_int_destroy(subc_list_int *l) -{ - free(l->data); -} - -void -subc_list_error (struct lexer *lexer, const char *sbc, int max_list) -{ - lex_error (lexer, _("No more than %d %s subcommands allowed."), - max_list, sbc); -} diff --git a/src/language/lexer/subcommand-list.h b/src/language/lexer/subcommand-list.h deleted file mode 100644 index 8d664f5665..0000000000 --- a/src/language/lexer/subcommand-list.h +++ /dev/null @@ -1,67 +0,0 @@ -/* PSPP - a program for statistical analysis. - Copyright (C) 2004, 2011 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 3 of the License, 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 . */ - -#ifndef SUBCLIST_H -#define SUBCLIST_H - - -#include - -/* This module provides a rudimentary list class - It is intended for use by the command line parser for list subcommands -*/ - -struct lexer; - -struct subc_list_double { - double *data ; - size_t sz; - int n_data; -}; - -struct subc_list_int { - int *data ; - size_t sz; - int n_data; -}; - - -typedef struct subc_list_double subc_list_double ; -typedef struct subc_list_int subc_list_int ; - -/* Create a list */ -void subc_list_double_create(subc_list_double *l) ; -void subc_list_int_create(subc_list_int *l) ; - -/* Push a value onto the list */ -void subc_list_double_push(subc_list_double *l, double d) ; -void subc_list_int_push(subc_list_int *l, int i) ; - -/* Index into the list */ -double subc_list_double_at(const subc_list_double *l, int idx); -int subc_list_int_at(const subc_list_int *l, int idx); - -/* Return the number of values in the list */ -int subc_list_double_count(const subc_list_double *l); -int subc_list_int_count(const subc_list_int *l); - -/* Destroy the list */ -void subc_list_double_destroy(subc_list_double *l) ; -void subc_list_int_destroy(subc_list_int *l) ; - -void subc_list_error (struct lexer *, const char *sbc, int max_list); - -#endif