Changeset 73 for branches/Transpascal/Compiler/Analyze/UPascalParser.pas

Timestamp:

Oct 20, 2010, 11:16:02 AM (14 years ago)

Author:

george

Message:

• Fixed: Searching variable types in other modules.

File:

• branches/Transpascal/Compiler/Analyze/UPascalParser.pas (modified) (8 diffs)

branches/Transpascal/Compiler/Analyze/UPascalParser.pas

@@ -271 +271 @@
 begin
   begin
-    if NextToken = 'begin' then
-    begin
+    if NextToken = 'begin' then begin
       Result := TBeginEnd.Create;
       TBeginEnd(Result).CommonBlock := SourceCode;
@@ -278 +277 @@
       // + ' ' + IntToStr(Integer(Result)));
       ParseBeginEnd(TBeginEnd(Result));
-    end
-    else
-    if NextToken = 'if' then
-    begin
+    end else
+    if NextToken = 'if' then begin
       Result := TIfThenElse.Create;
       TIfThenElse(Result).CommonBlock := SourceCode;
       ParseIfThenElse(TIfThenElse(Result));
-    end
-    else
-    if NextToken = 'while' then
-    begin
+    end else
+    if NextToken = 'while' then begin
       Result := TWhileDo.Create;
       TWhileDo(Result).CommonBlock := SourceCode;
       ParseWhileDo(TWhileDo(Result));
-    end
-    else
-    if NextToken = 'for' then
-    begin
+    end else
+    if NextToken = 'for' then begin
       Result := TForToDo.Create;
       TForToDo(Result).CommonBlock := SourceCode;
       ParseForToDo(TForToDo(Result));
-    end
-    else
-    if IsIdentificator(NextToken) then
-    begin
-      if Assigned(SourceCode.Variables.Search(NextToken)) then
-      begin
+    end else
+    if IsIdentificator(NextToken) then begin
+      if Assigned(SourceCode.Variables.Search(NextToken)) then begin
         // Variable assignment
         Result := TAssignment.Create;
@@ -314 +304 @@
         TAssignment(Result).Source.CommonBlock := SourceCode;
         ParseExpression(TAssignment(Result).Source);
-      end
-      else
-      if Assigned(SourceCode.Functions.Search(NextToken)) then
-      begin
+      end else
+      if Assigned(SourceCode.Functions.Search(NextToken)) then begin
         // Function call
         FunctionName := ReadCode;
@@ -334 +322 @@
           Expect(')');
         end;
-      end
-      else
-      begin
+      end else begin
         Result := nil;
         ErrorMessage(SUnknownIdentifier, [ReadCode], -1);
       end;
-    end
-    else
+    end else
     if NextToken = ';' then
-    else
-    begin
+    else begin
       Result := nil;
       ErrorMessage(SIllegalExpression, [ReadCode], -1);
@@ -646 +630 @@
   I: integer;
 begin
+  try
   Identifiers := TStringList.Create;
-  with SourceCode do
-  begin
+  with SourceCode do begin
     Expect('var');
-    while IsIdentificator(NextToken) and (NextTokenType <> ttEndOfFile) do
-    begin
+    while IsIdentificator(NextToken) and (NextTokenType <> ttEndOfFile) do begin
       Identifiers.Clear;
       VariableName := ReadCode;
       Variable := Search(VariableName);
-      if not Assigned(Variable) then
-      begin
+      if not Assigned(Variable) then begin
         Identifiers.Add(VariableName);
-        while NextToken = ',' do
-        begin
+        while NextToken = ',' do begin
           Expect(',');
           Identifiers.Add(ReadCode);
         end;
-      end
-      else
+      end else
         ErrorMessage(SRedefineIdentifier, [VariableName], 0);
       Expect(':');
@@ -673 +653 @@
       else
         for I := 0 to Identifiers.Count - 1 do
-          with TVariable(Items[Add(TVariable.Create)]) do
-          begin
+          with TVariable(Items[Add(TVariable.Create)]) do begin
             Name := Identifiers[I];
             ValueType := NewValueType;
@@ -681 +660 @@
     end;
   end;
-  Identifiers.Destroy;
+  finally
+    Identifiers.Free;
+  end;
 end;
 
@@ -688 +669 @@
 procedure TPascalParser.ParseVariable(SourceCode: TVariable; Exported: Boolean = False);
 begin
-  with SourceCode do
-  begin
+  with SourceCode do begin
     Name := NextToken;
     Expect(':=');