source file of the LilyPond music typesetter
- (c) 1997--2000 Jan Nieuwenhuizen
+ (c) 1997--2005 Jan Nieuwenhuizen
*/
+#include <climits> // INT_MAX
-#include <limits.h> // INT_MAX
-#include <assert.h>
-
-#include "flower-proto.hh"
-#include "string.hh"
-#include "source-file.hh"
#include "binary-source-file.hh"
#include "string-convert.hh"
-Binary_source_file::Binary_source_file (String& filename_string)
- : Source_file (filename_string)
+Binary_source_file::Binary_source_file (String &file_name_string)
+ : Source_file (file_name_string)
{
}
}
String
-Binary_source_file::error_string (char const* pos_str0) const
+Binary_source_file::error_string (char const *pos_str0) const
{
assert (this);
- if (!in_b (pos_str0))
+ if (!contains (pos_str0))
return "";
- char const* begin_str0 = pos_str0 - 8 >? to_str0 ();
- char const* end_str0 = pos_str0 + 7 <? to_str0 () + length ();
+ char const *begin_str0 = pos_str0 - 8 >? to_str0 ();
+ char const *end_str0 = pos_str0 + 7 <? to_str0 () + length ();
- String pre_string ((Byte const*)begin_str0, pos_str0 - begin_str0);
+ String pre_string ((Byte const *)begin_str0, pos_str0 - begin_str0);
pre_string = String_convert::bin2hex (pre_string);
for (int i = 2; i < pre_string.length (); i += 3)
- pre_string = pre_string.left_string (i) + " " + pre_string.cut_string (i, INT_MAX);
- String post_string ((Byte const*)pos_str0, end_str0 - pos_str0);
+ pre_string = pre_string.left_string (i)
+ + " " + pre_string.cut_string (i, INT_MAX);
+ String post_string ((Byte const *)pos_str0, end_str0 - pos_str0);
post_string = String_convert::bin2hex (post_string);
for (int i = 2; i < post_string.length (); i += 3)
- post_string = post_string.left_string (i) + " " + post_string.cut_string (i, INT_MAX);
+ post_string = post_string.left_string (i)
+ + " " + post_string.cut_string (i, INT_MAX);
String str = pre_string
+ to_string ('\n')
int
Binary_source_file::get_line (char const* pos_str0) const
{
- if (!in_b (pos_str0))
+ if (!contains (pos_str0))
return 0;
return pos_str0 - to_str0 ();
/*
naming is wrong. This is a UNIX-endian-32 (as opposed to xinu or ixun)
- */
+*/
U32
Binary_source_file::get_U32 ()
{
U32 b;
-
+
b = get_U8 () << 24;
b |= get_U8 () << 16;
b |= get_U8 () << 8;
return b;
}
-