Changeset 62 for trunk/Compiler

Timestamp:

Jul 17, 2012, 10:14:41 AM (12 years ago)

Author:

chronos

Message:

• Modified: Show tab sheets of source code forms on file click in project manager.
• Fixed: Compilation error message line calculation on Windows.

Location:

trunk/Compiler

Files:

• Analyze/UAnalyzer.pas (deleted)
• Analyze/UAnalyzerPascal.pas (modified) (2 diffs)
• UAnalyzer.pas (modified) (1 diff)
• UCompiler.pas (modified) (3 diffs)

trunk/Compiler/Analyze/UAnalyzerPascal.pas

@@ -568 +568 @@
       if NextToken = 'initialization' then Break
       else if NextToken = 'finalization' then Break
+      else if NextToken = 'end' then Break
       else begin
         ErrorMessage(SInvalidConstruction, [NextToken]);
@@ -1444 +1445 @@
       Module := SourceCode.ParentModule.ParentProgram.Modules.Search(Name);
       if not Assigned(Module) then begin
-        if ParseFile(Name) then begin
+        if ParseFile(Name + '.pas') then begin
           Module := SourceCode.ParentModule.ParentProgram.Modules.Search(Name);
           Exported := AExported;

trunk/Compiler/UAnalyzer.pas

@@ -374 +374 @@
         // Update cursor position
         Inc(CodePosition.X);
-        if (CurrentChar = LineEnding) then begin
+        if (CurrentChar = LineEnding[1]) then begin
           CodePosition.X := 0;
           Inc(CodePosition.Y);

trunk/Compiler/UCompiler.pas

@@ -111 +111 @@
 begin
   I := 0;
-  while (I < Files.Count) and (ExtractFileNameOnly(Files[I]) <> Name) do Inc(I);
+  while (I < Files.Count) and (ExtractFileName(Files[I]) <> Name) do Inc(I);
   if I < Files.Count then begin
     if FileExistsUTF8(Files[I]) then begin
@@ -127 +127 @@
 begin
   I := 0;
-  while (I < Files.Count) and (ExtractFileNameOnly(Files[I]) <> Name) do Inc(I);
+  while (I < Files.Count) and (ExtractFileName(Files[I]) <> Name) do Inc(I);
   if I >= Files.Count then begin
     SaveStringToFile(Name, Content);
@@ -212 +212 @@
   if MainSource <> '' then begin
     Analyzer.FileName := MainSource;
-    Analyzer.OnGetSource(ExtractFileNameOnly(Analyzer.FileName), Analyzer.SourceCode);
+    Analyzer.OnGetSource(ExtractFileName(Analyzer.FileName), Analyzer.SourceCode);
     Analyzer.Process;
     //ShowMessage(IntToHex(Integer(Addr(Analyzer.OnGetSource)), 8));