Changeset 14 for branches/Void/UModel.pas

Timestamp:

Nov 10, 2009, 8:19:41 AM (15 years ago)

Author:

george

Message:

• Upraveno: Lepší zpracování parametrů procedůr.

File:

• branches/Void/UModel.pas (modified) (9 diffs)

branches/Void/UModel.pas

@@ -9 +9 @@
 
 type
+  TValueType = (vtVariable, vtNumber, vtString, vtFloat, vtChar);
+
   TType = class
     Name: string;
@@ -19 +21 @@
   end;
 
+  TVariableValue = class
+    ValueType: TValueType;
+    VariableDef: TVariable;
+    StringConstant: string;
+    NumberConstant: Integer;
+    FloatConstant: Double;
+    CharConstant: Char;
+  end;
+
   TCommand = class
     Name: string;
-    Parameters: TStringList;
+    Parameters: TList;
     constructor Create;
     destructor Destroy; override;
@@ -35 +46 @@
   TProcedure = class
     Name: string;
-    Parameters: TStringList;
+    Parameters: TList;
     BeginEnd: TBeginEnd;
     constructor Create;
     destructor Destroy; override;
   end;
-
-  { TModule }
 
   TModule = class
@@ -119 +128 @@
 constructor TCommand.Create;
 begin
-  Parameters := TStringList.Create;
+  Parameters := TList.Create;
 end;
 
 destructor TCommand.Destroy;
-begin
+var
+  I: Integer;
+begin
+  for I := 0 to Parameters.Count - 1 do
+    TVariableValue(Parameters[I]).Destroy;
   Parameters.Destroy;
   inherited Destroy;
@@ -131 +144 @@
 begin
   BeginEnd := TBeginEnd.Create;
-  Parameters := TStringList.Create;
+  Parameters := TList.Create;
 end;
 
 destructor TProcedure.Destroy;
-begin
+var
+  I: Integer;
+begin
+  for I := 0 to Parameters.Count - 1 do
+    TVariableValue(Parameters[I]).Destroy;
   Parameters.Destroy;
   BeginEnd.Destroy;
@@ -173 +190 @@
 begin
   I := 0;
-  while (I < Variables.Count) and (TVariable(Variables[I]).Name <> AName) do
+  while (I < Variables.Count) and (LowerCase(TVariable(Variables[I]).Name) <> LowerCase(AName)) do
     Inc(I);
   if I < Variables.Count then Result := Variables[I] else Result := nil;
@@ -183 +200 @@
 begin
   I := 0;
-  while (I < Procedures.Count) and (TProcedure(Procedures[I]).Name <> AName) do
+  while (I < Procedures.Count) and (LowerCase(TProcedure(Procedures[I]).Name) <> LowerCase(AName)) do
     Inc(I);
   if I < Procedures.Count then Result := Procedures[I] else Result := nil;
@@ -211 +228 @@
   with TProcedure(Procedures[Procedures.Add(TProcedure.Create)]) do begin
     Name := 'WriteLn';
+    with TVariable(Parameters[Parameters.Add(TVariable.Create)]) do begin
+      Name := 'Text';
+      VarType := FindTypeByName('String');
+    end;
   end;
   with TProcedure(Procedures[Procedures.Add(TProcedure.Create)]) do begin
@@ -236 +257 @@
 begin
   I := 0;
-  while (I < Types.Count) and (TType(Types[I]).Name <> AName) do
+  while (I < Types.Count) and (LowerCase(TType(Types[I]).Name) <> LowerCase(AName)) do
     Inc(I);
   if I < Types.Count then Result := Types[I] else Result := nil;