Changeset 213 for branches/interpreter2/Forms

Timestamp:

Apr 22, 2020, 10:23:31 PM (5 years ago)

Author:

chronos

Message:

• Added: Transformation of Result variable assignment into Return statement.

Location:

branches/interpreter2/Forms

Files:

• UFormMain.lfm (modified) (1 diff)
• UFormMain.pas (modified) (10 diffs)

branches/interpreter2/Forms/UFormMain.lfm

@@ -108 +108 @@
       OnExecute = AExitExecute
     end
-    object AOptimize: TAction
-      Caption = 'Optimize'
-      OnExecute = AOptimizeExecute
-    end
     object AGenerateXml: TAction
       Caption = 'Generate XML'

branches/interpreter2/Forms/UFormMain.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, Forms, Controls, Graphics, Dialogs, StdCtrls, Menus,
-  ActnList, ExtCtrls, SynHighlighterPas, SynEdit, USource;
+  ActnList, ExtCtrls, SynHighlighterPas, SynEdit, USource, UOptimizer;
 
 type
@@ -16 +16 @@
     ACompile: TAction;
     AGenerateXml: TAction;
-    AOptimize: TAction;
     AExit: TAction;
     ARun: TAction;
@@ -44 +43 @@
     procedure AGeneratePhpExecute(Sender: TObject);
     procedure AGenerateXmlExecute(Sender: TObject);
-    procedure AOptimizeExecute(Sender: TObject);
+    procedure Optimize(Features: TOptimizeFeatures);
     procedure ARunExecute(Sender: TObject);
     procedure FormActivate(Sender: TObject);
@@ -71 +70 @@
 uses
   UParser, UExecutor, UGeneratorPascal, UGeneratorPhp, UFormMessages, UFormSource,
-  UGeneratorCSharp, UOptimizer, UGeneratorXml, UFormOutput;
+  UGeneratorCSharp, UGeneratorXml, UFormOutput;
 
 { TFormMain }
@@ -127 +126 @@
 begin
   ACompile.Execute;
-  AOptimize.Execute;
+  Optimize([ofReplaceResultByReturn, ofReplaceRepeatUntilByWhileDo]);
   FormOutput.SynEditOutput.Highlighter := FormOutput.SynCppSyn1;
   FormOutput.Clear;
@@ -145 +144 @@
 begin
   ACompile.Execute;
-  AOptimize.Execute;
   FormOutput.SynEditOutput.Highlighter := FormOutput.SynPasSyn1;
   FormOutput.SynEditOutput.Lines.Clear;
@@ -163 +161 @@
 begin
   ACompile.Execute;
+  Optimize([ofReplaceResultByReturn, ofReplaceRepeatUntilByWhileDo]);
   FormOutput.SynEditOutput.Highlighter := FormOutput.SynPhpSyn1;
   FormOutput.SynEditOutput.Lines.Clear;
@@ -192 +191 @@
 end;
 
-procedure TFormMain.AOptimizeExecute(Sender: TObject);
+procedure TFormMain.Optimize(Features: TOptimizeFeatures);
 var
   Optimizer: TOptimizer;
@@ -198 +197 @@
   if Assigned(Prog) then begin
     Optimizer := TOptimizer.Create;
+    Optimizer.Features := Features;
     Optimizer.Prog := Prog;
     Optimizer.Optimize;
@@ -209 +209 @@
 begin
   ACompile.Execute;
-  AOptimize.Execute;
   FormOutput.SynEditOutput.Highlighter := nil;
   FormOutput.SynEditOutput.Lines.Clear;