* Documentation/windows/zlily-profile.sh:

[lilypond.git] / lily / include / lily-guile.hh

diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh
index 7788833f4b19641dd9fa71d6f539fa59a9a641e8..6b13fc9eb8f491fafae72875a6c3621485d17a19 100644 (file)
--- a/lily/include/lily-guile.hh
+++ b/lily/include/lily-guile.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef LILY_GUILE_HH
@@ -21,6 +21,8 @@
 #include <guile/gh.h>
 
 #include "config.h"
+#include "drul-array.hh"
+
 
 /* Guile 1.3.4 compatibility */
 #if GUILE_MINOR_VERSION < 4
@@ -68,7 +70,6 @@
 #endif
 
 
-
 #include "direction.hh"
 #include "flower-proto.hh"
 
@@ -101,9 +102,6 @@ SCM ly_truncate_list (int k, SCM l );
 #endif
 
 
-#ifdef CACHE_SYMBOLS
-
-
 /*
   We don't use gh_symbol2scm directly, since it has const-correctness
   problems in GUILE 1.3.4
@@ -111,6 +109,9 @@ SCM ly_truncate_list (int k, SCM l );
  */
 SCM my_gh_symbol2scm (const char* x);
 
+#ifdef CACHE_SYMBOLS
+
+
 /*
   Using this trick we cache the value of gh_symbol2scm ("fooo") where
   "fooo" is a constant string. This is done at the cost of one static
@@ -129,7 +130,7 @@ SCM my_gh_symbol2scm (const char* x);
   value = gh_symbol2scm ((char*) (x)); \
   value; })
 #else
-inline SCM ly_symbol2scm(char const* x) { return gh_symbol2scm((x)); }
+inline SCM ly_symbol2scm(char const* x) { return my_gh_symbol2scm((x)); }
 #endif 
 
 
@@ -141,13 +142,14 @@ Offset ly_scm2offset (SCM);
 SCM ly_assoc_chain (SCM key, SCM achain);
 SCM ly_assoc_cdr (SCM key, SCM alist);
 Interval ly_scm2interval (SCM);
-SCM ly_interval2scm (Interval);
+SCM ly_interval2scm (Drul_array<Real>);
 
 
 SCM ly_parse_scm (char const* s, int* n);
 SCM ly_quote_scm (SCM s);
 SCM ly_type (SCM);
 bool type_check_assignment (SCM val, SCM sym,  SCM type_symbol) ;
+String print_scm_val (SCM val);
 SCM ly_number2string (SCM s);
 
 SCM parse_symbol_list (char const *);
@@ -166,7 +168,12 @@ inline SCM ly_assoc_front_x(SCM alist, SCM key, SCM val)
 {
   return scm_acons(key, val, scm_assoc_remove_x (alist, key));
 }
+#ifdef PARANOID
+#define gh_pair_p ly_pair_p
+bool ly_pair_p (SCM x);
+#else
 inline bool ly_pair_p (SCM x) { return SCM_NFALSEP (scm_pair_p (x)); }
+#endif
 inline bool ly_symbol_p (SCM x) { return SCM_SYMBOLP (x); }
 inline bool ly_number_p (SCM x) { return SCM_NUMBERP (x); }
 inline bool ly_procedure_p (SCM x) { return SCM_NFALSEP (scm_procedure_p(x)); }
@@ -183,8 +190,7 @@ void ly_display_scm (SCM s);
 void read_lily_scm_file (String);
 void init_lily_guile (String dir);
 
-bool isdir_b (SCM s);
-bool isaxis_b (SCM s);
+bool ly_dir_p (SCM s);
 bool ly_number_pair_p (SCM);
 bool ly_axis_p (SCM);
 
@@ -203,6 +209,10 @@ SCM index_cell (SCM cellp, Direction d);
 SCM index_set_cell (SCM cellp, Direction d, SCM val);
 
 
+
+SCM ly_snoc (SCM s, SCM list);
+SCM ly_split_list (SCM s, SCM list);
+SCM ly_unique (SCM list);
 /*
   snarfing.
  */
@@ -215,10 +225,12 @@ typedef SCM (*Scheme_function_unknown) ();
 typedef SCM (*Scheme_function_0) ();
 typedef SCM (*Scheme_function_1) (SCM);
 typedef SCM (*Scheme_function_2) (SCM,SCM);     
+typedef SCM (*Scheme_function_3) (SCM,SCM, SCM);        
 #else
 typedef SCM (*Scheme_function_0) (...);
 typedef SCM (*Scheme_function_1) (...);
 typedef SCM (*Scheme_function_2) (...);
+typedef SCM (*Scheme_function_3) (...);
 #endif
 
 #define DECLARE_SCHEME_CALLBACK(NAME,ARGS) \
@@ -237,6 +249,10 @@ TYPE ## _ ## FUNC ## _init_functions ()                                    \
 ADD_SCM_INIT_FUNC (TYPE ## _ ## FUNC ## _callback, TYPE ## _ ## FUNC ## _init_functions);      \
 
 
+void ly_add_function_documentation (char const * fname,
+                                   char const * varlist,
+                                   char const * doc);
+
 #define ADD_SCM_INIT_FUNC(name, func)\
 class name ## _scm_initter {                   \
 public:\
@@ -247,4 +263,20 @@ public:\
 } _ ## name ## _scm_initter;                   \
 /* end define */
 
+#define LY_DEFINE(FNAME, PRIMNAME, REQ, OPT, VAR, ARGLIST, DOCSTRING) \
+SCM FNAME ARGLIST ; \
+SCM FNAME ## _proc;\
+void \
+FNAME ## init ()\
+{\
+ FNAME ## _proc \
+    = scm_c_define_gsubr (PRIMNAME,REQ, OPT, VAR, (Scheme_function_unknown) FNAME);\
+  ly_add_function_documentation (PRIMNAME, #ARGLIST,  DOCSTRING);\
+}\
+ADD_SCM_INIT_FUNC (FNAME ## init_unique_prefix, FNAME ## init);\
+SCM \
+FNAME ARGLIST\
+
+
+
 #endif // LILY_GUILE_HH