Changeset 90152a4 for tests/function-operator.c

Timestamp:

Aug 27, 2018, 4:40:34 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

b7c89aa

Parents:

f9feab8 (diff), 305581d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into cleanup-dtors

File:

• tests/function-operator.c (moved) (moved from src/tests/function-operator.c ) (10 diffs)

tests/function-operator.c

@@ -9 +9 @@
 // Author           : Rob Schluntz
 // Created On       : Fri Aug 25 15:21:11 2017
-// Last Modified By : Rob Schluntz
-// Last Modified On : Fri Aug 25 15:31:29 2017
-// Update Count     : 2
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Aug  2 09:27:53 2018
+// Update Count     : 8
 //
 
-#include <fstream>
-#include <stdlib>
+#include <fstream.hfa>
+#include <stdlib.hfa>
 
 #define length(array) (sizeof((array))/sizeof((array)[0]))
@@ -34 +34 @@
 forall(otype Tin, dtype Input | Iterator(Input, Tin), otype Tout, dtype Output | Iterator(Output, Tout) | Assignable(Tout, Tin))
 Output copy(Input first, Input last, Output result) {
-  while (first != last) {
-    *result = *first;
-    ++result; ++first;
-  }
-  return result;
+        while (first != last) {
+                *result = *first;
+                ++result; ++first;
+        }
+        return result;
 }
 
@@ -44 +44 @@
 forall(otype Tin, dtype Input | Iterator(Input, Tin), otype Tout, dtype Output | Iterator(Output, Tout), otype FuncRet, dtype Func | { FuncRet ?()(Func *, Tin); } | Assignable(Tout, FuncRet))
 Output transform (Input first, Input last, Output result, Func * op) {
-  while (first != last) {
-    *result = op(*first);
-    ++result; ++first;
-  }
-  return result;
+        while (first != last) {
+                *result = op(*first);
+                ++result; ++first;
+        }
+        return result;
 }
 
@@ -54 +54 @@
 forall(dtype Iter, otype T | Iterator(Iter, T), otype Pred | { int ?()(Pred, T); })
 Iter find_if (Iter first, Iter last, Pred pred) {
-  while (first != last) {
-    if (pred(*first)) return first;
-    ++first;
-  }
-  return last;
+        while (first != last) {
+                if (pred(*first)) return first;
+                ++first;
+        }
+        return last;
 }
 
@@ -64 +64 @@
 forall(otype Generator, otype GenRet | { GenRet ?()(Generator &); }, dtype Iter, otype T| Iterator(Iter, T) | Assignable(T, GenRet))
 void generate(Iter first, Iter last, Generator & gen) {
-  int i = 0;
-  while (first != last) {
-    *first = gen();
-    ++first;
-  }
+        int i = 0;
+        while (first != last) {
+                *first = gen();
+                ++first;
+        }
 }
 
@@ -78 +78 @@
 // TODO: abstract over os type with ostream trait; resolver is currently too slow for this to be reasonable, but it does work.
 struct os_wrapper {
-  ofstream * out;
+        ofstream * out;
 };
 
 // TODO: abstract over (os, T)
 os_wrapper ?=?(os_wrapper & wrapper, int x) {
-  wrapper.out | x | endl;
-  return wrapper;
+        *wrapper.out | x | endl;
+        return wrapper;
 }
 
-struct ostream_iterator {
-  os_wrapper * out;
-};
+        struct ostream_iterator {
+                os_wrapper * out;
+        };
 void ?{}(ostream_iterator & iter, ofstream * out) {
-  iter.out = new(out);
+        iter.out = new(out);
 }
 // no destructor, memory leak. This is necessary for this to work at the moment, since
@@ -98 +98 @@
 // implement Iterator
 os_wrapper & *?(ostream_iterator iter) {
-  return *iter.out;
+        return *iter.out;
 }
 ostream_iterator ++?(ostream_iterator & iter) {
-  // nothing to do
-  return iter;
+        // nothing to do
+        return iter;
 }
 int ?!=?(ostream_iterator i1, ostream_iterator i2) {
-  return i1.out->out != i2.out->out;
+        return i1.out->out != i2.out->out;
 }
 
@@ -132 +132 @@
 forall(otype Return, ttype Args)
 struct function {
-  Return (*f)(Args);
+        Return (*f)(Args);
 };
 // TODO: missing adapter in these functions
@@ -148 +148 @@
 
         // copy for output
-        ostream_iterator out_iter = { sout };
+        ostream_iterator out_iter = { &sout };
         copy(begin(x), end(x), out_iter);
         copy(begin(y), end(y), out_iter);
@@ -168 +168 @@
         transform(begin(x), end(x), begin(x), &times2);
         copy(begin(x), end(x), out_iter);
+
+        // REMOVE WHEN ?* PROBLEM FIXED.
+        delete(out_iter.out);
 }