Moves Serializer files to Serializer/

Serializer: Renames .mqh to .h
EA31337 · Aug 19, 2022 · 943f662 · 943f662
1 parent 8b9072d
commit 943f662
Show file tree

Hide file tree

Showing 73 changed files with 245 additions and 186 deletions.
diff --git a/.github/workflows/test-serializer.yml b/.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
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -110,7 +110,6 @@ jobs:
           - OrderQuery
           - ProfilerTest
           - RefsTest
-          - SerializerTest
           - TerminalTest
           - TimerTest
           - ValueStorageTest

diff --git a/3D/Chart3D.h b/3D/Chart3D.h
@@ -30,8 +30,8 @@
 #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"

diff --git a/Account/Account.h b/Account/Account.h
@@ -26,7 +26,7 @@
 
 // Includes.
 #include "../BufferStruct.mqh"
-#include "../Serializer.mqh"
+#include "../Serializer/Serializer.h"
 #include "AccountBase.h"
 
 /**

diff --git a/Account/Account.struct.h b/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.

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

diff --git a/Account/AccountBase.struct.h b/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.

diff --git a/Account/AccountForex.h b/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"
 

diff --git a/Account/AccountForex.struct.h b/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.

diff --git a/Account/AccountMt.h b/Account/AccountMt.h
@@ -35,7 +35,7 @@ class AccountMt;
 #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"

diff --git a/Bar.struct.h b/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));

diff --git a/BufferStruct.mqh b/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.

diff --git a/Candle.struct.h b/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) {

diff --git a/Chart.mqh b/Chart.mqh
@@ -40,7 +40,7 @@
 #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.

diff --git a/Chart.struct.h b/Chart.struct.h
@@ -41,8 +41,8 @@ struct ChartTf;
 #include "Chart.enum.h"
 #include "Chart.struct.static.h"
 #include "Chart.struct.tf.h"
-#include "Serializer.mqh"
-#include "SerializerNode.enum.h"
+#include "Serializer/Serializer.h"
+#include "Serializer/SerializerNode.enum.h"
 #include "Terminal.define.h"
 
 /* Defines struct to store bar entries. */

diff --git a/Chart.struct.serialize.h b/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) {

diff --git a/Chart.struct.tf.h b/Chart.struct.tf.h
@@ -35,8 +35,9 @@ class Serializer;
 
 // Includes.
 #include "Chart.enum.h"
-#include "SerializerNode.enum.h"
+#include "Serializer/SerializerNode.enum.h"
 #include "Terminal.define.h"
+#include "Serializer/Serializer.h"
 
 /* Defines struct for chart timeframe. */
 struct ChartTf {
@@ -351,8 +352,6 @@ struct ChartTf {
   SerializerNodeType Serialize(Serializer& s);
 };
 
-#include "Serializer.mqh"
-
 /* Method to serialize ChartTf structure. */
 SerializerNodeType ChartTf::Serialize(Serializer& s) {
   s.PassEnum(THIS_REF, "tf", tf);

diff --git a/Config.mqh b/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 };
 

diff --git a/Data.struct.h b/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);

diff --git a/Dict.mqh b/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> {

diff --git a/DictIteratorBase.mqh b/DictIteratorBase.mqh
@@ -31,7 +31,7 @@ class DictBase;
 
 #include "DictBase.mqh"
 #include "DictSlotsRef.h"
-#include "SerializerConversions.h"
+#include "Serializer/SerializerConversions.h"
 
 template <typename K, typename V>
 class DictIteratorBase {

diff --git a/DictObject.mqh b/DictObject.mqh
@@ -26,8 +26,8 @@
 
 #include "Convert.mqh"
 #include "DictBase.mqh"
-#include "Serializer.mqh"
-#include "SerializerNodeIterator.mqh"
+#include "Serializer/Serializer.h"
+#include "Serializer/SerializerNodeIterator.h"
 
 template <typename K, typename V>
 class DictObjectIterator : public DictIteratorBase<K, V> {

diff --git a/DictStruct.mqh b/DictStruct.mqh
@@ -26,8 +26,8 @@
 
 #include "DictBase.mqh"
 #include "DictIteratorBase.mqh"
-#include "Serializer.mqh"
-#include "SerializerNodeIterator.mqh"
+#include "Serializer/Serializer.h"
+#include "Serializer/SerializerNodeIterator.h"
 
 // DictIterator could be used as DictStruct iterator.
 #define DictStructIterator DictIteratorBase

diff --git a/EA.mqh b/EA.mqh
@@ -39,10 +39,10 @@
 #include "Market.mqh"
 #include "Platform.h"
 #include "Refs.struct.h"
-#include "SerializerConverter.mqh"
-#include "SerializerCsv.mqh"
-#include "SerializerJson.mqh"
-#include "SerializerSqlite.mqh"
+#include "Serializer/SerializerConverter.h"
+#include "Serializer/SerializerCsv.h"
+#include "Serializer/SerializerJson.h"
+#include "Serializer/SerializerSqlite.h"
 #include "Strategy.mqh"
 #include "SummaryReport.mqh"
 #include "Task/TaskManager.h"

diff --git a/Indicator/Indicator.h b/Indicator/Indicator.h
@@ -42,9 +42,9 @@ struct IndicatorParams;
 #include "../Math.h"
 #include "../Object.mqh"
 #include "../Refs.mqh"
-#include "../Serializer.mqh"
-#include "../SerializerCsv.mqh"
-#include "../SerializerJson.mqh"
+#include "../Serializer/Serializer.h"
+#include "../Serializer/SerializerCsv.h"
+#include "../Serializer/SerializerJson.h"
 #include "../Storage/ValueStorage.h"
 #include "../Storage/ValueStorage.indicator.h"
 #include "../Storage/ValueStorage.native.h"

diff --git a/Indicator/Indicator.struct.h b/Indicator/Indicator.struct.h
@@ -40,7 +40,7 @@ struct ChartParams;
 #include "../Chart.struct.tf.h"
 #include "../Data.struct.h"
 #include "../DateTime.struct.h"
-#include "../SerializerNode.enum.h"
+#include "../Serializer/SerializerNode.enum.h"
 #include "Indicator.enum.h"
 #include "IndicatorData.struct.cache.h"
 //#include "Indicator.struct.serialize.h"

diff --git a/Indicator/Indicator.struct.serialize.h b/Indicator/Indicator.struct.serialize.h
@@ -25,8 +25,8 @@
  * Includes Indicator's struct serializers.
  */
 
-#include "../Serializer.mqh"
-#include "../SerializerNode.enum.h"
+#include "../Serializer/Serializer.h"
+#include "../Serializer/SerializerNode.enum.h"
 #include "Indicator.struct.h"
 
 /* Method to serialize IndicatorParams structure. */