|
@@ -13640,16 +13640,16 @@ function TPasToJSConverter.ConvertBuiltIn_Ord(El: TParamsExpr;
|
|
Result:=nil;
|
|
Result:=nil;
|
|
OrdValue:=nil;
|
|
OrdValue:=nil;
|
|
ParamValue:=aResolver.Eval(Param,[]);
|
|
ParamValue:=aResolver.Eval(Param,[]);
|
|
|
|
+ if ParamValue=nil then exit;
|
|
try
|
|
try
|
|
- if ParamValue<>nil then
|
|
|
|
|
|
+ OrdValue:=aResolver.ExprEvaluator.OrdValue(ParamValue,El);
|
|
|
|
+ if OrdValue=ParamValue then
|
|
|
|
+ ParamValue:=nil;
|
|
|
|
+ if OrdValue<>nil then
|
|
begin
|
|
begin
|
|
- OrdValue:=aResolver.ExprEvaluator.OrdValue(ParamValue,El);
|
|
|
|
- if OrdValue<>nil then
|
|
|
|
- begin
|
|
|
|
- // ord(constant) -> constant
|
|
|
|
- Result:=ConvertConstValue(OrdValue,AContext,El);
|
|
|
|
- exit;
|
|
|
|
- end;
|
|
|
|
|
|
+ // ord(constant) -> constant
|
|
|
|
+ Result:=ConvertConstValue(OrdValue,AContext,El);
|
|
|
|
+ exit;
|
|
end;
|
|
end;
|
|
finally
|
|
finally
|
|
ReleaseEvalValue(ParamValue);
|
|
ReleaseEvalValue(ParamValue);
|