Changeset 14 for branches/DelphiToC/UPascalParser.pas

Timestamp:

Apr 9, 2009, 11:04:41 AM (16 years ago)

Author:

george

Message:

• Opraveno: Chyby v uvolňování paměti.
• Opraveno: Program po rozdělení do více souborů opět funguje jako dříve.

File:

• branches/DelphiToC/UPascalParser.pas (modified) (7 diffs)

branches/DelphiToC/UPascalParser.pas

@@ -12 +12 @@
   TPascalParser = class
   private
-    CodePosition: Integer;
     ProgramCode: TProgram;
     FOnErrorMessage: TOnErrorMessage;
     procedure ErrorMessage(Text: string);
   public
+    CodePosition: Integer;
     SourceCode: TStringList;
     function IsAlphanumeric(Character: Char): Boolean;
@@ -32 +32 @@
     procedure ParseModuleUnit(Module: TModule);
     procedure ParseModuleProgram(Module: TModule);
-
     procedure ParseFunction(AFunction: TFunction);
     procedure ParseVariableList(VariableList: TVariableList);
@@ -207 +206 @@
 begin
   with AProgram do begin
-  for I := 0 to Modules.Count - 1 do
-    TModule(Modules[I]).Clear;
-  Modules.Clear;
-  with TModule(Modules[Modules.Add(TModule.Create)]) do begin
-    Name := 'main';
-    with TType(Types[Types.Add(TType.Create)]) do begin
-      Name := 'byte';
-      Size := 1;
-      UsedType := nil;
-    end;
-  end;
+    for I := 0 to Modules.Count - 1 do
+      TModule(Modules[I]).Clear;
+    Modules.Clear;
+    with TModule(Modules[Modules.Add(TModule.Create)]) do begin
+      Name := 'main';
+      with TType(Types[Types.Add(TType.Create)]) do begin
+        Name := 'byte';
+        Size := 1;
+        UsedType := nil;
+      end;
+    end;
     ParseModule(TModule(Modules[0]));
   end;
@@ -294 +293 @@
   Constant: TConstant;
 //  Brackets: Integer;
-  Expressions: TList; // TList<TExpression>;
+  Expressions: TExpressionList;
   I: Integer;
   II: Integer;
 begin
-  Expressions := TList.Create;
+  Expressions := TExpressionList.Create;
   Expressions.Add(TExpression.Create);
   with CommonBlock do begin
@@ -367 +366 @@
         end else
         begin
-                with TExpression(Expressions[Expressions.Count - 1]) do begin
-                  SubItems[1] := TExpression.Create;
-                  TExpression(SubItems[1]).NodeType := ntConstant;
-
-                  if Identifier[1] = '''' then begin
-                    SetLength(TExpression(SubItems[1]).Value, Length(Identifier));
-                    for I := 1 to Length(Identifier) do TExpression(SubItems[1]).Value[I - 1] := Byte(Identifier[I]);
-                  end else begin
-                    SetLength(TExpression(SubItems[1]).Value, 1);
-                    TExpression(SubItems[1]).Value[0] := StrToInt(Identifier);
-                  end;
-                end;
-                with TExpression(Expressions.Items[Expressions.Add(TExpression.Create)]) do begin
-                  SubItems[0] := TExpression(Expressions[Expressions.Count - 2]).SubItems[1];
-                end;
+          with TExpression(Expressions[Expressions.Count - 1]) do begin
+            SubItems[1] := TExpression.Create;
+            TExpression(SubItems[1]).NodeType := ntConstant;
+
+            if Identifier[1] = '''' then begin
+              SetLength(TExpression(SubItems[1]).Value, Length(Identifier));
+              for I := 1 to Length(Identifier) do TExpression(SubItems[1]).Value[I - 1] := Byte(Identifier[I]);
+            end else begin
+              SetLength(TExpression(SubItems[1]).Value, 1);
+              TExpression(SubItems[1]).Value[0] := StrToInt(Identifier);
+            end;
+          end;
+          with TExpression(Expressions.Items[Expressions.Add(TExpression.Create)]) do begin
+            SubItems[0] := TExpression(Expressions[Expressions.Count - 2]).SubItems[1];
+          end;
         end;
     end;
@@ -400 +399 @@
   end;
   Result := TExpression(Expressions[0]).SubItems[1];
-  TExpression(Expressions[0]).Destroy;
-  TExpression(Expressions[1]).Destroy;
+  TExpression(Expressions[0]).SubItems[1] := nil;
+  TExpression(Expressions[1]).SubItems[0] := nil;
   Expressions.Destroy;
 end;
@@ -623 +622 @@
 end;
 
-
-
-
-
-
-
 end.