pastojs: rtti for enum range

git-svn-id: trunk@37576 -

packages/pastojs/src/fppas2js.pp

@@ -2785,13 +2785,26 @@ begin
     begin
     if ParamResolved.IdentEl is TPasSetType then
       TIName:=Pas2JSBuiltInNames[pbitnTISet];
+    end
+  else if ParamResolved.BaseType=btRange then
+    begin
+    ConvertRangeToElement(ParamResolved);
+    if ParamResolved.BaseType in btAllJSInteger then
+      TIName:=Pas2JSBuiltInNames[pbitnTIInteger]
+    else if ParamResolved.BaseType=btContext then
+      begin
+      TypeEl:=ParamResolved.TypeEl;
+      C:=TypeEl.ClassType;
+      if C=TPasEnumType then
+        TIName:=Pas2JSBuiltInNames[pbitnTIEnum];
+      end;
     end;
   if TIName='' then
     begin
     {$IFDEF VerbosePas2JS}
     writeln('TPas2JSResolver.BI_TypeInfo_OnGetCallResult ',GetResolverResultDbg(ParamResolved));
     {$ENDIF}
-    RaiseMsg(20170413091852,nTypeIdentifierExpected,sTypeIdentifierExpected,[],Param);
+    RaiseNotYetImplemented(20170413091852,Param);
     end;
 
   // search for TIName
@@ -8605,6 +8618,7 @@ var
   MinInt, MaxInt: MaxPrecInt;
   OrdType: TOrdType;
   TIProp: TJSObjectLiteralElement;
+  fn: TPas2JSBuiltInName;
 begin
   Result:=nil;
   if not HasTypeInfo(El,AContext) then exit;
@@ -8618,22 +8632,15 @@ begin
     MaxVal:=AContext.Resolver.EvalRangeLimit(El.RangeExpr,[refConst],false,El);
     if MinVal.Kind=revkInt then
       begin
-      MinInt:=TresEvalInt(MinVal).Int;
-      MaxInt:=TresEvalInt(MaxVal).Int;
-      OrdType:=GetOrdType(MinInt,MaxInt,El);
-      Call:=CreateRTTINewType(El,FBuiltInNames[pbifnRTTINewInt],false,AContext,TIObj);
-      // add  minvalue: number
-      TIProp:=TIObj.Elements.AddElement;
-      TIProp.Name:=TJSString(FBuiltInNames[pbivnRTTIInt_MinValue]);
-      TIProp.Expr:=CreateLiteralNumber(El,MinInt);
-      // add  maxvalue: number
-      TIProp:=TIObj.Elements.AddElement;
-      TIProp.Name:=TJSString(FBuiltInNames[pbivnRTTIInt_MaxValue]);
-      TIProp.Expr:=CreateLiteralNumber(El,MaxInt);
-      // add  ordtype: number
-      TIProp:=TIObj.Elements.AddElement;
-      TIProp.Name:=TJSString(FBuiltInNames[pbivnRTTIInt_OrdType]);
-      TIProp.Expr:=CreateLiteralNumber(El,ord(OrdType));
+      fn:=pbifnRTTINewInt;
+      MinInt:=TResEvalInt(MinVal).Int;
+      MaxInt:=TResEvalInt(MaxVal).Int;
+      end
+    else if MinVal.Kind=revkEnum then
+      begin
+      fn:=pbifnRTTINewEnum;
+      MinInt:=TResEvalEnum(MinVal).Index;
+      MaxInt:=TResEvalEnum(MaxVal).Index;
       end
     else
       begin
@@ -8642,6 +8649,27 @@ begin
       {$ENDIF}
       RaiseNotSupported(El,AContext,20170925201628);
       end;
+    OrdType:=GetOrdType(MinInt,MaxInt,El);
+    Call:=CreateRTTINewType(El,FBuiltInNames[fn],false,AContext,TIObj);
+    // add  minvalue: number
+    TIProp:=TIObj.Elements.AddElement;
+    TIProp.Name:=TJSString(FBuiltInNames[pbivnRTTIInt_MinValue]);
+    TIProp.Expr:=CreateLiteralNumber(El,MinInt);
+    // add  maxvalue: number
+    TIProp:=TIObj.Elements.AddElement;
+    TIProp.Name:=TJSString(FBuiltInNames[pbivnRTTIInt_MaxValue]);
+    TIProp.Expr:=CreateLiteralNumber(El,MaxInt);
+    // add  ordtype: number
+    TIProp:=TIObj.Elements.AddElement;
+    TIProp.Name:=TJSString(FBuiltInNames[pbivnRTTIInt_OrdType]);
+    TIProp.Expr:=CreateLiteralNumber(El,ord(OrdType));
+    if MinVal.Kind=revkEnum then
+      begin
+      // add  enumtype: this.TypeName
+      TIProp:=TIObj.Elements.AddElement;
+      TIProp.Name:=TJSString(FBuiltInNames[pbivnRTTIEnum_EnumType]);
+      TIProp.Expr:=CreateSubDeclNameExpr(El,TResEvalEnum(MinVal).ElType.Name,AContext);
+      end;
     Result:=Call;
   finally
     ReleaseEvalValue(MinVal);
@@ -10183,6 +10211,7 @@ function TPasToJSConverter.ConvertImplBlock(El: TPasImplBlock;
   AContext: TConvertContext): TJSElement;
 
 begin
+  //writeln('TPasToJSConverter.ConvertImplBlock ');
   Result:=Nil;
   if (El is TPasImplStatement) then
     Result:=ConvertStatement(TPasImplStatement(El),AContext)

packages/pastojs/tests/tcmodules.pas

@@ -496,6 +496,7 @@ type
     Procedure TestRTTI_ProcType;
     Procedure TestRTTI_ProcType_ArgFromOtherUnit;
     Procedure TestRTTI_EnumAndSetType;
+    Procedure TestRTTI_EnumRange;
     Procedure TestRTTI_AnonymousEnumType;
     Procedure TestRTTI_StaticArray;
     Procedure TestRTTI_DynArray;
@@ -13442,6 +13443,23 @@ begin
     '']));
 end;
 
+procedure TTestModule.TestRTTI_EnumRange;
+begin
+  Converter.Options:=Converter.Options-[coNoTypeInfo];
+  StartProgram(false);
+  Add([
+  'type',
+  '  TCol = (red,green,blue);',
+  '  TColRg = green..blue;',
+  '  TSetOfColRg = set of TColRg;',
+  'var p: pointer;',
+  'begin',
+  '  p:=typeinfo(tcolrg);',
+  '  p:=typeinfo(tsetofcolrg);',
+  '']);
+  ConvertProgram;
+end;
+
 procedure TTestModule.TestRTTI_AnonymousEnumType;
 begin
   Converter.Options:=Converter.Options-[coNoTypeInfo];