[Guile-commits] 01/02: Remove unused static definitions

[Andy Wingo]

wingo pushed a commit to branch master
in repository guile.

commit 2cb7c4c4d7e6e6e5df9746c2582c49a8234d6103
Author: Andy Wingo <address@hidden>
Date:   Sat Jun 11 18:29:35 2016 +0200

    Remove unused static definitions
    
    * libguile/expand.c:
    * libguile/vm.c: Remove unused static definitions.
---
 libguile/expand.c |    9 ---------
 libguile/vm.c     |   36 ------------------------------------
 2 files changed, 45 deletions(-)

diff --git a/libguile/expand.c b/libguile/expand.c
index 91097c2..fc7da54 100644
--- a/libguile/expand.c
+++ b/libguile/expand.c
@@ -109,27 +109,18 @@ static const char s_bad_expression[] = "Bad expression";
 static const char s_expression[] = "Missing or extra expression in";
 static const char s_missing_expression[] = "Missing expression in";
 static const char s_extra_expression[] = "Extra expression in";
-static const char s_empty_combination[] = "Illegal empty combination";
-static const char s_missing_body_expression[] = "Missing body expression in";
-static const char s_mixed_body_forms[] = "Mixed definitions and expressions 
in";
 static const char s_bad_define[] = "Bad define placement";
 static const char s_missing_clauses[] = "Missing clauses";
 static const char s_misplaced_else_clause[] = "Misplaced else clause";
-static const char s_bad_case_clause[] = "Bad case clause";
-static const char s_bad_case_labels[] = "Bad case labels";
-static const char s_duplicate_case_label[] = "Duplicate case label";
 static const char s_bad_cond_clause[] = "Bad cond clause";
 static const char s_missing_recipient[] = "Missing recipient in";
 static const char s_bad_variable[] = "Bad variable";
 static const char s_bad_bindings[] = "Bad bindings";
 static const char s_bad_binding[] = "Bad binding";
 static const char s_duplicate_binding[] = "Duplicate binding";
-static const char s_bad_exit_clause[] = "Bad exit clause";
 static const char s_bad_formals[] = "Bad formals";
 static const char s_bad_formal[] = "Bad formal";
 static const char s_duplicate_formal[] = "Duplicate formal";
-static const char s_splicing[] = "Non-list result for unquote-splicing";
-static const char s_bad_slot_number[] = "Bad slot number";
 
 static void syntax_error (const char* const, const SCM, const SCM) 
SCM_NORETURN;
 
diff --git a/libguile/vm.c b/libguile/vm.c
index 07d6c13..60469f6 100644
--- a/libguile/vm.c
+++ b/libguile/vm.c
@@ -437,25 +437,20 @@ static void vm_error_apply_to_non_list (SCM x) 
SCM_NORETURN SCM_NOINLINE;
 static void vm_error_kwargs_length_not_even (SCM proc) SCM_NORETURN 
SCM_NOINLINE;
 static void vm_error_kwargs_invalid_keyword (SCM proc, SCM obj) SCM_NORETURN 
SCM_NOINLINE;
 static void vm_error_kwargs_unrecognized_keyword (SCM proc, SCM kw) 
SCM_NORETURN SCM_NOINLINE;
-static void vm_error_too_many_args (int nargs) SCM_NORETURN SCM_NOINLINE;
 static void vm_error_wrong_num_args (SCM proc) SCM_NORETURN SCM_NOINLINE;
 static void vm_error_wrong_type_apply (SCM proc) SCM_NORETURN SCM_NOINLINE;
-static void vm_error_stack_underflow (void) SCM_NORETURN SCM_NOINLINE;
-static void vm_error_improper_list (SCM x) SCM_NORETURN SCM_NOINLINE;
 static void vm_error_not_a_char (const char *subr, SCM x) SCM_NORETURN 
SCM_NOINLINE;
 static void vm_error_not_a_pair (const char *subr, SCM x) SCM_NORETURN 
SCM_NOINLINE;
 static void vm_error_not_a_string (const char *subr, SCM x) SCM_NORETURN 
SCM_NOINLINE;
 static void vm_error_not_a_bytevector (const char *subr, SCM x) SCM_NORETURN 
SCM_NOINLINE;
 static void vm_error_not_a_struct (const char *subr, SCM x) SCM_NORETURN 
SCM_NOINLINE;
 static void vm_error_not_a_vector (const char *subr, SCM v) SCM_NORETURN 
SCM_NOINLINE;
-static void vm_error_out_of_range (const char *subr, SCM k) SCM_NORETURN 
SCM_NOINLINE;
 static void vm_error_out_of_range_uint64 (const char *subr, scm_t_uint64 idx) 
SCM_NORETURN SCM_NOINLINE;
 static void vm_error_out_of_range_int64 (const char *subr, scm_t_int64 idx) 
SCM_NORETURN SCM_NOINLINE;
 static void vm_error_no_values (void) SCM_NORETURN SCM_NOINLINE;
 static void vm_error_not_enough_values (void) SCM_NORETURN SCM_NOINLINE;
 static void vm_error_wrong_number_of_values (scm_t_uint32 expected) 
SCM_NORETURN SCM_NOINLINE;
 static void vm_error_continuation_not_rewindable (SCM cont) SCM_NORETURN 
SCM_NOINLINE;
-static void vm_error_bad_wide_string_length (size_t len) SCM_NORETURN 
SCM_NOINLINE;
 
 static void
 vm_error (const char *msg, SCM arg)
@@ -527,12 +522,6 @@ vm_error_kwargs_unrecognized_keyword (SCM proc, SCM kw)
 }
 
 static void
-vm_error_too_many_args (int nargs)
-{
-  vm_error ("VM: Too many arguments", scm_from_int (nargs));
-}
-
-static void
 vm_error_wrong_num_args (SCM proc)
 {
   scm_wrong_num_args (proc);
@@ -546,18 +535,6 @@ vm_error_wrong_type_apply (SCM proc)
 }
 
 static void
-vm_error_stack_underflow (void)
-{
-  vm_error ("VM: Stack underflow", SCM_UNDEFINED);
-}
-
-static void
-vm_error_improper_list (SCM x)
-{
-  vm_error ("Expected a proper list, but got object with tail ~s", x);
-}
-
-static void
 vm_error_not_a_char (const char *subr, SCM x)
 {
   scm_wrong_type_arg_msg (subr, 1, x, "char");
@@ -594,13 +571,6 @@ vm_error_not_a_vector (const char *subr, SCM x)
 }
 
 static void
-vm_error_out_of_range (const char *subr, SCM k)
-{
-  scm_to_size_t (k);
-  scm_out_of_range (subr, k);
-}
-
-static void
 vm_error_out_of_range_uint64 (const char *subr, scm_t_uint64 idx)
 {
   scm_out_of_range (subr, scm_from_uint64 (idx));
@@ -638,12 +608,6 @@ vm_error_continuation_not_rewindable (SCM cont)
   vm_error ("Unrewindable partial continuation", cont);
 }
 
-static void
-vm_error_bad_wide_string_length (size_t len)
-{
-  vm_error ("VM: Bad wide string length: ~S", scm_from_size_t (len));
-}
-