X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fc%2B%2B.scm;h=74f58f4da3f4da2449535f0faf6ca1034c85dcd0;hb=67ff565b4ada90eeb753a866b22ddb4eaa8c6234;hp=b17bfecf92a908698b8ffb0824f43cab13fcf9cb;hpb=1b4f371fe85ccdf1a5e5670cf5626426bd05d82b;p=lilypond.git

diff --git a/scm/c++.scm b/scm/c++.scm
index b17bfecf92..74f58f4da3 100644
--- a/scm/c++.scm
+++ b/scm/c++.scm
@@ -1,89 +1,86 @@
-;;;; 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--2002 Jan Nieuwenhuizen <janneke@gnu.org>
-;;;; Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; Copyright (C) 1998--2011 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
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; type predicates.
-(define-public (number-pair?  x)
+(define-public (number-pair? x)
   (and (pair? x)
        (number? (car x)) (number? (cdr x))))
+
 (define-public (number-or-grob? x)
-  (or (ly-grob? x) (number? x))
-  )
+  (or (ly:grob? x) (number? x)))
 
 (define-public (grob-list? x)
   (list? x))
 
-(define-public (moment-pair?  x)
+(define-public (moment-pair? x)
   (and (pair? x)
-       (moment? (car x)) (moment? (cdr x))))
+       (ly:moment? (car x)) (ly:moment? (cdr x))))
 
 (define-public (boolean-or-symbol? x)
   (or (boolean? x) (symbol? x)))
 
+(define-public (string-or-symbol? x)
+  (or (string? x) (symbol? x)))
+
 (define-public (number-or-string? x)
   (or (number? x) (string? x)))
 
-(define-public (markup? x)
-  (or (string? x) (list? x)))
+(define-public (string-or-pair? x)
+  (or (string? x) (pair? x)))
 
-(define-public (scheme? x) #t)
+(define-public (number-or-pair? x)
+  (or (number? x) (pair? x)))
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-(define type-p-name-alist
-  `(
-   (,dir? . "direction")
-   (,scheme? . "any type")
-   (,number-pair? . "pair of numbers")
-   (,ly-input-location? . "input location")   
-   (,ly-grob? . "grob (GRaphical OBject)")
-   (,grob-list? . "list of grobs")
-   (,duration? . "duration")
-   (,pair? . "pair")
-   (,integer? . "integer")
-   (,list? . "list")
-   (,symbol? . "symbol")
-   (,string? . "string")
-   (,boolean? . "boolean")
-   (,moment? . "moment")
-   (,ly-input-location? . "input location")
-   (,music-list? . "list of music")
-   (,music? . "music")
-   (,number? . "number")
-   (,char? . "char")
-   (,input-port? . "input port")
-   (,output-port? . "output port")   
-   (,vector? . "vector")
-   (,procedure? . "procedure") 
-   (,boolean-or-symbol? . "boolean or symbol")
-   (,number-or-string? . "number or string")
-   (,markup? . "markup (list or string)")
-   (,number-or-grob? . "number or grob")
-   ))
+(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)
 
+(define-public (symbol-or-boolean? x)
+  (or (symbol? x) (boolean? x)))
+
+;; moved list to end of lily.scm: then all type-predicates are
+;; defined.
+(define type-p-name-alist '())
 
 (define (match-predicate obj alist)
   (if (null? alist)
       "Unknown type"
       (if (apply (caar alist) obj)
 	  (cdar alist)
-	  (match-predicate obj (cdr alist))
-	  )
-      ))
+	  (match-predicate obj (cdr alist)))))
 
 (define-public (object-type obj)
   (match-predicate obj type-p-name-alist))
 
-(define-public (type-name  predicate)
+(define-public (object-type-name obj)
+  (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"
-	)))
+        (string-trim-right
+         (symbol->string (procedure-name predicate))
+         #\?))))