Lib mode is back!

+some cleanup
SunSerega · Apr 11, 2019 · 16501af · 16501af
1 parent 9736433
commit 16501af
Show file tree

Hide file tree

Showing 18 changed files with 36 additions and 19 deletions.
diff --git a/Config.exe b/Config.exe
diff --git a/src/Config.exe b/src/Config.exe
diff --git a/src/DrctHelp.exe b/src/DrctHelp.exe
diff --git a/src/Editor.exe b/src/Editor.exe
diff --git a/src/File tests.pas b/src/File tests.pas
@@ -8,8 +8,8 @@
   var ep: ExecParams;
   ep.SupprIO := true;
 
-  var s := new Script('D:\Мои программы\SAC\src\TestSuite\TestExec\AllFuncs\Main.sac',ep);
-  //var s := new Script('0\0.sac', ep);
+  //var s := new Script('D:\Мои программы\SAC\src\TestSuite\TestExec\AllFuncs\Main.sac',ep);
+  var s := new Script('0\2.sac', ep);
 
   //SaveObj('test.bin',s);
 

diff --git a/src/FuncHelp.exe b/src/FuncHelp.exe
diff --git a/src/Help.exe b/src/Help.exe
diff --git a/src/LangPacker.exe b/src/LangPacker.exe
diff --git a/src/OperHelp.exe b/src/OperHelp.exe
diff --git a/src/Packs/KCDPacker.exe b/src/Packs/KCDPacker.exe
diff --git a/src/Packs/LibPacker.exe b/src/Packs/LibPacker.exe
diff --git a/src/SAC.exe b/src/SAC.exe
diff --git a/src/ScriptExecutor.pas b/src/ScriptExecutor.pas
@@ -55,7 +55,19 @@   ScriptExecutionForm=class(Form)
         end
       );
 
-      {$endregion script}
+      {$endregion Script}
+
+      {$region Lib mode}
+
+      if ep.lib_mode then
+      begin
+        var sfd := new System.Windows.Forms.SaveFileDialog;
+        sfd.Filter := Translate('PreCompFileFilter');
+        if sfd.ShowDialog = System.Windows.Forms.DialogResult.OK then scr.SaveLib(sfd.FileName);
+        Halt;
+      end;
+
+      {$endregion Lib mode}
 
       {$region Form}
 

diff --git a/src/StmParser.pas b/src/StmParser.pas
@@ -1,8 +1,6 @@
 unit StmParser;
-//ToDo я видел очень странный ExpOptCode в каком то тесте, лучше пересмотреть все
 
 //ToDo оператор Assert
-//ToDo не удалять лишние блоки при оптимизации в режиме библиотеки
 
 //ToDo в каждом операторе надо хранить имя начального файла
 // - иначе оптимизация меняет блок а с ним и файл, и ReadOnly переменные могут перестать работать
@@ -1065,27 +1063,29 @@   CannotExecInLibModeException = class(WrongSettingsException)
       loop br.ReadInt32 do
       begin
         var vname := br.ReadString;
+        var val: object;
         case br.ReadByte of
-          1: self.SngDefConsts.Add(vname, nil);
-          2: self.SngDefConsts.Add(vname, br.ReadString);
-          3: self.SngDefConsts.Add(vname, br.ReadDouble);
+          1: val := nil;
+          2: val := br.ReadString;
+          3: val := br.ReadDouble;
         end;
+        AddSngDef(vname, val is real, val, VarAccessT.init_only, nil);
       end;
 
       loop br.ReadInt32 do
       begin
         var vname := br.ReadString;
         var is_readonly := br.ReadBoolean;
         var fname := CombinePaths(load_path, br.ReadString);
-        self.SngDefStrs.Add(vname, (is_readonly, fname));
+        AddSngDef(vname,false,nil,is_readonly?VarAccessT.read_only:VarAccessT.none,fname);
       end;
 
       loop br.ReadInt32 do
       begin
         var vname := br.ReadString;
         var is_readonly := br.ReadBoolean;
         var fname := CombinePaths(load_path, br.ReadString);
-        self.SngDefNums.Add(vname, (is_readonly, fname));
+        AddSngDef(vname,true,nil,is_readonly?VarAccessT.read_only:VarAccessT.none,fname);
       end;
 
       var lbls := new StmBlock[br.ReadInt32];
@@ -4483,8 +4483,12 @@ constructor Script.Create(fname: string; ep: ExecParams);
     self.SupprIO := new SuppressedIOData;
 
   var sc_sz := System.Windows.Forms.Screen.PrimaryScreen.WorkingArea.Size;
-  AddSngDef('WW', true, real(sc_sz.Width),  VarAccessT.init_only, nil);
-  AddSngDef('WH', true, real(sc_sz.Height), VarAccessT.init_only, nil);
+
+  if not settings.lib_mode then
+  begin
+    AddSngDef('WW', true, real(sc_sz.Width),  VarAccessT.init_only, nil);
+    AddSngDef('WH', true, real(sc_sz.Height), VarAccessT.init_only, nil);
+  end;
 
   read_start_lbl_name := System.IO.Path.GetFullPath(fname);
 
@@ -4650,9 +4654,9 @@ procedure Script.AddSngDef(vname: string; IsNum: boolean; val: object; Access: V
   if Access=VarAccessT.init_only then
   begin
     if
-      SngDefConsts.ContainsKey(vname) or
       SngDefNums.ContainsKey(vname) or
-      SngDefStrs.ContainsKey(vname)
+      SngDefStrs.ContainsKey(vname) or
+      (SngDefConsts.ContainsKey(vname) and not SngDefConsts[vname].Equals(val))
     then raise new CannotOverrideConstException(nil);//ToDo надо отдельное исключение, потому что это не совсем отражает проблему
 
     SngDefConsts[vname] := val;
@@ -4923,10 +4927,11 @@ procedure Script.Optimize;
       end;
     end;
 
-    if not done.Any(bl->bl.GetAllFRefs.Any(ref->ref is DynamicStmBlockRef)) then
-      foreach var kvp in bls.ToList do
-        if not done.Contains(kvp.Value) then
-          bls.Remove(kvp.Key);
+    if not settings.lib_mode then
+      if not done.Any(bl->bl.GetAllFRefs.Any(ref->ref is DynamicStmBlockRef)) then
+        foreach var kvp in bls.ToList do
+          if not done.Contains(kvp.Value) then
+            bls.Remove(kvp.Key);
 
     {$endregion Block chaining}
 

diff --git a/src/Test.exe b/src/Test.exe
diff --git a/src/WK.exe b/src/WK.exe
diff --git a/src/WMP.exe b/src/WMP.exe
diff --git a/src/version.dat b/src/version.dat
@@ -1 +1 @@
-(1 shl 16) + (53)
+(1 shl 16) + (56)