pastojs: property default value of set type

git-svn-id: trunk@37319 -

packages/pastojs/src/fppas2js.pp

@@ -241,6 +241,8 @@ Works:
     - typeinfo(class) -> class.$rtti
   - WPO skip not used typeinfo
   - open array param
+  - property stored modifier
+  - property default value
 - pointer
   - compare with and assign nil
 - ECMAScript6:
@@ -256,9 +258,7 @@ ToDos:
   - RTTI
 - property index specifier
 - RTTI
-  - stored false/true
   - class property
-    - defaultvalue
   - type alias type
   - documentation
 - move local types to unit scope
@@ -9703,11 +9703,11 @@ var
   PropName: String;
   Flags: Integer;
   GetterPas, SetterPas, DeclEl: TPasElement;
-  ResultTypeInfo: TJSElement;
+  ResultTypeInfo, DefValue: TJSElement;
   VarType: TPasType;
   StoredExpr: TPasExpr;
-  StoredResolved: TPasResolverResult;
-  StoredValue, Value: TResEvalValue;
+  StoredResolved, VarTypeResolved: TPasResolverResult;
+  StoredValue, PasValue: TResEvalValue;
 begin
   Result:=nil;
   OptionsEl:=nil;
@@ -9763,8 +9763,9 @@ begin
       end;
     Call.AddArg(CreateLiteralNumber(Prop,Flags));
 
-    // add resulttype
+    // add type
     VarType:=AContext.Resolver.GetPasPropertyType(Prop);
+    AContext.Resolver.ComputeElement(VarType,VarTypeResolved,[rcType]);
     ResultTypeInfo:=CreateTypeInfoRef(VarType,AContext,Prop);
     if ResultTypeInfo<>nil then
       Call.AddArg(ResultTypeInfo)
@@ -9794,18 +9795,21 @@ begin
     // add option "defaultvalue"
     if Prop.DefaultExpr<>nil then
       begin
-      Value:=AContext.Resolver.Eval(Prop.DefaultExpr,[refConst],false);
+      PasValue:=AContext.Resolver.Eval(Prop.DefaultExpr,[refConst],false);
       try
-        AddOption(FBuiltInNames[pbivnRTTIPropDefault],
-          ConvertConstValue(Value,AContext,Prop));
+        DefValue:=nil;
+        if VarTypeResolved.BaseType=btSet then
+          begin
+          DefValue:=CreateValInit(VarType,Prop.DefaultExpr,Prop.DefaultExpr,AContext);
+          end;
+        if DefValue=nil then
+          DefValue:=ConvertConstValue(PasValue,AContext,Prop);
+        AddOption(FBuiltInNames[pbivnRTTIPropDefault],DefValue);
       finally
-        ReleaseEvalValue(Value);
+        ReleaseEvalValue(PasValue);
       end;
       end;
 
-    // add option Index
-    // ToDo
-
     Result:=Call;
   finally
     if Result=nil then
@@ -9919,6 +9923,7 @@ begin
   if El.DispIDExpr<>nil then
     RaiseNotSupported(El.DispIDExpr,AContext,20170215103029,'property dispid expression');
   // does not need any declaration. Access is redirected to getter/setter.
+  // RTTI is created in CreateRTTIClassProperty
 end;
 
 function TPasToJSConverter.ConvertExportSymbol(El: TPasExportSymbol;

packages/pastojs/tests/tcmodules.pas

@@ -323,9 +323,6 @@ type
     Procedure TestArray_DynArrayConst;
     Procedure TestExternalClass_TypeCastArrayToExternalArray;
     Procedure TestExternalClass_TypeCastArrayFromExternalArray;
-    // ToDo: static array const
-    // ToDo: SetLength(array of static array)
-    // ToDo: SetLength(dim1,dim2)
 
     // record
     Procedure TestRecord_Var;
@@ -504,6 +501,7 @@ type
     Procedure TestRTTI_PublishedFieldExternalFail;
     Procedure TestRTTI_StoredModifier;
     Procedure TestRTTI_DefaultValue;
+    Procedure TestRTTI_DefaultValueSet;
     Procedure TestRTTI_Class_Field;
     Procedure TestRTTI_Class_Method;
     Procedure TestRTTI_Class_MethodArgFlags;
@@ -13377,13 +13375,15 @@ end;
 
 procedure TTestModule.TestRTTI_DefaultValue;
 begin
+  Converter.Options:=Converter.Options-[coNoTypeInfo];
   StartProgram(false);
   Add([
+  'type',
+  '  TEnum = (red, blue);',
   'const',
   '  CB = true or false;',
   '  CI = 1+2;',
   'type',
-  '  TEnum = (red, blue);',
   '  TObject = class',
   '    FB: boolean;',
   '    FI: longint;',
@@ -13401,14 +13401,19 @@ begin
   ConvertProgram;
   CheckSource('TestRTTI_DefaultValue',
     LinesToStr([ // statements
-    'this.CB = true || false;',
-    'this.CI = 1 + 2;',
     'this.TEnum = {',
     '  "0": "red",',
     '  red: 0,',
     '  "1": "blue",',
     '  blue: 1',
     '};',
+    '$mod.$rtti.$Enum("TEnum", {',
+    '  minvalue: 0,',
+    '  maxvalue: 1,',
+    '  enumtype: this.TEnum',
+    '});',
+    'this.CB = true || false;',
+    'this.CI = 1 + 2;',
     'rtl.createClass($mod, "TObject", null, function () {',
     '  this.$init = function () {',
     '    this.FB = false;',
@@ -13494,6 +13499,98 @@ begin
     '']));
 end;
 
+procedure TTestModule.TestRTTI_DefaultValueSet;
+begin
+  Converter.Options:=Converter.Options-[coNoTypeInfo];
+  StartProgram(false);
+  Add([
+  'type',
+  '  TEnum = (red, blue);',
+  '  TSet = set of TEnum;',
+  'const',
+  '  CSet = [red,blue];',
+  'type',
+  '  TObject = class',
+  '    FSet: TSet;',
+  '  published',
+  '    property Set1: TSet read FSet default [];',
+  '    property Set2: TSet read FSet default [red];',
+  '    property Set3: TSet read FSet default [red,blue];',
+  '    property Set4: TSet read FSet default CSet;',
+  '  end;',
+  'begin']);
+  ConvertProgram;
+  CheckSource('TestRTTI_DefaultValueSet',
+    LinesToStr([ // statements
+    'this.TEnum = {',
+    '  "0": "red",',
+    '  red: 0,',
+    '  "1": "blue",',
+    '  blue: 1',
+    '};',
+    '$mod.$rtti.$Enum("TEnum", {',
+    '  minvalue: 0,',
+    '  maxvalue: 1,',
+    '  enumtype: this.TEnum',
+    '});',
+    '$mod.$rtti.$Set("TSet", {',
+    '  comptype: $mod.$rtti["TEnum"]',
+    '});',
+    'this.CSet = rtl.createSet($mod.TEnum.red, $mod.TEnum.blue);',
+    'rtl.createClass($mod, "TObject", null, function () {',
+    '  this.$init = function () {',
+    '    this.FSet = {};',
+    '  };',
+    '  this.$final = function () {',
+    '    this.FSet = undefined;',
+    '  };',
+    '  var $r = this.$rtti;',
+    '  $r.addProperty(',
+    '    "Set1",',
+    '    0,',
+    '    $mod.$rtti["TSet"],',
+    '    "FSet",',
+    '    "",',
+    '    {',
+    '      Default: {}',
+    '    }',
+    '  );',
+    '  $r.addProperty(',
+    '    "Set2",',
+    '    0,',
+    '    $mod.$rtti["TSet"],',
+    '    "FSet",',
+    '    "",',
+    '    {',
+    '      Default: rtl.createSet($mod.TEnum.red)',
+    '    }',
+    '  );',
+    '  $r.addProperty(',
+    '    "Set3",',
+    '    0,',
+    '    $mod.$rtti["TSet"],',
+    '    "FSet",',
+    '    "",',
+    '    {',
+    '      Default: rtl.createSet($mod.TEnum.red, $mod.TEnum.blue)',
+    '    }',
+    '  );',
+    '  $r.addProperty(',
+    '    "Set4",',
+    '    0,',
+    '    $mod.$rtti["TSet"],',
+    '    "FSet",',
+    '    "",',
+    '    {',
+    '      Default: $mod.CSet',
+    '    }',
+    '  );',
+    '});',
+    '']),
+    LinesToStr([ // $mod.$main
+    '']));
+end;
+
 procedure TTestModule.TestRTTI_Class_Field;
 begin
   Converter.Options:=Converter.Options-[coNoTypeInfo];