Run grand replace for 2015.

[lilypond.git] / lily / scm-hash.cc

diff --git a/lily/scm-hash.cc b/lily/scm-hash.cc
index 058f3be9d5a79a430597a0cfd4f8df94a11f5c97..5eb048f6d177694dda7bb88873b5286bc6fdbd57 100644 (file)
--- a/lily/scm-hash.cc
+++ b/lily/scm-hash.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1999--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1999--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -23,7 +23,6 @@
 #include <algorithm>
 using namespace std;
 
-#include "ly-smobs.icc"
 
 /*
   Return: number of objects.
@@ -40,7 +39,7 @@ static void
 copy_scm_hashes (SCM dest, SCM src)
 {
   scm_internal_hash_for_each_handle ((scm_t_hash_handle_fn) &copy_handle,
-                                    dest, src);
+                                     dest, src);
 }
 
 Scheme_hash_table::Scheme_hash_table ()
@@ -51,6 +50,7 @@ Scheme_hash_table::Scheme_hash_table ()
 }
 
 Scheme_hash_table::Scheme_hash_table (Scheme_hash_table const &src)
+  : Smob<Scheme_hash_table> ()
 {
   hash_tab_ = SCM_EOL;
   smobify_self ();
@@ -63,7 +63,7 @@ Scheme_hash_table::copy (Scheme_hash_table const &src)
   if (&src == this)
     return;
 
-  hash_tab_ = scm_c_make_hash_table (SCM_HASHTABLE_N_ITEMS(src.hash_tab_));
+  hash_tab_ = scm_c_make_hash_table (SCM_HASHTABLE_N_ITEMS (src.hash_tab_));
   copy_scm_hashes (hash_tab_, src.hash_tab_);
 }
 
@@ -72,26 +72,24 @@ Scheme_hash_table::~Scheme_hash_table ()
 }
 
 SCM
-Scheme_hash_table::mark_smob (SCM s)
+Scheme_hash_table::mark_smob ()
 {
-  Scheme_hash_table *me = (Scheme_hash_table *) SCM_CELL_WORD_1 (s);
-  scm_gc_mark (me->hash_tab_);
+  scm_gc_mark (hash_tab_);
   return SCM_EOL;
 }
 
 int
-Scheme_hash_table::print_smob (SCM s, SCM p, scm_print_state*)
+Scheme_hash_table::print_smob (SCM p, scm_print_state *)
 {
-  assert (unsmob (s));
   scm_puts ("#<Scheme_hash_table  ", p);
-  Scheme_hash_table *me = (Scheme_hash_table *) SCM_CELL_WORD_1 (s);
-  scm_display (me->hash_tab_, p);
+  scm_display (hash_tab_, p);
   scm_puts ("> ", p);
   return 1;
 }
 
 bool
-Scheme_hash_table::try_retrieve (SCM k, SCM *v){
+Scheme_hash_table::try_retrieve (SCM k, SCM *v)
+{
 
   SCM handle = scm_hashq_get_handle (hash_tab_, k);
   if (scm_is_pair (handle))
@@ -133,19 +131,16 @@ Scheme_hash_table::remove (SCM k)
 
 static SCM
 collect_handles (void * /* closure */,
-                SCM key,
-                SCM value,
-                SCM result)
+                 SCM key,
+                 SCM value,
+                 SCM result)
 {
-  return scm_acons(key, value, result);
+  return scm_acons (key, value, result);
 }
 
 SCM
 Scheme_hash_table::to_alist () const
 {
   return scm_internal_hash_fold ((scm_t_hash_fold_fn) &collect_handles,
-                                NULL, SCM_EOL, hash_tab_);
+                                 NULL, SCM_EOL, hash_tab_);
 }
-
-IMPLEMENT_SMOBS (Scheme_hash_table);
-IMPLEMENT_DEFAULT_EQUAL_P (Scheme_hash_table);