WIP. Refactoring of MQL code to be compatible with C++.

EA31337 · Jun 1, 2021 · 5a93edf · 5a93edf
1 parent 1accd3b
commit 5a93edf
Show file tree

Hide file tree

Showing 14 changed files with 123 additions and 97 deletions.
diff --git a/Account.mqh b/Account.mqh
@@ -507,11 +507,7 @@ class Account {
    * @return
    *   Returns true when the condition is met.
    */
-  #ifdef __cplusplus
-  bool CheckCondition(ENUM_ACCOUNT_CONDITION _cond, DataParamEntry (&_args)[]) {
-  #else
-  bool CheckCondition(ENUM_ACCOUNT_CONDITION _cond, DataParamEntry &_args[]) {
-  #endif
+  bool CheckCondition(ENUM_ACCOUNT_CONDITION _cond, ARRAY_REF(DataParamEntry, _args)) {
     switch (_cond) {
       /* @todo
       case ACCOUNT_COND_BALM_GT_YEARLY:

diff --git a/Bar.struct.h b/Bar.struct.h
@@ -35,7 +35,6 @@
 #include "Chart.enum.h"
 #include "Serializer.mqh"
 #include "SerializerNode.enum.h"
-#include "Bar.enum.h"
 
 /* Struct for storing OHLC values. */
 struct BarOHLC {
@@ -174,7 +173,7 @@ struct BarOHLC {
   float GetWickSum() const { return GetWickLower() + GetWickUpper(); }
   float GetWickUpper() const { return high - GetMaxOC(); }
   float GetWickUpperInPct() const { return GetRange() > 0 ? 100 / GetRange() * GetWickUpper() : 0; }
-  void GetValues(float REF(_out)[]) {
+  void GetValues(ARRAY_REF(float, _out)) {
     ArrayResize(_out, 4);
     int _index = ArraySize(_out) - 4;
     _out[_index++] = open;
@@ -215,10 +214,10 @@ struct BarOHLC {
 /* Method to serialize BarOHLC structure. */
 SerializerNodeType BarOHLC::Serialize(Serializer &s) {
   // s.Pass(this, "time", TimeToString(time));
-  s.Pass(this, "open", open, SERIALIZER_FIELD_FLAG_DYNAMIC);
-  s.Pass(this, "high", high, SERIALIZER_FIELD_FLAG_DYNAMIC);
-  s.Pass(this, "low", low, SERIALIZER_FIELD_FLAG_DYNAMIC);
-  s.Pass(this, "close", close, SERIALIZER_FIELD_FLAG_DYNAMIC);
+  s.Pass(THIS_REF, "open", open, SERIALIZER_FIELD_FLAG_DYNAMIC);
+  s.Pass(THIS_REF, "high", high, SERIALIZER_FIELD_FLAG_DYNAMIC);
+  s.Pass(THIS_REF, "low", low, SERIALIZER_FIELD_FLAG_DYNAMIC);
+  s.Pass(THIS_REF, "close", close, SERIALIZER_FIELD_FLAG_DYNAMIC);
   return SerializerNodeObject;
 }
 

diff --git a/Chart.struct.h b/Chart.struct.h
@@ -42,24 +42,6 @@ class Class;
 #include "Serializer.mqh"
 #include "Terminal.define.h"
 
-/**
- * Wrapper struct that returns open time of each bar of the current chart.
- *
- * @see: https://docs.mql4.com/predefined/time
- */
-struct ChartBarTime {
- protected:
-  string symbol;
-  ENUM_TIMEFRAMES tf;
-
- public:
-  ChartBarTime() : symbol(_Symbol), tf(PERIOD_CURRENT) {}
-  datetime operator[](const int _shift) const { return Get(symbol, tf, _shift); }
-  static datetime Get(const string _symbol, const ENUM_TIMEFRAMES _tf, const int _shift) {
-    return ChartStatic::iTime(_symbol, _tf, _shift);
-  }
-};
-
 /* Defines struct to store bar entries. */
 struct ChartEntry {
   BarEntry bar;
@@ -129,7 +111,40 @@ struct ChartParams {
   SerializerNodeType Serialize(Serializer& s);
 } chart_params_defaults(PERIOD_CURRENT, _Symbol);
 
-/**
+/* Defines struct for chart static methods. */
+struct ChartStatic {
+  /**
+   * Returns the number of bars on the specified chart.
+   */
+  static int iBars(string _symbol = NULL, ENUM_TIMEFRAMES _tf = PERIOD_CURRENT) {
+#ifdef __MQL4__
+    // In MQL4, for the current chart, the information about the amount of bars is in the Bars predefined variable.
+    return ::iBars(_symbol, _tf);
+#else  // _MQL5__
+    // ENUM_TIMEFRAMES _tf = MQL4::TFMigrate(_tf);
+    return ::Bars(_symbol, _tf);
+#endif
+  }
+
+  /**
+   * Wrapper struct that returns open time of each bar of the current chart.
+   *
+   * @see: https://docs.mql4.com/predefined/time
+   */
+  struct ChartBarTime {
+   protected:
+    string symbol;
+    ENUM_TIMEFRAMES tf;
+
+   public:
+    ChartBarTime() : symbol(_Symbol), tf(PERIOD_CURRENT) {}
+    datetime operator[](const int _shift) const { return Get(symbol, tf, _shift); }
+    static datetime Get(const string _symbol, const ENUM_TIMEFRAMES _tf, const int _shift) {
+      return ChartStatic::iTime(_symbol, _tf, _shift);
+    }
+  };
+
+  /**
  * Wrapper struct that returns close prices of each bar of the current chart.
  *
  * @see: https://docs.mql4.com/predefined/close
@@ -193,21 +208,6 @@ struct ChartPriceOpen {
   }
 };
 
-/* Defines struct for chart static methods. */
-struct ChartStatic {
-  /**
-   * Returns the number of bars on the specified chart.
-   */
-  static int iBars(string _symbol = NULL, ENUM_TIMEFRAMES _tf = PERIOD_CURRENT) {
-#ifdef __MQL4__
-    // In MQL4, for the current chart, the information about the amount of bars is in the Bars predefined variable.
-    return ::iBars(_symbol, _tf);
-#else  // _MQL5__
-    // ENUM_TIMEFRAMES _tf = MQL4::TFMigrate(_tf);
-    return ::Bars(_symbol, _tf);
-#endif
-  }
-
   /**
    * Search for a bar by its time.
    *

diff --git a/Collection.mqh b/Collection.mqh
@@ -36,7 +36,7 @@ class Collection {
   // Variables.
   string name;
   int index;
-  Ref<X> data[];
+  ARRAY(Ref<X>, data);
 
  public:
   /**

diff --git a/Data.struct.h b/Data.struct.h
@@ -36,7 +36,6 @@ struct MqlParam;
 
 // Includes.
 #include "Data.enum.h"
-#include "Indicator.struct.h"
 #include "Serializer.mqh"
 #include "SerializerNode.enum.h"
 

diff --git a/DateTime.mqh b/DateTime.mqh
@@ -234,7 +234,7 @@ class DateTime {
     }
   }
   static bool CheckCondition(ENUM_DATETIME_CONDITION _cond) {
-    DataParamEntry _args[] = {};
+    ARRAY(DataParamEntry, _args);
     return DateTime::CheckCondition(_cond, _args);
   }
 };

diff --git a/DateTime.struct.h b/DateTime.struct.h
@@ -35,7 +35,6 @@ struct DateTimeStatic;
 
 // Includes.
 #include "DateTime.enum.h"
-#include "DateTime.struct.h"
 
 #ifndef __MQLBUILD__
 /**
@@ -57,7 +56,27 @@ struct MqlDateTime {
 };
 #endif
 
-struct DateTimeEntry : MqlDateTime {
+/*
+ * Struct to provide static date and time methods.
+ */
+struct DateTimeStatic {
+  /**
+   * Returns the current day of the month (e.g. the day of month of the last known server time).
+   */
+  static int Day(datetime dt = NULL) {
+    if (dt == 0) {
+      dt = TimeCurrent();
+    }
+#ifdef __MQL4__
+    return ::TimeDay(dt);
+#else
+    MqlDateTime _dt;
+    TimeToStruct(dt, _dt);
+    return _dt.day;
+#endif
+  }
+
+  struct DateTimeEntry : MqlDateTime {
   int week_of_year;
   // Struct constructors.
   DateTimeEntry() { SetDateTime(); }
@@ -108,10 +127,10 @@ struct DateTimeEntry : MqlDateTime {
     return GetValue((ENUM_DATETIME_UNIT)_unit);
   }
   int GetYear() { return year; }
-  datetime GetTimestamp() { return StructToTime(this); }
+  datetime GetTimestamp() { return StructToTime(THIS_REF); }
   // Setters.
-  void SetDateTime() { TimeToStruct(TimeCurrent(), this); }
-  void SetDateTime(datetime _dt) { TimeToStruct(_dt, this); }
+  void SetDateTime() { TimeToStruct(TimeCurrent(), THIS_REF); }
+  void SetDateTime(datetime _dt) { TimeToStruct(_dt, THIS_REF); }
   void SetDayOfMonth(int _value) {
     day = _value;
     day_of_week = DateTimeStatic::DayOfWeek();  // Zero-based day of week.
@@ -171,26 +190,6 @@ struct DateTimeEntry : MqlDateTime {
   void SetYear(int _value) { year = _value; }
 };
 
-/*
- * Struct to provide static date and time methods.
- */
-struct DateTimeStatic {
-  /**
-   * Returns the current day of the month (e.g. the day of month of the last known server time).
-   */
-  static int Day(datetime dt = NULL) {
-    if (dt == 0) {
-      dt = TimeCurrent();
-    }
-#ifdef __MQL4__
-    return ::TimeDay(dt);
-#else
-    MqlDateTime _dt;
-    TimeToStruct(dt, _dt);
-    return _dt.day;
-#endif
-  }
-
   /**
    * Returns the current zero-based day of the week of the last known server time.
    */

diff --git a/File.mqh b/File.mqh
@@ -32,6 +32,39 @@
 // Includes.
 #include "Terminal.mqh"
 
+#ifndef __MQL__
+enum ENUM_FILE_PROPERTY_INTEGER {
+  FILE_EXISTS,
+  FILE_CREATE_DATE,
+  FILE_MODIFY_DATE,
+  FILE_ACCESS_DATE,
+  FILE_SIZE,
+  FILE_POSITION,
+  FILE_END,
+  FILE_LINE_END,
+  FILE_IS_COMMON,
+  FILE_IS_TEXT,
+  FILE_IS_BINARY,
+  FILE_IS_CSV,
+  FILE_IS_ANSI,
+  FILE_IS_READABLE,
+  FILE_IS_WRITABLE,
+};
+enum ENUM_FILE_OPEN_FLAGS {
+  FILE_READ = 1,
+  FILE_WRITE = 2,
+  FILE_BIN = 4,
+  FILE_CSV = 8,
+  FILE_TXT = 16,
+  FILE_ANSI = 32,
+  FILE_UNICODE = 64,
+  FILE_SHARE_READ = 128,
+  FILE_SHARE_WRITE = 256,
+  FILE_REWRITE = 512,
+  FILE_COMMON = 4096,
+};
+#endif
+
 /**
  * Class to provide a group of functions for working with files.
  */
@@ -52,7 +85,7 @@ class File {
     string str;
     if (file_handle < 0) {
       if (verbose) {
-        PrintFormat("%s: Error: Failed to open %s file: %s", __FUNCTION__, file_name, GetLastError());
+        PrintFormat("%s: Error: Failed to open %s file: %i", __FUNCTION__, C_STR(file_name), GetLastError());
       }
       return "";
     }

diff --git a/Indicator.enum.h b/Indicator.enum.h
@@ -30,6 +30,9 @@
 #pragma once
 #endif
 
+// Includes.
+#include "Indicator.define.h"
+
 /* Indicator actions. */
 enum ENUM_INDICATOR_ACTION {
   INDI_ACTION_CLEAR_CACHE,  // Clear cache.

diff --git a/Indicator.struct.h b/Indicator.struct.h
@@ -56,11 +56,11 @@ struct IndicatorCalculateCache {
   bool price_was_as_series;
 
   // Buffers used for OnCalculate calculations.
-  double buffer1[];
-  double buffer2[];
-  double buffer3[];
-  double buffer4[];
-  double buffer5[];
+  ARRAY(double, buffer1);
+  ARRAY(double, buffer2);
+  ARRAY(double, buffer3);
+  ARRAY(double, buffer4);
+  ARRAY(double, buffer5);
 
   /**
    * Constructor.
@@ -113,7 +113,7 @@ struct IndicatorCalculateCache {
   /**
    * Updates prev_calculated value used by indicator's OnCalculate method.
    */
-  void SetPrevCalculated(double REF(price)[], int _prev_calculated) {
+  void SetPrevCalculated(ARRAY_REF(double, price), int _prev_calculated) {
     prev_calculated = _prev_calculated;
     ArraySetAsSeries(price, price_was_as_series);
   }
@@ -239,7 +239,10 @@ struct IndicatorDataEntry {
     string ToString() {
       return (string)Get<T>();
     }
-  } values[];
+  };
+
+  ARRAY(IndicatorDataEntryValue, values);
+
   // Constructors.
   IndicatorDataEntry(int _size = 1) : flags(INDI_ENTRY_FLAG_NONE), timestamp(0) { ArrayResize(values, _size); }
   int GetSize() { return ArraySize(values); }
@@ -546,7 +549,7 @@ struct IndicatorParams {
     idstype = IDATA_INDICATOR;
   }
   void SetIndicatorType(ENUM_INDICATOR_TYPE _itype) { itype = _itype; }
-  void SetInputParams(DataParamEntry REF(_params)[]) {
+  void SetInputParams(ARRAY_REF(DataParamEntry, _params)) {
     int _asize = ArraySize(_params);
     SetMaxParams(ArraySize(_params));
     for (int i = 0; i < _asize; i++) {

diff --git a/Log.mqh b/Log.mqh
@@ -142,7 +142,7 @@ class Log : public Object {
   bool Add(string msg, string prefix, string suffix, ENUM_LOG_LEVEL entry_log_level = V_INFO) {
     return Add(prefix, msg, suffix, entry_log_level);
   }
-  bool Add(double REF(arr)[], string prefix, string suffix, ENUM_LOG_LEVEL entry_log_level = V_INFO) {
+  bool Add(ARRAY_REF(double, arr), string prefix, string suffix, ENUM_LOG_LEVEL entry_log_level = V_INFO) {
     return Add(prefix, Array::ArrToString(arr), suffix, entry_log_level);
   }
 
@@ -193,7 +193,7 @@ class Log : public Object {
   /**
    * Copy logs into another array.
    */
-  bool Copy(log_entry REF(_logs)[]) {
+  bool Copy(ARRAY_REF(log_entry, _logs)) {
     // @fixme
     // Error: 'ArrayCopy<log_entry>' - cannot to apply function template
     // Array::ArrayCopy(_logs, data, 0, 0, WHOLE_ARRAY);
@@ -209,7 +209,7 @@ class Log : public Object {
   /**
    * Append logs into another array.
    */
-  bool Append(log_entry REF(_logs)[]) {
+  bool Append(ARRAY_REF(log_entry, _logs)) {
     // @fixme
     // Error: 'ArrayCopy<log_entry>' - cannot to apply function template
     // Array::ArrayCopy(_logs, data, 0, 0, WHOLE_ARRAY);

diff --git a/Refs.struct.h b/Refs.struct.h
@@ -32,6 +32,9 @@
 
 // Forward class declaration.
 class Refs;
+class ReferenceCounter;
+template <typename X>
+  struct WeakRef;
 
 /**
  * Class used to hold strong reference to reference-counted object.