summaryrefslogtreecommitdiff
path: root/compiler/scanner.pas
diff options
context:
space:
mode:
authorpeter <peter@3ad0048d-3df7-0310-abae-a5850022a9f2>2006-09-04 19:54:21 +0000
committerpeter <peter@3ad0048d-3df7-0310-abae-a5850022a9f2>2006-09-04 19:54:21 +0000
commit6ccc305eb1305c48e7617c05f0125be3548f6eb4 (patch)
treefc81a739dad2bb3df5a3a92f280b767027c0d2d6 /compiler/scanner.pas
parent6d381d1c8541f9d7c1ad201047c0b287527fecce (diff)
downloadfpc-6ccc305eb1305c48e7617c05f0125be3548f6eb4.tar.gz
* inline directive enabled by default for fpc,objfpc,delphi modes
* -Si and $inline directive control are now local switches and have finer control on whether a function will really inlined or not git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@4553 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'compiler/scanner.pas')
-rw-r--r--compiler/scanner.pas17
1 files changed, 16 insertions, 1 deletions
diff --git a/compiler/scanner.pas b/compiler/scanner.pas
index 926a5a064f..a03129a4b8 100644
--- a/compiler/scanner.pas
+++ b/compiler/scanner.pas
@@ -288,8 +288,9 @@ implementation
aktlocalswitches:=nextaktlocalswitches;
localswitcheschanged:=false;
end;
+
{ turn ansistrings on by default ? }
- if (m_delphi in aktmodeswitches) then
+ if (m_default_ansistring in aktmodeswitches) then
begin
include(aktlocalswitches,cs_ansistrings);
if changeinit then
@@ -302,6 +303,20 @@ implementation
exclude(initlocalswitches,cs_ansistrings);
end;
+ { turn inline on by default ? }
+ if (m_default_inline in aktmodeswitches) then
+ begin
+ include(aktlocalswitches,cs_do_inline);
+ if changeinit then
+ include(initlocalswitches,cs_do_inline);
+ end
+ else
+ begin
+ exclude(aktlocalswitches,cs_ansistrings);
+ if changeinit then
+ exclude(initlocalswitches,cs_ansistrings);
+ end;
+
{ turn on bitpacking for mode macpas }
if (m_mac in aktmodeswitches) then
begin