Moves Indicator and Serializer class related files to own dirs

.github/workflows/test-indicator.yml

@@ -50,7 +50,10 @@ jobs:
     strategy:
       matrix:
         test:
+          - Indicator.test
+          - IndicatorBase.test
           - IndicatorCandle.test
+          - IndicatorData.test
           - IndicatorTf.test
           - IndicatorTick.test
     steps:

.github/workflows/test-serializer.yml

@@ -0,0 +1,65 @@
+---
+name: Test Serializer
+
+# yamllint disable-line rule:truthy
+on:
+  pull_request:
+    paths:
+      - 'Serializer/**'
+      - '.github/workflows/test-serializer.yml'
+  push:
+    paths:
+      - 'Serializer/**'
+      - '.github/workflows/test-serializer.yml'
+
+jobs:
+
+  Compile:
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Compile
+        uses: fx31337/mql-compile-action@master
+        with:
+          init-platform: true
+          path: 'serializer/tests'
+          verbose: true
+      - name: Print compiled files
+        run: '(Get-ChildItem -Recurse -Path . -Include *.ex[45]).fullname'
+        shell: powershell
+      - name: Upload artifacts (MQL4)
+        uses: actions/upload-artifact@v2
+        with:
+          name: files-ex4
+          path: '**/*.ex4'
+      - name: Upload artifacts (MQL5)
+        uses: actions/upload-artifact@v2
+        with:
+          name: files-ex5
+          path: '**/*.ex5'
+
+  Serializer-Tests-MQL4:
+    defaults:
+      run:
+        shell: bash
+        working-directory: serializer/tests
+    needs: Compile
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        test:
+          - Serializer.test
+    steps:
+      - uses: actions/download-artifact@v2
+        with:
+          name: files-ex4
+      - name: Run ${{ matrix.test }}
+        uses: fx31337/mql-tester-action@master
+        with:
+          BtDays: 4-8
+          BtMonths: 1
+          BtYears: 2021
+          MtVersion: 4.0.0.1359
+          RunOnError: show_logs 200
+          TestExpert: ${{ matrix.test }}
+    timeout-minutes: 10

.github/workflows/test.yml

@@ -60,7 +60,6 @@ jobs:
           - DatabaseTest
           - DrawIndicatorTest
           - EATest
-          - IndicatorTest
           - IndicatorsTest
           - MailTest
           - MarketTest
@@ -111,7 +110,6 @@ jobs:
           - OrderQuery
           - ProfilerTest
           - RefsTest
-          - SerializerTest
           - TerminalTest
           - TimerTest
           - ValueStorageTest

3D/Chart3D.h

@@ -26,12 +26,12 @@
  */
 
 #include "../Bar.struct.h"
-#include "../IndicatorData.mqh"
+#include "../Indicator/IndicatorData.h"
 #include "../Indicators/Indi_MA.mqh"
 #include "../Instances.h"
 #include "../Refs.mqh"
-#include "../SerializerConverter.mqh"
-#include "../SerializerJson.mqh"
+#include "../Serializer/SerializerConverter.h"
+#include "../Serializer/SerializerJson.h"
 #include "Chart3DCandles.h"
 #include "Chart3DType.h"
 #include "Cube.h"

Account/Account.h

@@ -26,7 +26,7 @@
 
 // Includes.
 #include "../BufferStruct.mqh"
-#include "../Serializer.mqh"
+#include "../Serializer/Serializer.h"
 #include "AccountBase.h"
 
 /**

Account/Account.struct.h

@@ -35,7 +35,7 @@
 class Serializer;
 
 // Includes.
-#include "../Serializer.mqh"
+#include "../Serializer/Serializer.h"
 #include "../Terminal.define.h"
 
 // Struct for account entries.

Account/AccountBase.h

@@ -25,7 +25,6 @@
 #define ACCOUNTBASE_H
 
 // Includes.
-//#include "../Serializer.mqh"
 #include "../Refs.mqh"
 #include "AccountBase.struct.h"
 

Account/AccountBase.struct.h

@@ -35,7 +35,7 @@
 class Serializer;
 
 // Includes.
-#include "../Serializer.mqh"
+#include "../Serializer/Serializer.h"
 #include "../Terminal.define.h"
 
 // Struct for account entries.

Account/AccountForex.h

@@ -25,7 +25,7 @@
 #define ACCOUNTFOREX_H
 
 // Includes.
-#include "../Serializer.mqh"
+#include "../Serializer/Serializer.h"
 #include "Account.h"
 #include "AccountForex.struct.h"
 

Account/AccountForex.struct.h

@@ -35,7 +35,7 @@
 class Serializer;
 
 // Includes.
-#include "../Serializer.mqh"
+#include "../Serializer/Serializer.h"
 #include "../Terminal.define.h"
 
 // Struct for account entries.

Account/AccountMt.h

@@ -30,13 +30,12 @@ class AccountMt;
 // Includes.
 #include "../Array.mqh"
 #include "../BufferStruct.mqh"
-#include "../Chart.mqh"
 #include "../Convert.mqh"
 #include "../Data.struct.h"
-#include "../Indicator.struct.h"
+#include "../Indicator/Indicator.struct.h"
 #include "../Order.struct.h"
 #include "../Orders.mqh"
-#include "../Serializer.mqh"
+#include "../Serializer/Serializer.h"
 #include "../SymbolInfo.mqh"
 #include "../Trade.struct.h"
 #include "Account.define.h"

Bar.struct.h

@@ -36,15 +36,16 @@ class Serializer;
 // Includes.
 #include "Bar.enum.h"
 #include "Chart.enum.h"
-#include "ISerializable.h"
-#include "Serializer.enum.h"
-#include "SerializerNode.enum.h"
+#include "Serializer/Serializable.h"
+#include "Serializer/Serializer.enum.h"
+#include "Serializer/SerializerNode.enum.h"
 #include "Std.h"
+#include "Serializer/Serializer.h"
 
 /* Struct for storing OHLC values. */
 struct BarOHLC
 #ifndef __MQL__
-    : public ISerializable
+    : public Serializable
 #endif
 {
   datetime time;
@@ -230,8 +231,6 @@ struct BarOHLC
   string ToCSV() { return StringFormat("%d,%g,%g,%g,%g", time, open, high, low, close); }
 };
 
-#include "Serializer.mqh"
-
 /* Method to serialize BarOHLC structure. */
 SerializerNodeType BarOHLC::Serialize(Serializer &s) {
   // s.Pass(THIS_REF, "time", TimeToString(time));

Buffer/BufferTick.h

@@ -28,7 +28,7 @@
 #include "../BufferStruct.mqh"
 #include "../Chart.enum.h"
 #include "../Storage/IValueStorage.h"
-#include "../Tick.struct.h"
+#include "../Tick/Tick.struct.h"
 
 // TV = Type of price stored by BufferTick. RV = Type of property to be retrieved from BufferTick.
 template <typename TV, typename RV>

BufferFXT.mqh

@@ -25,9 +25,8 @@
 
 // Includes.
 #include "Account/AccountMt.h"
-#include "Chart.mqh"
 #include "DictStruct.mqh"
-#include "IndicatorBase.h"
+#include "Indicator/IndicatorData.h"
 #include "Object.mqh"
 
 // Defines.

BufferStruct.mqh

@@ -27,7 +27,7 @@
 // Includes.
 #include "DictBase.mqh"
 #include "DictStruct.mqh"
-#include "Serializer.mqh"
+#include "Serializer/Serializer.h"
 
 /**
  * Implements BufferStruct's Overflow Listener.

Candle.struct.h

@@ -36,16 +36,17 @@ class Serializer;
 // Includes.
 #include "Bar.enum.h"
 #include "Chart.enum.h"
-#include "ISerializable.h"
-#include "Serializer.enum.h"
-#include "SerializerNode.enum.h"
+#include "Serializer/Serializable.h"
+#include "Serializer/Serializer.enum.h"
+#include "Serializer/SerializerNode.enum.h"
 #include "Std.h"
+#include "Serializer/Serializer.h"
 
 /* Structure for storing OHLC values. */
 template <typename T>
 struct CandleOHLC
 #ifndef __MQL__
-    : public ISerializable
+    : public Serializable
 #endif
 {
   T open, high, low, close;
@@ -276,8 +277,6 @@ struct CandleTOHLC : CandleOHLC<T> {
   string ToCSV() { return StringFormat("%d,%g,%g,%g,%g", time, open, high, low, close); }
 };
 
-#include "Serializer.mqh"
-
 /* Method to serialize CandleEntry structure. */
 template <typename T>
 SerializerNodeType CandleOHLC::Serialize(Serializer &s) {

Chart.mqh

@@ -29,10 +29,6 @@
  * - https://www.mql5.com/en/docs/series
  */
 
-// Class dependencies.
-class Chart;
-class Market;
-
 // Prevents processing this includes file for the second time.
 #ifndef CHART_MQH
 #define CHART_MQH
@@ -44,9 +40,13 @@ class Market;
 #include "Chart.struct.serialize.h"
 #include "Convert.mqh"
 #include "Market.mqh"
-#include "Serializer.mqh"
+#include "Serializer/Serializer.h"
 #include "Task/TaskCondition.enum.h"
 
+// Forward class declaration.
+class Chart;
+class Market;
+
 #ifndef __MQL4__
 // Defines structs (for MQL4 backward compatibility).
 // Struct arrays that contains given values of each bar of the current chart.

Chart.struct.h

@@ -32,6 +32,7 @@
 
 // Forward class declaration.
 class Class;
+struct ChartTf;
 
 // Includes.
 #include "Array.mqh"
@@ -40,7 +41,8 @@ class Class;
 #include "Chart.enum.h"
 #include "Chart.struct.static.h"
 #include "Chart.struct.tf.h"
-#include "Serializer.mqh"
+#include "Serializer/Serializer.h"
+#include "Serializer/SerializerNode.enum.h"
 #include "Terminal.define.h"
 
 /* Defines struct to store bar entries. */

Chart.struct.serialize.h

@@ -29,8 +29,8 @@
 class Serializer;
 
 // Includes.
-#include "Serializer.mqh"
-#include "SerializerNode.enum.h"
+#include "Serializer/Serializer.h"
+#include "Serializer/SerializerNode.enum.h"
 
 /* Method to serialize ChartEntry structure. */
 SerializerNodeType ChartEntry::Serialize(Serializer& _s) {
@@ -42,6 +42,6 @@ SerializerNodeType ChartEntry::Serialize(Serializer& _s) {
 SerializerNodeType ChartParams::Serialize(Serializer& s) {
   s.Pass(THIS_REF, "id", id);
   s.Pass(THIS_REF, "symbol", symbol);
-  s.PassStruct(THIS_REF, "tf", tf);
+  // s.PassStruct(THIS_REF, "tf", tf); // @fixme
   return SerializerNodeObject;
 }

Chart.struct.tf.h

@@ -30,10 +30,14 @@
 #pragma once
 #endif
 
+// Forward declarations.
+class Serializer;
+
 // Includes.
 #include "Chart.enum.h"
-#include "Serializer.mqh"
+#include "Serializer/SerializerNode.enum.h"
 #include "Terminal.define.h"
+#include "Serializer/Serializer.h"
 
 /* Defines struct for chart timeframe. */
 struct ChartTf {

ChartMt.h

@@ -31,6 +31,7 @@
 #endif
 
 // Includes.
+#include "Chart.struct.static.h"
 #include "Chart.symboltf.h"
 #include "Terminal.define.h"
 

Config.mqh

@@ -33,7 +33,7 @@
 #include "DictStruct.mqh"
 #include "File.mqh"
 #include "Object.mqh"
-#include "Serializer.mqh"
+#include "Serializer/Serializer.h"
 
 enum CONFIG_FORMAT { CONFIG_FORMAT_JSON, CONFIG_FORMAT_JSON_NO_WHITESPACES, CONFIG_FORMAT_INI };
 

Data.struct.h

@@ -38,9 +38,10 @@ struct MqlRates;
 // Includes.
 #include "Data.enum.h"
 #include "DateTime.mqh"
-#include "Serializer.enum.h"
-#include "SerializerNode.enum.h"
+#include "Serializer/Serializer.enum.h"
+#include "Serializer/SerializerNode.enum.h"
 #include "Std.h"
+#include "Serializer/Serializer.h"
 
 #ifndef __MQL__
 /**
@@ -330,8 +331,6 @@ struct DataParamEntry : public MqlParam {
   SerializerNodeType Serialize(Serializer &s);
 };
 
-#include "Serializer.mqh"
-
 /* Method to serialize DataParamEntry struct. */
 SerializerNodeType DataParamEntry::Serialize(Serializer &s) {
   s.PassEnum(THIS_REF, "type", type, SERIALIZER_FIELD_FLAG_HIDDEN);

Dict.mqh

@@ -27,8 +27,8 @@
 #include "Convert.mqh"
 #include "DictBase.mqh"
 #include "Matrix.mqh"
-#include "Serializer.mqh"
-#include "SerializerNodeIterator.mqh"
+#include "Serializer/Serializer.h"
+#include "Serializer/SerializerNodeIterator.h"
 
 template <typename K, typename V>
 class DictIterator : public DictIteratorBase<K, V> {