Changeset 18 for branches/Void/UModel.pas

Timestamp:

Nov 10, 2009, 3:38:32 PM (15 years ago)

Author:

george

Message:

• Upraveno: Nasazení generického TFPGObjectList pro použité seznamy typu TList.
• Přidáno: Kostra tříd pro gramatickou analýzu.

Location:

branches/Void

Files:

• . (modified) (1 prop)
• UModel.pas (modified) (14 diffs)

branches/Void

@@ -11 +11 @@
 Output.dpr
 Output.exe
+Output.asm

@@ -11 +11 @@
 Output.dpr
 Output.exe
+Output.asm

branches/Void/UModel.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils;
+  Classes, SysUtils, fgl;
 
 type
@@ -16 +16 @@
   end;
 
+  TTypeList = specialize TFPGObjectList<TType>;
+
   TVariable = class
     Name: string;
     VarType: TType;
   end;
+
+  TVariableList = specialize TFPGObjectList<TVariable>;
 
   TVariableValue = class
@@ -30 +34 @@
   end;
 
+  TVariableValueList = specialize TFPGObjectList<TVariableValue>;
+
+  TExpression = class
+
+  end;
+
   TCommand = class
     Name: string;
-    Parameters: TList;
-    constructor Create;
-    destructor Destroy; override;
-  end;
+    Parameters: TVariableValueList;
+    constructor Create;
+    destructor Destroy; override;
+  end;
+
+  TCommandList = specialize TFPGObjectList<TCommand>;
 
   TBeginEnd = class
-    Commands: TList;
+    Commands: TCommandList;
     constructor Create;
     destructor Destroy; override;
@@ -46 +58 @@
   TProcedure = class
     Name: string;
-    Parameters: TList;
+    Parameters: TVariableList;
     BeginEnd: TBeginEnd;
     constructor Create;
     destructor Destroy; override;
   end;
+
+  TProcedureList = specialize TFPGObjectList<TProcedure>;
 
   TModuleType = (mtUnit, mtProgram);
@@ -58 +72 @@
     Name: string;
     ModuleType: TModuleType;
-    Types: TList;
-    Variables: TList;
-    Procedures: TList;
+    Types: TTypeList;
+    Variables: TVariableList;
+    Procedures: TProcedureList;
     BeginEnd: TBeginEnd;
     constructor Create;
@@ -105 +119 @@
 constructor TBeginEnd.Create;
 begin
-  Commands := TList.Create;
+  Commands := TCommandList.Create;
 end;
 
 destructor TBeginEnd.Destroy;
+begin
+  Commands.Destroy;
+  inherited Destroy;
+end;
+
+procedure TBeginEnd.Clear;
 var
   I: Integer;
 begin
   for I := 0 to Commands.Count - 1 do
-    TCommand(Commands[I]).Destroy;
-  Commands.Destroy;
-  inherited Destroy;
-end;
-
-procedure TBeginEnd.Clear;
-var
-  I: Integer;
-begin
-  for I := 0 to Commands.Count - 1 do
-    TCommand(Commands[I]).Destroy;
+    Commands[I].Destroy;
   Commands.Clear;
 end;
@@ -131 +141 @@
 constructor TCommand.Create;
 begin
-  Parameters := TList.Create;
+  Parameters := TVariableValueList.Create;
 end;
 
 destructor TCommand.Destroy;
-var
-  I: Integer;
-begin
-  for I := 0 to Parameters.Count - 1 do
-    TVariableValue(Parameters[I]).Destroy;
+begin
   Parameters.Destroy;
   inherited Destroy;
@@ -147 +153 @@
 begin
   BeginEnd := TBeginEnd.Create;
-  Parameters := TList.Create;
+  Parameters := TVariableList.Create;
 end;
 
 destructor TProcedure.Destroy;
-var
-  I: Integer;
-begin
-  for I := 0 to Parameters.Count - 1 do
-    TVariableValue(Parameters[I]).Destroy;
+begin
   Parameters.Destroy;
   BeginEnd.Destroy;
@@ -165 +167 @@
 constructor TModule.Create;
 begin
-  Types := TList.Create;
-  Variables := TList.Create;
+  Types := TTypeList.Create;
+  Variables := TVariableList.Create;
   BeginEnd := TBeginEnd.Create;
-  Procedures := TList.Create;
+  Procedures := TProcedureList.Create;
 end;
 
 destructor TModule.Destroy;
-var
-  I: Integer;
-begin
-  for I := 0 to Types.Count - 1 do
-    TType(Types[I]).Destroy;
+begin
   Types.Destroy;
-  for I := 0 to Variables.Count - 1 do
-    TVariable(Variables[I]).Destroy;
   Variables.Destroy;
-  for I := 0 to Procedures.Count - 1 do
-    TProcedure(Procedures[I]).Destroy;
   Procedures.Destroy;
   BeginEnd.Destroy;
@@ -193 +187 @@
 begin
   I := 0;
-  while (I < Variables.Count) and (LowerCase(TVariable(Variables[I]).Name) <> LowerCase(AName)) do
+  while (I < Variables.Count) and (LowerCase(Variables[I].Name) <> LowerCase(AName)) do
     Inc(I);
   if I < Variables.Count then Result := Variables[I] else Result := nil;
@@ -203 +197 @@
 begin
   I := 0;
-  while (I < Procedures.Count) and (LowerCase(TProcedure(Procedures[I]).Name) <> LowerCase(AName)) do
+  while (I < Procedures.Count) and (LowerCase(Procedures[I].Name) <> LowerCase(AName)) do
     Inc(I);
   if I < Procedures.Count then Result := Procedures[I] else Result := nil;
@@ -212 +206 @@
 begin
   // System types
-  with TType(Types[Types.Add(TType.Create)]) do begin
+  with Types[Types.Add(TType.Create)] do begin
     Name := 'Integer';
   end;
-  with TType(Types[Types.Add(TType.Create)]) do begin
+  with Types[Types.Add(TType.Create)] do begin
     Name := 'String';
   end;
-  with TType(Types[Types.Add(TType.Create)]) do begin
+  with Types[Types.Add(TType.Create)] do begin
     Name := 'Char';
   end;
-  with TType(Types[Types.Add(TType.Create)]) do begin
+  with Types[Types.Add(TType.Create)] do begin
     Name := 'Byte';
   end;
-  with TType(Types[Types.Add(TType.Create)]) do begin
+  with Types[Types.Add(TType.Create)] do begin
     Name := 'Word';
   end;
 
   // System procedures
-  with TProcedure(Procedures[Procedures.Add(TProcedure.Create)]) do begin
+  with Procedures[Procedures.Add(TProcedure.Create)] do begin
     Name := 'WriteLn';
-    with TVariable(Parameters[Parameters.Add(TVariable.Create)]) do begin
+    with Parameters[Parameters.Add(TVariable.Create)] do begin
       Name := 'Text';
       VarType := FindTypeByName('String');
     end;
   end;
-  with TProcedure(Procedures[Procedures.Add(TProcedure.Create)]) do begin
+  with Procedures[Procedures.Add(TProcedure.Create)] do begin
     Name := 'Exit';
   end;
-  with TProcedure(Procedures[Procedures.Add(TProcedure.Create)]) do begin
+  with Procedures[Procedures.Add(TProcedure.Create)] do begin
     Name := 'ReadLn';
   end;
@@ -249 +243 @@
 begin
   for I := 0 to Variables.Count - 1 do
-    TVariable(Variables[I]).Destroy;
+    Variables[I].Destroy;
   Variables.Clear;
   BeginEnd.Clear;
@@ -260 +254 @@
 begin
   I := 0;
-  while (I < Types.Count) and (LowerCase(TType(Types[I]).Name) <> LowerCase(AName)) do
+  while (I < Types.Count) and (LowerCase(Types[I].Name) <> LowerCase(AName)) do
     Inc(I);
   if I < Types.Count then Result := Types[I] else Result := nil;

@@ -11 +11 @@
 Output.dpr
 Output.exe
+Output.asm