Merge branch 'master' of https://github.com/pascalabcnet/pascalabcnet …

…into test
spectatorBH · Feb 2, 2024 · 72dd446 · 72dd446
2 parents d348b0f + 5496eb1
commit 72dd446
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/Compiler/Compiler.cs b/Compiler/Compiler.cs
@@ -2005,14 +2005,14 @@ private void SetOutputPlatformOption(NETGenerator.CompilerOptions compilerOption
                 }
                 if (CompilerOptions.Only32Bit)
                     compilerOptions.platformtarget = NETGenerator.CompilerOptions.PlatformTarget.x86;
-
-                // целевой framework
-                if (this.compilerDirectives.TryGetValue(TreeConverter.compiler_string_consts.compiler_directive_targetframework, out compilerDirectivesList))
+            }
+            if (compilerDirectives.TryGetValue(TreeConverter.compiler_string_consts.compiler_directive_targetframework, out compilerDirectivesList))
+            {
+                compilerOptions.TargetFramework = compilerDirectivesList[0].directive;
+                if (!(new string[] { "net40", "net403", "net45", "net451", "net452", "net46", "net461", "net462", "net47", "net471", "net472", "net48", "net481" })
+                    .Contains(compilerOptions.TargetFramework))
                 {
-                    compilerOptions.TargetFramework = compilerDirectivesList[0].directive;
-                    if (!(new string[] { "net40", "net403", "net45", "net451", "net452", "net46", "net461", "net462", "net47", "net471", "net472", "net48", "net481" })
-                        .Contains(compilerOptions.TargetFramework))
-                        ErrorsList.Add(new UnsupportedTargetFramework(compilerOptions.TargetFramework, compilerDirectivesList[0].location));
+                    ErrorsList.Add(new UnsupportedTargetFramework(compilerOptions.TargetFramework, compilerDirectivesList[0].location));
                 }
             }
         }
@@ -2329,7 +2329,7 @@ private void PrebuildMainSemanticTreeActions(out NETGenerator.CompilerOptions co
 
             compilerOptions = new NETGenerator.CompilerOptions();
 
-            // выяснение целевой платформы
+            // выяснение TargetFramework и целевой платформы
             SetOutputPlatformOption(compilerOptions);
 
             // остальные директивы

diff --git a/bin/Lib/CRT.pas b/bin/Lib/CRT.pas
@@ -155,9 +155,9 @@ function ReadKey: char;// TODO продумать это
 var
   KeyInfo: ConsoleKeyInfo;
 begin
-  if NextKey <> Chr(0) then 
+  if NextKey <> #0 then 
   begin
-    ReadKey := nextkey;
+    ReadKey := NextKey;
     NextKey := #0;
   end 
   else 
@@ -172,7 +172,7 @@ function ReadKey: char;// TODO продумать это
 
 function KeyPressed: boolean;
 begin
-  KeyPressed := Console.KeyAvailable;
+  KeyPressed := (NextKey <> #0) or Console.KeyAvailable;
 end;
 
 function WindowWidth: integer;
@@ -300,4 +300,4 @@ procedure __InitModule__;
 begin
   //zdes oshibka ISConsoleApplication u nas nikogda ne inicializiruetsja
   __InitModule;
-end.
+end.