Changeset 344

Timestamp:

05/29/08 08:03:39 (6 months ago)

Author:

FeepingCreature

Message:

• No debugging symbols, please
  

Files:

• trunk/tools/dsss.conf (modified) (1 diff)
• trunk/tools/tools/base.d (modified) (6 diffs)

trunk/tools/dsss.conf

@@ -2 +2 @@
-[tools]
-type=library
-
+
+
-[tools/unittests.d]
-target=tools_test
-
+
+

trunk/tools/tools/base.d

@@ -308 +308 @@
-
-void function() yield=&slowyield;
-
-
-void remove(T)(inout T[] array, T key, bool all=true) {
@@ -790 +789 @@
-  while (true) {
-    auto oldstate=*stp;
+    if (!(*stp in states)) {
+      logln("Invalid state reached: ", *stp, " not in ", states, "!");
+      asm { int 3; }
+    }
-    states[*stp](*stp);
-    if (oldstate!=*stp) continue;
@@ -844 +847 @@
-}
-
-Off
+At
-  return stuple(source[0..source.find(sep)], source[source.find(sep)+sep.length..$]);
-}
@@ -1021 +1024 @@
-_eval eval;
-
+struct _BoolSet(string OP, T...) {
+  T values;
+  int opEquals(U)(U other) {
+    bool res = other == values[0];
+    foreach (value; values[1..$])
+      res = mixin("res "~OP~" value");
+    return res;
+  }
+}
+
+template BoolSet(string OP) {
+  _BoolSet!(OP, T) BoolSet(T...)(T t) {
+    _BoolSet!(OP, T) res = void;
+    foreach (i, v; t) res.values[i] = v;
+    return res;
+  }
+}
+
+alias BoolSet!("||") OrSet; alias BoolSet!("&&") AndSet;
+mixin(Operator!("or", "return OrSet(lhs, rhs); "));
+
-import tools.log: logln;
-unittest {
@@ -1037 +1061 @@
-  mustEqual("PtupleBasicTest", a==2, b==5f, true);
-  mustEqual("ExTest", ex!("a, b, c -> d -> a(b, c) == d")((int a, int b) { return a == b; }, 2, 3)(false), true);
+  mustEqual("BoolSetTestOr", 2 /or/ 3 == 3, true);
+  mustEqual("BoolSetTestAnd", AndSet(2, 3) == 3, false);
-}
-
@@ -1044 +1070 @@
-}
-
-// lower-inclusive, upper-exclusive.
-struct between { int from, to; bool opIn_r(int i) { return (i < to) && (i !< from); } }
-
-R delegate(T) toDg(R, T...)(R function(T) fn) { return fn /fix/ stuple(); }
+
+string between(string text, string from, string to) {
+  int pos1;
+  if (from.length) pos1 = text.find(from);
+  else pos1 = 0;
+  if (pos1 == -1) return null;
+  text = text[pos1 + from.length .. $];
+  int pos2;
+  if (to.length) pos2 = text.find(to);
+  else pos2 = text.length;
+  if (pos2 == -1) return null;
+  return text[0 .. pos2];
+}
+
+string[] betweens(string text, string from, string to) {
+  string[] res;
+  while (true) {
+    auto pos1 = text.find(from); if (pos1 == -1) break;
+    text = text[pos1 + from.length .. $];
+    auto pos2 = text.find(to); if (pos2 == -1) break;
+    res ~= text[0 .. pos2];
+    text = text[pos2 + to.length .. $];
+  }
+  return res;
+}
+
+void glomp_parse(string text, void delegate(string pre, ref string post)[string] words, void delegate(string) rest) {
+  while (true) {
+    void delegate(string, ref string) dg; int min = int.max; string match;
+    foreach (key, value; words) {
+      auto pos = text.find(key);
+      if (pos == -1) continue;
+      if (pos < min) {
+        min = pos;
+        dg = value;
+        match = key;
+      }
+    }
+    if (dg) {
+      auto pre = text[0 .. min];
+      text = text[min + match.length .. $];
+      // logln("Found at ", min, ", pre ", pre, ", text ", text);
+      dg(pre, text);
+    } else {
+      rest(text);
+      break;
+    }
+  }
+}