Update ZigZag EA

.gitattributes

@@ -1,37 +1,19 @@
-# default: self-detect the content type (text vs. binary)
-*                 text=auto
-
-
-# enforce content type "text" to fix mixed line-endings in the repo
-*.h               text
-*.htm             text
-*.html            text
-*.ini             text
-*.md              text
-*.mq4             text
-*.mq5             text
-*.mqh             text
-*.sh              text
-*.txt             text
-
 
 # set content encodings
-*                 encoding=UTF-8
-*.mqh             encoding=CP1252
-*.mq4             encoding=CP1252
-*.mq5             encoding=CP1252
-*.tpl             encoding=CP1252
+*     encoding=UTF-8
+*.mqh encoding=CP1252 text
+*.mq4 encoding=CP1252 text
+*.mq5 encoding=CP1252 text
+*.tpl encoding=CP1252 text
 
 
 # checkout with Windows line-endings (not yet supported by EGit)
-*.tpl             text eol=crlf
-hotkeys.ini       text eol=crlf
+hotkeys.ini   text eol=crlf
 
 
 # Gitgub Linguist overrides
-/etc/**           linguist-detectable=false
-/files/**         linguist-detectable=false
-/sounds/**        linguist-detectable=false
-/templates/**     linguist-detectable=false
-*.mqh             linguist-language=MQL4
-
+/etc/**       linguist-detectable=false
+/files/**     linguist-detectable=false
+/sounds/**    linguist-detectable=false
+/templates/** linguist-detectable=false
+*.mqh         linguist-language=MQL4

.github/workflows/compile-mql.yml

@@ -123,7 +123,6 @@ jobs:
                          -d 'artifact-id=${{ steps.artifact.outputs.artifact-id }}')"
           echo "HTTP status: $status"
           cat "$response_file"
-
           ((status >= 400)) && exit 1 || :
 
       # ------------------------------------------------------------------------------------------------------------------------------------

bin/mqlc

@@ -262,15 +262,16 @@ function compareDirs() {
 # @param $3 - include directory
 #
 function compileMql40() {
-  local srcFile="$1" version="$2" include="$3" s_compiler s_srcFile
-  local compiler errorStatus=0 startms endms time='' output=() line errors=0 epl='' warnings=0 wpl='' retVal
+  local srcFile="$1" version="$2" include="$3" s_compiler s_srcFile logFile
+  local compiler errorStatus=0 startms endms time='' output=() line i errors=0 epl='' warnings=0 wpl='' retVal
 
   ((originalOutput)) || echo "Compiling \"$srcFile\" as $(versionName "$version")"
 
   # compose compiler command
   setCompilerPath 'compiler' "$version" "$include"
   [[ "$compiler" == /* ]] && compiler="$(cygpath -w "$compiler")"
   [[ "$srcFile" == /* ]] && srcFile="$(cygpath -w "$srcFile")"
+  logFile="${srcFile%.*}.log"
   ((debug)) && {
     [[ "$compiler" == *\ * ]] && s_compiler="\"$compiler\"" || s_compiler="$compiler"
     [[ "$srcFile"  == *\ * ]] && s_srcFile="\"$srcFile\""   || s_srcFile="$srcFile"
@@ -289,12 +290,20 @@ function compileMql40() {
   # on success
   if ((!errorStatus)); then
     [[ "${output[-1]}" =~ ^(Exp|Library exp)\ file\ .+\ produced\ -\ ([0-9]+)\ error.+\ ([0-9]+)\ warning.+ ]] || {
-      fail "unexpected compiler output in last line: \"${output[-1]}\"";
+      fail "unexpected compiler output in last line:${NL}${output[-1]}";
     }
-    errors="${BASH_REMATCH[2]}";   ((errors   == 1)) && epl='' || epl='s'
-    warnings="${BASH_REMATCH[3]}"; ((warnings == 1)) && wpl='' || wpl='s'
+    errors="${BASH_REMATCH[2]}"
+    warnings="${BASH_REMATCH[3]}"
 
     if ((!originalOutput)); then
+      # reset some warnings
+      for ((i=3; i < ${#output[@]}; ++i)); do
+        [[ "${output[i]}" == '1;'* ]] && [[ "${output[i]}" == *'is not referenced and will be removed from exp-file' ]] && ((--warnings))
+      done
+
+      # add final results
+      ((errors   == 1)) && epl='' || epl='s'
+      ((warnings == 1)) && wpl='' || wpl='s'
       time="$(duration "$startms" "$endms")"
       output[-1]="Result: $errors error$epl, $warnings warning$wpl, $time elapsed"
       ((!warnings))              && output+=('Success')
@@ -310,9 +319,8 @@ function compileMql40() {
       ((++errors))
     else
       # count errors and warnings
-      local i
       for ((i=3; i < ${#output[@]}; ++i)); do
-        [[ "${output[i]}" == '1;'* ]] && ((++warnings))
+        [[ "${output[i]}" == '1;'* ]] && [[ "${output[i]}" != *'is not referenced and will be removed from exp-file' ]] && ((++warnings))
         [[ "${output[i]}" == '2;'* ]] && ((++errors))
       done
     fi
@@ -349,6 +357,7 @@ function compileMql40() {
   printf '%s\n' "${output[@]}"
 
   ((warn2error)) || warnings=0
+  ((!errors && !warnings)) && rm -f "$logFile"
   ((retVal = errors + warnings))
   ((retVal > 255)) && retVal=255
   return "$retVal"
@@ -434,33 +443,38 @@ function compileMql5() {
 #
 # Reformat a single log message produced by the MQL4.0 compiler.
 #
-# @param _InOut_ $1 - named reference to the log message
+# @param _InOut_ $1 - reference to the log message
 # @param _In_    $2 - source file of the compilation
-# @param _In_    $3 - number of errors during the compilation
-# @param _In_    $4 - number of warnings during the compilation
+# @param _In_    $3 - number of errors during compilation
+# @param _In_    $4 - number of warnings during compilation
 #
 function formatCompiler40Msg() {
   ((BASH_SUBSHELL)) && fail "${FUNCNAME[0]}() can't write to outer scope from subshell"
   local -n logmsg="$1"
-  local srcFile="$2" errors="$3" warnings="$4" type code level levelS file location message len
+  local srcFile="$2" errors="$3" warnings="$4" type code level levelS file line location='' message len
 
-  [[ "$logmsg" =~ ^([0-9]+)\;([0-9]+)\;(.+)\;([0-9]+:[0-9]+)?\;(.*)$ ]] || fail "unexpected format of compiler message:$NL\"$logmsg\""
+  [[ "$logmsg" =~ ^([0-9]+)\;([0-9]+)\;(.+)?\;([0-9]+:[0-9]+)?\;(.*)$ ]] || fail "unexpected format of compiler message:${NL}${logmsg}"
   type="${BASH_REMATCH[1]}"
   code="${BASH_REMATCH[2]}"
   file="${BASH_REMATCH[3]}"
-  location="${BASH_REMATCH[4]}"
+  line="${BASH_REMATCH[4]}"
   message="${BASH_REMATCH[5]}"
 
-  [[ "$type" == [12] ]] || fail "unexpected message type $type in compiler message:$NL\"$logmsg\""
-  ((type == 1)) && level='warn' || level='error'
+  [[ "$type" == [12] ]] || fail "unexpected message type $type in compiler message:${NL}${logmsg}"
+  if ((type == 1)); then
+    [[ "$message" == *'is not referenced and will be removed from exp-file' ]] && level='info' || level='warn'
+  else
+    level='error'
+  fi
   ((errors)) && len=6 || len=5
   levelS="$level: "
   levelS="${levelS:0:$len}"
 
-  [[ -n "$location" ]] && location=" ($location)"
-
-  logmsg="${levelS} ${file}${location}: ${message}"
-  #logmsg="${file}${location}: ${level}: ${message}"
+  if [[ -n "$file" ]]; then
+    [[ -n "$line" ]] && line=" ($line)"
+    location="${file}${line}: "
+  fi
+  logmsg="${levelS} ${location}${message}"
 }
 
 
@@ -1186,15 +1200,14 @@ metalang.exe
 1=warn
 2=error
 
-2 ; 124 ; C:\z\F\Projects\mt4\mql\bin\Dow Jones Breakout.mq4 ; 146:12 ; 'HandleCommand' - function is not defined
 1 ; 33  ; C:\z\F\Projects\mt4\mql\bin\Dow Jones Breakout.mq4 ; 149:8  ; '5' - comparison expression expected
-2 ; 89  ; C:\z\F\Projects\mt4\mql\bin\Dow Jones Breakout.mq4 ; 526:1  ; '\end_of_program' - unbalanced left parenthesis
+2 ; 124 ; C:\z\F\Projects\mt4\mql\bin\Dow Jones Breakout.mq4 ; 146:12 ; 'HandleCommand' - function is not defined
 2 ; 114 ; C:\z\F\Projects\mt4\mql\bin\output.txt             ; 11:53  ; 'some text' - more than 1 symbol
 1 ; 41  ; C:\z\F\Projects\mt4\mql\bin\metalang.exe           ; 1:1    ; 'MZ???' - expression on global scope not allowed
 2 ; 75  ; C:\z\F\Projects\mt4\mql\bin\metalang.exe           ; 1:1    ; 'MZ???' - variable not defined
 2 ; 76  ;                                                    ;        ; cannot open the source file
 2 ; 52  ;                                                    ;        ; cannot open the output file
-
+1 ; 39  ;                                                    ;        ; Function "Foo" is not referenced and will be removed from exp-file
 
 metaeditor.exe
 --------------

config/hotkeys.ini

@@ -12,6 +12,7 @@ Chart.ToggleTradeHistory=Alt+H
 Chart.ToggleUnitSize=Alt+D
 Config=Alt+C
 EA.ToggleMetrics=Alt+M
+EA.TogglePercent=Alt+P
 Empty=Ctrl+P
 MarketWatch.Symbols=Ctrl+S
 ParameterStepper.Down=Alt+L
@@ -20,4 +21,3 @@ ReopenAlerts=Alt+A
 SuperBars.TimeframeDown=Ctrl+L
 SuperBars.TimeframeUp=Ctrl+K
 </scripts>
-