소스 검색

pastojs: enable widechar and unicodestring

git-svn-id: trunk@37293 -
Mattias Gaertner 8 년 전
부모
커밋
b226b21925
2개의 변경된 파일8개의 추가작업 그리고 6개의 파일을 삭제
  1. 2 0
      packages/pastojs/src/fppas2js.pp
  2. 6 6
      packages/pastojs/tests/tcmodules.pas

+ 2 - 0
packages/pastojs/src/fppas2js.pp

@@ -805,7 +805,9 @@ const
 
 
   btAllJSBaseTypes = [
   btAllJSBaseTypes = [
     btChar,
     btChar,
+    btWideChar,
     btString,
     btString,
+    btUnicodeString,
     btDouble,
     btDouble,
     btBoolean,
     btBoolean,
     btByteBool,
     btByteBool,

+ 6 - 6
packages/pastojs/tests/tcmodules.pas

@@ -211,7 +211,7 @@ type
     Procedure TestString_CharAt;
     Procedure TestString_CharAt;
     Procedure TestStr;
     Procedure TestStr;
     Procedure TestBaseType_AnsiStringFail;
     Procedure TestBaseType_AnsiStringFail;
-    Procedure TestBaseType_UnicodeStringFail;
+    Procedure TestBaseType_WideStringFail;
     Procedure TestBaseType_ShortStringFail;
     Procedure TestBaseType_ShortStringFail;
     Procedure TestBaseType_RawByteStringFail;
     Procedure TestBaseType_RawByteStringFail;
     Procedure TestTypeShortstring_Fail;
     Procedure TestTypeShortstring_Fail;
@@ -4177,11 +4177,11 @@ begin
   ConvertProgram;
   ConvertProgram;
 end;
 end;
 
 
-procedure TTestModule.TestBaseType_UnicodeStringFail;
+procedure TTestModule.TestBaseType_WideStringFail;
 begin
 begin
   StartProgram(false);
   StartProgram(false);
-  Add('var s: UnicodeString');
-  SetExpectedPasResolverError('identifier not found "UnicodeString"',PasResolveEval.nIdentifierNotFound);
+  Add('var s: WideString');
+  SetExpectedPasResolverError('identifier not found "WideString"',PasResolveEval.nIdentifierNotFound);
   ConvertProgram;
   ConvertProgram;
 end;
 end;
 
 
@@ -12748,7 +12748,7 @@ begin
   Add([
   Add([
   'type',
   'type',
   '  uni = string;',
   '  uni = string;',
-  '  WideChar = char;',
+  '  WChar = char;',
   'procedure DoIt(s: string); begin end;',
   'procedure DoIt(s: string); begin end;',
   'procedure DoIt(v: jsvalue); begin end;',
   'procedure DoIt(v: jsvalue); begin end;',
   'var',
   'var',
@@ -12784,7 +12784,7 @@ begin
   Add([
   Add([
   'type',
   'type',
   '  uni = string;',
   '  uni = string;',
-  '  WideChar = char;',
+  '  WChar = char;',
   'procedure DoIt(c: char); begin end;',
   'procedure DoIt(c: char); begin end;',
   'procedure DoIt(v: jsvalue); begin end;',
   'procedure DoIt(v: jsvalue); begin end;',
   'var',
   'var',