Changeset 58

Timestamp:

Jul 17, 2012, 6:05:13 AM (12 years ago)

Author:

chronos

Message:

• Fixed: Wrong expression analyzing.

Location:

trunk/Compiler

Files:

• Analyze/UAnalyzerPascal.pas (modified) (4 diffs)
• Target/Delphi/UProducerPascal.pas (modified) (1 diff)

trunk/Compiler/Analyze/UAnalyzerPascal.pas

@@ -15 +15 @@
   private
   public
+    function DebugExpressions(List: TListExpression): string;
     function ParseFile(Name: string): Boolean;
     function ParseWhileDo(var WhileDo: TWhileDo; SourceCode: TCommonBlock): Boolean;
@@ -86 +87 @@
 { TAnalyzerPascal }
 
+function TAnalyzerPascal.DebugExpressions(List: TListExpression): string;
+var
+  I: Integer;
+begin
+  Result := Result + '(';
+  for I := 0 to List.Count - 1 do begin
+    Result := Result + IntToStr(I) + ': ';
+    if Assigned(List[I]) then
+      Result := Result + IntToStr(Integer(TExpression(List[I]).NodeType)) +
+      DebugExpressions(TExpression(List[I]).SubItems);
+    if I < List.Count - 1 then Result := Result + ', ';
+  end;
+  Result := Result + ')';
+end;
+
 function TAnalyzerPascal.ParseFile(Name: string): Boolean;
 var
@@ -150 +166 @@
           ReadToken;
         end;
-        ShowMessage(IntToStr(TExpression(Expressions.Last).SubItems.Count) + ' ' + TExpression(Expressions.Last).OperatorName);
-        if Assigned(TExpression(Expressions.First)) then
-          ShowMessage('First ' + IntToStr(Integer(TExpression(Expressions.Last).SubItems.First)));
-        if Assigned(TExpression(Expressions.Last)) then
-          ShowMessage('Last ' + IntToStr(Integer(TExpression(Expressions.Last).SubItems.Last)));
+        //ShowMessage(DebugExpressions(Expressions));
       end;
 
@@ -325 +337 @@
     if Assigned(NewExpression) then begin
       TExpression(Expressions.Last).SubItems.Last := NewExpression;
-      with Expressions.Items[Expressions.Add(TExpression.Create)] do
+      with TExpression(Expressions.Items[Expressions.Add(TExpression.Create)]) do
       begin
         CommonBlock := SourceCode.CommonBlock;

trunk/Compiler/Target/Delphi/UProducerPascal.pas

@@ -73 +73 @@
   ModuleName: string;
 begin
+  if UsedModules.Count = 0 then Exit;
   EmitLn('uses');
   Inc(Indentation);