paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-21 02:32:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Undo last wrong commit

Browse Source 
git-svn-id: trunk@6118 -
This commit is contained in:
pierre 2007-01-22 04:03:46 +00:00
parent f876187194
commit 87c0a048e5
13 changed files with 117 additions and 198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
ide/compiler/Makefile
View File

@ -2,7 +2,7 @@
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/01/18]
#
default: all
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded powerpc64-linux powerpc64-embedded
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded
BSDs = freebsd netbsd openbsd darwin
UNIXs = linux $(BSDs) solaris qnx
LIMIT83fs = go32v2 os2 emx watcom
@ -306,6 +306,9 @@ endif
ifeq ($(FULL_TARGET),i386-embedded)
override TARGET_UNITS+=compunit
endif
ifeq ($(FULL_TARGET),i386-symbian)
override TARGET_UNITS+=compunit
endif
ifeq ($(FULL_TARGET),m68k-linux)
override TARGET_UNITS+=compunit
endif
@ -393,6 +396,9 @@ endif
ifeq ($(FULL_TARGET),arm-embedded)
override TARGET_UNITS+=compunit
endif
ifeq ($(FULL_TARGET),arm-symbian)
override TARGET_UNITS+=compunit
endif
ifeq ($(FULL_TARGET),powerpc64-linux)
override TARGET_UNITS+=compunit
endif
@ -454,6 +460,9 @@ endif
ifeq ($(FULL_TARGET),i386-embedded)
override COMPILER_OPTIONS+=-Ur -dNOCATCH
endif
ifeq ($(FULL_TARGET),i386-symbian)
override COMPILER_OPTIONS+=-Ur -dNOCATCH
endif
ifeq ($(FULL_TARGET),m68k-linux)
override COMPILER_OPTIONS+=-Ur -dNOCATCH
endif
@ -541,6 +550,9 @@ endif
ifeq ($(FULL_TARGET),arm-embedded)
override COMPILER_OPTIONS+=-Ur -dNOCATCH
endif
ifeq ($(FULL_TARGET),arm-symbian)
override COMPILER_OPTIONS+=-Ur -dNOCATCH
endif
ifeq ($(FULL_TARGET),powerpc64-linux)
override COMPILER_OPTIONS+=-Ur -dNOCATCH
endif
@ -601,6 +613,9 @@ endif
ifeq ($(FULL_TARGET),i386-embedded)
override COMPILER_INCLUDEDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(CPU_TARGET)
endif
ifeq ($(FULL_TARGET),i386-symbian)
override COMPILER_INCLUDEDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(CPU_TARGET)
endif
ifeq ($(FULL_TARGET),m68k-linux)
override COMPILER_INCLUDEDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(CPU_TARGET)
endif
@ -688,6 +703,9 @@ endif
ifeq ($(FULL_TARGET),arm-embedded)
override COMPILER_INCLUDEDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(CPU_TARGET)
endif
ifeq ($(FULL_TARGET),arm-symbian)
override COMPILER_INCLUDEDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(CPU_TARGET)
endif
ifeq ($(FULL_TARGET),powerpc64-linux)
override COMPILER_INCLUDEDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(CPU_TARGET)
endif
@ -748,6 +766,9 @@ endif
ifeq ($(FULL_TARGET),i386-embedded)
override COMPILER_UNITDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(CPU_TARGET) $(COMPILERDIR)/targets $(COMPILERDIR)/systems
endif
ifeq ($(FULL_TARGET),i386-symbian)
override COMPILER_UNITDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(CPU_TARGET) $(COMPILERDIR)/targets $(COMPILERDIR)/systems
endif
ifeq ($(FULL_TARGET),m68k-linux)
override COMPILER_UNITDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(CPU_TARGET) $(COMPILERDIR)/targets $(COMPILERDIR)/systems
endif
@ -835,6 +856,9 @@ endif
ifeq ($(FULL_TARGET),arm-embedded)
override COMPILER_UNITDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(CPU_TARGET) $(COMPILERDIR)/targets $(COMPILERDIR)/systems
endif
ifeq ($(FULL_TARGET),arm-symbian)
override COMPILER_UNITDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(CPU_TARGET) $(COMPILERDIR)/targets $(COMPILERDIR)/systems
endif
ifeq ($(FULL_TARGET),powerpc64-linux)
override COMPILER_UNITDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(CPU_TARGET) $(COMPILERDIR)/targets $(COMPILERDIR)/systems
endif
@ -1167,6 +1191,10 @@ EXEEXT=.gba
SHAREDLIBEXT=.so
SHORTSUFFIX=gba
endif
ifeq ($(OS_TARGET),symbian)
SHAREDLIBEXT=.dll
SHORTSUFFIX=symbian
endif
else
ifeq ($(OS_TARGET),go32v1)
PPUEXT=.pp1
@ -1639,6 +1667,9 @@ endif
ifeq ($(FULL_TARGET),i386-embedded)
REQUIRE_PACKAGES_RTL=1
endif
ifeq ($(FULL_TARGET),i386-symbian)
REQUIRE_PACKAGES_RTL=1
endif
ifeq ($(FULL_TARGET),m68k-linux)
REQUIRE_PACKAGES_RTL=1
endif
@ -1726,6 +1757,9 @@ endif
ifeq ($(FULL_TARGET),arm-embedded)
REQUIRE_PACKAGES_RTL=1
endif
ifeq ($(FULL_TARGET),arm-symbian)
REQUIRE_PACKAGES_RTL=1
endif
ifeq ($(FULL_TARGET),powerpc64-linux)
REQUIRE_PACKAGES_RTL=1
endif

112
ide/cvsdiff.tdf
View File

@ -1,56 +1,56 @@
[Main]
Title="CVS Diff"
Size=(56,15)
CommandLine="diff %c% %revision% %filename%"
Default="filename"
[filename]
Type=InputLine
Origin=(2,3)
Size=(52,1)
Value=$EDNAME
[label1]
Type=Label
Origin=(2,2)
Size=(52,1)
Text="~F~ile(s) to diff"
Link="filename"
[revision]
Type=InputLine
Origin=(2,5)
Size=(52,1)
Value=
[label2]
Type=Label
Origin=(2,4)
Size=(52,1)
Text="to specific ~r~evision"
Link="revision"
[c]
Type=CheckBox
Name="~C~ontext diff"
Origin=(2,6)
Size=(25,1)
Default=On
On="-c"
[b]
Type=CheckBox
Name="~I~gnore blank changes"
Origin=(2,7)
Size=(25,1)
Default=On
On="-b"
[u]
Type=CheckBox
Name="~U~nified diff"
Origin=(2,8)
Size=(25,1)
Default=Off
On="-u"
[Main]
Title="CVS Commit"
Size=(56,15)
CommandLine="diff %c% %revision% %filename%"
Default="filename"
[filename]
Type=InputLine
Origin=(2,3)
Size=(52,1)
Value=$EDNAME
[label1]
Type=Label
Origin=(2,2)
Size=(52,1)
Text="~F~ile(s) to diff"
Link="filename"
[revision]
Type=InputLine
Origin=(2,5)
Size=(52,1)
Value=
[label2]
Type=Label
Origin=(2,4)
Size=(52,1)
Text="to specific ~r~evision"
Link="revision"
[c]
Type=CheckBox
Name="~C~ontext diff"
Origin=(2,6)
Size=(25,1)
Default=On
On="-c"
[b]
Type=CheckBox
Name="~I~gnore blank changes"
Origin=(2,7)
Size=(25,1)
Default=On
On="-b"
[u]
Type=CheckBox
Name="~U~nified diff"
Origin=(2,8)
Size=(25,1)
Default=Off
On="-u"

21
ide/fpcatch.pas
View File

@ -224,27 +224,10 @@ begin
exit;
{$ifdef Windows}
if GetConsoleMode(GetStdHandle(cardinal(Std_Input_Handle)), @Mode) then
begin
{$ifdef DEBUG}
Writeln(stderr,'Starting value of ConsoleMode is $',hexstr(Mode,8));
{$endif DEBUG}
SetConsoleMode(GetStdHandle(cardinal(Std_Input_Handle)),
(Mode or ENABLE_MOUSE_INPUT) and not ENABLE_PROCESSED_INPUT);
{$ifdef DEBUG}
end
else
begin
Writeln(stderr,'Call to GetConsoleMode failed, GetLastError=',
GetLastError);
{$endif DEBUG}
end;
SetConsoleMode(GetStdHandle(cardinal(Std_Input_Handle)), (Mode or ENABLE_MOUSE_INPUT) and not ENABLE_PROCESSED_INPUT);
{$endif Windows}
{$ifdef go32v2}
{
I think that it was an error to put that here PM
djgpp_set_ctrl_c(false);
at least since that this is now handled in fpusrscr.pas unit
}
djgpp_set_ctrl_c(false);
{$endif go32v2}
{$ifdef HasSignal}
{$ifndef TP}

19
ide/fpcompil.pas
View File

@ -220,8 +220,7 @@ const
procedure ParseUserScreen;
var
Y,YMax : longint;
LEvent : TEvent;
y : longint;
Text,Attr : String;
DisplayCompilerWindow : boolean;
cc: integer;
@ -233,7 +232,7 @@ var
if pos(' $',Text)=1 then
begin
AText:=Text;
Delete(Text,1,11);
Delete(Text,1,10);
While pos(' ',Text)=1 do
Delete(Text,1,1);
if pos('of ',Text)>0 then
@ -252,7 +251,7 @@ var
end
else
row:=0;
CompilerMessageWindow^.AddMessage(V_Fatal or v_lineinfo,AText
CompilerMessageWindow^.AddMessage(V_Fatal,AText
,ModuleName,row,1);
DisplayCompilerWindow:=true;
end;
@ -283,21 +282,11 @@ begin
if not assigned(UserScreen) then
exit;
DisplayCompilerWindow:=false;
YMax:=UserScreen^.GetHeight;
PushStatus('Parsing User Screen');
CompilerMessageWindow^.Lock;
for Y:=0 to YMax do
for Y:=0 to UserScreen^.GetHeight do
begin
UserScreen^.GetLine(Y,Text,Attr);
if (y mod 10) = 0 then
begin
CompilerMessageWindow^.Unlock;
SetStatus('Parsing User Screen line '+IntToStr(y)+'/'+IntToStr(YMax));
CompilerMessageWindow^.Lock;
end;
GetKeyEvent(LEvent);
if (LEvent.What=evKeyDown) and (LEvent.KeyCode=kbEsc) then
break;
SearchBackTrace;
InsertInMessages(' Fatal:',v_Fatal or v_lineinfo,true);
InsertInMessages(' Error:',v_Error or v_lineinfo,true);

5
ide/fpcygwin.pas
View File

@ -67,7 +67,7 @@ begin
GetCygwinFullName:='cygwin1.dll';
end;
initialization
begin
ModuleH:=GetModuleHandle('cygwin1');
GetMem(CygwinFullName,MAX_PATH+1);
GetModuleFileName(ModuleH,CygwinFullName,MAX_PATH+1);
@ -81,6 +81,5 @@ initialization
FileInfo:=PFileInfo^;
end;
FreeMem(InfoData,size);
finalization
FreeMem(CygwinFullName,MAX_PATH+1);
{FreeMem(CygwinFullName,MAX_PATH+1);}
end.

2
ide/fpide.pas
View File

@ -1326,7 +1326,7 @@ begin
cmHelpContents : HelpContents;
cmHelpIndex : HelpHelpIndex;
cmHelpDebug : HelpDebugInfos;
cmHelpTopicSearch: HelpTopicSearch;
{ cmHelpTopicSearch: HelpTopicSearch;}
cmHelpPrevTopic : HelpPrevTopic;
cmHelpUsingHelp : HelpUsingHelp;
cmHelpFiles : HelpFiles;

11
ide/fpredir.pas
View File

@ -695,12 +695,9 @@ end;
function ExecuteRedir (Const ProgName, ComLine, RedirStdIn, RedirStdOut, RedirStdErr : String) : boolean;
{$ifdef Windows}
var
mode,modebefore : word;
mode : word;
{$endif Windows}
Begin
{$ifdef Windows}
GetConsoleMode(GetStdHandle(cardinal(Std_Input_Handle)), @modebefore);
{$endif Windows}
RedirErrorOut:=0; RedirErrorIn:=0; RedirErrorError:=0;
ExecuteResult:=0;
IOStatus:=0;
@ -718,10 +715,10 @@ Begin
(RedirErrorIn=0) and (RedirErrorError=0) and
(ExecuteResult=0);
{$ifdef Windows}
// restore previous mode
// reenable mouse events
GetConsoleMode(GetStdHandle(cardinal(Std_Input_Handle)), @mode);
//mode:=mode or ENABLE_MOUSE_INPUT;
SetConsoleMode(GetStdHandle(cardinal(Std_Input_Handle)), modebefore);
mode:=mode or ENABLE_MOUSE_INPUT;
SetConsoleMode(GetStdHandle(cardinal(Std_Input_Handle)), mode);
{$endif Windows}
End;

61
ide/fpusrscr.pas
View File

@ -222,10 +222,6 @@ type
ConsoleMode,IdeMode : Dword;
IdeScreenMode : TVideoMode;
procedure BufferCopy(src,dest : THandle);
{$ifdef debug}
procedure Complain(St : string);
Procedure SetConsoleMode(FH : Handle;Mode : DWord);
{$endif debug}
end;
{$endif}
@ -986,12 +982,8 @@ end;
{ Seems to be missing in windows unit PM }
const
ENABLE_INSERT_MODE = $20;
ENABLE_INSERT_MODE = $20;
ENABLE_QUICK_EDIT_MODE = $40;
ENABLE_EXTENDED_FLAGS = $80;
ENABLE_AUTO_POSITION = $100;
procedure UpdateFileHandles;
begin
@ -1029,7 +1021,6 @@ begin
GetConsoleMode(GetStdHandle(cardinal(Std_Input_Handle)), @ConsoleMode);
IdeMode:=ConsoleMode;
{$ifdef debug}
Complain('Starting ConsoleMode is $'+hexstr(ConsoleMode,8));
{define Windowsbigwin}
{$endif debug}
{$ifdef Windowsbigwin}
@ -1274,17 +1265,9 @@ end;
{ dummy for Windows as the Buffer screen
do hold all the info }
procedure TWindowsScreen.SaveIDEScreen;
var
NowIdeMode : Dword;
begin
IdeScreenMode:=ScreenMode;
GetConsoleMode(GetStdHandle(cardinal(Std_Input_Handle)), @NowIdeMode);
{$ifdef debug}
Complain('IDE ConsoleMode is $'+hexstr(NowIdeMode,8));
if NowIdeMode<>IdeMode then
Complain('is not equal to IDEMode $'+hexstr(IdeMode,8));
{$endif debug}
IdeMode:=NowIdeMode;
GetConsoleMode(GetStdHandle(cardinal(Std_Input_Handle)), @IdeMode);
{ set the dummy buffer as active already now PM }
SetStdHandle(cardinal(Std_Output_Handle),DummyScreenBufferHandle);
UpdateFileHandles;
@ -1295,9 +1278,6 @@ end;
procedure TWindowsScreen.SaveConsoleScreen;
begin
GetConsoleMode(GetStdHandle(cardinal(Std_Input_Handle)), @ConsoleMode);
{$ifdef debug}
Complain('ConsoleMode now is $'+hexstr(ConsoleMode,8));
{$endif debug}
{ set the dummy buffer as active already now PM }
SetStdHandle(cardinal(Std_Output_Handle),DummyScreenBufferHandle);
UpdateFileHandles;
@ -1327,9 +1307,7 @@ begin
{ Needed to force InitSystemMsg to use the right console handle }
DoneEvents;
InitEvents;
IdeMode:=({IdeMode or }ENABLE_MOUSE_INPUT or
ENABLE_WINDOW_INPUT or
ENABLE_EXTENDED_FLAGS)
IdeMode:=(IdeMode or ENABLE_MOUSE_INPUT or ENABLE_WINDOW_INPUT)
and not (ENABLE_PROCESSED_INPUT or
ENABLE_LINE_INPUT or
ENABLE_ECHO_INPUT or
@ -1362,39 +1340,6 @@ begin
IDEActive:=true;
end;
{$ifdef debug}
procedure TWindowsScreen.Complain(St : string);
begin
if IDEActive then
DebugMessage('',St,0,0)
else
Writeln(stderr,St);
end;
procedure TWindowsScreen.SetConsoleMode(FH : Handle;Mode: DWord);
var
Test: DWord;
begin
If not Windows.SetConsoleMode(FH,Mode) then
begin
Complain('SetConsoleMode call failed GetLastError='+IntToStr(GetLastError));
end
else
begin
if not GetConsoleMode(FH,Test) then
begin
Complain('GetConsoleMode call failed GetLastError='+IntToStr(GetLastError));
end
else if (Test<>Mode) then
begin
Complain('GetConsoleMode result '+IntToStr(Test)+' <> '+
IntToStr(Mode));
end;
end;
end;
{$endif DEBUG}
{$endif}
{****************************************************************************

4
ide/globdir.inc
View File

@ -32,9 +32,9 @@
{$define HasSignal}
{$define FSCaseInsensitive}
{$define HasSysMsgUnit}
{$ifdef EXTDEBUG}
{$ifdef DEBUG}
{$define USE_GRAPH_SWITCH}
{$endif EXTDEBUG}
{$endif DEBUG}
{$endif}
{$ifdef Linux}

16
ide/test.pas
View File

@ -88,7 +88,6 @@ var Hello : word;
Pointer2: PObj;
ClassVar1: TClass;
ClassVar2: TClass2;
ClassClass: Class of TObject;
Obj1: TObj;
Obj2: TObj2;
CharArray : Array[1..2000] of char;
@ -131,17 +130,6 @@ begin
X:=7;
end;
procedure TestOverload;
begin
Writeln('Procedure without argument called');
end;
procedure TestOverload(arg : string);
begin
Writeln('Procedure with one argument called');
Writeln('argument is ',arg);
end;
function Func1(x,z : word; var y : boolean; const r: TRecord): shortint;
var loc : string;
@ -193,8 +181,6 @@ BEGIN
SingleArrayArray[i,j]:=i*j;
ClassVar1:=TClass2.create;
ClassClass:=TClass2.ClassType;
Obj1.Init;
pointer2:=@Obj1;
Writeln('Obj1.Z=',Obj1.Z);
@ -207,8 +193,6 @@ BEGIN
Writeln('ParamCount = ',ParamCount);
For i:=0 to paramcount do
writeln('Paramstr(',i,') = '+Paramstr(i));
TestOverload;
TestOverload('Test');
writeln(IsOdd(3));
writeln(Func1(5,5,Bool,T));
new(X);

19
ide/wconsole.pas
View File

@ -48,13 +48,8 @@ Procedure RestoreConsoleMode(const ConsoleMode : TConsoleMode);
implementation
{$ifdef Windows}
uses
wutils,
windows;
{$endif Windows}
{$ifdef GO32V2}
uses
Dpmiexcp;
{$endif GO32V2}
Procedure SaveConsoleMode(var ConsoleMode : TConsoleMode);
Begin
@ -62,15 +57,10 @@ Begin
TCGetAttr(1,ConsoleMode);
{$endif UNIX}
{$ifdef Windows}
if not GetConsoleMode(GetStdHandle(STD_INPUT_HANDLE),ConsoleMode) then
DebugMessage('','Call to GetConsoleMode failed, GetLastError='+
IntToStr(GetLastError),0,0);
GetConsoleMode(GetStdHandle(STD_INPUT_HANDLE),ConsoleMode);
{$endif Windows}
{$ifdef go32v2}
if djgpp_set_ctrl_c(false) then
ConsoleMode:=1
else
ConsoleMode:=0;
ConsoleMode:=0;
{$endif go32v2}
{$ifdef netware}
ConsoleMode:=0;
@ -83,12 +73,9 @@ Begin
TCSetAttr(1,TCSANOW,ConsoleMode);
{$endif UNIX}
{$ifdef Windows}
if not SetConsoleMode(GetStdHandle(STD_INPUT_HANDLE),ConsoleMode) then
DebugMessage('','Call to SetConsoleMode failed, GetLastError='+
IntToStr(GetLastError),0,0);
SetConsoleMode(GetStdHandle(STD_INPUT_HANDLE),ConsoleMode);
{$endif Windows}
{$ifdef go32v2}
djgpp_set_ctrl_c((ConsoleMode and 1)<>0);
{$endif go32v2}
End;

3
ide/whtmlhlp.pas
View File

@ -1331,8 +1331,7 @@ begin
DebugMessage(Name,Link+' not found',1,1);
{$endif DEBUG}
end;
if HTMLFile<>nil then
Dispose(HTMLFile, Done);
if HTMLFile<>nil then Dispose(HTMLFile, Done);
if BookMark='' then
T^.StartNamedMark:=0
else

6
ide/wutils.pas
View File

@ -200,14 +200,14 @@ const LastStrToIntResult : integer = 0;
procedure RegisterWUtils;
{$ifdef DEBUG}
Procedure WUtilsDebugMessage(AFileName, AText : string; ALine, APos : sw_word);
type
TDebugMessage = procedure(AFileName, AText : string; ALine, APos : sw_word);
Const
DebugMessage : TDebugMessage = @WUtilsDebugMessage;
{$endif DEBUG}
implementation
uses
@ -1350,11 +1350,13 @@ begin
{$endif}
end;
{$ifdef DEBUG}
Procedure WUtilsDebugMessage(AFileName, AText : string; ALine, APos : sw_word);
begin
writeln(stderr,AFileName,' (',ALine,',',APos,') ',AText);
end;
{$endif DEBUG}
BEGIN
Randomize;
END.