compiler/libec/pass16: Fixed losing prev/next pointer manipulating expression

- Index() was losing an argument:
   class MyClass : struct { }
   MapIterator<MyClass, int> it { };
   it.Index({ }, false);

diff --git a/compiler/bootstrap/libec/bootstrap/pass16.c b/compiler/bootstrap/libec/bootstrap/pass16.c
index 3ce9fbc..9bccae8 100644 (file)
--- a/compiler/bootstrap/libec/bootstrap/pass16.c
+++ b/compiler/bootstrap/libec/bootstrap/pass16.c
@@ -2291,11 +2291,15 @@ PopContext(exp->__anon1.compound->__anon1.compound.context);
 }
 else
 {
+struct Expression * prev = exp->prev, * next = exp->next;
+
 FreeType(newCall->destType);
 FreeType(newCall->expType);
 newCall->destType = exp->destType;
 newCall->expType = exp->expType;
 *exp = *newCall;
+exp->prev = prev;
+exp->next = next;
 ((newCall ? (__ecereClass_Expression->Destructor ? __ecereClass_Expression->Destructor((void *)newCall) : 0, __ecereNameSpace__ecere__com__eSystem_Delete(newCall)) : 0), newCall = 0);
 }
 }

diff --git a/compiler/libec/src/pass16.ec b/compiler/libec/src/pass16.ec
index 6e4b928..31b4c0d 100644 (file)
--- a/compiler/libec/src/pass16.ec
+++ b/compiler/libec/src/pass16.ec
@@ -1149,11 +1149,14 @@ static void ProcessExpression(Expression exp)
                   }
                   else
                   {
+                     Expression prev = exp.prev, next = exp.next;
                      FreeType(newCall.destType);
                      FreeType(newCall.expType);
                      newCall.destType = exp.destType;
                      newCall.expType = exp.expType;
                      *exp = *newCall;
+                     exp.prev = prev;
+                     exp.next = next;
                      delete newCall;
                   }
                }