pastojs: TPasElement free instead of reference count

packages/pastojs/src/fppas2js.pp

@@ -2583,15 +2583,7 @@ end;
 procedure TPas2JSModuleScope.SetJSPromiseClass(const AValue: TPasClassType);
 begin
   if FJSPromiseClass=AValue then Exit;
-  {$IFNDEF EnablePasTreeFree}
-  if FJSPromiseClass<>nil then
-    FJSPromiseClass.Release{$IFDEF CheckPasTreeRefCount}('TPas2JSModuleScope.SetJSPromiseClass'){$ENDIF};
-  {$ENDIF}
   FJSPromiseClass:=AValue;
-  {$IFNDEF EnablePasTreeFree}
-  if FJSPromiseClass<>nil then
-    FJSPromiseClass.AddRef{$IFDEF CheckPasTreeRefCount}('TPas2JSModuleScope.SetJSPromiseClass'){$ENDIF};
-  {$ENDIF}
 end;
 
 procedure TPas2JSModuleScope.ClearStoreJSLocalVars;
@@ -4491,9 +4483,7 @@ begin
             RaiseMsg(20170322134321,nInvalidVariableModifier,
               sInvalidVariableModifier,['export name'],El.ExportName);
           El.ExportName:=TPrimitiveExpr.Create(El,pekString,''''+El.Name+'''');
-          {$IFDEF EnablePasTreeFree}
           FOwnedElements.Add(El.ExportName);
-          {$ENDIF}
           end;
         Include(El.VarModifiers,vmExternal);
         end;
@@ -4712,9 +4702,7 @@ begin
                 sInvalidXModifierY,[Proc.ElementTypeName,'symbol name'],Proc.LibrarySymbolName);
             Proc.Modifiers:=Proc.Modifiers+[pmExternal];
             Proc.LibrarySymbolName:=TPrimitiveExpr.Create(Proc,pekString,''''+Proc.Name+'''');
-            {$IFDEF EnablePasTreeFree}
             FOwnedElements.Add(Proc.LibrarySymbolName);
-            {$ENDIF}
             end;
 
           if Proc.Visibility=visPublished then
@@ -6446,11 +6434,7 @@ var
 begin
   inherited ClearBuiltInIdentifiers;
   for bt in TPas2jsBaseType do
-    {$IFDEF EnablePasTreeFree}
     FJSBaseTypes[bt]:=nil;
-    {$ELSE}
-    ReleaseAndNil(TPasElement(FJSBaseTypes[bt]){$IFDEF CheckPasTreeRefCount},'TPasResolver.AddCustomBaseType'{$ENDIF});
-    {$ENDIF}
   for pbp in TPas2jsBuiltInProc do
     FJSBuiltInProcs[pbp]:=nil;
 end;
@@ -7631,16 +7615,10 @@ begin
         raise EPas2JS.Create('');
         end;
     Data.CustomData:=CustomData;
-    {$IFNDEF EnablePasTreeFree}
-    TPasElement(FElement).Release{$IFDEF CheckPasTreeRefCount}('TPas2JsElementData.SetElement'){$ENDIF};
-    {$ENDIF}
     end;
   FElement:=AValue;
   if FElement<>nil then
     begin
-    {$IFNDEF EnablePasTreeFree}
-    TPasElement(FElement).AddRef{$IFDEF CheckPasTreeRefCount}('TPas2JsElementData.SetElement'){$ENDIF};
-    {$ENDIF}
     Data:=FElement;
     while Data.CustomData is TPasElementBase do
       Data:=TPasElementBase(Data.CustomData);

packages/pastojs/src/pas2jscompiler.pp

@@ -1013,13 +1013,7 @@ begin
   FreeAndNil(FScanner);
   FreeAndNil(FFileResolver);
   FreeAndNil(FPasResolver);
-  {$IFDEF EnablePasTreeFree}
   FPasModule:=nil;
-  {$ELSE}
-  if FPasModule<>nil then
-    FPasModule.ReleaseUsedUnits;
-  ReleaseAndNil(TPasElement(FPasModule){$IFDEF CheckPasTreeRefCount},'CreateElement'{$ENDIF});
-  {$ENDIF}
   inherited Destroy;
 end;
 

packages/pastojs/src/pas2jsfiler.pp

@@ -5107,10 +5107,6 @@ begin
   if RefEl is TPasType then
     begin
     El.VarType:=TPasType(RefEl);
-    {$IFNDEF EnablePasTreeFree}
-    if RefEl.Parent<>El then
-      RefEl.AddRef{$IFDEF CheckPasTreeRefCount}('TPasVariable.VarType'){$ENDIF};
-    {$ENDIF}
     end
   else
     RaiseMsg(20180211121809,El,GetObjName(RefEl));
@@ -5123,10 +5119,6 @@ begin
   if RefEl is TPasType then
     begin
     El.DestType:=TPasType(RefEl);
-    {$IFNDEF EnablePasTreeFree}
-    if RefEl.Parent<>El then
-      RefEl.AddRef{$IFDEF CheckPasTreeRefCount}('TPasAliasType.DestType'){$ENDIF};
-    {$ENDIF}
     end
   else
     RaiseMsg(20180211121801,El,GetObjName(RefEl));
@@ -5140,10 +5132,6 @@ begin
   if RefEl is TPasType then
     begin
     El.DestType:=TPasType(RefEl);
-    {$IFNDEF EnablePasTreeFree}
-    if RefEl.Parent<>El then
-      RefEl.AddRef{$IFDEF CheckPasTreeRefCount}('TPasPointerType.DestType'){$ENDIF};
-    {$ENDIF}
     end
   else
     RaiseMsg(20180211121757,El,GetObjName(RefEl));
@@ -5156,10 +5144,6 @@ begin
   if RefEl is TPasType then
     begin
     El.ElType:=TPasType(RefEl);
-    {$IFNDEF EnablePasTreeFree}
-    if RefEl.Name<>'' then
-      RefEl.AddRef{$IFDEF CheckPasTreeRefCount}('TPasArrayType.ElType'){$ENDIF};
-    {$ENDIF}
     end
   else
     RaiseMsg(20180211121732,El,GetObjName(RefEl));
@@ -5172,10 +5156,6 @@ begin
   if RefEl is TPasType then
     begin
     El.ElType:=TPasType(RefEl);
-    {$IFNDEF EnablePasTreeFree}
-    if RefEl.Parent<>El then
-      RefEl.AddRef{$IFDEF CheckPasTreeRefCount}('TPasFileType.ElType'){$ENDIF};
-    {$ENDIF}
     end
   else
     RaiseMsg(20180211121726,El,GetObjName(RefEl));
@@ -5188,10 +5168,6 @@ begin
   if RefEl is TPasType then
     begin
     El.EnumType:=TPasType(RefEl);
-    {$IFNDEF EnablePasTreeFree}
-    if RefEl.Parent<>El then
-      RefEl.AddRef{$IFDEF CheckPasTreeRefCount}('TPasSetType.EnumType'){$ENDIF};
-    {$ENDIF}
     end
   else
     RaiseMsg(20180211121714,El,GetObjName(RefEl));
@@ -5204,10 +5180,6 @@ begin
   if RefEl is TPasRecordType then
     begin
     El.Members:=TPasRecordType(RefEl);
-    {$IFNDEF EnablePasTreeFree}
-    if RefEl.Parent<>El then
-      RefEl.AddRef{$IFDEF CheckPasTreeRefCount}('TPasVariant.Members'){$ENDIF};
-    {$ENDIF}
     end
   else
     RaiseMsg(20180211121657,El,GetObjName(RefEl));
@@ -5221,10 +5193,6 @@ begin
   if (RefEl is TPasType) or (RefEl.ClassType=TPasVariable) then
     begin
     El.VariantEl:=RefEl;
-    {$IFNDEF EnablePasTreeFree}
-    if RefEl.Parent<>El then
-      RefEl.AddRef{$IFDEF CheckPasTreeRefCount}('TPasRecordType.VariantEl'){$ENDIF};
-    {$ENDIF}
     end
   else
     RaiseMsg(20180210205031,El,GetObjName(RefEl));
@@ -5248,10 +5216,6 @@ begin
   if RefEl is TPasType then
     begin
     El.ArgType:=TPasType(RefEl);
-    {$IFNDEF EnablePasTreeFree}
-    if RefEl.Parent<>El then
-      RefEl.AddRef{$IFDEF CheckPasTreeRefCount}('TPasArgument.ArgType'){$ENDIF};
-    {$ENDIF}
     end
   else
     RaiseMsg(20180211121643,El,GetObjName(RefEl));
@@ -5324,10 +5288,6 @@ begin
   if RefEl is TPasType then
     begin
     El.AncestorType:=TPasType(RefEl);
-    {$IFNDEF EnablePasTreeFree}
-    if RefEl.Parent<>El then
-      RefEl.AddRef{$IFDEF CheckPasTreeRefCount}('TPasClassType.AncestorType'){$ENDIF};
-    {$ENDIF}
     end
   else
     RaiseMsg(20180211121632,El,GetObjName(RefEl));
@@ -5341,10 +5301,6 @@ begin
   if RefEl is TPasType then
     begin
     El.HelperForType:=TPasType(RefEl);
-    {$IFNDEF EnablePasTreeFree}
-    if RefEl.Parent<>El then
-      RefEl.AddRef{$IFDEF CheckPasTreeRefCount}('TPasClassType.HelperForType'){$ENDIF};
-    {$ENDIF}
     end
   else
     RaiseMsg(20180211121612,El,GetObjName(RefEl));
@@ -5358,10 +5314,6 @@ begin
   if RefEl is TPasType then
     begin
     El.ResultType:=TPasType(RefEl);
-    {$IFNDEF EnablePasTreeFree}
-    if RefEl.Parent<>El then
-      RefEl.AddRef{$IFDEF CheckPasTreeRefCount}('TPasResultElement.ResultType'){$ENDIF};
-    {$ENDIF}
     end
   else
     RaiseMsg(20180211121537,El,GetObjName(RefEl));
@@ -5469,10 +5421,6 @@ begin
     begin
     Scope:=El.CustomData as TPasEnumTypeScope;
     Scope.CanonicalSet:=TPasSetType(RefEl);
-    {$IFNDEF EnablePasTreeFree}
-    if RefEl.Parent<>El then
-      RefEl.AddRef{$IFDEF CheckPasTreeRefCount}('TPasEnumTypeScope.CanonicalSet'){$ENDIF};
-    {$ENDIF}
     end
   else
     RaiseMsg(20180316215238,Scope.Element,GetObjName(RefEl));
@@ -5518,10 +5466,6 @@ begin
   if RefEl is TPasType then
     begin
     El.TypeEl:=TPasType(RefEl);
-    {$IFNDEF EnablePasTreeFree}
-    if RefEl.Parent<>El then
-      RefEl.AddRef{$IFDEF CheckPasTreeRefCount}('TPasVariable.VarType'){$ENDIF};
-    {$ENDIF}
     end
   else
     RaiseMsg(20200115214455,El,GetObjName(RefEl));
@@ -6095,19 +6039,11 @@ begin
           begin
           PendingElListRef:=TPCUReaderPendingElListRef(RefItem);
           PendingElListRef.List[PendingElListRef.Index]:=Ref.Element;
-          {$IFNDEF EnablePasTreeFree}
-          if PendingElListRef.AddRef{$IFDEF CheckPasTreeRefCount}<>''{$ENDIF} then
-            Ref.Element.AddRef{$IFDEF CheckPasTreeRefCount}(PendingElListRef.AddRef){$ENDIF};
-          {$ENDIF}
           end
         else if RefItem is TPCUReaderPendingElArrRef then
           begin
           PendingElArrRef:=TPCUReaderPendingElArrRef(RefItem);
           PendingElArrRef.Arr[PendingElArrRef.Index]:=Ref.Element;
-          {$IFNDEF EnablePasTreeFree}
-          if PendingElArrRef.AddRef{$IFDEF CheckPasTreeRefCount}<>''{$ENDIF} then
-            Ref.Element.AddRef{$IFDEF CheckPasTreeRefCount}(PendingElArrRef.AddRef){$ENDIF};
-          {$ENDIF}
           end
         else if RefItem is TPCUReaderPendingElScopeRef then
           begin
@@ -6160,10 +6096,6 @@ begin
     begin
     // element was already created -> set list item immediately
     List[Index]:=Ref.Element;
-    {$IFNDEF EnablePasTreeFree}
-    if AddRef{$IFDEF CheckPasTreeRefCount}<>''{$ENDIF} then
-      Ref.Element.AddRef{$IFDEF CheckPasTreeRefCount}(AddRef){$ENDIF};
-    {$ENDIF}
     end
   else
     begin
@@ -6189,10 +6121,6 @@ begin
     begin
     // element was already created -> set list item immediately
     Arr[Index]:=Ref.Element;
-    {$IFNDEF EnablePasTreeFree}
-    if AddRef{$IFDEF CheckPasTreeRefCount}<>''{$ENDIF} then
-      Ref.Element.AddRef{$IFDEF CheckPasTreeRefCount}(AddRef){$ENDIF};
-    {$ENDIF}
     end
   else
     begin
@@ -7013,9 +6941,6 @@ begin
       if Module=nil then
         RaiseMsg(20180307231247,Use);
       Use.Module:=Module;
-      {$IFNDEF EnablePasTreeFree}
-      Module.AddRef{$IFDEF CheckPasTreeRefCount}('TPasUsesUnit.Module'){$ENDIF};
-      {$ENDIF}
       if ReadInteger(UsesObj,'Id',Id,Use) then
         AddElReference(Id,Use,Use);
       end;
@@ -7232,9 +7157,7 @@ var
   Kind: TPasIdentifierKind;
 begin
   Result:=AClass.Create(AName,AParent);
-  {$IFDEF EnablePasTreeFree}
   Resolver.AddOwnedElement(Result);
-  {$ENDIF}
   Result.SourceFilename:=SourceFilename;
   {$IFDEF CheckPasTreeRefCount}Result.RefIds.Add('CreateElement');{$ENDIF}
   if (AName<>'')
@@ -7270,9 +7193,6 @@ begin
   if not (Result is BaseClass) then
     begin
     s:=GetObjName(Result);
-    {$IFNDEF EnablePasTreeFree}
-    Result.Release{$IFDEF CheckPasTreeRefCount}('CreateElement'){$ENDIF};;
-    {$ENDIF}
     Result:=nil;
     RaiseMsg(20180211105744,Parent,PropName+' is '+s);
     end;
@@ -7401,10 +7321,6 @@ begin
     if not (SubEl is TPasType) then
       begin
       s:=GetObjName(SubEl);
-      {$IFNDEF EnablePasTreeFree}
-      if SubEl<>nil then
-        SubEl.Release{$IFDEF CheckPasTreeRefCount}('CreateElement'){$ENDIF};
-      {$ENDIF}
       RaiseMsg(20180210150730,El,PropName+', expected type, but got '+s);
       end;
     ReadElement(SubObj,SubEl,aContext);
@@ -7612,10 +7528,6 @@ begin
     if not (El is TPasExpr) then
       begin
       s:=GetObjName(El);
-      {$IFNDEF EnablePasTreeFree}
-      if El<>nil then
-        El.Release{$IFDEF CheckPasTreeRefCount}('CreateElement'){$ENDIF};
-      {$ENDIF}
       RaiseMsg(20180210152134,Parent,PropName+' got '+s);
       end;
     ReadElement(SubObj,El,aContext);
@@ -7957,7 +7869,6 @@ function TPCUReader.ReadNewElement(Obj: TJSONObject; Parent: TPasElement
 
 var
   aType, Name: string;
-  ok: Boolean;
 begin
   Result:=nil;
   if not ReadString(Obj,'Type',aType,Parent) then
@@ -7967,187 +7878,174 @@ begin
   {$IFDEF VerbosePCUFiler}
   writeln('TPCUReader.ReadNewElement Parent=',GetObjName(Parent),' Type="',aType,'" Name="',Name,'"');
   {$ENDIF}
-  ok:=false;
-  try
-    case aType of
-    'Unary':
-      Result:=CreateElement(TUnaryExpr,Name,Parent);
-    'Binary':
-      begin
-      Result:=CreateElement(TBinaryExpr,Name,Parent);
-      TBinaryExpr(Result).Kind:=pekBinary;
-      TBinaryExpr(Result).OpCode:=eopAdd;
-      end;
-    'Ident': ReadPrimitive(pekIdent);
-    'Number': ReadPrimitive(pekNumber);
-    'String': ReadPrimitive(pekString);
-    'Bool':
-      begin
-      Result:=CreateElement(TBoolConstExpr,'',Parent);
-      TBoolConstExpr(Result).Kind:=pekBoolConst;
-      TBoolConstExpr(Result).Value:=false;
-      end;
-    'False','True':
-      begin
-      Result:=CreateElement(TBoolConstExpr,'',Parent);
-      TBoolConstExpr(Result).Kind:=pekBoolConst;
-      TBoolConstExpr(Result).Value:=aType='True';
-      end;
-    'Nil':
-      begin
-      Result:=CreateElement(TNilExpr,'nil',Parent);
-      TNilExpr(Result).Kind:=pekNil;
-      end;
-    'Inherited':
-      begin
-      Result:=CreateElement(TInheritedExpr,'',Parent);
-      TInheritedExpr(Result).Kind:=pekInherited;
-      end;
-    'Self':
-      begin
-      Result:=CreateElement(TSelfExpr,'',Parent);
-      TSelfExpr(Result).Kind:=pekSelf;
-      end;
-    'A[]':
-      ReadParams(pekArrayParams);
-    'F()':
-      ReadParams(pekFuncParams);
-    '[]':
-      ReadParams(pekSet);
-    'ProcExpr':
-      Result:=CreateElement(TProcedureExpr,Name,Parent);
-    'RecValues':
-      begin
-      Result:=CreateElement(TRecordValues,'',Parent);
-      TRecordValues(Result).Kind:=pekListOfExp;
-      end;
-    'ArrValues':
-      begin
-      Result:=CreateElement(TArrayValues,'',Parent);
-      TArrayValues(Result).Kind:=pekListOfExp;
-      end;
-    'ResString':
-      Result:=CreateElement(TPasResString,Name,Parent);
-    'Alias':
-      Result:=CreateElement(TPasAliasType,Name,Parent);
-    'Pointer':
-      Result:=CreateElement(TPasPointerType,Name,Parent);
-    'TypeAlias':
-      Result:=CreateElement(TPasTypeAliasType,Name,Parent);
-    'ClassOf':
-      Result:=CreateElement(TPasClassOfType,Name,Parent);
-    'Specialize':
-      Result:=CreateElement(TPasSpecializeType,Name,Parent);
-    'InlineSpecialize':
-      Result:=CreateElement(TInlineSpecializeExpr,Name,Parent);
-    'RangeType':
-      Result:=CreateElement(TPasRangeType,Name,Parent);
-    'ArrType':
-      Result:=CreateElement(TPasArrayType,Name,Parent);
-    'File':
-      Result:=CreateElement(TPasFileType,Name,Parent);
-    'EnumV':
-      Result:=CreateElement(TPasEnumValue,Name,Parent);
-    'EnumType':
-      Result:=CreateElement(TPasEnumType,Name,Parent);
-    'SetType':
-      Result:=CreateElement(TPasSetType,Name,Parent);
-    'RecVariant':
-      Result:=CreateElement(TPasVariant,Name,Parent);
-    'Record':
-      Result:=CreateElement(TPasRecordType,Name,Parent);
-    'Object': CreateClassType(okObject,Name);
-    'Class': CreateClassType(okClass,Name);
-    'Interface': CreateClassType(okInterface,Name);
-    'ClassHelper': CreateClassType(okClassHelper,Name);
-    'RecordHelper': CreateClassType(okRecordHelper,Name);
-    'TypeHelper': CreateClassType(okTypeHelper,Name);
-    'DispInterface': CreateClassType(okDispInterface,Name);
-    'Arg':
-      Result:=CreateElement(TPasArgument,Name,Parent);
-    'ProcType':
-      Result:=CreateElement(TPasProcedureType,Name,Parent);
-    'FuncType':
-      Result:=CreateElement(TPasFunctionType,Name,Parent);
-    'Result':
-      Result:=CreateElement(TPasResultElement,Name,Parent);
-    'StringType':
-      Result:=CreateElement(TPasStringType,Name,Parent);
-    'Var':
-      Result:=CreateElement(TPasVariable,Name,Parent);
-    'Export':
-      Result:=CreateElement(TPasExportSymbol,Name,Parent);
-    'Const':
-      Result:=CreateElement(TPasConst,Name,Parent);
-    'Property':
-      Result:=CreateElement(TPasProperty,Name,Parent);
-    'MethodRes':
-      Result:=CreateElement(TPasMethodResolution,Name,Parent);
-    'Procedure': ReadProc(TPasProcedure,Name);
-    'ClassProcedure': ReadProc(TPasClassProcedure,Name);
-    'Function': ReadProc(TPasFunction,Name);
-    'ClassFunction': ReadProc(TPasClassFunction,Name);
-    'Constructor': ReadProc(TPasConstructor,Name);
-    'ClassConstructor': ReadProc(TPasClassConstructor,Name);
-    'Destructor': ReadProc(TPasDestructor,Name);
-    'ClassDestructor': ReadProc(TPasClassDestructor,Name);
-    'AnonymousProcedure': ReadProc(TPasAnonymousProcedure,Name);
-    'AnonymousFunction': ReadProc(TPasAnonymousFunction,Name);
-    'Operator': ReadOper(TPasOperator,Name);
-    'ClassOperator': ReadOper(TPasClassOperator,Name);
-    'Attributes':
-      Result:=CreateElement(TPasAttributes,Name,Parent);
-    'ImplCmd':
-      Result:=CreateElement(TPasImplCommand,Name,Parent);
-    'Begin':
-      Result:=CreateElement(TPasImplBeginBlock,Name,Parent);
-    'Asm':
-      Result:=CreateElement(TPasImplAsmStatement,Name,Parent);
-    'Repeat':
-      Result:=CreateElement(TPasImplRepeatUntil,Name,Parent);
-    'If':
-      Result:=CreateElement(TPasImplIfElse,Name,Parent);
-    'While':
-      Result:=CreateElement(TPasImplWhileDo,Name,Parent);
-    'With':
-      Result:=CreateElement(TPasImplWithDo,Name,Parent);
-    'CaseOf':
-      Result:=CreateElement(TPasImplCaseOf,Name,Parent);
-    'CaseSt':
-      Result:=CreateElement(TPasImplCaseStatement,Name,Parent);
-    'CaseElse':
-      Result:=CreateElement(TPasImplCaseElse,Name,Parent);
-    'ForLoop':
-      Result:=CreateElement(TPasImplForLoop,Name,Parent);
-    'Assign':
-      Result:=CreateElement(TPasImplAssign,Name,Parent);
-    'Simple':
-      Result:=CreateElement(TPasImplSimple,Name,Parent);
-    'Try':
-      Result:=CreateElement(TPasImplTry,Name,Parent);
-    'Finally':
-      Result:=CreateElement(TPasImplTryFinally,Name,Parent);
-    'Except':
-      Result:=CreateElement(TPasImplTryExcept,Name,Parent);
-    'ExceptElse':
-      Result:=CreateElement(TPasImplTryExceptElse,Name,Parent);
-    'ExceptOn':
-      Result:=CreateElement(TPasImplExceptOn,Name,Parent);
-    'Raise':
-      Result:=CreateElement(TPasImplRaise,Name,Parent);
-    else
-      RaiseMsg(20200514220001,Parent,'unknown type "'+LeftStr(aType,100)+'"');
-    end;
-    ok:=true;
-  finally
-    if not ok then
-      if Result<>nil then
-        begin
-        {$IFNDEF EnablePasTreeFree}
-        Result.Release{$IFDEF CheckPasTreeRefCount}('CreateElement'){$ENDIF};
-        {$ENDIF}
-        Result:=nil;
-        end;
+  case aType of
+  'Unary':
+    Result:=CreateElement(TUnaryExpr,Name,Parent);
+  'Binary':
+    begin
+    Result:=CreateElement(TBinaryExpr,Name,Parent);
+    TBinaryExpr(Result).Kind:=pekBinary;
+    TBinaryExpr(Result).OpCode:=eopAdd;
+    end;
+  'Ident': ReadPrimitive(pekIdent);
+  'Number': ReadPrimitive(pekNumber);
+  'String': ReadPrimitive(pekString);
+  'Bool':
+    begin
+    Result:=CreateElement(TBoolConstExpr,'',Parent);
+    TBoolConstExpr(Result).Kind:=pekBoolConst;
+    TBoolConstExpr(Result).Value:=false;
+    end;
+  'False','True':
+    begin
+    Result:=CreateElement(TBoolConstExpr,'',Parent);
+    TBoolConstExpr(Result).Kind:=pekBoolConst;
+    TBoolConstExpr(Result).Value:=aType='True';
+    end;
+  'Nil':
+    begin
+    Result:=CreateElement(TNilExpr,'nil',Parent);
+    TNilExpr(Result).Kind:=pekNil;
+    end;
+  'Inherited':
+    begin
+    Result:=CreateElement(TInheritedExpr,'',Parent);
+    TInheritedExpr(Result).Kind:=pekInherited;
+    end;
+  'Self':
+    begin
+    Result:=CreateElement(TSelfExpr,'',Parent);
+    TSelfExpr(Result).Kind:=pekSelf;
+    end;
+  'A[]':
+    ReadParams(pekArrayParams);
+  'F()':
+    ReadParams(pekFuncParams);
+  '[]':
+    ReadParams(pekSet);
+  'ProcExpr':
+    Result:=CreateElement(TProcedureExpr,Name,Parent);
+  'RecValues':
+    begin
+    Result:=CreateElement(TRecordValues,'',Parent);
+    TRecordValues(Result).Kind:=pekListOfExp;
+    end;
+  'ArrValues':
+    begin
+    Result:=CreateElement(TArrayValues,'',Parent);
+    TArrayValues(Result).Kind:=pekListOfExp;
+    end;
+  'ResString':
+    Result:=CreateElement(TPasResString,Name,Parent);
+  'Alias':
+    Result:=CreateElement(TPasAliasType,Name,Parent);
+  'Pointer':
+    Result:=CreateElement(TPasPointerType,Name,Parent);
+  'TypeAlias':
+    Result:=CreateElement(TPasTypeAliasType,Name,Parent);
+  'ClassOf':
+    Result:=CreateElement(TPasClassOfType,Name,Parent);
+  'Specialize':
+    Result:=CreateElement(TPasSpecializeType,Name,Parent);
+  'InlineSpecialize':
+    Result:=CreateElement(TInlineSpecializeExpr,Name,Parent);
+  'RangeType':
+    Result:=CreateElement(TPasRangeType,Name,Parent);
+  'ArrType':
+    Result:=CreateElement(TPasArrayType,Name,Parent);
+  'File':
+    Result:=CreateElement(TPasFileType,Name,Parent);
+  'EnumV':
+    Result:=CreateElement(TPasEnumValue,Name,Parent);
+  'EnumType':
+    Result:=CreateElement(TPasEnumType,Name,Parent);
+  'SetType':
+    Result:=CreateElement(TPasSetType,Name,Parent);
+  'RecVariant':
+    Result:=CreateElement(TPasVariant,Name,Parent);
+  'Record':
+    Result:=CreateElement(TPasRecordType,Name,Parent);
+  'Object': CreateClassType(okObject,Name);
+  'Class': CreateClassType(okClass,Name);
+  'Interface': CreateClassType(okInterface,Name);
+  'ClassHelper': CreateClassType(okClassHelper,Name);
+  'RecordHelper': CreateClassType(okRecordHelper,Name);
+  'TypeHelper': CreateClassType(okTypeHelper,Name);
+  'DispInterface': CreateClassType(okDispInterface,Name);
+  'Arg':
+    Result:=CreateElement(TPasArgument,Name,Parent);
+  'ProcType':
+    Result:=CreateElement(TPasProcedureType,Name,Parent);
+  'FuncType':
+    Result:=CreateElement(TPasFunctionType,Name,Parent);
+  'Result':
+    Result:=CreateElement(TPasResultElement,Name,Parent);
+  'StringType':
+    Result:=CreateElement(TPasStringType,Name,Parent);
+  'Var':
+    Result:=CreateElement(TPasVariable,Name,Parent);
+  'Export':
+    Result:=CreateElement(TPasExportSymbol,Name,Parent);
+  'Const':
+    Result:=CreateElement(TPasConst,Name,Parent);
+  'Property':
+    Result:=CreateElement(TPasProperty,Name,Parent);
+  'MethodRes':
+    Result:=CreateElement(TPasMethodResolution,Name,Parent);
+  'Procedure': ReadProc(TPasProcedure,Name);
+  'ClassProcedure': ReadProc(TPasClassProcedure,Name);
+  'Function': ReadProc(TPasFunction,Name);
+  'ClassFunction': ReadProc(TPasClassFunction,Name);
+  'Constructor': ReadProc(TPasConstructor,Name);
+  'ClassConstructor': ReadProc(TPasClassConstructor,Name);
+  'Destructor': ReadProc(TPasDestructor,Name);
+  'ClassDestructor': ReadProc(TPasClassDestructor,Name);
+  'AnonymousProcedure': ReadProc(TPasAnonymousProcedure,Name);
+  'AnonymousFunction': ReadProc(TPasAnonymousFunction,Name);
+  'Operator': ReadOper(TPasOperator,Name);
+  'ClassOperator': ReadOper(TPasClassOperator,Name);
+  'Attributes':
+    Result:=CreateElement(TPasAttributes,Name,Parent);
+  'ImplCmd':
+    Result:=CreateElement(TPasImplCommand,Name,Parent);
+  'Begin':
+    Result:=CreateElement(TPasImplBeginBlock,Name,Parent);
+  'Asm':
+    Result:=CreateElement(TPasImplAsmStatement,Name,Parent);
+  'Repeat':
+    Result:=CreateElement(TPasImplRepeatUntil,Name,Parent);
+  'If':
+    Result:=CreateElement(TPasImplIfElse,Name,Parent);
+  'While':
+    Result:=CreateElement(TPasImplWhileDo,Name,Parent);
+  'With':
+    Result:=CreateElement(TPasImplWithDo,Name,Parent);
+  'CaseOf':
+    Result:=CreateElement(TPasImplCaseOf,Name,Parent);
+  'CaseSt':
+    Result:=CreateElement(TPasImplCaseStatement,Name,Parent);
+  'CaseElse':
+    Result:=CreateElement(TPasImplCaseElse,Name,Parent);
+  'ForLoop':
+    Result:=CreateElement(TPasImplForLoop,Name,Parent);
+  'Assign':
+    Result:=CreateElement(TPasImplAssign,Name,Parent);
+  'Simple':
+    Result:=CreateElement(TPasImplSimple,Name,Parent);
+  'Try':
+    Result:=CreateElement(TPasImplTry,Name,Parent);
+  'Finally':
+    Result:=CreateElement(TPasImplTryFinally,Name,Parent);
+  'Except':
+    Result:=CreateElement(TPasImplTryExcept,Name,Parent);
+  'ExceptElse':
+    Result:=CreateElement(TPasImplTryExceptElse,Name,Parent);
+  'ExceptOn':
+    Result:=CreateElement(TPasImplExceptOn,Name,Parent);
+  'Raise':
+    Result:=CreateElement(TPasImplRaise,Name,Parent);
+  else
+    RaiseMsg(20200514220001,Parent,'unknown type "'+LeftStr(aType,100)+'"');
   end;
 end;
 
@@ -8618,10 +8516,6 @@ begin
   if not (Expr is TBinaryExpr) then
     begin
     s:=GetObjName(Expr);
-    {$IFNDEF EnablePasTreeFree}
-    if Expr<>nil then
-      Expr.Release{$IFDEF CheckPasTreeRefCount}('CreateElement'){$ENDIF};
-    {$ENDIF}
     RaiseMsg(20180216204042,El,s);
     end;
   El.RangeExpr:=TBinaryExpr(Expr);
@@ -9038,9 +8932,6 @@ begin
     CanonicalClassOf.SourceFilename:=aClass.SourceFilename;
     CanonicalClassOf.SourceLinenumber:=aClass.SourceLinenumber;
     CanonicalClassOf.DestType:=aClass;
-    {$IFNDEF EnablePasTreeFree}
-    aClass.AddRef{$IFDEF CheckPasTreeRefCount}('TPasClassScope.CanonicalClassOf'){$ENDIF};
-    {$ENDIF}
     if ReadInteger(Obj,'ClassOf',CanonicalClassOfId,CanonicalClassOf) then
       AddElReference(CanonicalClassOfId,CanonicalClassOf,CanonicalClassOf);
     end;
@@ -9464,11 +9355,7 @@ var
   GenType: TPasGenericTemplateType;
   NamePart: TProcedureNamePart;
 begin
-  {$IFDEF EnablePasTreeFree}
   FreeProcNameParts(El.NameParts);
-  {$ELSE}
-  ReleaseProcNameParts(El.NameParts);
-  {$ENDIF}
   if ReadArray(Obj,'NameParts',Arr,El) then
     begin
     if El.NameParts=nil then
@@ -9674,9 +9561,6 @@ begin
           if not (ImplEl is TPasImplBlock) then
             begin
             s:=GetObjName(ImplEl);
-            {$IFNDEF EnablePasTreeFree}
-            ImplEl.Release;
-            {$ENDIF}
             RaiseMsg(20191231171840,ProcBody,s);
             end;
           ProcBody.Body:=TPasImplBlock(ImplEl);
@@ -9933,12 +9817,7 @@ begin
     begin
     Sub:=TPasElement(Elements[Elements.Count-1]);
     if Sub is TPasImplCaseElse then
-      begin
       El.ElseBranch:=TPasImplCaseElse(Sub);
-      {$IFNDEF EnablePasTreeFree}
-      Sub.AddRef;
-      {$ENDIF}
-      end;
     end;
 end;
 
@@ -10045,9 +9924,6 @@ begin
   if El.VarEl<>nil then
     begin
     El.TypeEl:=El.VarEl.VarType;
-    {$IFNDEF EnablePasTreeFree}
-    El.TypeEl.AddRef{$IFDEF CheckPasTreeRefCount}('TPasVariable.VarType'){$ENDIF};
-    {$ENDIF}
     end
   else
     ReadElType(Obj,'VarType',El,@Set_ExceptOn_TypeEl,aContext);

packages/pastojs/tests/tcfiler.pas

@@ -532,13 +532,6 @@ begin
     FreeAndNil(FRestAnalyzer);
     RestParser.Free;
     RestScanner.Free;
-    {$IFNDEF EnablePasTreeFree}
-    if (RestResolver<>nil) and (RestResolver.RootElement<>nil) then
-      begin
-      RestResolver.RootElement.ReleaseUsedUnits;
-      RestResolver.RootElement.Release{$IFDEF CheckPasTreeRefCount}('CreateElement'){$ENDIF};
-      end;
-    {$ENDIF}
     RestResolver.Free; // free parser before resolver
     RestFileResolver.Free;
 

packages/pastojs/tests/tcmodules.pas

@@ -1645,14 +1645,7 @@ begin
       CurModule:=TTestEnginePasResolver(FResolvers[i]).Module;
       if CurModule=nil then continue;
       //writeln('TCustomTestModule.TearDown ReleaseUsedUnits ',CurModule.Name,' ',CurModule.RefCount,' ',CurModule.RefIds.Text);
-      {$IFNDEF EnablePasTreeFree}
-      CurModule.ReleaseUsedUnits;
-      {$ENDIF}
       end;
-    {$IFNDEF EnablePasTreeFree}
-    if FModule<>nil then
-      FModule.ReleaseUsedUnits;
-    {$ENDIF}
     for i:=0 to FResolvers.Count-1 do
       begin
       CurModule:=TTestEnginePasResolver(FResolvers[i]).Module;
@@ -1660,11 +1653,7 @@ begin
       //writeln('TCustomTestModule.TearDown UsesReleased ',CurModule.Name,' ',CurModule.RefCount,' ',CurModule.RefIds.Text);
       end;
     FreeAndNil(FResolvers);
-    {$IFDEF EnablePasTreeFree}
     FModule:=nil;
-    {$ELSE}
-    ReleaseAndNil(TPasElement(FModule){$IFDEF CheckPasTreeRefCount},'CreateElement'{$ENDIF});
-    {$ENDIF}
     FEngine:=nil;
     end;
   FreeAndNil(FHub);