Merge pull request #3 from Alexxx180/develop

Develop

Makefile

@@ -6,7 +6,7 @@ SHELL := powershell.exe
 CMD=powershell -NoProfile -Command
 
 CC=cl
-CFLAGS=/nologo /EHsc /I header /Zi
+CFLAGS=/nologo /EHsc /I header
 LINK=link
 LFLAGS=/nologo /SUBSYSTEM:CONSOLE /DEBUG:FULL
 
@@ -30,7 +30,7 @@ DELOBJ=del $$PSItem.FullName -Recurse
 %.obj : %.cpp
 	$(eval folder=$(subst $(SRC),$(OBJ),$(@D)))
 	$(eval result=$(folder)/$(@F))
-	@$(CMD) "if (-not (Test-Path $(folder))) { mkdir $(folder) > $(BUILD)/$(CLOG) }"
+	@$(CMD) "if (-not (Test-Path $(folder))) { mkdir $(folder) }"
 	@$(CC) $(CFLAGS) /Fo$(result) /c $<
 
 compile : $(OFILES)

demo/input/numbers.txt

@@ -0,0 +1 @@
+-4 12 6 -9 8 -2 3 5

demo/input/search.txt

@@ -0,0 +1,6 @@
+There is a couple of
+examples to work with {keyword}.
+As you can see the {keyword}
+tend to be used in various
+markdown systems that contain
+{keyword} format string.

demo/output/binary.txt

@@ -0,0 +1,8 @@
+12
+6
+8
+3
+5
+-2
+-9
+-4

demo/output/squares.txt

@@ -0,0 +1,8 @@
+16
+144
+36
+81
+64
+4
+9
+25

header/common/calculus/pow.h

@@ -0,0 +1,15 @@
+#ifndef COMMON_CALCULUS_POW
+#define COMMON_CALCULUS_POW
+
+template<TYPE>
+TYPE pow(TYPE base, byte exp) {
+    TYPE result = 1;
+    while (exp) {
+        if (exp % 2) result *= base;
+        exp /= 2;
+        base *= base;
+    }
+    return result;
+}
+
+#endif

header/common/texts/errors.h

@@ -10,7 +10,8 @@ static const std::map<std::string, std::wstring> errors = {
     { "empty_string", L"\u041e\u0448\u0438\u0431\u043a\u0430\u003a\u0020\u0432\u0432\u0435\u0434\u0435\u043d\u0430\u0020\u043f\u0443\u0441\u0442\u0430\u044f\u0020\u0441\u0442\u0440\u043e\u043a\u0430!" }, // Ошибка: введена пустая строка!
     { "invalid_character", L"\u041e\u0448\u0438\u0431\u043a\u0430\u003a\u0020\u043d\u0435\u043a\u043e\u0440\u0440\u0435\u043a\u0442\u043d\u044b\u0439\u0020\u0441\u0438\u043c\u0432\u043e\u043b!" }, // Ошибка: некорректный символ!
     { "out_of_bounds", L"\u0414\u0430\u043d\u043d\u044b\u0435 \u0432\u043d\u0435 \u0434\u0438\u0430\u043f\u0430\u0437\u043e\u043d\u0430!" }, // Данные вне диапазона!
-    { "can_not_read", L"\u041e\u0448\u0438\u0431\u043a\u0430 \u0447\u0442\u0435\u043d\u0438\u044f \u0434\u0430\u043d\u043d\u044b\u0445!" }, // Ошибка чтения данных!
+    { "read_failure", L"\u041e\u0448\u0438\u0431\u043a\u0430 \u0447\u0442\u0435\u043d\u0438\u044f \u0434\u0430\u043d\u043d\u044b\u0445!" }, // Ошибка чтения данных!
+    { "write_failure", L"\u041e\u0448\u0438\u0431\u043a\u0430 \u0437\u0430\u043f\u0438\u0441\u0438 \u0434\u0430\u043d\u043d\u044b\u0445!" }, // Ошибка записи данных!
 };
 
 #endif

header/input/feedback/typer.h

@@ -16,8 +16,9 @@ class Typer {
 
         void Input() {
             out->Field();
+            byte context = out->TargetLayer;
             do {
-                out->Target(MAIN)->Move();
+                out->Target(context)->Move();
                 Type();
             }
             while (!IsVerified);

header/screen/matrix/tools/layer/layer.h

@@ -11,13 +11,15 @@ struct Layer {
     Fragment<Grid> back;
     Fragment<Stencil> out;
     Fragment<Bar> status;
+    byte TargetLayer;
 
     void Add(Screen* screen) {
         back.Add(screen->back);
         out.Add(screen->out);
     }
 
     Layer* Target(byte current) {
+        TargetLayer = current;
         back.Target(current);
         out.Target(current);
         status.Target(current);

header/screen/matrix/tools/markdown.h

@@ -43,6 +43,7 @@ class Markdown {
         Markdown* Top(byte flow);
         Markdown* Bot(byte flow);
         Markdown* Relate(byte flow, float relation);
+        Markdown* Split(byte flow, float ratio);
         Markdown* Margin(byte flow, byte margin);
 };
 

header/task/forms/defaults/cui/screens/menu/main/files/files.h

@@ -0,0 +1,3 @@
+#include "screen/controls/menu/menuitem.h"
+
+MenuItem FilesMenu();

header/task/forms/defaults/cui/screens/menu/main/files/text.h

@@ -0,0 +1,3 @@
+#include "screen/controls/menu/menuitem.h"
+
+MenuItem TextFilesMenu();

header/task/forms/defaults/cui/screens/menu/main/practice.h

@@ -0,0 +1,3 @@
+#include "screen/controls/menu/menuitem.h"
+
+MenuItem PracticeMenu();

header/task/forms/defaults/cui/screens/menu/main/records.h

@@ -0,0 +1,6 @@
+#include "screen/controls/menu/menuitem.h"
+#include <vector>
+#include <string>
+
+MenuItem RecordsMenu();
+std::vector<std::string> RecordsWeek();

header/task/forms/defaults/cui/screens/menu/main/structure.h

@@ -0,0 +1,3 @@
+#include "screen/controls/menu/menuitem.h"
+
+MenuItem StructureMenu();

header/task/forms/defaults/cui/screens/menu/structure/common.h

@@ -0,0 +1,4 @@
+#include "screen/controls/menu/menu.h"
+#include "screen/controls/menu/menuitem.h"
+
+Menu CommonMenu(MenuItem* task);

header/task/forms/defaults/cui/screens/menu/structure/list.h

@@ -0,0 +1,5 @@
+#include "screen/controls/menu/loop/exit.h"
+
+extern ExitMenu list_menu;
+
+void ListMenu();

header/task/forms/defaults/cui/screens/menu/structure/list/fill.h

@@ -0,0 +1,3 @@
+#include "screen/controls/menu/menuitem.h"
+
+MenuItem ListFillMenu();

header/task/forms/defaults/cui/screens/menu/structure/list/operations.h

@@ -0,0 +1,3 @@
+#include "screen/controls/menu/menuitem.h"
+
+MenuItem ListOperationsMenu();

header/task/forms/defaults/cui/screens/menu/structure/list/operations/add.h

@@ -0,0 +1,3 @@
+#include "screen/controls/menu/menuitem.h"
+
+MenuItem ListAddMenu();

header/task/forms/defaults/cui/screens/menu/structure/list/operations/delete.h

@@ -0,0 +1,3 @@
+#include "screen/controls/menu/menuitem.h"
+
+MenuItem ListDeleteMenu();

header/task/forms/defaults/cui/screens/menu/structure/queue.h

@@ -0,0 +1,5 @@
+#include "screen/controls/menu/loop/exit.h"
+
+extern ExitMenu queue_menu;
+
+void QueueMenu();

header/task/forms/defaults/cui/screens/menu/structure/queue/fill.h

@@ -0,0 +1,3 @@
+#include "screen/controls/menu/menuitem.h"
+
+MenuItem QueueFillMenu();

header/task/forms/defaults/cui/screens/menu/structure/queue/operations.h

@@ -0,0 +1,3 @@
+#include "screen/controls/menu/menuitem.h"
+
+MenuItem QueueOperationsMenu();

header/task/forms/defaults/cui/screens/menu/structure/queue/operations/view.h

@@ -0,0 +1,3 @@
+#include "screen/controls/menu/menuitem.h"
+
+MenuItem QueueViewMenu();

header/task/forms/defaults/cui/screens/menu/structure/stack.h

@@ -0,0 +1,5 @@
+#include "screen/controls/menu/loop/exit.h"
+
+extern ExitMenu stack_menu;
+
+void StackMenu();

header/task/forms/defaults/cui/screens/menu/structure/stack/fill.h

@@ -0,0 +1,3 @@
+#include "screen/controls/menu/menuitem.h"
+
+MenuItem StackFillMenu();

header/task/forms/defaults/cui/screens/menu/structure/stack/operations.h

@@ -0,0 +1,3 @@
+#include "screen/controls/menu/menuitem.h"
+
+MenuItem StackOperationsMenu();

header/task/forms/defaults/cui/screens/menu/structure/stack/operations/view.h

@@ -0,0 +1,3 @@
+#include "screen/controls/menu/menuitem.h"
+
+MenuItem StackViewMenu();

header/task/forms/defaults/cui/screens/templates/list.h

@@ -0,0 +1 @@
+void ListInfo();

header/task/forms/defaults/cui/screens/templates/queue.h

@@ -0,0 +1 @@
+void QueueInfo();

header/task/forms/defaults/cui/screens/templates/stack.h

@@ -0,0 +1 @@
+void StackInfo();

header/task/forms/defaults/io/input.h

@@ -7,4 +7,4 @@ void SetInputVerifiers();
 extern Boundary<char> limits;
 extern StringPrompt* prompts;
 extern Verifier<char>* numeric;
-extern Randomizer<char> gen_int8;
+extern Randomizer<char> gen8;