From 77bbf7f907a5df448825f2cf4f762b95ed706011 Mon Sep 17 00:00:00 2001
From: AlbinZhang <312024054@qq.com>
Date: Fri, 2 Jun 2017 08:58:09 +0800
Subject: [PATCH] fix compilation error with MSVC2013 (#15)

MSVC2013 support C99 incompletely, which causes build errors for C codes in peg-highlight module.

1. Move variable declarations at the front of code block;
2. Add compilation flag `Q_COMPILER_INITIALIZER_LISTS`;
---
 peg-highlight/pmh_parser.c      | 13 +++++++++----
 peg-highlight/pmh_styleparser.c | 32 +++++++++++++++++---------------
 src/src.pro                     |  4 ++++
 3 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/peg-highlight/pmh_parser.c b/peg-highlight/pmh_parser.c
index 83617ca4..433e7bfd 100644
--- a/peg-highlight/pmh_parser.c
+++ b/peg-highlight/pmh_parser.c
@@ -563,10 +563,12 @@ static pmh_element *ll_mergesort(pmh_element *list,
                                  int (*compare)(const pmh_element*,
                                                 const pmh_element*))
 {
+    pmh_element *out_head = NULL;
+	
     if (!list)
         return NULL;
     
-    pmh_element *out_head = list;
+    out_head = list;
     
     /* Merge widths of doubling size until done */
     int merge_width = 1;
@@ -599,12 +601,12 @@ static pmh_element *ll_mergesort(pmh_element *list,
             /* Merge l & r */
             while (lsize > 0 || (rsize > 0 && r))
             {
+                pmh_element *e = NULL;
                 bool get_from_left = false;
                 if (lsize == 0)             get_from_left = false;
                 else if (rsize == 0 || !r)  get_from_left = true;
                 else if (compare(l,r) <= 0) get_from_left = true;
                 
-                pmh_element *e;
                 if (get_from_left) {
                     e = l; l = l->next; lsize--;
                 } else {
@@ -658,10 +660,12 @@ static bool extension(parser_data *p_data, int ext)
 /* return reference pmh_realelement for a given label */
 static pmh_realelement *get_reference(parser_data *p_data, char *label)
 {
+    pmh_realelement *cursor = NULL;
     if (!label)
         return NULL;
+
+    cursor = p_data->references;
     
-    pmh_realelement *cursor = p_data->references;
     while (cursor != NULL)
     {
         if (cursor->label && strcmp(label, cursor->label) == 0)
@@ -752,10 +756,11 @@ p_data->current_elem elements. Return the (list of) elements with real offsets.
 */
 static pmh_realelement *fix_offsets(parser_data *p_data, pmh_realelement *elem)
 {
+    pmh_realelement *new_head = NULL;
     if (elem->type == pmh_EXTRA_TEXT)
         return mk_etext(p_data, elem->text);
     
-    pmh_realelement *new_head = copy_element(p_data, elem);
+    new_head = copy_element(p_data, elem);
     
     pmh_realelement *tail = new_head;
     pmh_realelement *prev = NULL;
diff --git a/peg-highlight/pmh_styleparser.c b/peg-highlight/pmh_styleparser.c
index 96c142ed..4c577c90 100644
--- a/peg-highlight/pmh_styleparser.c
+++ b/peg-highlight/pmh_styleparser.c
@@ -82,11 +82,12 @@ static void free_raw_attributes(raw_attribute *list)
     raw_attribute *cur = list;
     while (cur != NULL)
     {
+        raw_attribute *pattr = NULL;
         if (cur->name != NULL) free(cur->name);
         if (cur->value != NULL) free(cur->value);
-        raw_attribute *this = cur;
+        pattr = cur;
         cur = cur->next;
-        free(this);
+        free(pattr);
     }
 }
 
@@ -94,9 +95,10 @@ static void free_raw_attributes(raw_attribute *list)
 static void report_error(style_parser_data *p_data,
                          int line_number, char *str, ...)
 {
+    va_list argptr;
     if (p_data->error_callback == NULL)
         return;
-    va_list argptr;
+    
     va_start(argptr, str);
     char *errmsg;
     our_vasprintf(&errmsg, str, argptr);
@@ -255,9 +257,9 @@ static void free_style_attributes(pmh_style_attribute *list)
                 free(cur->value->string);
             free(cur->value);
         }
-        pmh_style_attribute *this = cur;
+        pmh_style_attribute *pattr = cur;
         cur = cur->next;
-        free(this);
+        free(pattr);
     }
 }
 
@@ -355,10 +357,10 @@ static void free_multi_value(multi_value *val)
     multi_value *cur = val;
     while (cur != NULL)
     {
-        multi_value *this = cur;
+        multi_value *pvalue = cur;
         multi_value *next_cur = cur->next;
-        free(this->value);
-        free(this);
+        free(pvalue->value);
+        free(pvalue);
         cur = next_cur;
     }
 }
@@ -560,10 +562,10 @@ static void free_blocks(block *val)
     block *cur = val;
     while (cur != NULL)
     {
-        block *this = cur;
-        block *next = this->next;
-        free_multi_value(this->lines);
-        free(this);
+        block *pblock = cur;
+        block *next = pblock->next;
+        free_multi_value(pblock->lines);
+        free(pblock);
         cur = next;
     }
 }
@@ -799,6 +801,9 @@ static void _sty_parse(style_parser_data *p_data)
     block *block_cur = blocks;
     while (block_cur != NULL)
     {
+        raw_attribute *attributes_head = NULL;
+        raw_attribute *attributes_tail = NULL;
+	
         pmhsp_PRINTF("Block:\n");
         multi_value *header_line = block_cur->lines;
         if (header_line == NULL) {
@@ -817,9 +822,6 @@ static void _sty_parse(style_parser_data *p_data)
                          "No style attributes defined for style rule '%s'",
                          style_rule_name);
         
-        raw_attribute *attributes_head = NULL;
-        raw_attribute *attributes_tail = NULL;
-        
         while (attr_line_cur != NULL)
         {
             if (line_is_comment(attr_line_cur))
diff --git a/src/src.pro b/src/src.pro
index c98d65a5..24009871 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -134,6 +134,10 @@ macx {
     INCLUDEPATH += /usr/local/include
 }
 
+windows {
+    DEFINES *= Q_COMPILER_INITIALIZER_LISTS
+}
+
 win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../hoedown/release/ -lhoedown
 else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../hoedown/debug/ -lhoedown
 else:unix: LIBS += -L$$OUT_PWD/../hoedown/ -lhoedown