paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-06-13 17:08:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: fixed order of syntax options + test (issue #12204)

Browse Source 
git-svn-id: trunk@16694 -
This commit is contained in:
vincents 2008-09-24 07:22:02 +00:00
parent 2c8a855666
commit e9fe4e0b49
5 changed files with 82 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitattributes vendored
View File

@ -3710,6 +3710,9 @@ packager/ufrmaddcomponent.pas svneol=native#text/pascal
startlazarus.app/Contents/Info.plist svneol=native#text/plain startlazarus.app/Contents/Info.plist svneol=native#text/plain
startlazarus.app/Contents/MacOS/startlazarus -text svneol=unset#application/octet startlazarus.app/Contents/MacOS/startlazarus -text svneol=unset#application/octet
startlazarus.app/Contents/PkgInfo svneol=native#text/plain startlazarus.app/Contents/PkgInfo svneol=native#text/plain
test/bugs/12204/bug12204.lpi svneol=native#text/plain
test/bugs/12204/bug12204.pas svneol=native#text/plain
test/bugs/12204/expected.txt svneol=native#text/plain
test/bugs/2068/bug2068.lpi svneol=native#text/plain test/bugs/2068/bug2068.lpi svneol=native#text/plain
test/bugs/2068/bug2068.lpr svneol=native#text/plain test/bugs/2068/bug2068.lpr svneol=native#text/plain
test/bugs/2068/expected.txt svneol=native#text/plain test/bugs/2068/expected.txt svneol=native#text/plain

14
ide/compileroptions.pp
View File

@ -2339,6 +2339,11 @@ begin
-Mmacpas Macintosh Pascal dialects compatibility mode -Mmacpas Macintosh Pascal dialects compatibility mode
} }
if SyntaxMode<>'' then
Result:='-M'+SyntaxMode
else
Result:='';
tempsw := ''; tempsw := '';
if (CStyleOperators) then if (CStyleOperators) then
@ -2358,15 +2363,10 @@ begin
if (StaticKeyword) then if (StaticKeyword) then
tempsw := tempsw + 't'; tempsw := tempsw + 't';
if (tempsw <> '') then if (tempsw <> '') then begin
Result := '-S' + tempsw
else
Result:='';
if SyntaxMode<>'' then begin
if Result<>'' then if Result<>'' then
Result:=Result+' '; Result:=Result+' ';
Result:=Result+'-M'+SyntaxMode; Result := Result+'-S' + tempsw;
end; end;
end; end;

57
test/bugs/12204/bug12204.lpi Normal file
View File

@ -0,0 +1,57 @@
<?xml version="1.0"?>
<CONFIG>
<ProjectOptions>
<PathDelim Value="\"/>
<Version Value="6"/>
<General>
<Flags>
<MainUnitHasUsesSectionForAllUnits Value="False"/>
<MainUnitHasCreateFormStatements Value="False"/>
<MainUnitHasTitleStatement Value="False"/>
</Flags>
<SessionStorage Value="InIDEConfig"/>
<MainUnit Value="0"/>
<IconPath Value="./"/>
<TargetFileExt Value=".exe"/>
</General>
<VersionInfo>
<ProjectVersion Value=""/>
</VersionInfo>
<PublishOptions>
<Version Value="2"/>
<IgnoreBinaries Value="False"/>
<IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
<ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>
</PublishOptions>
<RunParams>
<local>
<FormatVersion Value="1"/>
<LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
</local>
</RunParams>
<Units Count="2">
<Unit0>
<Filename Value="bug12204.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="bug12204"/>
</Unit0>
<Unit1>
<Filename Value="expected.txt"/>
<IsPartOfProject Value="True"/>
</Unit1>
</Units>
</ProjectOptions>
<CompilerOptions>
<Version Value="8"/>
<PathDelim Value="\"/>
<Parsing>
<SyntaxOptions>
<CStyleOperator Value="False"/>
<UseAnsiStrings Value="True"/>
</SyntaxOptions>
</Parsing>
<Other>
<CompilerPath Value="$(CompPath)"/>
</Other>
</CompilerOptions>
</CONFIG>

13
test/bugs/12204/bug12204.pas Normal file
View File

@ -0,0 +1,13 @@
program bug12204;
var
s1: AnsiString;
s2: string;
begin
s1 := 's1';
WriteLn('s1 = ', s1, ' : ', SizeOf(s1));
s2 := 's2';
WriteLn('s2 = ', s2, ' : ', SizeOf(s2));
end.

2
test/bugs/12204/expected.txt Normal file
View File

@ -0,0 +1,2 @@
s1 = s1 : 4
s2 = s2 : 4