Changeset 62

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

Files:

• Compiler/Analyze/UAnalyzer.pas (deleted)
• Compiler/Analyze/UAnalyzerPascal.pas (modified) (2 diffs)
• Compiler/UAnalyzer.pas (modified) (1 diff)
• Compiler/UCompiler.pas (modified) (3 diffs)
• IDE/Forms/UFormMain.pas (modified) (3 diffs)
• IDE/Forms/UFormProject.pas (modified) (1 diff)
• IDE/Forms/UFormSourceCode.pas (modified) (1 diff)
• IDE/Forms/UFormTargetProject.pas (modified) (1 diff)
• IDE/UCore.lfm (modified) (1 diff)

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));

trunk/IDE/Forms/UFormMain.pas

@@ -183 +183 @@
     with TProjectFile(Project.Files[0]) do begin
       Compiler.SourceFiles.Files.Clear;
+      Compiler.TargetFiles.Files.Clear;
       Project.Files.DumpFileList(Compiler.SourceFiles.Files);
       Compiler.MainSource := Project.MainSource.AbsoluteFileName;
@@ -497 +498 @@
   Core.ProjectTemplatesInit;
 
-  if Core.ReopenLastOpenedFile and (Core.LastOpenedFiles.Items.Count > 0) then begin
+  if Core.ReopenLastOpenedFile and (Core.LastOpenedFiles.Items.Count > 0) then
+  if FileExistsUTF8(Core.LastOpenedFiles.Items[0]) then
     Core.ProjectOpen(Core.LastOpenedFiles.Items[0]);
-  end;
 
   WindowState := wsMaximized;
@@ -513 +514 @@
 procedure TFormMain.AProjectCloseExecute(Sender: TObject);
 begin
-  //if Project.Modified then ;
+  //if Project.Modified then ;  A
+  FormSourceCode.ProjectFile := nil;
   FreeAndNil(Core.Project);
+  FormProject.UpdateProjectTree;
   UpdateInterface;
 end;

trunk/IDE/Forms/UFormProject.pas

@@ -125 +125 @@
 procedure TFormProject.AShowExecute(Sender: TObject);
 begin
-  if Assigned(TreeViewProject.Selected) then
-  FormSourceCode.SynEditSource.Lines.Assign(TProjectFile(TreeViewProject.Selected.Data).Source);
+  if Assigned(TreeViewProject.Selected) then begin
+    FormMain.TabSheetSource.Show;
+    FormSourceCode.ProjectFile := TProjectFile(TreeViewProject.Selected.Data);
+  end;
 end;
 

trunk/IDE/Forms/UFormSourceCode.pas

@@ -40 +40 @@
 procedure TFormSourceCode.SynEditSourceChange(Sender: TObject);
 begin
+  Save;
   if Assigned(Core.Project) and Assigned(ProjectFile) then
     ProjectFile.Modified := True;

trunk/IDE/Forms/UFormTargetProject.pas

@@ -66 +66 @@
     if TProjectFile(Node.Data) is TProjectFile then begin
       ProjectFile := TProjectFile(Node.Data);
+      FormMain.TabSheetTarget.Show;
       SynEdit1.Lines.Assign(TProjectFile(Node.Data).Source);
     end;

trunk/IDE/UCore.lfm

@@ -37 +37 @@
     EmailContact = 'robie@centrum.cz'
     AppName = 'Transpascal IDE'
-    ReleaseDate = 41103
+    ReleaseDate = 41107
     RegistryKey = '\Software\Chronosoft\Transpascal'
     RegistryRoot = rrKeyCurrentUser