administrator/pascalabcnet
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Mikhalkovich Stanislav 2024-02-04 19:17:38 +03:00
parent 72988ff4cc 71df546ed0
commit 630e682b5f
3 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CodeCompletion/Testing.cs
View file

@ -1148,6 +1148,8 @@ namespace CodeCompletion
if (Text.Replace("\r\n","\n") != Text2.Replace("\r\n","\n"))
{
int line = 1;
Text = Text.Replace("\r\n", "\n");
Text2 = Text2.Replace("\r\n", "\n");
for (int i = 0; i < Math.Min(Text.Length, Text2.Length); i++)
{
if (Text[i] != Text2[i])

16
Compiler/Compiler.cs
View file

@ -2005,14 +2005,14 @@ namespace PascalABCCompiler
}
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 @@ namespace PascalABCCompiler
compilerOptions = new NETGenerator.CompilerOptions();
// выяснение целевой платформы
// выяснение TargetFramework и целевой платформы
SetOutputPlatformOption(compilerOptions);
// остальные директивы

8
bin/Lib/CRT.pas
View file

@ -185,9 +185,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
@ -202,7 +202,7 @@ end;
function KeyPressed: boolean;
begin
KeyPressed := Console.KeyAvailable;
KeyPressed := (NextKey <> #0) or Console.KeyAvailable;
end;
function WindowWidth: integer;
@ -330,4 +330,4 @@ end;
begin
//zdes oshibka ISConsoleApplication u nas nikogda ne inicializiruetsja
__InitModule;
end.
end.