auto: private constructor, maker method

multun · Jul 10, 2018 · 4602177 · 4602177
1 parent 7629405
commit 4602177
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 14 deletions.
diff --git a/auto.hh b/auto.hh
@@ -61,22 +61,24 @@ class Auto {
         return data_[!data_pos_];
     }
 
+    Auto() : data_pos_(0) {}
 
 public:
     auto &get_state() {
         return *cur_data().template get_data<intf_t>();
     }
 
-    Auto() : data_pos_(0) {}
 
     ~Auto() {
         cur_data().leave();
     }
 
     template<template<class> class InitialState, class ...Args>
-    void initialize(Args&& ...args) {
-        cur_data().template enter<InitialState, Args...>(
+    static Auto init(Args&& ...args) {
+        Auto res;
+        res.cur_data().template enter<InitialState, Args...>(
             std::forward<Args>(args)...);
+	return res;
     }
 
     template<template<class> class NewState, class ...Args>

diff --git a/test.cc b/test.cc
@@ -1,15 +1,6 @@
 #include "auto.hh"
 #include <iostream>
 
-// template<class ...States>
-// struct ExInterface;
-// template<class ...States>
-// struct StateA;
-// template<class ...States>
-// struct StateB;
-
-
-
 template<class Auto>
 struct ExInterface {
     virtual void callback(Auto &a) = 0;
@@ -57,8 +48,7 @@ using trans = TList<TPair<StateB, StateA>>;
 using MyAuto = Auto<ExInterface, trans, StateA, StateB>;
 
 int main() {
-    MyAuto a;
-    a.template initialize<StateB>(1);
+    auto a = MyAuto::template init<StateB>(1);
     a.get_state().callback(a);
     a.get_state().callback(a);
 }