From 076b97545be083859dca93613f5a9086b94094b2 Mon Sep 17 00:00:00 2001 From: fred Date: Sun, 24 Mar 2002 19:31:39 +0000 Subject: [PATCH] lilypond-0.0.32 --- hdr/lexer.hh | 4 +-- hdr/source.hh | 2 +- hdr/sourcefile.hh | 12 ++++---- hdr/textdef.hh | 2 +- src/lexerinit.cc | 4 +-- src/lyricitem.cc | 4 +-- src/source.cc | 4 +-- src/sourcefile.cc | 74 +++++++++++++++++++++++------------------------ src/textdef.cc | 2 +- 9 files changed, 54 insertions(+), 54 deletions(-) diff --git a/hdr/lexer.hh b/hdr/lexer.hh index e2909d8879..8f1e67123e 100644 --- a/hdr/lexer.hh +++ b/hdr/lexer.hh @@ -14,7 +14,7 @@ void set_lexer(); struct Input_file { istream* is; - char const* defined_ch_c_l_m; + char const* defined_ch_c_l_; Source_file* sourcefile_l_; int line; String name; @@ -31,7 +31,7 @@ struct My_flex_lexer : yyFlexLexer { Assoc *the_id_tab; Keyword_table * keytable; Notename_tab * defaulttab; - char const* data_ch_c_l_m; + char const* data_ch_c_l_; int errorlevel_i_; /* *************** */ int ret_notename(int *p, String text, int octave_mod); diff --git a/hdr/source.hh b/hdr/source.hh index b9d00f4650..063905baaa 100644 --- a/hdr/source.hh +++ b/hdr/source.hh @@ -16,7 +16,7 @@ public: Source_file* sourcefile_l( char const* ch_c_l ); private: - IPointerList sourcefile_p_iplist_m; + IPointerList sourcefile_p_iplist_; }; #endif // SOURCE_HH // diff --git a/hdr/sourcefile.hh b/hdr/sourcefile.hh index f92631dbe0..a52e76f66a 100644 --- a/hdr/sourcefile.hh +++ b/hdr/sourcefile.hh @@ -11,7 +11,7 @@ class Source_file { public: /** - RETURN path to opened file. + @return path to opened file. */ Source_file( String &filename_str ); ~Source_file(); @@ -29,11 +29,11 @@ private: void open(); void unmap(); - istream* istream_p_m; - int fildes_i_m; - String name_str_m; - off_t size_off_m; - caddr_t data_caddr_m; + istream* istream_p_; + int fildes_i_; + String name_str_; + off_t size_off_; + caddr_t data_caddr_; }; #endif // SOURCE_FILE_HH // diff --git a/hdr/textdef.hh b/hdr/textdef.hh index 8100ed45d8..da0055281d 100644 --- a/hdr/textdef.hh +++ b/hdr/textdef.hh @@ -14,7 +14,7 @@ struct Text_def { int align_i_; String text_str_; String style_str_; - char const* defined_ch_c_l_m; + char const* defined_ch_c_l_; /* ****************/ diff --git a/src/lexerinit.cc b/src/lexerinit.cc index 5840b3c62e..43a1c2c5a6 100644 --- a/src/lexerinit.cc +++ b/src/lexerinit.cc @@ -28,7 +28,7 @@ Input_file::Input_file(String s) String pf(s); if (pf=="") { is = &cin; - defined_ch_c_l_m = 0; + defined_ch_c_l_ = 0; sourcefile_l_ = 0; } else { @@ -36,7 +36,7 @@ Input_file::Input_file(String s) source_global_l->add( sourcefile_p ); sourcefile_l_ = sourcefile_p; is = sourcefile_l_->istream_l(); - defined_ch_c_l_m = sourcefile_l_->ch_c_l(); + defined_ch_c_l_ = sourcefile_l_->ch_c_l(); } cout << "["<text_str_.pos( "Gates" ) )// :-) - warning( "foul word", tdef_l_->defined_ch_c_l_m ); + warning( "foul word", tdef_l_->defined_ch_c_l_ ); } diff --git a/src/source.cc b/src/source.cc index dbdc501a4d..34f1a8808f 100644 --- a/src/source.cc +++ b/src/source.cc @@ -22,13 +22,13 @@ Source::~Source() void Source::add( Source_file* sourcefile_p ) { - sourcefile_p_iplist_m.bottom().add( sourcefile_p ); + sourcefile_p_iplist_.bottom().add( sourcefile_p ); } Source_file* Source::sourcefile_l( char const* ch_c_l ) { - PCursor sourcefile_p_pcur( sourcefile_p_iplist_m.top() ); + PCursor sourcefile_p_pcur( sourcefile_p_iplist_.top() ); for ( ; sourcefile_p_pcur.ok(); sourcefile_p_pcur++ ) if ( sourcefile_p_pcur->in_b( ch_c_l ) ) return *sourcefile_p_pcur; diff --git a/src/sourcefile.cc b/src/sourcefile.cc index ac164fd94a..f10d419b5a 100644 --- a/src/sourcefile.cc +++ b/src/sourcefile.cc @@ -26,21 +26,21 @@ Source_file::Source_file( String &filename_str ) { - data_caddr_m = 0; - fildes_i_m = 0; - size_off_m = 0; - name_str_m = filename_str; - istream_p_m = 0; + data_caddr_ = 0; + fildes_i_ = 0; + size_off_ = 0; + name_str_ = filename_str; + istream_p_ = 0; open(); map(); - filename_str = name_str_m; + filename_str = name_str_; } Source_file::~Source_file() { - delete istream_p_m; - istream_p_m = 0; + delete istream_p_; + istream_p_ = 0; unmap(); close(); } @@ -49,15 +49,15 @@ char const* Source_file::ch_c_l() { assert( this ); - return (char const*)data_caddr_m; + return (char const*)data_caddr_; } void Source_file::close() { - if ( fildes_i_m ) { - ::close( fildes_i_m ); - fildes_i_m = 0; + if ( fildes_i_ ) { + ::close( fildes_i_ ); + fildes_i_ = 0; } } @@ -77,7 +77,7 @@ Source_file::error_str( char const* pos_ch_c_l ) } char const* end_ch_c_l = pos_ch_c_l; - while ( end_ch_c_l < data_ch_c_l + size_off_m ) + while ( end_ch_c_l < data_ch_c_l + size_off_ ) if ( *end_ch_c_l++ == '\n' ) { break; } @@ -111,22 +111,22 @@ Source_file::error_str( char const* pos_ch_c_l ) bool Source_file::in_b( char const* pos_ch_c_l ) { - return ( pos_ch_c_l && ( pos_ch_c_l >= ch_c_l() ) && ( pos_ch_c_l < ch_c_l() + size_off_m ) ); + return ( pos_ch_c_l && ( pos_ch_c_l >= ch_c_l() ) && ( pos_ch_c_l < ch_c_l() + size_off_ ) ); } istream* Source_file::istream_l() { - assert( fildes_i_m ); - if ( !istream_p_m ) { - if ( size_off_m ) // can-t this be done without such a hack? - istream_p_m = new istrstream( ch_c_l(), size_off_m ); + assert( fildes_i_ ); + if ( !istream_p_ ) { + if ( size_off_ ) // can-t this be done without such a hack? + istream_p_ = new istrstream( ch_c_l(), size_off_ ); else { - istream_p_m = new istrstream( "", 0 ); - istream_p_m->set(ios::eofbit); + istream_p_ = new istrstream( "", 0 ); + istream_p_->set(ios::eofbit); } } - return istream_p_m; + return istream_p_; } int @@ -146,47 +146,47 @@ Source_file::line_i( char const* pos_ch_c_l ) void Source_file::map() { - if ( fildes_i_m == -1 ) + if ( fildes_i_ == -1 ) return; - data_caddr_m = (caddr_t)mmap( (void*)0, size_off_m, PROT_READ, MAP_SHARED, fildes_i_m, 0 ); + data_caddr_ = (caddr_t)mmap( (void*)0, size_off_, PROT_READ, MAP_SHARED, fildes_i_, 0 ); - if ( (int)data_caddr_m == -1 ) - warning( String( "can't map: " ) + name_str_m + String( ": " ) + strerror( errno ), defined_ch_c_l ); //lexer->here_ch_c_l() ); + if ( (int)data_caddr_ == -1 ) + warning( String( "can't map: " ) + name_str_ + String( ": " ) + strerror( errno ), defined_ch_c_l ); //lexer->here_ch_c_l() ); } String Source_file::name_str() { - return name_str_m; + return name_str_; } void Source_file::open() { - String name_str = find_file( name_str_m ); + String name_str = find_file( name_str_ ); if ( name_str != "" ) - name_str_m = name_str; + name_str_ = name_str; - fildes_i_m = ::open( name_str_m, O_RDONLY ); + fildes_i_ = ::open( name_str_, O_RDONLY ); - if ( fildes_i_m == -1 ) { - warning( String( "can't open: " ) + name_str_m + String( ": " ) + strerror( errno ), defined_ch_c_l ); // lexer->here_ch_c_l() ); + if ( fildes_i_ == -1 ) { + warning( String( "can't open: " ) + name_str_ + String( ": " ) + strerror( errno ), defined_ch_c_l ); // lexer->here_ch_c_l() ); return; } struct stat file_stat; - fstat( fildes_i_m, &file_stat ); - size_off_m = file_stat.st_size; + fstat( fildes_i_, &file_stat ); + size_off_ = file_stat.st_size; } void Source_file::unmap() { - if ( data_caddr_m ) { - munmap( data_caddr_m, size_off_m ); - data_caddr_m = 0; - size_off_m = 0; + if ( data_caddr_ ) { + munmap( data_caddr_, size_off_ ); + data_caddr_ = 0; + size_off_ = 0; } } String diff --git a/src/textdef.cc b/src/textdef.cc index 09fb2257a1..d4e9824d1b 100644 --- a/src/textdef.cc +++ b/src/textdef.cc @@ -8,7 +8,7 @@ Text_def::Text_def() { align_i_ = 1; // right style_str_ = "roman"; - defined_ch_c_l_m = 0; + defined_ch_c_l_ = 0; } bool Text_def::compare(const Text_def&def) -- 2.39.5