Refactor CYSetLast to return a reference to the eol.

diff --git a/List.hpp b/List.hpp
index 92d64e11d3bd1a7444b955b594037bb35683417e..f4762f224875a291ffdffaad9cb30b20995de0ec 100644 (file)
--- a/List.hpp
+++ b/List.hpp
@@ -42,14 +42,14 @@ struct CYNext {
 };
 
 template <typename Type_>
 };
 
 template <typename Type_>

-void CYSetLast(Type_ *&list, Type_ *item) {
+Type_ *&CYLast(Type_ *&list) {

     if (list == NULL)
     if (list == NULL)

-        list = item;
+        return list;

     else {
         Type_ *next(list);
         while (next->next_ != NULL)
             next = next->next_;
     else {
         Type_ *next(list);
         while (next->next_ != NULL)
             next = next->next_;

-        next->next_ = item;
+        return next->next_;

     }
 }
 
     }
 }
 

diff --git a/Parser.hpp b/Parser.hpp
index c53d132bcb3f7bebfaedfa1151c1780294c01eaa..57dd99356686e7405039f4cfa17c6777bf365ca8 100644 (file)
--- a/Parser.hpp
+++ b/Parser.hpp
@@ -430,7 +430,7 @@ struct CYBlock :
     }
 
     void AddPrev(CYStatement *statement) {
     }
 
     void AddPrev(CYStatement *statement) {

-        CYSetLast(statement, statements_);
+        CYLast(statement) = statements_;

         statements_ = statement;
     }
 
         statements_ = statement;
     }
 


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

-        CYSetLast(expression, expressions_);
+        CYLast(expression) = expressions_;

         expressions_ = expression;
     }
 
         expressions_ = expression;
     }
 

diff --git a/Replace.cpp b/Replace.cpp
index d40c8f315deb12694aedd4ff493d8600c6fa01d3..c70aab8f62d09a2f9bcd41e3c365b44c0e7e9f63 100644 (file)
--- a/Replace.cpp
+++ b/Replace.cpp
@@ -513,7 +513,7 @@ namespace cy {
 namespace Syntax {
 
 CYExpression *New::AddArgument(CYContext &context, CYExpression *value) {
 namespace Syntax {
 
 CYExpression *New::AddArgument(CYContext &context, CYExpression *value) {

-    CYSetLast(arguments_, $ CYArgument(value));
+    CYLast(arguments_) = $ CYArgument(value);

     return this;
 }
 
     return this;
 }