Browse Source

* better clean up

git-svn-id: trunk@960 -
florian 20 years ago
parent
commit
2f9a952747
2 changed files with 21 additions and 8 deletions
  1. 11 4
      utils/h2pas/h2pas.pas
  2. 10 4
      utils/h2pas/h2pas.y

+ 11 - 4
utils/h2pas/h2pas.pas

@@ -1548,9 +1548,16 @@ begin
          popshift;
          popshift;
          end;
-         if assigned(yyv[yysp-4])then  dispose(yyv[yysp-4],done);
-         if assigned(yyv[yysp-3])then  dispose(yyv[yysp-3],done);
-         if assigned(yyv[yysp-1])then  dispose(yyv[yysp-1],done);
+         if assigned(yyv[yysp-4]) then
+         dispose(yyv[yysp-4],done);
+         if assigned(yyv[yysp-3]) then
+         dispose(yyv[yysp-3],done);
+         if assigned(yyv[yysp-2]) then
+         dispose(yyv[yysp-2],done);
+         if assigned(yyv[yysp-1]) then
+         dispose(yyv[yysp-1],done);
+         if assigned(yyv[yysp-0]) then
+         dispose(yyv[yysp-0],done);
          
        end;
   29 : begin
@@ -8752,4 +8759,4 @@ begin
   PTypeList.Free;
   freedynlibproc.free;
   loaddynlibproc.free;
-end.
+end.

+ 10 - 4
utils/h2pas/h2pas.y

@@ -1473,9 +1473,16 @@ declaration :
              popshift;
              popshift;
           end;
-        if assigned($1)then  dispose($1,done);
-        if assigned($2)then  dispose($2,done);
-        if assigned($4)then  dispose($4,done);
+        if assigned($1) then
+          dispose($1,done);
+        if assigned($2) then
+          dispose($2,done);
+        if assigned($3) then
+          dispose($3,done);
+        if assigned($4) then
+          dispose($4,done);
+        if assigned($5) then
+          dispose($5,done);
      }
      | dec_specifier type_specifier dec_modifier declarator_list systrap_specifier SEMICOLON
      {
@@ -2941,4 +2948,3 @@ begin
   freedynlibproc.free;
   loaddynlibproc.free;
 end.
-