Build CYSetLast to simplify some replacements.

diff --git a/Parser.hpp b/Parser.hpp
index ebcbb7f8f577b48ca154d52427d1f18fd0e4598d..0b9099adfa8059009323d8f016a7451e68a40c49 100644 (file)
--- a/Parser.hpp
+++ b/Parser.hpp
@@ -57,6 +57,18 @@ struct CYNext {
     }
 };
 
     }
 };
 

+template <typename Type_>
+void CYSetLast(Type_ *&list, Type_ *item) {
+    if (list == NULL)
+        list = item;
+    else {
+        Type_ *next(list);
+        while (next->next_ != NULL)
+            next = next->next_;
+        next->next_ = item;
+    }
+}
+

 #define CYForEach(value, list) \
     for (__typeof__(*list) *value(list); value != NULL; value = value->next_)
 
 #define CYForEach(value, list) \
     for (__typeof__(*list) *value(list); value != NULL; value = value->next_)
 


@@ -426,10 +438,7 @@ struct CYBlock :
     }
 
     void AddPrev(CYStatement *statement) {
     }
 
     void AddPrev(CYStatement *statement) {

-        CYStatement *last(statement);
-        while (last->next_ != NULL)
-            last = last->next_;
-        last->SetNext(statements_);
+        CYSetLast(statement, statements_);

         statements_ = statement;
     }
 
         statements_ = statement;
     }
 


@@ -614,10 +623,7 @@ struct CYCompound :
     }
 
     void AddPrev(CYExpression *expression) {
     }
 
     void AddPrev(CYExpression *expression) {

-        CYExpression *last(expression);
-        while (last->next_ != NULL)
-            last = last->next_;
-        last->SetNext(expressions_);
+        CYSetLast(expression, expressions_);

         expressions_ = expression;
     }
 
         expressions_ = expression;
     }
 

diff --git a/Replace.cpp b/Replace.cpp
index d1f8ab5b11a9c53ee797832e9447c25d9562fdaa..5803478d1d6ffc16418e3c703eae99c3f0a6c527 100644 (file)
--- a/Replace.cpp
+++ b/Replace.cpp
@@ -453,10 +453,7 @@ namespace cy {
 namespace Syntax {
 
 CYExpression *New::AddArgument(CYContext &context, CYExpression *value) {
 namespace Syntax {
 
 CYExpression *New::AddArgument(CYContext &context, CYExpression *value) {

-    CYArgument **argument(&arguments_);
-    while (*argument != NULL)
-        argument = &(*argument)->next_;
-    *argument = $ CYArgument(value);
+    CYSetLast(arguments_, $ CYArgument(value));

     return this;
 }
 
     return this;
 }