Skip to content

Commit ff260c1

Browse files
author
Viktor Chernev
committed
fixing bugs
1 parent 0cefb27 commit ff260c1

File tree

6 files changed

+64
-38
lines changed

6 files changed

+64
-38
lines changed

‎@DescribeCompilerCLI/DescribeCompilerCLI.csproj.user‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
4-
<StartArguments>parse-folder "C:\Users\Viktor Chernev\Desktop\docs-scratch\TestData" "C:\Users\Viktor Chernev\Desktop\docs-scratch\result.json" template="JSON_COMMONER" verbosity=low logfile="C:\Users\Viktor Chernev\Desktop\docs-scratch\last-log.txt" dsonly toponly=false onerror=ignore</StartArguments>
4+
<StartArguments>parse-folder "C:\Users\Viktor Chernev\Desktop\dbs\2023.12.12-200906461\Public\files" "C:\Users\Viktor Chernev\Desktop\testResult.json" translator="JSON" verbosity=low dsonly toponly=false onerror=ignore</StartArguments>
55
</PropertyGroup>
66
<PropertyGroup>
77
<PublishUrlHistory>C:\Users\Viktor Chernev\Desktop\World-Describe\Language\DescribeLanguage\.repo\Release\0.9.2\|C:\Users\Viktor Chernev\Desktop\World-Describe\Language\DescribeLanguage\.repo\Release\|C:\Users\Viktor Chernev\Desktop\DescribeParser\%40CompilerCLI\Release\|publish\</PublishUrlHistory>

‎@DescribeCompilerCLI/FunctionsMessages.cs‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,15 @@ public static class Messages
1717
public static ConsoleColor TEXT_COLOR = ConsoleColor.White;
1818
public static ConsoleColor ERROR_COLOR = ConsoleColor.Red;
1919
public static ConsoleColor MOREINFO_COLOR = ConsoleColor.Green;
20+
static ConsoleColor beforeForeground;
21+
static ConsoleColor beforeBackground;
2022

2123
static string thisName;
2224
static Messages()
2325
{
2426
thisName = Assembly.GetExecutingAssembly().GetName().Name;
27+
beforeForeground = Console.ForegroundColor;
28+
beforeBackground = Console.BackgroundColor;
2529
}
2630

2731

@@ -61,6 +65,11 @@ public static void SetDarkBlueTheme()
6165
ERROR_COLOR = ConsoleColor.Red;
6266
MOREINFO_COLOR = ConsoleColor.DarkCyan;
6367
}
68+
public static void RevertConsoleColors()
69+
{
70+
Console.ForegroundColor = beforeForeground;
71+
Console.BackgroundColor = beforeBackground;
72+
}
6473

6574

6675
//presets

‎@DescribeCompilerCLI/Program.cs‎

Lines changed: 47 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -18,45 +18,56 @@ internal class Program
1818
{
1919
static void Main(string[] args)
2020
{
21-
//preset
22-
Messages.presetConsole();
23-
Messages.SetDarkBlueTheme();
24-
Messages.printLogo3Bicolor();
25-
Messages.printCmdLine(args);
26-
27-
//read args
28-
if (args.Length < 1)
29-
{
30-
Messages.printNoArgumentsError();
31-
}
32-
//DescribeCompilerCLI help | -h
33-
else if (args[0].ToLower() == "help" || args[0] == "-h")
34-
{
35-
Messages.printHelpMessage();
36-
}
37-
//DescribeCompilerCLI parse-file PARSE_PATH RESULT_PATH
38-
//[dsonly[=<verb>]] [verbosity=<verb> | log-verbosity=<verb> ] [onerror=<verb> ]
39-
//[artifacts=<verb> [artifacts-path=ARTIFACTS_PATH]] [logfile=LOG_PATH ]
40-
else if (args[0].ToLower() == "parse-file")
41-
{
42-
parseFile(args);
43-
}
44-
//DescribeCompilerCLI parse-folder PARSE_PATH RESULT_PATH
45-
//[ dsonly[=<verb>] ] [ toponly[=true|=false] ] [ verbosity=<verb> | log-verbosity=<verb> ]
46-
//[ onerror=<verb> ] [ artifacts=<verb> [artifacts-path=ARTIFACTS_PATH ]] [ logfile=LOG_PATH ]
47-
else if (args[0].ToLower() == "parse-folder")
21+
try
4822
{
49-
parseFolder(args);
23+
//preset
24+
Messages.presetConsole();
25+
Messages.SetDarkBlueTheme();
26+
Messages.printLogo3Bicolor();
27+
Messages.printCmdLine(args);
28+
29+
//read args
30+
if (args.Length < 1)
31+
{
32+
Messages.printNoArgumentsError();
33+
}
34+
//DescribeCompilerCLI help | -h
35+
else if (args[0].ToLower() == "help" || args[0] == "-h")
36+
{
37+
Messages.printHelpMessage();
38+
}
39+
//DescribeCompilerCLI parse-file PARSE_PATH RESULT_PATH
40+
//[dsonly[=<verb>]] [verbosity=<verb> | log-verbosity=<verb> ] [onerror=<verb> ]
41+
//[artifacts=<verb> [artifacts-path=ARTIFACTS_PATH]] [logfile=LOG_PATH ]
42+
else if (args[0].ToLower() == "parse-file")
43+
{
44+
parseFile(args);
45+
}
46+
//DescribeCompilerCLI parse-folder PARSE_PATH RESULT_PATH
47+
//[ dsonly[=<verb>] ] [ toponly[=true|=false] ] [ verbosity=<verb> | log-verbosity=<verb> ]
48+
//[ onerror=<verb> ] [ artifacts=<verb> [artifacts-path=ARTIFACTS_PATH ]] [ logfile=LOG_PATH ]
49+
else if (args[0].ToLower() == "parse-folder")
50+
{
51+
parseFolder(args);
52+
}
53+
else
54+
{
55+
Messages.printArgumentError(args[0], 1);
56+
}
57+
58+
//save log to file
59+
if (Datnik.logToFile)
60+
{
61+
File.WriteAllText(Datnik.logFilePath, Messages.Log);
62+
}
5063
}
51-
else
64+
catch (Exception ex)
5265
{
53-
Messages.printArgumentError(args[0], 1);
66+
Messages.printFatalError(ex.Message);
5467
}
55-
56-
//save log to file
57-
if (Datnik.logToFile)
58-
{
59-
File.WriteAllText(Datnik.logFilePath, Messages.Log);
68+
finally
69+
{
70+
Messages.RevertConsoleColors();
6071
}
6172
}
6273
static void parseFile(string[] args)
@@ -227,7 +238,7 @@ static void parseFolder(string[] args)
227238

228239
//Compile
229240
MainFunctions.Compile();
230-
Console.ReadKey();
241+
Messages.printCompilationSuccess();
231242
}
232243
}
233244
}

‎Documentation/v 9.3/bugNotShowingPressAnyKeyAfterSuccess.txt‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

Documentation/v 9.3/bugConsoleCollorOnExit.txt renamed to Documentation/v 9.3/fixed/@bugConsoleCollorOnExit.txt

File renamed without changes.

‎Documentation/v 9.3/fixed/@bugNotShowingPressAnyKeyAfterSuccess.txt‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
BUG: show press aky key to exit after successful parse operation
2+
fixed.
3+
Wasn't showing it after parsing a folder, to be precise.
4+
5+
parse-folder "C:\Users\Viktor Chernev\Desktop\dbs\2023.12.12-200906461\Public\files" "C:\Users\Viktor Chernev\Desktop\testResult.json" translator="JSON" verbosity=low dsonly toponly=false onerror=ignore
6+
7+
parse-file "C:\Users\Viktor Chernev\Desktop\dbs\2023.12.12-200906461\Public\files\@public.ds" "C:\Users\Viktor Chernev\Desktop\testResult.json" translator="JSON" verbosity=low

0 commit comments

Comments
 (0)