X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finput.cc;h=b6aed9e2d1296b74182d9aca7f2921c6f9a04001;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=a091ef9855c72111c069d77d4931599bc3df9e83;hpb=00216e16c717470ae53dbbfd1d52850d1b102e29;p=lilypond.git

diff --git a/lily/input.cc b/lily/input.cc
index a091ef9855..b6aed9e2d1 100644
--- a/lily/input.cc
+++ b/lily/input.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--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,6 +23,7 @@
 using namespace std;
 
 #include "international.hh"
+#include "lily-imports.hh"
 #include "program-option.hh"
 #include "source-file.hh"
 #include "sources.hh"
@@ -92,12 +93,11 @@ Input::message_location () const
 {
   return (source_file_) ? location_string () : "";
 }
+
 void
 Input::error (const string &s) const
 {
-  ::non_fatal_error (message_string (s), message_location ());
-  // UGH, fix naming or usage (use non_fatal_error in most places, instead)
-  // exit (1);
+  ::error (message_string (s), message_location ());
 }
 
 void
@@ -142,7 +142,7 @@ string
 Input::line_number_string () const
 {
   if (source_file_)
-    return to_string (source_file_->get_line (start_));
+    return ::to_string (source_file_->get_line (start_));
   return "?";
 }
 
@@ -219,3 +219,104 @@ Input::end () const
 {
   return end_;
 }
+
+static SCM
+with_location_hook_0 (void *it)
+{
+  SCM *args = static_cast <SCM *> (it);
+  return scm_call_0 (args[0]);
+}
+
+SCM
+with_location (SCM loc, SCM proc)
+{
+  return scm_c_with_fluid (Lily::f_location,
+                           unsmob<Input> (loc) ? loc : SCM_BOOL_F,
+                           with_location_hook_0,
+                           static_cast <void *> (&proc));
+}
+
+static SCM
+with_location_hook_1 (void *it)
+{
+  SCM *args = static_cast <SCM *> (it);
+  return scm_call_1 (args[0], args[1]);
+}
+
+SCM
+with_location (SCM loc, SCM proc, SCM arg1)
+{
+  SCM args[] = { proc, arg1 };
+  return scm_c_with_fluid (Lily::f_location,
+                           unsmob<Input> (loc) ? loc : SCM_BOOL_F,
+                           with_location_hook_1,
+                           static_cast <void *> (&args));
+}
+
+static SCM
+with_location_hook_2 (void *it)
+{
+  SCM *args = static_cast <SCM *> (it);
+  return scm_call_2 (args[0], args[1], args[2]);
+}
+
+SCM
+with_location (SCM loc, SCM proc, SCM arg1, SCM arg2)
+{
+  SCM args[] = { proc, arg1, arg2 };
+  return scm_c_with_fluid (Lily::f_location,
+                           unsmob<Input> (loc) ? loc : SCM_BOOL_F,
+                           with_location_hook_2,
+                           static_cast <void *> (&args));
+}
+
+static SCM
+with_location_hook_3 (void *it)
+{
+  SCM *args = static_cast <SCM *> (it);
+  return scm_call_3 (args[0], args[1], args[2], args[3]);
+}
+
+SCM
+with_location (SCM loc, SCM proc, SCM arg1, SCM arg2, SCM arg3)
+{
+  SCM args[] = { proc, arg1, arg2, arg3 };
+  return scm_c_with_fluid (Lily::f_location,
+                           unsmob<Input> (loc) ? loc : SCM_BOOL_F,
+                           with_location_hook_3,
+                           static_cast <void *> (&args));
+}
+
+static SCM
+with_location_hook_4 (void *it)
+{
+  SCM *args = static_cast <SCM *> (it);
+  return scm_call_4 (args[0], args[1], args[2], args[3], args[4]);
+}
+
+SCM
+with_location (SCM loc, SCM proc, SCM arg1, SCM arg2, SCM arg3, SCM arg4)
+{
+  SCM args[] = { proc, arg1, arg2, arg3, arg4 };
+  return scm_c_with_fluid (Lily::f_location,
+                           unsmob<Input> (loc) ? loc : SCM_BOOL_F,
+                           with_location_hook_4,
+                           static_cast <void *> (&args));
+}
+
+static SCM
+with_location_hook_n (void *it)
+{
+  SCM *args = static_cast <SCM *> (it);
+  return scm_apply_0 (args[0], args[1]);
+}
+
+SCM
+with_location (SCM loc, SCM proc, SCM arg1, SCM arg2, SCM arg3, SCM arg4, SCM arg5)
+{
+  SCM args[] = { proc, scm_list_5 (arg1, arg2, arg3, arg4, arg5) };
+  return scm_c_with_fluid (Lily::f_location,
+                           unsmob<Input> (loc) ? loc : SCM_BOOL_F,
+                           with_location_hook_n,
+                           static_cast <void *> (&args));
+}