+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
/************************************************************************
* COPYRIGHT:
- * Copyright (c) 2000-2005, International Business Machines Corporation
+ * Copyright (c) 2000-2016, International Business Machines Corporation
* and others. All Rights Reserved.
************************************************************************/
/************************************************************************
#include "transapi.h"
#include "unicode/utypes.h"
#include "unicode/translit.h"
-#include "rbt.h"
#include "unicode/unifilt.h"
#include "cpdtrans.h"
-#include "nultrans.h"
+#include "cmemory.h"
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
UErrorCode status = U_ZERO_ERROR;
Transliterator* t= Transliterator::createInstance(trans, UTRANS_FORWARD, parseError, status);
if(t==0 || U_FAILURE(status)){
- errln("FAIL: construction of Latin-Greek");
+ dataerrln("FAIL: construction of Latin-Greek - %s",u_errorName(status));
return;
}else{
ID= t->getID();
Transliterator* t5=Transliterator::createInstance("Latin-Devanagari", UTRANS_FORWARD, parseError, status);
if(t5 == 0)
errln("FAIL: construction");
- if(t1->getID() != t5->getID() || t5->getID() != t3->getID() || t1->getID() != t3->getID())
+ else if(t1->getID() != t5->getID() || t5->getID() != t3->getID() || t1->getID() != t3->getID())
errln("FAIL: getID or clone failed");
Transliterator* t2 = Transliterator::createInstance("Latin-Devanagari", UTRANS_FORWARD, parseError, status);
Transliterator* invt2 = Transliterator::createInstance("Devanagari-Latin", UTRANS_FORWARD, parseError, status);
if(t1 == 0 || invt1 == 0 || t2 == 0 || invt2 == 0) {
- errln("FAIL: in instantiation");
+ dataerrln("FAIL: in instantiation - %s", u_errorName(status));
return;
}
"Any-Hex",
"Hex-Any"
};
- for(uint32_t i=0; i<sizeof(TransID)/sizeof(TransID[0]); i=i+2){
+ for(uint32_t i=0; i<UPRV_LENGTHOF(TransID); i=i+2){
Transliterator *trans1=Transliterator::createInstance(TransID[i], UTRANS_FORWARD, parseError, status);
if(t1 == 0){
errln("FAIL: in instantiation for" + TransID[i]);
t1=Transliterator::createInstance("Latin-Devanagari", UTRANS_FORWARD, parseError, status);
t2=Transliterator::createInstance("Latin-Greek", UTRANS_FORWARD, parseError, status);
if(t1 == 0 || t2 == 0){
- errln("FAIL: construction");
+ dataerrln("FAIL: construction - %s", u_errorName(status));
return;
}
t3=t1->clone();
return;
#else
- for (uint32_t i=0; i<sizeof(dispNames)/sizeof(dispNames[0]); i=i+2 ) {
+ for (uint32_t i=0; i<UPRV_LENGTHOF(dispNames); i=i+2 ) {
t = Transliterator::createInstance(dispNames[i+0], UTRANS_FORWARD, parseError, status);
if(t==0){
- errln("FAIL: construction: " + dispNames[i+0]);
+ dataerrln("FAIL: construction: " + dispNames[i+0] + " - " + u_errorName(status));
status = U_ZERO_ERROR;
continue;
}
"Latin-Devanagari",CharsToUnicodeString("bha\\u0304rata"), CharsToUnicodeString("\\u092D\\u093E\\u0930\\u0924") ,
"Latin-Devanagari",UnicodeString("kra ksha khra gra cra dya dhya",""), CharsToUnicodeString("\\u0915\\u094D\\u0930 \\u0915\\u094D\\u0936 \\u0916\\u094D\\u0930 \\u0917\\u094D\\u0930 \\u091a\\u094D\\u0930 \\u0926\\u094D\\u092F \\u0927\\u094D\\u092F") ,
- "Devanagari-Latin", CharsToUnicodeString("\\u092D\\u093E\\u0930\\u0924"), UnicodeString("bh\\u0101rata"),
+ "Devanagari-Latin", CharsToUnicodeString("\\u092D\\u093E\\u0930\\u0924"), CharsToUnicodeString("bh\\u0101rata"),
// "Contracted-Expanded", CharsToUnicodeString("\\u00C0\\u00C1\\u0042"), CharsToUnicodeString("\\u0041\\u0300\\u0041\\u0301\\u0042") ,
// "Expanded-Contracted", CharsToUnicodeString("\\u0041\\u0300\\u0041\\u0301\\u0042"), CharsToUnicodeString("\\u00C0\\u00C1\\u0042") ,
//"Latin-Arabic", "aap", CharsToUnicodeString("\\u0627\\u06A4") ,
UErrorCode status = U_ZERO_ERROR;
UParseError parseError;
- for(uint32_t i=0;i<sizeof(Data)/sizeof(Data[0]); i=i+3){
+ for(uint32_t i=0;i<UPRV_LENGTHOF(Data); i=i+3){
t=Transliterator::createInstance(Data[i+0], UTRANS_FORWARD, parseError, status);
if(t==0){
- errln("FAIL: construction: " + Data[i+0] + " Error: " + u_errorName(status));
- errln("PreContext: " + prettify(parseError.preContext) + " PostContext: " + prettify( parseError.postContext) );
+ dataerrln("FAIL: construction: " + Data[i+0] + " Error: " + u_errorName(status));
+ dataerrln("PreContext: " + prettify(parseError.preContext) + " PostContext: " + prettify( parseError.postContext) );
status = U_ZERO_ERROR;
continue;
}
"Hex-Any", CharsToUnicodeString("\\u0068\\u0065\\u006C\\u006C\\u006F\\u0021\\u0020"), "0", "5", "hello", "hello! " ,
// "Contracted-Expanded", CharsToUnicodeString("\\u00C0\\u00C1\\u0042"), "1", "2", CharsToUnicodeString("\\u0041\\u0301"), CharsToUnicodeString("\\u00C0\\u0041\\u0301\\u0042") ,
"Devanagari-Latin", CharsToUnicodeString("\\u092D\\u093E\\u0930\\u0924"), "0", "1", "bha", CharsToUnicodeString("bha\\u093E\\u0930\\u0924") ,
- "Devanagari-Latin", CharsToUnicodeString("\\u092D\\u093E\\u0930\\u0924"), "1", "2", "\\u0314\\u0101", CharsToUnicodeString("\\u092D\\u0314\\u0101\\u0930\\u0924")
+ "Devanagari-Latin", CharsToUnicodeString("\\u092D\\u093E\\u0930\\u0924"), "1", "2", CharsToUnicodeString("\\u0314\\u0101"), CharsToUnicodeString("\\u092D\\u0314\\u0101\\u0930\\u0924")
};
logln("\n Testing transliterate(String, int, int, StringBuffer)");
UErrorCode status = U_ZERO_ERROR;
UParseError parseError;
- for(uint32_t i=0; i<sizeof(Data2)/sizeof(Data2[0]); i=i+6){
+ for(uint32_t i=0; i<UPRV_LENGTHOF(Data2); i=i+6){
t=Transliterator::createInstance(Data2[i+0], UTRANS_FORWARD, parseError, status);
if(t==0){
- errln("FAIL: construction: " + prettify(Data2[i+0]));
+ dataerrln("FAIL: construction: " + prettify(Data2[i+0]) + " - " + u_errorName(status));
continue;
}
start=getInt(Data2[i+2]);
if(t == 0)
errln("FAIL : construction");
- for(uint32_t i=0; i<sizeof(Data)/sizeof(Data[0]); i=i+3){
+ for(uint32_t i=0; i<UPRV_LENGTHOF(Data); i=i+3){
start=getInt(Data[i+0]);
limit=getInt(Data[i+1]);
t->transliterate(rs, start, limit);
{-1, 16, 14, 16}, //invalid since START<0
{3, 50, 2, 50} //invalid since LIMIT>text.length()
};
- for(uint32_t i=0; i<sizeof(index1)/sizeof(index1[0]); i++){
+ for(uint32_t i=0; i<UPRV_LENGTHOF(index1); i++){
status=U_ZERO_ERROR;
t->transliterate(rs, index1[i], insertion, status);
if(status == U_ILLEGAL_ARGUMENT_ERROR)
status=U_ZERO_ERROR;
index.contextStart = index.contextLimit = index.start = index.limit = 0;
logln("Testing transliterate(Replaceable, int32_t, UChar, UErrorCode)");
- for(i=10; i<sizeof(Data)/sizeof(Data[0]); i=i+2){
+ for(i=10; i<UPRV_LENGTHOF(Data); i=i+2){
UnicodeString log;
if (Data[i+0] != "") {
log = s + " + " + Data[i+0] + " -> ";
rs="Initial String: add--";
t=Transliterator::createInstance("Any-Hex", UTRANS_FORWARD, parseError, status);
if(t == 0)
- errln("FAIL : construction");
+ dataerrln("FAIL : construction - %s", u_errorName(status));
else {
keyboardAux(t, Data, rs, 0, 20);
delete t;
rs="Hindi --";
t=Transliterator::createInstance("Latin-Devanagari", UTRANS_FORWARD, parseError, status);
if(t == 0)
- errln("FAIL : construction");
+ dataerrln("FAIL : construction - %s", u_errorName(status));
else
keyboardAux(t, Data, rs, 20, 40);
UTransPosition index={0, 0, 0, 0};
logln("Testing transliterate(Replaceable, int32_t, UErrorCode)");
Transliterator *t=Transliterator::createInstance("Any-Hex", UTRANS_FORWARD, parseError, status);
- if(U_FAILURE(status)) {
+ if(t == 0 || U_FAILURE(status)) {
errln("Error creating transliterator %s", u_errorName(status));
delete t;
return;
}
- if(t == 0)
- errln("FAIL : construction");
- for(uint32_t i=0; i<sizeof(Data)/sizeof(Data[0]); i=i+4){
+ for(uint32_t i=0; i<UPRV_LENGTHOF(Data); i=i+4){
UnicodeString log;
index.contextStart=getInt(Data[i+0]);
index.contextLimit=index.limit=getInt(Data[i+1]);
delete t;
}
void TransliteratorAPITest::TestNullTransliterator(){
+ UErrorCode status=U_ZERO_ERROR;
UnicodeString s("Transliterate using null transliterator");
- NullTransliterator *nullTrans=new NullTransliterator();
+ Transliterator *nullTrans=Transliterator::createInstance("Any-Null", UTRANS_FORWARD, status);
int32_t transLimit;
int32_t start=0;
int32_t limit=s.length();
index.contextLimit = limit;
index.start = 0;
index.limit = limit;
- nullTrans->handleTransliterate(replaceable, index, TRUE);
+ nullTrans->finishTransliteration(replaceable, index);
if(index.start != limit){
errln("ERROR: NullTransliterator->handleTransliterate() failed");
}
void TransliteratorAPITest::TestRegisterUnregister(){
UErrorCode status=U_ZERO_ERROR;
- UParseError parseError;
/* Make sure it doesn't exist */
- if (Transliterator::createInstance("TestA-TestB", UTRANS_FORWARD, parseError, status) != NULL) {
+ if (Transliterator::createInstance("TestA-TestB", UTRANS_FORWARD, status) != NULL) {
errln("FAIL: TestA-TestB already registered\n");
return;
}
status =U_ZERO_ERROR;
/* Create it */
- Transliterator *t = new RuleBasedTransliterator("TestA-TestB",
+ UParseError parseError;
+ Transliterator *t = Transliterator::createFromRules("TestA-TestB",
"a<>b",
+ UTRANS_FORWARD, parseError,
status);
/* Register it */
Transliterator::registerInstance(t);
/* Now check again -- should exist now*/
- Transliterator *s = Transliterator::createInstance("TestA-TestB", UTRANS_FORWARD, parseError, status);
+ Transliterator *s = Transliterator::createInstance("TestA-TestB", UTRANS_FORWARD, status);
if (s == NULL) {
errln("FAIL: TestA-TestB not registered\n");
return;
/*unregister the instance*/
Transliterator::unregister("TestA-TestB");
/* now Make sure it doesn't exist */
- if (Transliterator::createInstance("TestA-TestB", UTRANS_FORWARD, parseError, status) != NULL) {
+ if (Transliterator::createInstance("TestA-TestB", UTRANS_FORWARD, status) != NULL) {
errln("FAIL: TestA-TestB isn't unregistered\n");
return;
}
UErrorCode status = U_ZERO_ERROR;
UParseError parseError;
Transliterator *t=Transliterator::createInstance("Any-Hex", UTRANS_FORWARD, parseError, status);
- if(U_FAILURE(status)) {
- errln("Error creating transliterator %s", u_errorName(status));
- delete t;
- return;
+ if(t == 0 || U_FAILURE(status)) {
+ errln("Error creating transliterator %s", u_errorName(status));
+ delete t;
+ return;
}
- if(t == 0)
- errln("FAIL : construction");
const UnicodeFilter *u=t->getFilter();
if(u != NULL){
- errln("FAIL: getFilter failed. Didn't return null when the transliterator used no filtering");
+ errln("FAIL: getFilter failed. Didn't return null when the transliterator used no filtering");
+ delete t;
+ return;
}
-
+
UnicodeString got, temp, message;
UnicodeString data="ABCabcbbCBa";
temp = data;
if (prettify(result) == prettify(expected))
logln((UnicodeString)"Ok: " + prettify(message) + " passed \"" + prettify(expected) + "\"");
else
- errln((UnicodeString)"FAIL:" + message + " failed Got-->" + prettify(result)+ ", Expected--> " + prettify(expected) );
+ dataerrln((UnicodeString)"FAIL:" + message + " failed Got-->" + prettify(result)+ ", Expected--> " + prettify(expected) );
}
projects / apple / icu.git / blobdiff