Added MqlLexer

3 files changed, 138 insertions, 3 deletions

diff --git a/pygments/lexers/_mapping.py b/pygments/lexers/_mapping.py
index 59f09cf0..e1426b6f 100644
--- a/pygments/lexers/_mapping.py
+++ b/pygments/lexers/_mapping.py
@@ -63,7 +63,7 @@ LEXERS = {
     'CheetahJavascriptLexer': ('pygments.lexers.templates', 'JavaScript+Cheetah', ('js+cheetah', 'javascript+cheetah', 'js+spitfire', 'javascript+spitfire'), (), ('application/x-javascript+cheetah', 'text/x-javascript+cheetah', 'text/javascript+cheetah', 'application/x-javascript+spitfire', 'text/x-javascript+spitfire', 'text/javascript+spitfire')),
     'CheetahLexer': ('pygments.lexers.templates', 'Cheetah', ('cheetah', 'spitfire'), ('*.tmpl', '*.spt'), ('application/x-cheetah', 'application/x-spitfire')),
     'CheetahXmlLexer': ('pygments.lexers.templates', 'XML+Cheetah', ('xml+cheetah', 'xml+spitfire'), (), ('application/xml+cheetah', 'application/xml+spitfire')),
-    'CirruLexer': ('pygments.lexers.web', 'Cirru', ('cirru',), ('*.cirru',), ('text/x-cirru',)),
+    'CirruLexer': ('pygments.lexers.web', 'Cirru', ('cirru',), ('*.cirru', '*.cr'), ('text/x-cirru',)),
     'ClayLexer': ('pygments.lexers.compiled', 'Clay', ('clay',), ('*.clay',), ('text/x-clay',)),
     'ClojureLexer': ('pygments.lexers.jvm', 'Clojure', ('clojure', 'clj'), ('*.clj',), ('text/x-clojure', 'application/x-clojure')),
     'CobolFreeformatLexer': ('pygments.lexers.compiled', 'COBOLFree', ('cobolfree',), ('*.cbl', '*.CBL'), ()),
@@ -196,6 +196,7 @@ LEXERS = {
     'MoinWikiLexer': ('pygments.lexers.text', 'MoinMoin/Trac Wiki markup', ('trac-wiki', 'moin'), (), ('text/x-trac-wiki',)),
     'MonkeyLexer': ('pygments.lexers.compiled', 'Monkey', ('monkey',), ('*.monkey',), ('text/x-monkey',)),
     'MoonScriptLexer': ('pygments.lexers.agile', 'MoonScript', ('moon', 'moonscript'), ('*.moon',), ('text/x-moonscript', 'application/x-moonscript')),
+    'MqlLexer': ('pygments.lexers.compiled', 'MQL', ('mql', 'mq4', 'mq5', 'mql4', 'mql5'), ('*.mq4', '*.mq5', '*.mqh'), ('text/x-mql',)),
     'MscgenLexer': ('pygments.lexers.other', 'Mscgen', ('mscgen', 'msc'), ('*.msc',), ()),
     'MuPADLexer': ('pygments.lexers.math', 'MuPAD', ('mupad',), ('*.mu',), ()),
     'MxmlLexer': ('pygments.lexers.web', 'MXML', ('mxml',), ('*.mxml',), ()),
@@ -267,7 +268,7 @@ LEXERS = {
     'RstLexer': ('pygments.lexers.text', 'reStructuredText', ('rst', 'rest', 'restructuredtext'), ('*.rst', '*.rest'), ('text/x-rst', 'text/prs.fallenstein.rst')),
     'RubyConsoleLexer': ('pygments.lexers.agile', 'Ruby irb session', ('rbcon', 'irb'), (), ('text/x-ruby-shellsession',)),
     'RubyLexer': ('pygments.lexers.agile', 'Ruby', ('rb', 'ruby', 'duby'), ('*.rb', '*.rbw', 'Rakefile', '*.rake', '*.gemspec', '*.rbx', '*.duby'), ('text/x-ruby', 'application/x-ruby')),
-    'RustLexer': ('pygments.lexers.compiled', 'Rust', ('rust',), ('*.rs', '*.rc'), ('text/x-rustsrc',)),
+    'RustLexer': ('pygments.lexers.compiled', 'Rust', ('rust',), ('*.rs',), ('text/x-rustsrc',)),
     'SLexer': ('pygments.lexers.math', 'S', ('splus', 's', 'r'), ('*.S', '*.R', '.Rhistory', '.Rprofile'), ('text/S-plus', 'text/S', 'text/x-r-source', 'text/x-r', 'text/x-R', 'text/x-r-history', 'text/x-r-profile')),
     'SMLLexer': ('pygments.lexers.functional', 'Standard ML', ('sml',), ('*.sml', '*.sig', '*.fun'), ('text/x-standardml', 'application/x-standardml')),
     'SassLexer': ('pygments.lexers.web', 'Sass', ('sass',), ('*.sass',), ('text/x-sass',)),
diff --git a/pygments/lexers/compiled.py b/pygments/lexers/compiled.py
index 22d3cd67..edd9dd75 100644
--- a/pygments/lexers/compiled.py
+++ b/pygments/lexers/compiled.py
@@ -31,7 +31,7 @@ __all__ = ['CLexer', 'CppLexer', 'DLexer', 'DelphiLexer', 'ECLexer',
            'FantomLexer', 'RustLexer', 'CudaLexer', 'MonkeyLexer', 'SwigLexer',
            'DylanLidLexer', 'DylanConsoleLexer', 'CobolLexer',
            'CobolFreeformatLexer', 'LogosLexer', 'ClayLexer', 'PikeLexer',
-           'ChapelLexer', 'EiffelLexer']
+           'ChapelLexer', 'EiffelLexer', 'MqlLexer']
 
 
 class CFamilyLexer(RegexLexer):
@@ -3951,3 +3951,14 @@ class EiffelLexer(RegexLexer):
             (r'[0-9]+', Number.Integer),
         ],
     }
+
+class MqlLexer(CppLexer):
+    """
+    For `MQL4 <http://docs.mql4.com/>`_ and `MQL5 <http://www.mql5.com/en/docs>`_ source code.
+
+    .. versionadded:: 2.0
+    """
+    name = 'MQL'
+    aliases = ['mql', 'mq4', 'mq5', 'mql4', 'mql5']
+    filenames = ['*.mq4', '*.mq5', '*.mqh']
+    mimetypes = ['text/x-mql']
diff --git a/tests/examplefiles/example.mqh b/tests/examplefiles/example.mqh
new file mode 100644
index 00000000..ee80ed52
--- /dev/null
+++ b/tests/examplefiles/example.mqh
@@ -0,0 +1,123 @@
+//+------------------------------------------------------------------+

+//|                                                        Array.mqh |

+//|                   Copyright 2009-2013, MetaQuotes Software Corp. |

+//|                                              http://www.mql4.com |

+//+------------------------------------------------------------------+

+#include <Object.mqh>

+//+------------------------------------------------------------------+

+//| Class CArray                                                     |

+//| Purpose: Base class of dynamic arrays.                           |

+//|          Derives from class CObject.                             |

+//+------------------------------------------------------------------+

+class CArray : public CObject

+  {

+protected:

+   int               m_step_resize;      // increment size of the array

+   int               m_data_total;       // number of elements

+   int               m_data_max;         // maximmum size of the array without memory reallocation

+   int               m_sort_mode;        // mode of array sorting

+

+public:

+                     CArray(void);

+                    ~CArray(void);

+   //--- methods of access to protected data

+   int               Step(void) const { return(m_step_resize); }

+   bool              Step(const int step);

+   int               Total(void) const { return(m_data_total); }

+   int               Available(void) const { return(m_data_max-m_data_total); }

+   int               Max(void) const { return(m_data_max); }

+   bool              IsSorted(const int mode=0) const { return(m_sort_mode==mode); }

+   int               SortMode(void) const { return(m_sort_mode); }

+   //--- cleaning method

+   void              Clear(void) { m_data_total=0; }

+   //--- methods for working with files

+   virtual bool      Save(const int file_handle);

+   virtual bool      Load(const int file_handle);

+   //--- sorting method

+   void              Sort(const int mode=0);

+

+protected:

+   virtual void      QuickSort(int beg,int end,const int mode=0) { }

+  };

+//+------------------------------------------------------------------+

+//| Constructor                                                      |

+//+------------------------------------------------------------------+

+CArray::CArray(void) : m_step_resize(16),

+                       m_data_total(0),

+                       m_data_max(0),

+                       m_sort_mode(-1)

+  {

+  }

+//+------------------------------------------------------------------+

+//| Destructor                                                       |

+//+------------------------------------------------------------------+

+CArray::~CArray(void)

+  {

+  }

+//+------------------------------------------------------------------+

+//| Method Set for variable m_step_resize                            |

+//+------------------------------------------------------------------+

+bool CArray::Step(const int step)

+  {

+//--- check

+   if(step>0)

+     {

+      m_step_resize=step;

+      return(true);

+     }

+//--- failure

+   return(false);

+  }

+//+------------------------------------------------------------------+

+//| Sorting an array in ascending order                              |

+//+------------------------------------------------------------------+

+void CArray::Sort(const int mode)

+  {

+//--- check

+   if(IsSorted(mode))

+      return;

+   m_sort_mode=mode;

+   if(m_data_total<=1)

+      return;

+//--- sort

+   QuickSort(0,m_data_total-1,mode);

+  }

+//+------------------------------------------------------------------+

+//| Writing header of array to file                                  |

+//+------------------------------------------------------------------+

+bool CArray::Save(const int file_handle)

+  {

+//--- check handle

+   if(file_handle!=INVALID_HANDLE)

+     {

+      //--- write start marker - 0xFFFFFFFFFFFFFFFF

+      if(FileWriteLong(file_handle,-1)==sizeof(long))

+        {

+         //--- write array type

+         if(FileWriteInteger(file_handle,Type(),INT_VALUE)==INT_VALUE)

+            return(true);

+        }

+     }

+//--- failure

+   return(false);

+  }

+//+------------------------------------------------------------------+

+//| Reading header of array from file                                |

+//+------------------------------------------------------------------+

+bool CArray::Load(const int file_handle)

+  {

+//--- check handle

+   if(file_handle!=INVALID_HANDLE)

+     {

+      //--- read and check start marker - 0xFFFFFFFFFFFFFFFF

+      if(FileReadLong(file_handle)==-1)

+        {

+         //--- read and check array type

+         if(FileReadInteger(file_handle,INT_VALUE)==Type())

+            return(true);

+        }

+     }

+//--- failure

+   return(false);

+  }

+//+------------------------------------------------------------------+