Changeset 389

Timestamp:

07/21/08 09:00:32 (4 months ago)

Author:

FeepingCreature

Message:

• Small improvement to reverse
  

Files:

• trunk/tools/tools/base.d (modified) (7 diffs)
• trunk/tools/tools/functional.d (modified) (2 diffs)

trunk/tools/tools/base.d

@@ -462 +462 @@
-        LHS lhs;
-        typeof(function() { LHS lhs; RHS rhs; "~CODE~" }()) "~OP~"(RHS)(RHS rhs) { "~CODE~" }
-typeof(function() { LHS lhs; RHS rhs; "~CODE~" }()) opCall(RHS)(RHS rhs) { "~CODE~" }
+alias "~OP~" opCall;
-      }"
-  )~"
@@ -469 +469 @@
-    ?"
-    typeof(function() { Unstatic!(LHS) lhs; "~CODE~" }()) "~OP~"_r(LHS)(LHS lhs) { "~CODE~" }
-typeof(function() { Unstatic!(LHS) lhs; "~CODE~" }()) opCall  (LHS)(LHS lhs) { "~CODE~" }
+alias "~OP~"_r opCall;
-    "
-    :"
-    __"~NAME~"!(Unstatic!(LHS)) "~OP~"_r(LHS)(LHS lhs) { __"~NAME~"!(Unstatic!(LHS)) res=void; res.lhs = lhs; return res; }
-__"~NAME~"!(Unstatic!(LHS)) opCall(LHS)(LHS lhs) { __"~NAME~"!(Unstatic!(LHS)) res=void; res.lhs = lhs; return res; }
+alias "~OP~"_r opCall;
-    "
-  )~"}
@@ -588 +588 @@
-template Length(T, U) { const int Length=CallConfig!(T, U).length; }
-
+struct fix_late_holder(LHS, RHS) {
+  LHS lhs; RHS rhs;
+  typeof(lhs(rhs, TupleInit!(X))) opCall(X...)(X par) {
+    return lhs(rhs, par);
+  }
+}
+
-mixin(Operator!("fix", "
-  // pragma(msg, \"fix: \"~LHS.stringof~\" -> \"~RHS.stringof);
-  struct holder {
-    LHS fix_lhs; Unstatic!(RHS) fix_rhs;
-
-
-
+
-      return mixin(\\\"fix_lhs(\\\"~Value!(RHS, Ret!(LHS) function(Params!(LHS)[0..Length!(RHS, LHS)]), \\\"fix_rhs\\\")~\\\"
-        \"~((Length!(RHS, LHS) && (Params!(LHS).length-Length!(RHS, LHS)))?\", \":\"\")~refToValueList(isRef!(LHS)[Length!(RHS, LHS)..$])~\")\\\");
-    }\");
-  }
-
-
+
+
+
+
+
+
+
+
-"));
-
@@ -626 +637 @@
-_partial!(C) partial(C)(C callable) { _partial!(C) res; res.callable=callable; return res; }
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-template Reverse(T...) {
@@ -646 +654 @@
-  static if(LEN==1) const string ReverseIndices=BASE~"[0]"; else
-  const string ReverseIndices=BASE~"["~(LEN-1).stringof~"], "~ReverseIndices!(BASE, LEN-1);
+}
+
+struct reverse_holder(LHS) {
+  LHS lhs;
+  typeof(lhs(TupleInit!(Reverse!(X)))) opCall(X...)(X par) {
+    return mixin("lhs("~ReverseIndices!("par", X.length)~")");
+  }
-}
-
@@ -655 +670 @@
-  } else {
-    // reverse parameter order
-
-
-
-
-
+
+
+
+
-      }
-
-
-
+
+
+
+
+
+
-  }", true
-));
@@ -945 +962 @@
-T delegate(T) Loop(T)(int count, T delegate(T) dg) {
-  assert(count>0);
-
+
+
+
+
-}
-

trunk/tools/tools/functional.d

@@ -100 +100 @@
-
-mixin(Operator!("sort", "auto res=lhs.dup; res.sort; return res;", true));
+
+struct curry_holder(LHS, G...) {
+  LHS lhs; G g;
+  const string CODE = "
+    static if (is(typeof(lhs(g, par)))) return lhs(g, par);
+    else {
+      curry_holder!(LHS, G, X) res = void;
+      res.lhs = lhs;
+      foreach (id, entry; g) res.g[id] = entry;
+      foreach (id, entry; par) res.g[G.length + id] = entry;
+      return res;
+    }";
+  Ret!(typeof(function { X par; mixin(CODE); })) opCall(X...)(X par) {
+    mixin(CODE);
+  }
+}
+
-mixin(Operator!("curry", "
-
-
+
+
+
+
+
+
+
-", true));
+
+template CurryRes(S, T...) {
+  static if (T.length == 1) alias typeof(Init!(S) (Init!(T[0]))) CurryRes;
+  else alias typeof((Init!(S) (Init!(T[0])) /uncurry) (Init!(T[1 .. $]))) CurryRes;
+}
+
-template CollectParameters(T) {
-  static if (is(T==function) || is (T==delegate)) {
@@ -113 +141 @@
-  }
-}
+
-template CurryCalls(int depth) {
-  static if (!depth) const string CurryCalls="";
-  else const string CurryCalls=CurryCalls!(depth-1)~"(cp["~depth.stringof~"-1])";
-}
+ 
-mixin(Operator!("uncurry", "
-  alias CollectParameters!(LHS).tuple CPAR;