git.iko.soy/rowtype-yoga/purescript-native
on golang help sign in
Rename boxed::ref to boxed::recur
fab29cbAndy Arvanitis
runtime/purescript.h+6−6
compare with golang
unifiedsplit
@@ -144,12 +144,12 @@ namespace purescript {
144
144
145 }; // class boxed::weak
145 }; // class boxed::weak
146
146
147− class ref {
147+ class recur {
148 std::shared_ptr<boxed> sptr;
148 std::shared_ptr<boxed> sptr;
149 std::shared_ptr<boxed::weak> wptr;
149 std::shared_ptr<boxed::weak> wptr;
150
150
151 public:
151 public:
152− ref() : sptr(std::make_shared<boxed>())
152+ recur() : sptr(std::make_shared<boxed>())
153 , wptr(std::make_shared<boxed::weak>(*sptr)) {}
153 , wptr(std::make_shared<boxed::weak>(*sptr)) {}
154
154
155 operator const boxed&() const {
155 operator const boxed&() const {
@@ -169,7 +169,7 @@ namespace purescript {
169 }
169 }
170
170
171 template <typename T>
171 template <typename T>
172− auto operator=(T&& right) -> ref& {
172+ auto operator=(T&& right) -> recur& {
173 *sptr = std::forward<T>(right);
173 *sptr = std::forward<T>(right);
174 *wptr = *sptr;
174 *wptr = *sptr;
175 return *this;
175 return *this;
@@ -178,7 +178,7 @@ namespace purescript {
178 class weak {
178 class weak {
179 std::shared_ptr<boxed::weak> wptr;
179 std::shared_ptr<boxed::weak> wptr;
180 public:
180 public:
181− weak(const ref& r) : wptr(r.wptr) {}
181+ weak(const recur& r) : wptr(r.wptr) {}
182
182
183 operator boxed() const {
183 operator boxed() const {
184 return *wptr;
184 return *wptr;
@@ -191,8 +191,8 @@ namespace purescript {
191 auto operator()(const boxed& arg) const -> boxed {
191 auto operator()(const boxed& arg) const -> boxed {
192 return static_cast<boxed>(*wptr)(arg);
192 return static_cast<boxed>(*wptr)(arg);
193 }
193 }
194− }; // class ref::weak
194+ }; // class recur::weak
195− }; // class boxed::ref
195+ }; // class boxed::recur
196
196
197 }; // class boxed
197 }; // class boxed
198
198
src/CodeGen/Cpp.hs+2−2
@@ -255,10 +255,10 @@ moduleToCpp (Module _ coms mn _ imps _ foreigns decls) _ =
255 bindersToCpp ss binders vals
255 bindersToCpp ss binders vals
256 valueToCpp (Let _ ds val) = do
256 valueToCpp (Let _ ds val) = do
257 let recurs = concatMap getNames $ filter isRec ds
257 let recurs = concatMap getNames $ filter isRec ds
258− recurDs = (\v -> AST.Var Nothing $ "boxed::ref " <> identToCpp v) <$> recurs
258+ recurDs = (\v -> AST.Var Nothing $ "boxed::recur " <> identToCpp v) <$> recurs
259 recurDsWeak = (\v -> AST.Var
259 recurDsWeak = (\v -> AST.Var
260 Nothing
260 Nothing
261− ("boxed::ref::weak " <> identToCpp v <> unretainedSuffix <> "(" <> identToCpp v <> ")")
261+ ("boxed::recur::weak " <> identToCpp v <> unretainedSuffix <> "(" <> identToCpp v <> ")")
262 ) <$> recurs
262 ) <$> recurs
263 mutualRecurWarning = if any isMutRec $ filter isRec ds
263 mutualRecurWarning = if any isMutRec $ filter isRec ds
264 then [AST.Var Nothing "#pragma message(\"Mutually recursive lets will cause retain cycles (memory leaks)\") //"]
264 then [AST.Var Nothing "#pragma message(\"Mutually recursive lets will cause retain cycles (memory leaks)\") //"]