andy/mpc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed unused warnings

Browse Source
This commit is contained in:
Daniel Holden
2014-01-10 10:03:25 +00:00
parent 0eaaf4bba2
commit 26b6216d7a
4 changed files with 41 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -1,5 +1,5 @@
CC = gcc CC = gcc
CFLAGS = -ansi -pedantic -Wall -Werror -Wno-unused -g CFLAGS = -ansi -pedantic -Wall -Werror -g
TESTS = $(wildcard tests/*.c) TESTS = $(wildcard tests/*.c)

52
mpc.c
View File

@@ -134,15 +134,15 @@ static char* mpc_err_char_unescape(char c) {
switch (c) { switch (c) {
case '\a': "bell"; case '\a': return "bell";
case '\b': "backspace"; case '\b': return "backspace";
case '\f': "formfeed"; case '\f': return "formfeed";
case '\r': "carriage return"; case '\r': return "carriage return";
case '\v': "vertical tab"; case '\v': return "vertical tab";
case '\0': "end of input"; case '\0': return "end of input";
case '\n': "newline"; case '\n': return "newline";
case '\t': "tab"; case '\t': return "tab";
case ' ' : "space"; case ' ' : return "space";
default: default:
char_unescape_buffer[1] = c; char_unescape_buffer[1] = c;
return char_unescape_buffer; return char_unescape_buffer;
@@ -392,7 +392,6 @@ static mpc_input_t* mpc_input_new_file(const char* filename, FILE* file) {
static void mpc_input_delete(mpc_input_t* i) { static void mpc_input_delete(mpc_input_t* i) {
int j;
free(i->filename); free(i->filename);
if (i->type == MPC_INPUT_STRING) { free(i->string); } if (i->type == MPC_INPUT_STRING) { free(i->string); }
@@ -849,10 +848,6 @@ static void mpc_stack_popr_n(mpc_stack_t* s, int n) {
} }
} }
static mpc_result_t* mpc_stack_results(mpc_stack_t* s, int n) {
return &s->results[s->results_num-n];
}
static mpc_val_t* mpc_stack_merger_out(mpc_stack_t* s, int n, mpc_fold_t f) { static mpc_val_t* mpc_stack_merger_out(mpc_stack_t* s, int n, mpc_fold_t f) {
mpc_val_t* x = f(n, (mpc_val_t**)(&s->results[s->results_num-n])); mpc_val_t* x = f(n, (mpc_val_t**)(&s->results[s->results_num-n]));
mpc_stack_popr_n(s, n); mpc_stack_popr_n(s, n);
@@ -1900,10 +1895,6 @@ static mpc_val_t* mpcf_re_range(mpc_val_t* x) {
return comp ? mpc_noneof(range) : mpc_oneof(range); return comp ? mpc_noneof(range) : mpc_oneof(range);
} }
static mpc_val_t* mpcf_re_invalid(void) {
return mpc_fail("Invalid Regex");
}
mpc_parser_t* mpc_re(const char* re) { mpc_parser_t* mpc_re(const char* re) {
char* err_msg; char* err_msg;
@@ -2114,6 +2105,31 @@ mpc_val_t* mpcf_unescape_regex(mpc_val_t* x) {
return y; return y;
} }
mpc_val_t* mpcf_escape_string_raw(mpc_val_t* x) {
mpc_val_t* y = mpcf_escape_new(x, mpc_escape_input_raw_cstr, mpc_escape_output_raw_cstr);
free(x);
return y;
}
mpc_val_t* mpcf_unescape_string_raw(mpc_val_t* x) {
mpc_val_t* y = mpcf_unescape_new(x, mpc_escape_input_raw_cstr, mpc_escape_output_raw_cstr);
free(x);
return y;
}
mpc_val_t* mpcf_escape_char_raw(mpc_val_t* x) {
mpc_val_t* y = mpcf_escape_new(x, mpc_escape_input_raw_cchar, mpc_escape_output_raw_cchar);
free(x);
return y;
}
mpc_val_t* mpcf_unescape_char_raw(mpc_val_t* x) {
mpc_val_t* y = mpcf_unescape_new(x, mpc_escape_input_raw_cchar, mpc_escape_output_raw_cchar);
free(x);
return y;
}
mpc_val_t* mpcf_fst(int n, mpc_val_t** xs) { return xs[0]; } mpc_val_t* mpcf_fst(int n, mpc_val_t** xs) { return xs[0]; }
mpc_val_t* mpcf_snd(int n, mpc_val_t** xs) { return xs[1]; } mpc_val_t* mpcf_snd(int n, mpc_val_t** xs) { return xs[1]; }
mpc_val_t* mpcf_trd(int n, mpc_val_t** xs) { return xs[2]; } mpc_val_t* mpcf_trd(int n, mpc_val_t** xs) { return xs[2]; }

5
mpc.h
View File

@@ -199,8 +199,13 @@ mpc_val_t* mpcf_oct(mpc_val_t* x);
mpc_val_t* mpcf_float(mpc_val_t* x); mpc_val_t* mpcf_float(mpc_val_t* x);
mpc_val_t* mpcf_escape(mpc_val_t* x); mpc_val_t* mpcf_escape(mpc_val_t* x);
mpc_val_t* mpcf_escape_regex(mpc_val_t* x);
mpc_val_t* mpcf_escape_string_raw(mpc_val_t* x);
mpc_val_t* mpcf_escape_char_raw(mpc_val_t* x);
mpc_val_t* mpcf_unescape(mpc_val_t* x); mpc_val_t* mpcf_unescape(mpc_val_t* x);
mpc_val_t* mpcf_unescape_regex(mpc_val_t* x); mpc_val_t* mpcf_unescape_regex(mpc_val_t* x);
mpc_val_t* mpcf_unescape_string_raw(mpc_val_t* x);
mpc_val_t* mpcf_unescape_char_raw(mpc_val_t* x);
mpc_val_t* mpcf_fst(int n, mpc_val_t** xs); mpc_val_t* mpcf_fst(int n, mpc_val_t** xs);
mpc_val_t* mpcf_snd(int n, mpc_val_t** xs); mpc_val_t* mpcf_snd(int n, mpc_val_t** xs);

2
tests/regex.c
View File

@@ -49,7 +49,7 @@ void test_regex_basic(void) {
void test_regex_range(void) { void test_regex_range(void) {
mpc_parser_t *re0, *re1, *re2, *re3, *re4; mpc_parser_t *re0, *re1, *re2, *re3;
re0 = mpc_re("abg[abcdef]"); re0 = mpc_re("abg[abcdef]");
re1 = mpc_re("y*[a-z]"); re1 = mpc_re("y*[a-z]");