Changeset 13 for trunk

Timestamp:

Feb 11, 2012, 5:53:25 PM (12 years ago)

Author:

chronos

Message:

• Added: Options form.
• Modified: Interpretter now accept source code as string again.

Location:

trunk

Files:

• LazFuckIDE.lpi (modified) (3 diffs)
• LazFuckIDE.lpr (modified) (2 diffs)
• UBrainFuck.pas (modified) (9 diffs)
• UMainForm.lfm (modified) (3 diffs)
• UMainForm.pas (modified) (6 diffs)
• UOptionsForm.lfm (added)
• UOptionsForm.pas (added)

trunk/LazFuckIDE.lpi

@@ -40 +40 @@
       </Item2>
     </RequiredPackages>
-    <Units Count="6">
+    <Units Count="7">
       <Unit0>
         <Filename Value="LazFuckIDE.lpr"/>
@@ -77 +77 @@
         <UnitName Value="UCompiledForm"/>
       </Unit5>
+      <Unit6>
+        <Filename Value="UOptionsForm.pas"/>
+        <IsPartOfProject Value="True"/>
+        <ComponentName Value="OptionsForm"/>
+        <ResourceBaseClass Value="Form"/>
+        <UnitName Value="UOptionsForm"/>
+      </Unit6>
     </Units>
   </ProjectOptions>
@@ -96 +103 @@
         <StackChecks Value="True"/>
       </Checks>
-      <VerifyObjMethodCallValidity Value="True"/>
     </CodeGeneration>
     <Linking>

trunk/LazFuckIDE.lpr

@@ -10 +10 @@
   Interfaces, // this includes the LCL widgetset
   Forms, UMainForm, UBrainFuck, UInterpreterForm, UApplicationInfo, 
-UCompiledForm
+UCompiledForm, UOptionsForm
   { you can add units after this };
 
@@ -22 +22 @@
   Application.CreateForm(TInterpreterForm, InterpreterForm);
   Application.CreateForm(TCompiledForm, CompiledForm);
+  Application.CreateForm(TOptionsForm, OptionsForm);
   Application.Run;
 end.

trunk/UBrainFuck.pas

@@ -48 +48 @@
     FThread: TBrainFuckInterpretterThread;
     FStepCount: Integer;
+    function GetSource: string;
+    procedure SetSource(AValue: string);
     procedure SetState(AValue: TRunState);
     procedure Write(Value: Byte);
@@ -55 +57 @@
     procedure PrepareJumpTable;
   public
-    Source: array of Char;
+    FSource: array of Char;
     SourceJump: array of Integer;
     SourcePosition: Integer;
+    SourceBreakpoint: array of Boolean;
     Memory: array of Byte;
     MemoryPosition: Integer;
@@ -73 +76 @@
     property OnChangeState: TNotifyEvent read FOnChangeState write FOnChangeState;
     property StepCount: Integer read FStepCount;
+    property Source: string read GetSource write SetSource;
   end;
 
@@ -90 +94 @@
 begin
   repeat
-    while (Parent.SourcePosition < Length(Parent.Source)) and (Parent.State <> rsStopped) do begin
+    while (Parent.SourcePosition < Length(Parent.FSource)) and (Parent.State <> rsStopped) do begin
       Parent.SingleStep;
       while Parent.State = rsPaused do begin
@@ -114 +118 @@
 end;
 
+function TBrainFuckInterpretter.GetSource: string;
+var
+  I: Integer;
+begin
+  SetLength(Result, Length(FSource));
+  //Move(Pointer(Result)^, Pointer(FSource)^, Length(Result));
+  for I := 0 to Length(FSource) - 1 do
+    Result[I + 1] := FSource[I];
+end;
+
+procedure TBrainFuckInterpretter.SetSource(AValue: string);
+var
+  I: Integer;
+begin
+  SetLength(FSource, Length(AValue));
+  //Move(Pointer(AValue)^, Pointer(FSource)^, Length(AValue));
+  for I := 0 to Length(FSource) - 1 do
+    FSource[I] := AValue[I + 1];
+end;
+
 function TBrainFuckInterpretter.Read: Byte;
 begin
@@ -125 +149 @@
 function TBrainFuckInterpretter.ReadCode: Char;
 begin
-  Result := Source[SourcePosition];
+  Result := FSource[SourcePosition];
 end;
 
@@ -148 +172 @@
   I: Integer;
 begin
-  SetLength(SourceJump, Length(Source));
-  FillChar(Pointer(SourceJump)^, Length(SourceJump), 0);
+  SetLength(SourceJump, Length(FSource));
+  //FillChar(Pointer(SourceJump)^, Length(SourceJump), 0);
+  for I := 0 to Length(FSource) - 1 do
+    SourceJump[I] := 0;
   SetLength(Loop, 0);
-  for I := 0 to Length(Source) - 1 do begin
-    case Source[I] of
+  for I := 0 to Length(FSource) - 1 do begin
+    case FSource[I] of
       '[': begin
         SetLength(Loop, Length(Loop) + 1);
@@ -170 +196 @@
 
 procedure TBrainFuckInterpretter.Reset;
+var
+  I: Integer;
 begin
   PrepareJumpTable;
@@ -176 +204 @@
   Output := '';
   MemoryPosition := 0;
-  FillChar(Pointer(Memory)^, Length(Memory), 0);
+  //FillChar(Pointer(Memory)^, Length(Memory), 0);
+  for I := 0 to Length(Memory) - 1 do
+    Memory[I] := 0;
   FStepCount := 0;
 end;

trunk/UMainForm.lfm

@@ -94 +94 @@
       Action = ACompile
     end
+    object ToolButton8: TToolButton
+      Left = 149
+      Top = 2
+      Action = AOptions
+    end
   end
   object TabControl1: TTabControl
@@ -518 +523 @@
     object MenuItem18: TMenuItem
       Caption = 'View'
+      object MenuItem22: TMenuItem
+        Action = AOptions
+      end
       object MenuItem19: TMenuItem
         Action = AViewInterpretter
@@ -663 +671 @@
     object ABreakpointUnset: TAction
       Caption = 'Unset breakpoint'
+    end
+    object AOptions: TAction
+      Caption = 'Options'
+      ImageIndex = 2
+      OnExecute = AOptionsExecute
     end
   end

trunk/UMainForm.pas

@@ -18 +18 @@
     ABreakpointSet: TAction;
     ABreakpointUnset: TAction;
+    AOptions: TAction;
     AInterpretterStepOut: TAction;
     AInterpretterRunToCursor: TAction;
@@ -51 +52 @@
     MenuItem2: TMenuItem;
     MenuItem20: TMenuItem;
+    MenuItem22: TMenuItem;
     MenuItem40: TMenuItem;
     MenuItem21: TMenuItem;
@@ -72 +74 @@
     ToolButton6: TToolButton;
     ToolButton7: TToolButton;
+    ToolButton8: TToolButton;
     procedure ACompileExecute(Sender: TObject);
     procedure AExitExecute(Sender: TObject);
+    procedure AOptionsExecute(Sender: TObject);
     procedure AProgramPauseExecute(Sender: TObject);
     procedure AProgramStopExecute(Sender: TObject);
@@ -115 +119 @@
 
 uses
-  UInterpreterForm, UApplicationInfo, UCompiledForm;
+  UInterpreterForm, UApplicationInfo, UCompiledForm, UOptionsForm;
 
 { TMainForm }
@@ -193 +197 @@
 
 procedure TMainForm.AProgramRunExecute(Sender: TObject);
-var
-  SourceText: string;
 begin
   InterpreterForm.Show;
   BrainFuckInterpreter.Input := InterpreterForm.MemoInput.Lines.Text;
-  SourceText := MemoSource.Lines.Text;
-  SetLength(BrainFuckInterpreter.Source, Length(SourceText));
-  Move(Pointer(SourceText)^, Pointer(BrainFuckInterpreter.Source)^, Length(SourceText));
+  BrainFuckInterpreter.Source := MemoSource.Text;
   BrainFuckInterpreter.Run;
 end;
@@ -222 +222 @@
 begin
   Close;
+end;
+
+procedure TMainForm.AOptionsExecute(Sender: TObject);
+begin
+  if OptionsForm.ShowModal = mrOK then begin
+
+  end;
 end;