mirror of
https://github.com/unicode-org/icu.git
synced 2025-04-08 06:53:45 +00:00
ICU-2734 Fix incompatibity between ICU4C and ICU4J
X-SVN-Rev: 11554
This commit is contained in:
Ram Viswanadha
parent
d0213320b9
commit
d94419fc1a
3 changed files with 95 additions and 136 deletions
|
|
@ -89,46 +89,46 @@ encodeRunByte(uint16_t* buffer,uint16_t* bufLimit, uint8_t value, int32_t length
|
|||
return buffer;
|
||||
}
|
||||
|
||||
#define APPEND( buffer, bufLimit, value, status){ \
|
||||
if(buffer<bufLimit){ \
|
||||
*buffer++=(value); \
|
||||
}else{ \
|
||||
*status = U_BUFFER_OVERFLOW_ERROR; \
|
||||
} \
|
||||
num++; \
|
||||
#define APPEND( buffer, bufLimit, value, num, status){ \
|
||||
if(buffer<bufLimit){ \
|
||||
*buffer++=(value); \
|
||||
}else{ \
|
||||
*status = U_BUFFER_OVERFLOW_ERROR; \
|
||||
} \
|
||||
num++; \
|
||||
}
|
||||
|
||||
/**
|
||||
* Encode a run, possibly a degenerate run (of < 4 values).
|
||||
* @param length The length of the run; must be > 0 && <= 0xFFFF.
|
||||
*/
|
||||
static int32_t
|
||||
static uint16_t*
|
||||
encodeRunShort(uint16_t* buffer,uint16_t* bufLimit, uint16_t value, int32_t length,UErrorCode* status) {
|
||||
int32_t num=0;
|
||||
if (length < 4) {
|
||||
if (length < 4) {
|
||||
int j=0;
|
||||
for (; j<length; ++j) {
|
||||
if (value == (int32_t) ESCAPE){
|
||||
APPEND(buffer,bufLimit,ESCAPE,status);
|
||||
APPEND(buffer,bufLimit,ESCAPE, num, status);
|
||||
|
||||
}
|
||||
APPEND(buffer,bufLimit,value,status);
|
||||
APPEND(buffer,bufLimit,value,num, status);
|
||||
}
|
||||
}
|
||||
else {
|
||||
if (length == (int32_t) ESCAPE) {
|
||||
if (value == (int32_t) ESCAPE){
|
||||
APPEND(buffer,bufLimit,ESCAPE,status);
|
||||
APPEND(buffer,bufLimit,ESCAPE,num,status);
|
||||
|
||||
}
|
||||
APPEND(buffer,bufLimit,value,status);
|
||||
APPEND(buffer,bufLimit,value,num,status);
|
||||
--length;
|
||||
}
|
||||
APPEND(buffer,bufLimit,ESCAPE,status);
|
||||
APPEND(buffer,bufLimit,(uint16_t) length,status);
|
||||
APPEND(buffer,bufLimit,(uint16_t)value,status); /* Don't need to escape this value */
|
||||
APPEND(buffer,bufLimit,ESCAPE,num,status);
|
||||
APPEND(buffer,bufLimit,(uint16_t) length, num,status);
|
||||
APPEND(buffer,bufLimit,(uint16_t)value, num, status); /* Don't need to escape this value */
|
||||
}
|
||||
return num;
|
||||
return buffer;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -147,6 +147,7 @@ encodeRunShort(uint16_t* buffer,uint16_t* bufLimit, uint16_t value, int32_t leng
|
|||
int32_t
|
||||
usArrayToRLEString(const uint16_t* src,int32_t srcLen,uint16_t* buffer, int32_t bufLen,UErrorCode* status) {
|
||||
uint16_t* bufLimit = buffer+bufLen;
|
||||
uint16_t* saveBuffer = buffer;
|
||||
int32_t num = 0;
|
||||
if(buffer < bufLimit){
|
||||
*buffer++ = (uint16_t)(srcLen>>16);
|
||||
|
|
@ -161,19 +162,19 @@ usArrayToRLEString(const uint16_t* src,int32_t srcLen,uint16_t* buffer, int32_t
|
|||
if (s == runValue && runLength < 0xFFFF){
|
||||
++runLength;
|
||||
}else {
|
||||
num += encodeRunShort(buffer,bufLimit, (uint16_t)runValue, runLength,status);
|
||||
buffer = encodeRunShort(buffer,bufLimit, (uint16_t)runValue, runLength,status);
|
||||
runValue = s;
|
||||
runLength = 1;
|
||||
}
|
||||
}
|
||||
num += encodeRunShort(buffer,bufLimit,(uint16_t)runValue, runLength,status);
|
||||
buffer= encodeRunShort(buffer,bufLimit,(uint16_t)runValue, runLength,status);
|
||||
}else{
|
||||
*status = U_BUFFER_OVERFLOW_ERROR;
|
||||
}
|
||||
}else{
|
||||
*status = U_BUFFER_OVERFLOW_ERROR;
|
||||
}
|
||||
return num;
|
||||
return (buffer - saveBuffer);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -208,12 +208,27 @@ strrch(const char* source,uint32_t sourceLen,char find){
|
|||
return (uint32_t)(tSourceEnd-source);
|
||||
}
|
||||
|
||||
static int32_t getColumnCount(int32_t len){
|
||||
int32_t columnCount = 80;
|
||||
int32_t maxLines = 3000;
|
||||
int32_t adjustedLen = len*5; /* assume that every codepoint is represented in \uXXXX format*/
|
||||
/*
|
||||
* calculate the number of lines that
|
||||
* may be required if column count is 80
|
||||
*/
|
||||
if (maxLines < (adjustedLen / columnCount) ){
|
||||
columnCount = adjustedLen / maxLines;
|
||||
}
|
||||
return columnCount;
|
||||
}
|
||||
static void
|
||||
str_write_java( uint16_t* src, int32_t srcLen, UBool printEndLine, UErrorCode *status){
|
||||
|
||||
uint32_t length = srcLen*8;
|
||||
uint32_t bufLen = 0;
|
||||
char* buf = (char*) malloc(sizeof(char)*length);
|
||||
|
||||
uint32_t columnCount = getColumnCount(srcLen);
|
||||
|
||||
/* test for NULL */
|
||||
if(buf == NULL) {
|
||||
|
|
@ -231,12 +246,12 @@ str_write_java( uint16_t* src, int32_t srcLen, UBool printEndLine, UErrorCode *s
|
|||
return;
|
||||
}
|
||||
|
||||
if(bufLen+(tabCount*4) > 70 ){
|
||||
if(bufLen+(tabCount*4) > columnCount ){
|
||||
uint32_t len = 0;
|
||||
char* current = buf;
|
||||
uint32_t add;
|
||||
while(len < bufLen){
|
||||
add = 70-(tabCount*4)-5/* for ", +\n */;
|
||||
add = columnCount-(tabCount*4)-5/* for ", +\n */;
|
||||
current = buf +len;
|
||||
if (add < (bufLen-len)) {
|
||||
uint32_t index = strrch(current,add,'\\');
|
||||
|
|
@ -292,10 +307,11 @@ string_write_java(struct SResource *res,UErrorCode *status) {
|
|||
const char* type = "new ICUListResourceBundle.ResourceString(";
|
||||
char* dest = (char*) uprv_malloc( 8 * res->u.fString.fLength);
|
||||
int32_t len = 0;
|
||||
|
||||
uprv_strcat(fileName,outDir);
|
||||
if(outDir[uprv_strlen(outDir)-1]!=U_FILE_SEP_CHAR){
|
||||
uprv_strcat(fileName,U_FILE_SEP_STRING);
|
||||
if(outDir){
|
||||
uprv_strcat(fileName,outDir);
|
||||
if(outDir[uprv_strlen(outDir)-1]!=U_FILE_SEP_CHAR){
|
||||
uprv_strcat(fileName,U_FILE_SEP_STRING);
|
||||
}
|
||||
}
|
||||
uprv_strcat(fileName,file);/* UCARULES.utf8 UTF-8 file */
|
||||
|
||||
|
|
@ -320,67 +336,6 @@ string_write_java(struct SResource *res,UErrorCode *status) {
|
|||
T_FileStream_write(datFile,dest,len);
|
||||
T_FileStream_close(datFile);
|
||||
uprv_free(dest);
|
||||
|
||||
}else if( res->u.fString.fLength > 2000){
|
||||
|
||||
int32_t srcLen = res->u.fBinaryValue.fLength/2;
|
||||
int32_t tgtLen = srcLen *2;
|
||||
uint16_t* target = (uint16_t*)malloc(sizeof(uint16_t) * tgtLen );
|
||||
uint16_t* saveTarget;
|
||||
const char* type = "new ICUListResourceBundle.CompressedString(\n";
|
||||
if(target){
|
||||
saveTarget = target;
|
||||
tgtLen = usArrayToRLEString((uint16_t*)res->u.fBinaryValue.fData,
|
||||
srcLen,target, tgtLen, status);
|
||||
if(U_FAILURE(*status)){
|
||||
printf("Could not encode got error : %s \n", u_errorName(*status));
|
||||
return;
|
||||
}
|
||||
#if DEBUG
|
||||
{
|
||||
/***************** Test Roundtripping *********************/
|
||||
int32_t myTargetLen = rleStringToUCharArray(target,tgtLen,NULL,0,status);
|
||||
uint16_t* myTarget = (uint16_t*) malloc(sizeof(uint16_t) * myTargetLen);
|
||||
|
||||
/* test for NULL */
|
||||
if(myTarget == NULL) {
|
||||
*status = U_MEMORY_ALLOCATION_ERROR;
|
||||
return;
|
||||
}
|
||||
|
||||
int i=0;
|
||||
int32_t retVal=0;
|
||||
uint16_t* saveSrc = (uint16_t*)res->u.fBinaryValue.fData;
|
||||
*status = U_ZERO_ERROR;
|
||||
retVal=rleStringToUCharArray(target,tgtLen,myTarget,myTargetLen,status);
|
||||
if(U_SUCCESS(*status)){
|
||||
|
||||
for(i=0; i< srcLen;i++){
|
||||
if(saveSrc[i]!= myTarget[i]){
|
||||
printf("the encoded string cannot be decoded Expected : 0x%04X Got : %: 0x%04X at %i\n",res->u.fBinaryValue.fData[i],myTarget[i], i);
|
||||
}
|
||||
}
|
||||
}else{
|
||||
printf("Could not decode got error : %s \n", u_errorName(*status));
|
||||
}
|
||||
free(myTarget);
|
||||
}
|
||||
#endif
|
||||
|
||||
}else{
|
||||
*status= U_MEMORY_ALLOCATION_ERROR;
|
||||
return;
|
||||
}
|
||||
write_tabs(out);
|
||||
T_FileStream_write(out, type, (int32_t)uprv_strlen(type));
|
||||
T_FileStream_write(out, "\n", 1);
|
||||
tabCount++;
|
||||
write_tabs(out);
|
||||
str_write_java(target, tgtLen,FALSE, status);
|
||||
tabCount--;
|
||||
T_FileStream_write(out, "),\n", 3);
|
||||
|
||||
free(target);
|
||||
|
||||
}else{
|
||||
str_write_java(res->u.fString.fChars,res->u.fString.fLength,TRUE,status);
|
||||
|
|
@ -569,10 +524,11 @@ bin_write_java( struct SResource *res, UErrorCode *status) {
|
|||
}
|
||||
|
||||
uprv_strcat(fileName,ext);
|
||||
|
||||
uprv_strcat(fn,outDir);
|
||||
if(outDir[uprv_strlen(outDir)-1]!=U_FILE_SEP_CHAR){
|
||||
uprv_strcat(fn,U_FILE_SEP_STRING);
|
||||
if(outDir ){
|
||||
uprv_strcat(fn,outDir);
|
||||
if(outDir[uprv_strlen(outDir)-1]!=U_FILE_SEP_CHAR){
|
||||
uprv_strcat(fn,U_FILE_SEP_STRING);
|
||||
}
|
||||
}
|
||||
uprv_strcat(fn,fileName);
|
||||
type = "new ICUListResourceBundle.ResourceBinary(";
|
||||
|
|
@ -588,56 +544,54 @@ bin_write_java( struct SResource *res, UErrorCode *status) {
|
|||
|
||||
}else{
|
||||
|
||||
srcLen = res->u.fBinaryValue.fLength;
|
||||
tgtLen = srcLen * 2;
|
||||
target = (uint16_t*)malloc(sizeof(uint16_t) * tgtLen);
|
||||
saveTarget = target;
|
||||
if(target){
|
||||
tgtLen = byteArrayToRLEString(res->u.fBinaryValue.fData,
|
||||
srcLen,target, tgtLen,status);
|
||||
if(U_FAILURE(*status)){
|
||||
printf("Could not encode got error : %s \n", u_errorName(*status));
|
||||
return;
|
||||
}
|
||||
srcLen = res->u.fBinaryValue.fLength;
|
||||
tgtLen = srcLen * 2;
|
||||
target = (uint16_t*)malloc(sizeof(uint16_t) * tgtLen);
|
||||
saveTarget = target;
|
||||
if(target){
|
||||
tgtLen = byteArrayToRLEString(res->u.fBinaryValue.fData,
|
||||
srcLen,target, tgtLen,status);
|
||||
if(U_FAILURE(*status)){
|
||||
printf("Could not encode got error : %s \n", u_errorName(*status));
|
||||
return;
|
||||
}
|
||||
#if DEBUG
|
||||
/***************** Test Roundtripping *********************/
|
||||
{
|
||||
int32_t myTargetLen = rleStringToByteArray(target,tgtLen,NULL,0,status);
|
||||
uint8_t* myTarget = (uint8_t*) malloc(sizeof(uint8_t) * myTargetLen);
|
||||
|
||||
/* test for NULL */
|
||||
if(myTarget == NULL) {
|
||||
*status = U_MEMORY_ALLOCATION_ERROR;
|
||||
return;
|
||||
}
|
||||
|
||||
int i=0;
|
||||
int32_t retVal=0;
|
||||
|
||||
*status = U_ZERO_ERROR;
|
||||
retVal=rleStringToByteArray(target,tgtLen,myTarget,myTargetLen,status);
|
||||
if(U_SUCCESS(*status)){
|
||||
|
||||
for(i=0; i< srcLen;i++){
|
||||
if(res->u.fBinaryValue.fData[i]!= myTarget[i]){
|
||||
printf("the encoded string cannot be decoded Expected : 0x%02X Got : %: 0x%02X at %i\n",res->u.fBinaryValue.fData[i],myTarget[i], i);
|
||||
}
|
||||
}
|
||||
}else{
|
||||
printf("Could not decode got error : %s \n", u_errorName(*status));
|
||||
}
|
||||
free(myTarget);
|
||||
/***************** Test Roundtripping *********************/
|
||||
{
|
||||
int32_t myTargetLen = rleStringToByteArray(target,tgtLen,NULL,0,status);
|
||||
uint8_t* myTarget = (uint8_t*) malloc(sizeof(uint8_t) * myTargetLen);
|
||||
|
||||
/* test for NULL */
|
||||
if(myTarget == NULL) {
|
||||
*status = U_MEMORY_ALLOCATION_ERROR;
|
||||
return;
|
||||
}
|
||||
|
||||
int i=0;
|
||||
int32_t retVal=0;
|
||||
|
||||
*status = U_ZERO_ERROR;
|
||||
retVal=rleStringToByteArray(target,tgtLen,myTarget,myTargetLen,status);
|
||||
if(U_SUCCESS(*status)){
|
||||
|
||||
for(i=0; i< srcLen;i++){
|
||||
if(res->u.fBinaryValue.fData[i]!= myTarget[i]){
|
||||
printf("the encoded string cannot be decoded Expected : 0x%02X Got : %: 0x%02X at %i\n",res->u.fBinaryValue.fData[i],myTarget[i], i);
|
||||
}
|
||||
}
|
||||
}else{
|
||||
printf("Could not decode got error : %s \n", u_errorName(*status));
|
||||
}
|
||||
free(myTarget);
|
||||
|
||||
}
|
||||
#endif
|
||||
|
||||
}else{
|
||||
*status = U_MEMORY_ALLOCATION_ERROR;
|
||||
return;
|
||||
}
|
||||
|
||||
}else{
|
||||
*status = U_MEMORY_ALLOCATION_ERROR;
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
write_tabs(out);
|
||||
T_FileStream_write(out, type, (int32_t)uprv_strlen(type));
|
||||
T_FileStream_write(out, "\n", 1);
|
||||
|
|
@ -648,6 +602,9 @@ bin_write_java( struct SResource *res, UErrorCode *status) {
|
|||
T_FileStream_write(out, "),\n", 3);
|
||||
|
||||
free(target);
|
||||
|
||||
}
|
||||
|
||||
}else{
|
||||
write_tabs(out);
|
||||
T_FileStream_write(out,type,uprv_strlen(type));
|
||||
|
|
|
|||
|
|
@ -378,7 +378,8 @@ bin_write_xml( struct SResource *res, UErrorCode *status) {
|
|||
static const char* end = "\"/>\n";
|
||||
static const char* importStart ="<importBin key=\"%s\" filename=\"%s\"/>\n";
|
||||
char fileName[1024] ={0};
|
||||
char* fn = (char*) uprv_malloc(sizeof(char) * (uprv_strlen(outDir)+1024 +
|
||||
int32_t tLen = ( outDir == NULL) ? 0 :uprv_strlen(outDir);
|
||||
char* fn = (char*) uprv_malloc(sizeof(char) * (tLen+1024 +
|
||||
(res->u.fBinaryValue.fFileName !=NULL ?
|
||||
uprv_strlen(res->u.fBinaryValue.fFileName) :0)));
|
||||
char* buffer = NULL;
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue