浏览代码

* initialize current_settings as early as possible so cs_debugswitch is set correctly if needed

git-svn-id: trunk@48676 -
florian 4 年之前
父节点
当前提交
c3fb1e3a65
共有 1 个文件被更改,包括 4 次插入3 次删除
  1. 4 3
      compiler/parser.pas

+ 4 - 3
compiler/parser.pas

@@ -354,6 +354,10 @@ implementation
          exceptblockcounter:=0;
          exceptblockcounter:=0;
          current_settings.maxfpuregisters:=-1;
          current_settings.maxfpuregisters:=-1;
          current_settings.pmessage:=nil;
          current_settings.pmessage:=nil;
+
+         { Load current state from the init values }
+         current_settings:=init_settings;
+
        { reset the unit or create a new program }
        { reset the unit or create a new program }
          { a unit compiled at command line must be inside the loaded_unit list }
          { a unit compiled at command line must be inside the loaded_unit list }
          if (compile_level=1) then
          if (compile_level=1) then
@@ -369,9 +373,6 @@ implementation
                 (current_module.state in [ms_compile,ms_second_compile])) then
                 (current_module.state in [ms_compile,ms_second_compile])) then
            internalerror(200212281);
            internalerror(200212281);
 
 
-         { Load current state from the init values }
-         current_settings:=init_settings;
-
          { load current asmdata from current_module }
          { load current asmdata from current_module }
          current_asmdata:=TAsmData(current_module.asmdata);
          current_asmdata:=TAsmData(current_module.asmdata);