Changeset 71 for branches/Transpascal/Compiler

Timestamp:

Oct 19, 2010, 1:11:59 PM (15 years ago)

Author:

george

Message:

• Minor modifications.

Location:

branches/Transpascal/Compiler

Files:

• Analyze/UParser.pas (modified) (4 diffs)
• Analyze/UPascalParser.pas (modified) (4 diffs)
• UCompiler.pas (modified) (1 diff)
• USourceCode.pas (modified) (1 diff)

branches/Transpascal/Compiler/Analyze/UParser.pas

@@ -35 +35 @@
     CodeStreamPosition: integer;
     CodePosition: TPoint;
-    LastTokenPosition: TPoint;
+    LastTokenEnd: TPoint;
+    LastTokenStart: TPoint;
     SourceCodeText: TStringList;
     function IsAlphanumeric(Character: char): boolean;
@@ -74 +75 @@
 begin
   if Assigned(FOnErrorMessage) then
-    FOnErrorMessage(Format(Text, Arguments), LastTokenPosition, FileName);
+    FOnErrorMessage(Format(Text, Arguments), LastTokenStart, FileName);
 end;
 
@@ -80 +81 @@
 begin
   Log('Expected: ' + Code + '  Readed: ' + FNextToken);
-  if FNextToken <> Code then
-  begin
+  if FNextToken <> Code then begin
+    //ReadCode;
     ErrorMessage(SExpectedButFound, [Code, FNextToken]);
 
@@ -185 +186 @@
   DoubleSpecChar: array[0..6] of string = (':=', '..', '<=', '>=', '<>', '+=', '-=');
 begin
-  LastTokenPosition := CodePosition;
+  LastTokenStart := LastTokenEnd;
+  LastTokenEnd := CodePosition;
   FNextToken := '';
   FNextTokenType := ttNone;

branches/Transpascal/Compiler/Analyze/UPascalParser.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, UParser, USourceCode;
+  Classes, SysUtils, UParser, USourceCode, Dialogs;
 
 type
@@ -61 +61 @@
     Parser.ProgramCode := ProgramCode;
     Parser.OnGetSource := OnGetSource;
-    if Assigned(FOnGetSource) then begin
+    if Assigned(OnGetSource) then begin
       if FOnGetSource(Name, Parser.SourceCodeText) then begin
         Parser.Init;
@@ -948 +948 @@
         Module := SourceCode.ParentModule.ParentProgram.Modules.Search(Name);
         Exported := AExported;
-      end else ErrorMessage(SUnitNotFound, [Name]);
+      end else begin
+        ErrorMessage(SUnitNotFound, [Name]);
+        SourceCode.Delete(SourceCode.Count - 1);
+      end;
     end;
   end;
@@ -962 +965 @@
       Module := SourceCode.ParentModule.ParentProgram.Modules.Search(Name);
       if not Assigned(Module) then begin
-        if not ParseFile(Name) then ErrorMessage(SUnitNotFound, [Name]);
+        if not ParseFile(Name) then begin
+          ErrorMessage(SUnitNotFound, [Name]);
+          SourceCode.Delete(SourceCode.Count - 1);
+        end;
       end;
     end;

branches/Transpascal/Compiler/UCompiler.pas

@@ -66 +66 @@
     Parser.SourceCodeText := Source;
     Parser.Init;
+    //ShowMessage(IntToHex(Integer(Addr(Parser.OnGetSource)), 8));
     NewModule := Parser.ParseModule(ProgramCode);
     ProgramCode.Modules.Add(NewModule);

branches/Transpascal/Compiler/USourceCode.pas

@@ -768 +768 @@
     I := 0;
     while (I < UsedModules.Count) and (not Assigned(Result)) do begin
-      Result := TUsedModule(UsedModules[I]).Module.SearchType(Name, False);
+      with TUsedModule(UsedModules[I]) do
+        with Module do
+        Result := SearchType(Name, False);
       Inc(I);
     end;