Changeset 6 for branches/Void/UCompilator.pas

Timestamp:

Nov 9, 2009, 8:59:48 AM (15 years ago)

Author:

george

Message:

• Upraveno: Testování nyní prováděno přes oknovou aplikaci.
• Přidáno: Podpora pro zobrazení řádku chyby.

Location:

branches/Void

Files:

• . (modified) (1 prop)
• UCompilator.pas (modified) (9 diffs)

branches/Void

@@ -6 +6 @@
 project1.exe
 *.dsk
+*.~dsk

@@ -6 +6 @@
 project1.exe
 *.dsk
+*.~dsk

branches/Void/UCompilator.pas

@@ -9 +9 @@
 
 type
-  TOnErrorEvent = procedure (Text: string; var Terminate: Boolean) of object;
+  TOnErrorEvent = procedure (Text: string; var Terminate: Boolean; Position: TPoint) of object;
 
   TVariable = class
@@ -25 +25 @@
     Variables: TList;
     Commands: TList;
+    ParsePosition: TPoint;
     procedure DoError(Text: string);
     function FindVariableByName(AName: string): TVariable;
   public
+    SourceCode: TStringList;
     Output: TStringList;
-    procedure Compile(FileName: string);
+    procedure Compile;
+    procedure Clear;
     procedure ProcessLine(Line: string);
     constructor Create;
@@ -46 +49 @@
 begin
   Terminate := False;
-  if Assigned(FOnError) then FOnError(Text, Terminate);
+  if Assigned(FOnError) then FOnError(Text, Terminate, ParsePosition);
   if Terminate then raise Exception.Create('Compilation terminated');
 end;
@@ -60 +63 @@
 end;
 
-procedure TCompilator.Compile(FileName: string);
+procedure TCompilator.Compile;
 var
-  SourceCode: TStringList;
   I: Integer;
 begin
-  SourceCode := TStringList.Create;
-  SourceCode.LoadFromFile(FileName);
+  Clear;
 
   // Process source lines
   for I := 0 to SourceCode.Count - 1 do begin
+    ParsePosition.Y := I;
     ProcessLine(SourceCode[I]);
   end;
@@ -75 +77 @@
   // Prepare output
   Output.Clear;
-  Output.Add('program ' + ExtractFileName(FileName) + ';');
+  Output.Add('program Test;');
   Output.Add('{$APPTYPE CONSOLE}');
 
@@ -90 +92 @@
       Output.Add(Text);
   Output.Add('end.');
-  Output.SaveToFile(ExtractFileName(FileName) + '.dpr');
-  SourceCode.Destroy;
+end;
+
+procedure TCompilator.Clear;
+var
+  I: Integer;
+begin
+  for I := 0 to Variables.Count - 1 do
+    TVariable(Variables[I]).Destroy;
+  Variables.Clear;
+  for I := 0 to Commands.Count - 1 do
+    TCommand(Commands[I]).Destroy;
+  Commands.Clear;
+  Output.Clear;
 end;
 
@@ -99 +112 @@
   Variable: TVariable;
   VariableName: string;
-  begin
+begin
   Command := Parse(Line);
-  WriteLn(Command);
   if Command = 'Write' then
   with TCommand(Commands[Commands.Add(TCommand.Create)]) do begin
@@ -128 +140 @@
   end else if Command = 'Exit' then with TCommand(Commands[Commands.Add(TCommand.Create)]) do begin
     Text := 'Exit;';
-  end else DoError('Unknown command: ' + Command);
+  end else DoError('Unknown command ' + Command);
 end;
 
 constructor TCompilator.Create;
 begin
+  SourceCode := TStringList.Create;
   Output := TStringList.Create;
   Variables := TList.Create;
@@ -149 +162 @@
     TCommand(Commands[I]).Destroy;
   Commands.Destroy;
+  SourceCode.Destroy;
   inherited Destroy;
 end;

@@ -6 +6 @@
 project1.exe
 *.dsk
+*.~dsk