X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fc%2B%2B.scm;h=798d7059f6901c9d1db1aeb73e379ff4685634fc;hb=d98ccb8e9a3793207cacd4b83d6034458299bb88;hp=ee4de99005758b11de20e9de53a1e0cdb0349a83;hpb=e344ae579fa1d81fc6c6f3049494697872fd39f9;p=lilypond.git

diff --git a/scm/c++.scm b/scm/c++.scm
index ee4de99005..798d7059f6 100644
--- a/scm/c++.scm
+++ b/scm/c++.scm
@@ -1,9 +1,20 @@
-;;;; c++.scm -- implement Scheme frontends to C++ functions
+;;;; This file is part of LilyPond, the GNU music typesetter.
 ;;;;
-;;;;  source file of the GNU LilyPond music typesetter
-;;;; 
-;;;; (c) 1998--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; Copyright (C) 1998--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;;                 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
+;;;; the Free Software Foundation, either version 3 of the License, or
+;;;; (at your option) any later version.
+;;;;
+;;;; 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.
+;;;;
+;;;; You should have received a copy of the GNU General Public License
+;;;; along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Note: this file can't be used without LilyPond executable
 
@@ -33,12 +44,21 @@
 (define-public (number-or-string? x)
   (or (number? x) (string? x)))
 
+(define-public (string-or-pair? x)
+  (or (string? x) (pair? x)))
+
+(define-public (cheap-list? x)
+  (or (pair? x) (null? x)))
+
+(define-public (list-or-symbol? x)
+  (or (cheap-list? x) (symbol? x)))
+
 (define-public (scheme? x) #t)
 
 
 ;; moved list to end of lily.scm: then all type-predicates are
 ;; defined.
-(define type-p-name-alist '()) 
+(define type-p-name-alist '())
 
 (define (match-predicate obj alist)
   (if (null? alist)
@@ -54,6 +74,4 @@
   (type-name (match-predicate obj type-p-name-alist)))
 
 (define-public (type-name predicate)
-  (let ((entry (assoc predicate type-p-name-alist)))
-    (if (pair? entry) (cdr entry)
-	"unknown")))
+  (assoc-get predicate type-p-name-alist "unknown"))