Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove unused basicparser c code #998

Merged
merged 1 commit into from
Aug 8, 2024
Merged

Remove unused basicparser c code #998

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 5 additions & 24 deletions lib/include/ert/util/parser.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,38 +103,19 @@ typedef struct basic_parser_struct basic_parser_type;
*/

basic_parser_type *basic_parser_alloc(
const char *whitespace, /** Set to NULL if not interessting. */
const char *quoters, /** Set to NULL if not interessting. */
const char *specials, /** Set to NULL if not interessting. */
const char *whitespace, /** Set to NULL if not interesting. */
const char *quoters, /** Set to NULL if not interesting. */
const char *specials, /** Set to NULL if not interesting. */
const char *delete_set,
const char *comment_start, /** Set to NULL if not interessting. */
const char *comment_end); /** Set to NULL if not interessting. */

void basic_parser_set_splitters(basic_parser_type *parser,
const char *splitters);
void basic_parser_set_quoters(basic_parser_type *parser, const char *quoters);
void basic_parser_set_specials(basic_parser_type *parser, const char *specials);
void basic_parser_set_delete_set(basic_parser_type *parser,
const char *delete_set);
void basic_parser_set_comment_start(basic_parser_type *parser,
const char *comment_start);
void basic_parser_set_comment_end(basic_parser_type *parser,
const char *comment_end);
const char *comment_start, /** Set to NULL if not interesting. */
const char *comment_end); /** Set to NULL if not interesting. */

void basic_parser_free(basic_parser_type *parser);

stringlist_type *basic_parser_tokenize_buffer(const basic_parser_type *parser,
const char *buffer,
bool strip_quote_marks);

stringlist_type *basic_parser_tokenize_file(const basic_parser_type *parser,
const char *filename,
bool strip_quote_marks);

/* Pollution by Joakim: */

void basic_parser_strip_buffer(const basic_parser_type *parser,
char **__buffer);
bool basic_parser_fseek_string(const basic_parser_type *parser, FILE *stream,
const char *string, bool skip_string,
bool case_sensitive);
Expand Down
37 changes: 14 additions & 23 deletions lib/util/parser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,39 +27,40 @@ static void __verify_string_length(const char *s) {
__func__);
}

void basic_parser_set_splitters(basic_parser_type *parser,
const char *splitters) {
static void basic_parser_set_splitters(basic_parser_type *parser,
const char *splitters) {
__verify_string_length(splitters);
parser->splitters = util_realloc_string_copy(parser->splitters, splitters);
}

void basic_parser_set_quoters(basic_parser_type *parser, const char *quoters) {
static void basic_parser_set_quoters(basic_parser_type *parser,
const char *quoters) {
__verify_string_length(quoters);
parser->quoters = util_realloc_string_copy(parser->quoters, quoters);
}

void basic_parser_set_specials(basic_parser_type *parser,
const char *specials) {
static void basic_parser_set_specials(basic_parser_type *parser,
const char *specials) {
__verify_string_length(specials);
parser->specials = util_realloc_string_copy(parser->specials, specials);
}

void basic_parser_set_delete_set(basic_parser_type *parser,
const char *delete_set) {
static void basic_parser_set_delete_set(basic_parser_type *parser,
const char *delete_set) {
__verify_string_length(delete_set);
parser->delete_set =
util_realloc_string_copy(parser->delete_set, delete_set);
}

void basic_parser_set_comment_start(basic_parser_type *parser,
const char *comment_start) {
static void basic_parser_set_comment_start(basic_parser_type *parser,
const char *comment_start) {
__verify_string_length(comment_start);
parser->comment_start =
util_realloc_string_copy(parser->comment_start, comment_start);
}

void basic_parser_set_comment_end(basic_parser_type *parser,
const char *comment_end) {
static void basic_parser_set_comment_end(basic_parser_type *parser,
const char *comment_end) {
__verify_string_length(comment_end);
parser->comment_end =
util_realloc_string_copy(parser->comment_end, comment_end);
Expand Down Expand Up @@ -436,16 +437,6 @@ stringlist_type *basic_parser_tokenize_buffer(const basic_parser_type *parser,
return tokens;
}

stringlist_type *basic_parser_tokenize_file(const basic_parser_type *parser,
const char *filename,
bool strip_quote_marks) {
stringlist_type *tokens;
char *buffer = util_fread_alloc_file_content(filename, NULL);
tokens = basic_parser_tokenize_buffer(parser, buffer, strip_quote_marks);
free(buffer);
return tokens;
}

static bool fseek_quote_end(char quoter, FILE *stream) {
int c;
do {
Expand Down Expand Up @@ -599,8 +590,8 @@ bool basic_parser_fseek_string(const basic_parser_type *parser, FILE *stream,

*/

void basic_parser_strip_buffer(const basic_parser_type *parser,
char **__buffer) {
static void basic_parser_strip_buffer(const basic_parser_type *parser,
char **__buffer) {
char *src = *__buffer;
char *target = (char *)util_calloc((strlen(*__buffer) + 1), sizeof *target);

Expand Down