X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finput-smob.cc;h=6f5fc18a54fb116a58dc2c1db13cf227c472704c;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=fafeab7b7dc7879b895ba25de2e5d881a5c519dc;hpb=564616ff8acf931598b0a0f364eaff58440d51ee;p=lilypond.git

diff --git a/lily/input-smob.cc b/lily/input-smob.cc
index fafeab7b7d..6f5fc18a54 100644
--- a/lily/input-smob.cc
+++ b/lily/input-smob.cc
@@ -1,107 +1,58 @@
-/*   
-  input-smob.cc --  implement Input smob
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 2000--2004 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>
 
-/* Dummy input location for use if real one is missing.  */
-Input dummy_input_global;
+  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 long input_tag;
+  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
-SCM mark_smob (SCM)
-{
-  return SCM_EOL;
-}
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
-static int
-print_smob (SCM s, SCM port, scm_print_state *)
-{
-  String str = "#<location " +  unsmob_input (s)->location_string () + ">";
-  scm_puts (str.to_str0 (), port);
-  return 1;
-}
+#include "input.hh"
+#include "source-file.hh"
+#include "std-string.hh"
 
-static size_t
-free_smob (SCM s)
-{
-  delete unsmob_input (s);
-  return 0;
-}
 
+/* Dummy input location for use if real one is missing.  */
+Input dummy_input_global;
 
-static void
-start_input_smobs ()
-{
-  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);
-}
+const char * const Input::type_p_name_ = "ly:input-location?";
 
 SCM
-make_input (Input ip)
+Input::mark_smob () const
 {
-  Input *nip = new Input (ip);
-  SCM z;
-  
-  SCM_NEWSMOB (z, input_tag, nip);
-  return z;
-}
+  if (Source_file *sf = get_source_file ())
+    return sf->self_scm ();
 
-Input *						
-unsmob_input (SCM s)
-{
-  if (SCM_IMP (s))
-    return 0;
-  if (SCM_CAR (s) == (SCM)input_tag) // ugh.
-    return (Input*) SCM_CDR (s);
-  else						
-    return 0;					
-}
-
-/* We don't use IMPLEMENT_TYPE_P, since the smobification part is
-   implemented separately from the class.  */
-LY_DEFINE (ly_input, "ly:input-location?", 1, 0, 0,
-	   (SCM x),
-	   "Return #t if @var{x} is an input location.")
-{
-  return unsmob_input (x) ? SCM_BOOL_T : SCM_BOOL_F;
+  return SCM_EOL;
 }
 
-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}.\n")
+int
+Input::print_smob (SCM port, scm_print_state *) const
 {
-  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");
-
-  String m = ly_scm2string (msg);
-  ip->message (m);
-
-  return SCM_UNDEFINED;
+  string str = "#<location " + location_string () + ">";
+  scm_puts (str.c_str (), port);
+  return 1;
 }
 
-LY_DEFINE (ly_input_location, "ly:input-location", 1, 0, 0, (SCM sip),
-	  "Return input location in @var{sip} as (filename line column).")
+SCM
+Input::equal_p (SCM sa, SCM sb)
 {
-  Input *ip = unsmob_input (sip);
-  SCM_ASSERT_TYPE (ip, sip, SCM_ARG1, __FUNCTION__, "input location");
-  return scm_list_3 (scm_makfrom0str (ip->file_string ().to_str0 ()),
-		     scm_int2num (ip->line_number ()),
-		     scm_int2num (ip->column_number ()));
+  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);
-