source file of the GNU LilyPond music typesetter
- (c) 1998--2005 Jan Nieuwenhuizen <janneke@gnu.org>
- Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+ Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "config.hh"
-#include <math.h> /* isinf */
-#include <stdio.h>
-#include <string.h> /* memset */
+#include <cstdio>
+#include <cstring> /* memset */
+using namespace std;
#include "international.hh"
#include "libc-extension.hh"
#include "main.hh"
#include "file-path.hh"
-/* MacOS S fix:
- source-file.hh includes cmath which undefines isinf and isnan
-*/
-#ifdef __APPLE__
-inline int my_isinf (Real r) { return isinf (r); }
-inline int my_isnan (Real r) { return isnan (r); }
-#endif
-
LY_DEFINE (ly_find_file, "ly:find-file",
1, 0, 0, (SCM name),
"Return the absolute file name of @var{name}, "
buffering.)
*/
LY_DEFINE (ly_gulp_file, "ly:gulp-file",
- 1, 0, 0, (SCM name),
+ 1, 1, 0, (SCM name, SCM size),
"Read the file @var{name}, and return its contents in a string. "
- "The file is looked up using the search path.")
+ "The file is looked up using the search path. ")
{
SCM_ASSERT_TYPE (scm_is_string (name), name, SCM_ARG1, __FUNCTION__, "string");
- String contents = gulp_file_to_string (ly_scm2string (name), true);
+ int sz = -1;
+ if (size != SCM_UNDEFINED)
+ {
+ SCM_ASSERT_TYPE (scm_is_number (size), size, SCM_ARG2, __FUNCTION__, "number");
+ sz = scm_to_int (size);
+ }
+
+ String contents = gulp_file_to_string (ly_scm2string (name), true, sz);
return scm_from_locale_stringn (contents.get_str0 (), contents.length ());
}
if (scm_exact_p (s) == SCM_BOOL_F)
{
Real r (scm_to_double (s));
-#ifdef __APPLE__
- if (my_isinf (r) || my_isnan (r))
-#else
if (isinf (r) || isnan (r))
-#endif
{
programming_error (_ ("infinity or NaN encountered while converting Real number"));
programming_error (_ ("setting to zero"));
SCM lst = SCM_EOL;
int output_formats_count = output_formats.size ();
- for (int i = 0; i < output_formats_count; i ++)
+ for (int i = 0; i < output_formats_count; i++)
lst = scm_cons (scm_makfrom0str (output_formats[i].to_str0 ()), lst);
return lst;
char *p = buf;
if (wide_char < 0x0080)
- {
- *p++ = (char)wide_char;
- }
+ *p++ = (char)wide_char;
else if (wide_char < 0x0800)
{
*p++ = (char) (((wide_char >> 6)) | 0xC0);
{
SCM_ASSERT_TYPE (scm_string_p (file_name), file_name, SCM_ARG1,
__FUNCTION__, "file_name");
- char const* m = "w";
+ char const *m = "w";
if (mode != SCM_UNDEFINED && scm_string_p (mode))
m = ly_scm2newstr (mode, 0);
/* dup2 and (fileno (current-error-port)) do not work with mingw'c