v3.003-dev-new

.devcontainer/devcontainer.json

@@ -5,9 +5,10 @@
 	"customizations": {
         "vscode": {
             "extensions": [
-				"L-I-V.mql-tools",
 				"ms-vscode.cpptools",
-				"vscodevim.vim"
+				"vscodevim.vim",
+				"DavidAnson.vscode-markdownlint",
+				"EA31337.vscode-mql-tools"
 			],
         }
     },
@@ -18,7 +19,9 @@
 		"ghcr.io/guiyomh/features/vim:0": {},
 		"ghcr.io/jungaretti/features/make:1": {},
 		"ghcr.io/prulloac/devcontainer-features/pre-commit:1": {},
-		"ghcr.io/hspaans/devcontainer-features/ansible-lint:1": {}
+		"ghcr.io/hspaans/devcontainer-features/ansible-lint:1": {},
+		// "ghcr.io/maks1ms/devcontainers-features/wine:0": {},
+		"ghcr.io/devcontainers-contrib/features/node-asdf:0": {}
 	},
     // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
     "image": "mcr.microsoft.com/devcontainers/base:jammy",

.github/workflows/compile-cpp.yml

@@ -36,9 +36,13 @@ jobs:
         file: ${{ fromJson(needs.FileList.outputs.filelist) }}
     steps:
       - uses: actions/checkout@v2
-      - name: Install compiler
+      - name: Install Emscripten toolchain
+        uses: mymindstorm/setup-emsdk@v11
+      - name: Install CPP compiler
         uses: rlalik/[email protected]
         with:
           compiler: gcc-latest
-      - name: Compile ${{ matrix.file }}
-        run: g++ "${{ matrix.file }}"
+      - name: Compile ${{ matrix.file }} via emcc
+        run: emcc "${{ matrix.file }}"
+      - name: Compile ${{ matrix.file }} via g++
+        run: g++ -c "${{ matrix.file }}"

.github/workflows/test.yml

@@ -40,12 +40,10 @@ jobs:
       matrix:
         test:
           - AccountTest
-          - ActionTest
           - BufferStructTest
           - BufferTest
           - ChartTest
           - CompileIndicatorsTest
-          - ConditionTest
           - DatabaseTest
           # - DrawIndicatorTest
           - EATest
@@ -62,7 +60,6 @@ jobs:
           - StrategyTest-RSI
           - SymbolInfoTest
           - SummaryReportTest
-          - TaskTest
           - TickerTest
           - TradeTest
     steps:

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+    "files.associations": {
+        "indicatorcandle.h": "c"
+    }
+}

Chart.mqh

@@ -42,10 +42,10 @@ class Market;
 #include "Chart.enum.h"
 #include "Chart.struct.h"
 #include "Chart.struct.serialize.h"
-#include "Condition.enum.h"
 #include "Convert.mqh"
 #include "Market.mqh"
 #include "Serializer.mqh"
+#include "Task/TaskCondition.enum.h"
 
 #ifndef __MQL4__
 // Defines structs (for MQL4 backward compatibility).

DictIteratorBase.mqh

@@ -121,7 +121,7 @@ class DictIteratorBase {
   bool IsLast() {
     if (!IsValid()) return true;
 
-    if (_dict PTR_DEREF GetMode() == DictModeUnknown || _dict.Size() == 0) {
+    if (_dict PTR_DEREF GetMode() == DictModeUnknown || _dict PTR_DEREF Size() == 0) {
       return false;
     }
 

DictObject.mqh

@@ -142,9 +142,9 @@ class DictObject : public DictBase<K, V> {
     else
       slot = GetSlotByKey(this PTR_DEREF _DictSlots_ref, key, position);
 
-    if (slot == NULL || !slot.IsUsed()) return NULL;
+    if (slot == NULL || !slot PTR_DEREF IsUsed()) return NULL;
 
-    return &slot.value;
+    return &slot PTR_DEREF value;
   }
 
   /**
@@ -156,7 +156,7 @@ class DictObject : public DictBase<K, V> {
 
     if (!slot) return NULL;
 
-    return &slot.value;
+    return &slot PTR_DEREF value;
   }
 
   /**
@@ -171,7 +171,7 @@ class DictObject : public DictBase<K, V> {
       return NULL;
     }
 
-    return &slot.value;
+    return &slot PTR_DEREF value;
   }
 
   /**
@@ -186,7 +186,7 @@ class DictObject : public DictBase<K, V> {
 
     if (!slot) return false;
 
-    return slot.value == value;
+    return slot PTR_DEREF value == value;
   }
 
   /**
@@ -265,7 +265,7 @@ class DictObject : public DictBase<K, V> {
           if (this PTR_DEREF overflow_listener != NULL) {
             if (!this PTR_DEREF overflow_listener(DICT_OVERFLOW_REASON_TOO_MANY_CONFLICTS, dictSlotsRef._num_used,
                                                   _num_conflicts)) {
-              // Overflow listener returned false so we won't search for further empty slot.
+              // Overflow listener returned false so we won't search for further empty slot PTR_DEREF
               _overwrite_slot = true;
               break;
             }
@@ -285,7 +285,7 @@ class DictObject : public DictBase<K, V> {
         // Overwriting starting position for faster further lookup.
         position = _starting_position;
       } else {
-        // Slot overwrite is not needed. Using empty slot.
+        // Slot overwrite is not needed. Using empty slot PTR_DEREF
         ++dictSlotsRef._num_used;
       }
 

DictStruct.mqh

@@ -144,14 +144,14 @@ class DictStruct : public DictBase<K, V> {
     else
       slot = GetSlotByKey(_DictSlots_ref, key, position);
 
-    if (slot == NULL || !slot.IsUsed()) {
+    if (slot == NULL || !slot PTR_DEREF IsUsed()) {
       Alert("Invalid DictStruct key \"", key, "\" (called by [] operator). Returning empty structure.");
       DebugBreak();
       static V _empty;
       return _empty;
     }
 
-    return slot.value;
+    return slot PTR_DEREF value;
   }
 
   /**
@@ -166,7 +166,7 @@ class DictStruct : public DictBase<K, V> {
       return _empty;
     }
 
-    return slot.value;
+    return slot PTR_DEREF value;
   }
 
   /**
@@ -183,7 +183,7 @@ class DictStruct : public DictBase<K, V> {
       return _default;
     }
 
-    return slot.value;
+    return slot PTR_DEREF value;
   }
 
   /**
@@ -199,7 +199,7 @@ class DictStruct : public DictBase<K, V> {
       return _empty;
     }
 
-    return slot.value;
+    return slot PTR_DEREF value;
   }
 
 /**
@@ -231,7 +231,7 @@ class DictStruct : public DictBase<K, V> {
 
     if (!slot) return false;
 
-    return slot.value == value;
+    return slot PTR_DEREF value == value;
   }
 
   /**

EA.mqh

@@ -30,9 +30,7 @@
 #define EA_MQH
 
 // Includes.
-#include "Action.enum.h"
 #include "Chart.mqh"
-#include "Condition.enum.h"
 #include "Data.struct.h"
 #include "Dict.mqh"
 #include "DictObject.mqh"
@@ -46,7 +44,9 @@
 #include "SerializerSqlite.mqh"
 #include "Strategy.mqh"
 #include "SummaryReport.mqh"
-#include "Task.mqh"
+#include "Task/Task.h"
+#include "Task/TaskAction.enum.h"
+#include "Task/TaskCondition.enum.h"
 #include "Terminal.mqh"
 #include "Trade.mqh"
 #include "Trade/TradeSignal.h"

EA.struct.h

@@ -32,7 +32,7 @@
 
 // Includes.
 #include "DateTime.mqh"
-#include "Task.struct.h"
+#include "Task/Task.struct.h"
 
 /* Defines EA config parameters. */
 struct EAParams {
@@ -225,7 +225,7 @@ struct EAState {
  public:                  // @todo: Move to protected.
   DateTime last_updated;  // Last updated.
  protected:
-  unsigned int flags;        // Action flags.
+  unsigned int flags;      // TaskAction flags.
   unsigned int new_periods;  // Started periods.
  public:
   /* Struct's enumerations */

IndicatorData.mqh

@@ -176,6 +176,16 @@ class IndicatorData : public IndicatorBase {
     return _price;
   }
 
+  /* Setters */
+
+  /**
+   * Sets the value for IndicatorDataParams struct.
+   */
+  template <typename T>
+  void Set(STRUCT_ENUM_IDATA_PARAM _param, T _value) {
+    idparams.Set<T>(_param, _value);
+  }
+
   /* State methods */
 
   /**

Indicators/Indi_Drawer.mqh

@@ -24,10 +24,10 @@
 struct IndicatorParams;
 
 // Includes.
-#include "../Action.mqh"
 #include "../DictStruct.mqh"
 #include "../Indicator/IndicatorTickOrCandleSource.h"
 #include "../Redis.mqh"
+#include "../Task/TaskAction.h"
 #include "Indi_Drawer.struct.h"
 #include "Price/Indi_Price.mqh"
 
@@ -106,7 +106,7 @@ class Indi_Drawer : public IndicatorTickOrCandleSource<IndiDrawerParams> {
   virtual void OnTick() {
     Indicator<IndiDrawerParams>::OnTick();
 
-    ActionEntry action(INDI_ACTION_SET_VALUE);
+    TaskActionEntry action(INDI_ACTION_SET_VALUE);
     ArrayResize(action.args, 3);
     action.args[0].type = TYPE_LONG;
     action.args[0].integer_value = GetBarTime();
@@ -133,7 +133,7 @@ class Indi_Drawer : public IndicatorTickOrCandleSource<IndiDrawerParams> {
       Print("Got: ", message.Message);
 #endif
       if (message.Command == "message" && message.Channel == "INDICATOR_DRAW") {
-        ActionEntry action_entry;
+        TaskActionEntry action_entry;
         SerializerConverter::FromString<SerializerJson>(message.Message).ToObject(action_entry);
         ExecuteAction((ENUM_INDICATOR_ACTION)action_entry.action_id, action_entry.args);
 #ifdef __debug__