Remove parser field in Output_def.

diff --git a/lily/include/output-def.hh b/lily/include/output-def.hh
index 6a6165037efea772f25f0e869bc3734caf393976..5d024c7b662984fc9fffb580c8109603e929958d 100644 (file)
--- a/lily/include/output-def.hh
+++ b/lily/include/output-def.hh
@@ -49,9 +49,6 @@ public:
   Input input_origin_;
   string user_key_;
 
-  Lily_parser *parser_;
-  Lily_parser *get_parser () const;
-  
   Output_def (Output_def const&);
   Output_def ();
 

diff --git a/lily/lily-parser.cc b/lily/lily-parser.cc
index cfa8d3f9400d51466db40aa57e005c5d2d5cb03c..04b15622bfc7c20cca5e0470378aa728aaae0ce0 100644 (file)
--- a/lily/lily-parser.cc
+++ b/lily/lily-parser.cc
@@ -207,7 +207,6 @@ get_layout (Lily_parser *parser)
   Output_def *layout = unsmob_output_def (id);
   layout = layout ? layout->clone () : new Output_def;
   layout->set_variable (ly_symbol2scm ("is-layout"), SCM_BOOL_T);
-  layout->parser_ = parser;
     
   return layout;
 }
@@ -219,7 +218,6 @@ get_midi (Lily_parser *parser)
   Output_def *layout = unsmob_output_def (id);
   layout = layout ? layout->clone () : new Output_def;
   layout->set_variable (ly_symbol2scm ("is-midi"), SCM_BOOL_T);
-  layout->parser_ = parser;
   return layout;
 }
 
@@ -231,7 +229,6 @@ get_paper (Lily_parser *parser)
 
   layout = layout ? dynamic_cast<Output_def *> (layout->clone ()) : new Output_def;
   layout->set_variable (ly_symbol2scm ("is-paper"), SCM_BOOL_T);
-  layout->parser_ = parser;
   return layout;
 }
 

diff --git a/lily/output-def-scheme.cc b/lily/output-def-scheme.cc
index 4bf03f2e13d84001138d1f0d29a6059d8b998e21..9ab1ba64eb8a40e276d4b988ad5c2a6a26c6456f 100644 (file)
--- a/lily/output-def-scheme.cc
+++ b/lily/output-def-scheme.cc
@@ -98,21 +98,6 @@ LY_DEFINE (ly_paper_outputscale, "ly:paper-outputscale",
   return scm_from_double (output_scale (b));
 }
 
-/*
-  Cannot put in scope, but need a separate function, since we don't
-  want to allow this in --safe.
- */
-LY_DEFINE (ly_output_def_parser, "ly:output-def-parser",
-          1, 0, 0, (SCM odef),
-          "Return the parser where @var{odef} is coming from.")
-{
-  Output_def *b = unsmob_output_def (odef);
-  SCM_ASSERT_TYPE (b, odef, SCM_ARG1, __FUNCTION__, "paper");
-
-  return b->get_parser()->self_scm ();
-}
-
-
 LY_DEFINE (ly_make_output_def, "ly:make-output-def",
           0, 0, 0, (),
           "Make a output def.")

diff --git a/lily/output-def.cc b/lily/output-def.cc
index 739b4b9e7be729adeec2efea548258dbaf201f94..aade16df6eb336d287f4acf6f0ea928e55539a4e 100644 (file)
--- a/lily/output-def.cc
+++ b/lily/output-def.cc
@@ -26,7 +26,6 @@
 Output_def::Output_def ()
 {
   scope_ = SCM_EOL;
-  parser_ = 0;
   parent_ = 0;
 
   smobify_self ();
@@ -38,7 +37,6 @@ Output_def::Output_def (Output_def const &s)
 {
   scope_ = SCM_EOL;
   parent_ = 0;
-  parser_ = s.parser_;
   smobify_self ();
 
   input_origin_ = s.input_origin_;
@@ -54,12 +52,6 @@ Output_def::~Output_def ()
 IMPLEMENT_SMOBS (Output_def);
 IMPLEMENT_DEFAULT_EQUAL_P (Output_def);
 
-Lily_parser *
-Output_def::get_parser () const
-{
-  return parent_ ? parent_->get_parser () : parser_;
-}
-
 SCM
 Output_def::mark_smob (SCM m)
 {