Changeset 1313

Timestamp:

10/27/09 03:29:55 (15 years ago)

Author:

andrei

Message:

Minor optimization in decode

Files:

• trunk/phobos/linux.mak (modified) (2 diffs)
• trunk/phobos/std/math.d (modified) (2 diffs)
• trunk/phobos/std/typetuple.d (modified) (3 diffs)
• trunk/phobos/std/xml.d (modified) (1 diff)

trunk/phobos/linux.mak

@@ -45 +45 @@
-DMD_posix = dmd
-OBJSUFFIX_posix = .o
-LIB_posix = libphobos2.a
-EXESUFFIX_posix =
-LIBDRUNTIME_posix = $(DRUNTIMEDIR)/libdruntime.a
-CFLAGS_posix_debug = -m32 -g $(CFLAGS)
-CFLAGS_posix_release = -m32 -O3 $(CFLAGS)
-
-# D flags for all OSs, but customized by build
-DFLAGS_debug = -w -g -debug -d $(DFLAGS)
-inline -
+
-
-# D flags for documentation generation
-DDOCFLAGS=-version=ddoc -d -c -o- $(STDDOC)
-
-################################################################################
-
-STD_MODULES = $(addprefix std/, algorithm array atomics base64 bigint   \
-        bitmanip boxer compiler complex contracts conv cpuid cstream    \
-        ctype date datebase dateparse demangle encoding file format     \
-        functional getopt intrinsic iterator loader math md5            \
@@ -150 +150 @@
-    @$$(call RUN_$1,$$@)
-# succeeded, render the file new again
-    @touch $$@
-
-# $(PRODUCTIONLIBDIR)/tmp_$2$$(LIB_$1) : $$(LIB_$1_$2)
-#   ln -sf $$(realpath $$<) $$@
-
-$1/$2 : $$(LIB_$1_$2)
-$$(LIB_$1_$2) : $$(SRC2LIB_$1) $$(OBJS_$1_$2)                   \
-$(LIBDRUNTIME_$1)
-
-@
+#
+
-
-$$(ROOT$1$2)/.directory :
-    mkdir --parents $$(OBJDIR) || exists $$(OBJDIR)
-    if [ "$(SERVER_$1)" != "" ]; then \
-        $$(call RUN_$1,mkdir) --parents $$(OBJDIR)/$1 && \
-        ln -sf $(HOMEMAP_$1)/$(SERVERDIR_$1)/$$(OBJDIR)/$1 obj/ ; \
-    fi
-    mkdir --parents $$@ || [ -d $$@ ]
-
-$1/$2/unittest : $1/$2 $$(addsuffix $$(EXESUFFIX_$1),$$(addprefix $$(OBJDIR)/$1/$2/unittest/,$(STD_MODULES)))

trunk/phobos/std/math.d

@@ -3086 +3086 @@
-
-/**
-   Computes whether $(D lhs) is approximately equal to $(D rhs)
-   admitting a maximum relative difference $(D maxRelDiff) and a
-   maximum absolute difference $(D maxAbsDiff).
-
-   If the two inputs are ranges, $(D approxEqual) returns true if and
-   only if the ranges have the same number of elements and if $(D
-   approxEqual) evaluates to $(D true) for each pair of elements.
- */
-0
+1e-5
-{
-    static if (isInputRange!T)
-    {
-        static if (isInputRange!U)
-        {
-            // Two ranges
-            for (;; lhs.popFront, rhs.popFront)
-            {
-                if (lhs.empty) return rhs.empty;
-                if (rhs.empty) return lhs.empty;
@@ -3123 +3123 @@
-    {
-        static if (isInputRange!U)
-        {
-            // lhs is number, rhs is array
-            return approxEqual(rhs, lhs, maxRelDiff, maxAbsDiff);
-        }
-        else
-        {
-            // two numbers
-            //static assert(is(T : real) && is(U : real));
-
-
+
+
+
-            }
-            return fabs((lhs - rhs) / rhs) <= maxRelDiff
-
+=
-        }
-    }
-}
-
-/**
-0.01
+1e-2, 1e-5
- */
-bool approxEqual(T, U)(T lhs, U rhs)
-{
-0.01
+1e-2, 1e-5
-}
-
-unittest
-{
-    assert(approxEqual(1.0, 1.0099));
-    assert(!approxEqual(1.0, 1.011));
-    float[] arr1 = [ 1.0, 2.0, 3.0 ];
-    double[] arr2 = [ 1.001, 1.999, 3 ];
-    assert(approxEqual(arr1, arr2));
-}

trunk/phobos/std/typetuple.d

@@ -3 +3 @@
-/**
- * Templates with which to manipulate type tuples (also known as type lists).
- *
- * Some operations on type tuples are built in to the language,
- * such as TL[$(I n)] which gets the $(I n)th type from the
- * type tuple. TL[$(I lwr) .. $(I upr)] returns a new type
- * list that is a slice of the old one.
- *
- * References:
- *  Based on ideas in Table 3.1 from
-www.
+
- *      Modern C++ Design),
- *   Andrei Alexandrescu (Addison-Wesley Professional, 2001)
- * Macros:
- *  WIKI = Phobos/StdTypeTuple
- *
- * Copyright: Copyright Digital Mars 2005 - 2009.
- * License:   <a href="http://www.boost.org/LICENSE_1_0.txt">Boost License 1.0</a>.
- * Authors:   $(WEB digitalmars.com, Walter Bright)
- *
- *          Copyright Digital Mars 2005 - 2009.
@@ -353 +353 @@
-        equals!(short, ubyte, byte, byte));
-
-    static assert(Pack!(Replace!(1111, byte,
-                2222, 1111, 1111, 1111)).
-        equals!(2222, byte, 1111, 1111));
-
-    static assert(Pack!(Replace!(byte, 1111,
-                short, byte, byte, byte)).
-        equals!(short, 1111, byte, byte));
-
-
-
-
+
+
+
+
-}
-
-/**
- * Returns a typetuple created from TList with all occurrences
- * of type T, if found, replaced with type U.
- * Example:
- * ---
- * alias TypeTuple!(int, long, long, int, float) TL;
- *
- * ReplaceAll!(long, char, TL)
@@ -432 +433 @@
-        equals!(ubyte, short, ubyte, ubyte));
-
-    static assert(Pack!(ReplaceAll!(1111, byte,
-                1111, 2222, 1111, 1111)).
-        equals!(byte, 2222, byte, byte));
-
-    static assert(Pack!(ReplaceAll!(byte, 1111,
-                byte, short, byte, byte)).
-        equals!(1111, short, 1111, 1111));
-
-
-
-
+
+
+
+
-}
-
-/**
- * Returns a typetuple created from TList with the order reversed.
- * Example:
- * ---
- * alias TypeTuple!(int, long, long, int, float) TL;
- *
- * Reverse!(TL)
- * // is the same as:

trunk/phobos/std/xml.d

@@ -381 +381 @@
-    {
-        char c = s[i];
-        if (c != '&')
-        {
-            if (buffer.length != 0) buffer ~= c;
-        }
-        else
-        {
-            if (buffer.length == 0)
-            {
-
-
+
-            }
-            if (startsWith(s[i..$],"&#"))
-            {
-                try
-                {
-                    dchar d;
-                    string t = s[i..$];
-                    checkCharRef(t, d);
-                    char[4] temp;
-                    buffer ~= temp[0 .. std.utf.encode(temp, d)];