X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finput-smob.cc;h=6f5fc18a54fb116a58dc2c1db13cf227c472704c;hb=4d405ef96a8a62771d7d9a283ff5369a772e89d8;hp=bbd6f34dc3144995680c20c3754f0b54ecadc399;hpb=492f3643bd2a86956201c3e0c93bb1b65bcdea4e;p=lilypond.git

diff --git a/lily/input-smob.cc b/lily/input-smob.cc
index bbd6f34dc3..6f5fc18a54 100644
--- a/lily/input-smob.cc
+++ b/lily/input-smob.cc
@@ -1,106 +1,58 @@
-/*   
-  input-smob.cc --  implement Input smob
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+/*
+  This file is part of LilyPond, the GNU music typesetter.
 
-#include "input.hh"
-#include "input-smob.hh"
-#include "string.hh"
-#include "ly-smobs.icc"
+  Copyright (C) 2000--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-static long input_tag;
+  LilyPond 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.
 
-static
-SCM mark_smob (SCM)
-{
-  return SCM_EOL;
-}
+  LilyPond 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.
 
-static int
-print_smob (SCM s, SCM port, scm_print_state *)
-{
-  String str = "#<location " +  unsmob_input (s)->location_str () + ">";
-  scm_puts (str.ch_C (), port);
-  return 1;
-}
-
-static size_t
-free_smob (SCM s)
-{
-  delete unsmob_input (s);
-  return 0;
-}
-
-/*
-  We don't use IMPLEMENT_TYPE_P, since the smobification part is
-  implemented separately from the class.
- */
-LY_DEFINE(ly_input_p, "ly-input-location?", 1, 0, 0,
-	  (SCM x),
-	  "Return whether @var{x} is an input location")
-{
-  return unsmob_input (x) ? SCM_BOOL_T : SCM_BOOL_F ;
-}
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
-LY_DEFINE(ly_input_message,  "ly-input-message", 2, 0, 0, (SCM sip, SCM msg),
-	  "Print @var{msg} as a GNU compliant error message, pointing to the
-location in @var{sip}.")
-{
-  Input *ip  = unsmob_input(sip);
-  
-  SCM_ASSERT_TYPE(ip, sip, SCM_ARG1, __FUNCTION__, "input location");
-  SCM_ASSERT_TYPE(gh_string_p(msg), msg, SCM_ARG2, __FUNCTION__, "string");
+#include "input.hh"
+#include "source-file.hh"
+#include "std-string.hh"
 
-  String m = ly_scm2string (msg);
 
-  ip->message (m);
-  return SCM_UNDEFINED;
-}
+/* Dummy input location for use if real one is missing.  */
+Input dummy_input_global;
 
+const char * const Input::type_p_name_ = "ly:input-location?";
 
-static void
-start_input_smobs ()
+SCM
+Input::mark_smob () const
 {
-  input_tag = scm_make_smob_type ("input", 0);
-  scm_set_smob_mark (input_tag, mark_smob);
-  scm_set_smob_free (input_tag, free_smob);
-  scm_set_smob_print (input_tag, print_smob);
-  scm_set_smob_equalp (input_tag, 0);
+  if (Source_file *sf = get_source_file ())
+    return sf->self_scm ();
 
-  
+  return SCM_EOL;
 }
 
-SCM
-make_input (Input ip)
+int
+Input::print_smob (SCM port, scm_print_state *) const
 {
-  Input * nip =  new Input (ip);
-  SCM z;
-  
-  SCM_NEWCELL (z);
-  SCM_SETCAR (z, (SCM)input_tag);
-  SCM_SETCDR (z, (SCM)nip);
-				// fixme: done_malloc
-  return z;
+  string str = "#<location " + location_string () + ">";
+  scm_puts (str.c_str (), port);
+  return 1;
 }
 
-Input *						
-unsmob_input (SCM s)
+SCM
+Input::equal_p (SCM sa, SCM sb)
 {
-  if (SCM_IMP (s))
-    return 0;
-  if (SCM_CAR (s) == (SCM)input_tag) // ugh.
-    return (Input*) SCM_CDR (s);
-  else						
-    return 0;					
+  Input *a = unsmob<Input> (sa);
+  Input *b = unsmob<Input> (sb);
+  if (a->get_source_file () == b->get_source_file ()
+      && a->start () == b->start ()
+      && a->end () == b->end ())
+    return SCM_BOOL_T;
+  else
+    return SCM_BOOL_F;
 }
-
-
-ADD_SCM_INIT_FUNC (input, start_input_smobs);
-
-
-Input dummy_input_global;
-