projects/dwt-linux: dwt/dwthelper/utils.d comparison

comparison dwt/dwthelper/utils.d @ 307:9995e4a9d2ee

sync with dwt-win

author	Frank Benoit <benoit@tionex.de>
date	Thu, 21 Aug 2008 17:34:04 +0200
parents	1e93ff891d85
children	7ca3f26319f1 9f01a0643e26

comparison

equal deleted inserted replaced

-:9764f08379f2
+:9995e4a9d2ee
 return tango.text.convert.Integer.toString(i);
 }
 public static int parseInt( String s, int radix ){
 try{
-return tango.text.convert.Integer.parse( s, cast(uint)radix );
+return tango.text.convert.Integer.toLong( s, radix );
 }
 catch( IllegalArgumentException e ){
 throw new NumberFormatException( e );
 }
 }
 public static int parseInt( String s ){
 try{
-return tango.text.convert.Integer.parse( s );
+return tango.text.convert.Integer.toLong( s );
 }
 catch( IllegalArgumentException e ){
 throw new NumberFormatException( e );
 }
 }
 res+=4;
 }
 }
 return res;
 }
+/++
++
++/
 int indexToCodepointIndex( String str, int index ){
 if( index < 0 ) return index;
 int i = 0;
 int res = 0;
 while( i < index ){
 res++;
 }
 return res;
 }
+/++
++ Get that String, that contains the next codepoint of a String.
++/
 String firstCodePointStr( String str, out int consumed ){
 dchar[1] buf;
 uint ate;
 dchar[] res = str.toString32( buf, &ate );
 consumed = ate;
 return str[ 0 .. ate ];
 }
+/++
++ Get first codepoint of a String. If an offset is needed, simply use a slice:
++ ---
++ dchar res = str[ offset .. $ ].firstCodePoint();
++ ---
++/
 dchar firstCodePoint( String str ){
 int dummy;
 return firstCodePoint( str, dummy );
 }
 dchar firstCodePoint( String str, out int consumed ){
 }
 assert( ate > 0 );
 assert( res.length is 1 );
 return res[0];
 }
+dchar firstCodePoint( wchar[] str, out int consumed ){
+dchar[1] buf;
+uint ate;
+dchar[] res = str.toString32( buf, &ate );
+consumed = ate;
+if( ate is 0 || res.length is 0 ){
+Trace.formatln( "dwthelper.utils {}: str.length={} str={:X2}", __LINE__, str.length, cast(ubyte[])str );
+}
+assert( ate > 0 );
+assert( res.length is 1 );
+return res[0];
+}
 String dcharToString( dchar key ){
 dchar[1] buf;
 buf[0] = key;
 return tango.text.convert.Utf.toString( buf );
 alias tango.text.convert.Utf.toString16 toString16;
 alias tango.text.convert.Utf.toString toString;
 int getRelativeCodePointOffset( String str, int startIndex, int searchRelCp ){
+return getAbsoluteCodePointOffset( str, startIndex, searchRelCp ) - startIndex;
+}
+int getAbsoluteCodePointOffset( String str, int startIndex, int searchRelCp ){
 int ignore;
 int i = startIndex;
 if( searchRelCp > 0 ){
 while( searchRelCp !is 0 ){
 else if( searchRelCp < 0 ){
 while( searchRelCp !is 0 ){
 do{
 i--;
 if( i < 0 ){
-return -1;
+return startIndex-1;
 //Trace.formatln( "dwthelper.utils getRelativeCodePointOffset {}: str={}, startIndex={}, searchRelCp={}", __LINE__, str, startIndex, searchRelCp );
 //tango.text.convert.Utf.onUnicodeError( "invalid utf8 input", i );
 }
 } while(( str[i] & 0xC0 ) is 0x80 );
 searchRelCp++;
 }
 }
-return i - startIndex;
+return i;
+}
+int getAbsoluteCodePointOffset( wchar[] str, int startIndex, int searchRelCp ){
+int ignore;
+int i = startIndex;
+if( searchRelCp > 0 ){
+while( searchRelCp !is 0 ){
+if( ( i < str.length )
+&& ( str[i] & 0xD800 ) !is 0xD800 )
+{
+i+=1;
+}
+else if( ( i+1 < str.length )
+&& (( str[i+1] & 0xDC00 ) is 0xDC00 )
+&& (( str[i  ] & 0xDC00 ) is 0xD800 ))
+{
+i+=2;
+}
+else{
+Trace.formatln( "invalid utf8 characters:  {:X2}", cast(ubyte[]) str );
+tango.text.convert.Utf.onUnicodeError( "invalid utf8 input", i );
+}
+searchRelCp--;
+}
+}
+else if( searchRelCp < 0 ){
+while( searchRelCp !is 0 ){
+do{
+i--;
+if( i < 0 ){
+return startIndex-1;
+//Trace.formatln( "dwthelper.utils getRelativeCodePointOffset {}: str={}, startIndex={}, searchRelCp={}", __LINE__, str, startIndex, searchRelCp );
+//tango.text.convert.Utf.onUnicodeError( "invalid utf8 input", i );
+}
+} while(( str[i] & 0xDC00 ) is 0xDC00 );
+searchRelCp++;
+}
+}
+return i;
 }
 dchar getRelativeCodePoint( String str, int startIndex, int searchRelCp, out int relIndex ){
 relIndex = getRelativeCodePointOffset( str, startIndex, searchRelCp );
 int ignore;
 return firstCodePoint( str[ startIndex+relIndex .. $ ], ignore );

Mercurial > projects > dwt-linux

comparison dwt/dwthelper/utils.d @ 307:9995e4a9d2ee