Changeset 351

Timestamp:

08/24/08 20:32:09 (3 months ago)

Author:

JarrettBillingsley

Message:

finished the timelib.

Files:

• branches/v2new/minid/api.d (modified) (4 diffs)
• branches/v2new/minid/interpreter.d (modified) (5 diffs)
• branches/v2new/minid/timelib.d (modified) (7 diffs)
• branches/v2new/samples/simple.md (modified) (1 diff)
• branches/v2new/test.d (modified) (2 diffs)

branches/v2new/minid/api.d

@@ -46 +46 @@
-import minid.mathlib;
-import minid.stringlib;
+import minid.timelib;
-
-// ================================================================================================================================================
@@ -154 +155 @@
-    */
-    Regexp =  128,
-
-
-
-
+
+
+
+
+
+
+
+
+
-    or OS libraries to do bad things.
-    */
-
+ | Time
-
-    /**
@@ -169 +175 @@
-
-/**
-  
+
-
-Params:
@@ -200 +206 @@
-//  if(libs & MDStdlib.Table)
-//      TableLib.init(ret);
+
+    if(libs & MDStdlib.Time)
+        TimeLib.init(t);
-}
-

branches/v2new/minid/interpreter.d

@@ -507 +507 @@
-
-/**
-
+es
-
-Params:
@@ -521 +521 @@
-
-/**
-
+es
-
-Params:
@@ -536 +536 @@
-
-/**
- a value at the given stack index and push
+s a value at the given stack index and pushes
-
-Params:
@@ -553 +553 @@
-
-/**
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-and everything after it up by a _slot.  This means the stack will stay the same size.  Similar to a
-"rotate" operation common to many stack machines.
@@ -605 +625 @@
-
-/**
-
+s
-on the stack.  'this' is not counted; so if there is 'this' and one value, and you try to pop 2
-values, an error is thrown.

branches/v2new/minid/timelib.d

@@ -1 +1 @@
-/******************************************************************************
-License:
-7
+8
-
-This software is provided 'as-is', without any express or implied warranty.
@@ -24 +24 @@
-module minid.timelib;
-
+import tango.text.locale.Convert;
+import tango.text.locale.Core;
+import tango.time.chrono.Gregorian;
+import tango.time.Clock;
+import tango.time.StopWatch;
+import tango.time.Time;
+import tango.time.WallClock;
+import Utf = tango.text.convert.Utf;
+
+import minid.ex;
+import minid.interpreter;
-import minid.types;
-import minid.utils;
-
-import tango.text.locale.Convert;
-import tango.text.locale.Core;
-import tango.time.Clock;
-import tango.time.Time;
-import tango.time.StopWatch;
-import tango.time.WallClock;
-import tango.time.chrono.Gregorian;
-
-version(Windows)
@@ -47 +50 @@
-    static assert(false, "No valid platform defined");
-
-final class
+struct
-{
-static:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-        {
-            if(!QueryPerformanceFrequency(&performanceFreq))
@@ -74 +64 @@
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-            return 0;
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-    {
-        version(Windows)
@@ -104 +93 @@
-            ulong time;
-            QueryPerformanceCounter(&time);
-
+
-            if(time < 0x8637BD05AF6L)
-s.push((time * 1_000_000) / performanceFreq
+pushInt(t, cast(mdint)((time * 1_000_000) / performanceFreq)
-            else
-s.push((time / performanceFreq) * 1_000_000
+pushInt(t, cast(mdint)((time / performanceFreq) * 1_000_000)
-        }
-        else
@@ -114 +103 @@
-            timeval tv;
-            gettimeofday(&tv, null);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        else if(format == "R")
-            time = Clock.now;
@@ -137 +122 @@
-            time = WallClock.now;
-
+        Culture culture = null;
+
-        if(numParams > 2)
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    {
-        bool useGMT = false;
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-            {
-
-
-
-
+
+
-            }
-            else
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        if(numParams > 0)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        return time;
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        {
-            protected StopWatch mWatch;
-            protected mdfloat mTime = 0;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-            return 1;
-        }
-
-public int start(MDState s, uint
-
-s.getContext!(MDPerfCounter
+
+uword start(MDThread* t, uword
+
+getThis(t
-            return 0;
-        }
-
-public int stop(MDState s, uint
-
-self = s.getContext!(MDPerfCounter
-self.mTime = self
+
+uword stop(MDThread* t, uword
+
+members = getThis(t
+members.mTime = members
-            return 0;
-        }
-
-public int seconds(MDState s, uint
-
-s.push(s.getContext!(MDPerfCounter
+
+uword seconds(MDThread* t, uword
+
+pushFloat(t, getThis(t
-            return 1;
-        }
-
-public int millisecs(MDState s, uint
-
-s.push(s.getContext!(MDPerfCounter
+
+uword millisecs(MDThread* t, uword
+
+pushFloat(t, getThis(t
-            return 1;
-        }
-
-public int microsecs(MDState s, uint
-
-s.push(s.getContext!(MDPerfCounter
+
+uword microsecs(MDThread* t, uword
+
+pushFloat(t, getThis(t
-            return 1;
-        }

branches/v2new/samples/simple.md

@@ -1 +1 @@
-module samples.simple
-
-
-
-/+

branches/v2new/test.d

@@ -36 +36 @@
-    loadStdlibs(t);
-
-
-
-
-
-
-
+
-
-    Stdout.newline.format("MiniD using {} bytes before GC, ", bytesAllocated(vm)).flush;
@@ -50 +45 @@
-    delete vm;
-}
-
-private extern(Windows) int QueryPerformanceFrequency(ulong* frequency);
-private extern(Windows) int QueryPerformanceCounter(ulong* count);
-ulong performanceFreq;
-
-static this()
-{
-    if(!QueryPerformanceFrequency(&performanceFreq))
-        performanceFreq = 0x7fffffffffffffffL;
-}
-
-uword microTime(MDThread* t, uword numParams)
-{
-    ulong time;
-    QueryPerformanceCounter(&time);
-
-    if(time < 0x8637BD05AF6L)
-        pushInt(t, cast(mdint)((time * 1_000_000) / performanceFreq));
-    else
-        pushInt(t, cast(mdint)((time / performanceFreq) * 1_000_000));
-
-    return 1;
-}
-
-import tango.time.StopWatch;
-struct Timer
-{
-static:
-    private Members* getThis(MDThread* t)
-    {
-        return checkObjParam!(Members)(t, 0, "Timer");
-    }
-
-    void init(MDThread* t)
-    {
-        CreateObject(t, "Timer", (CreateObject* o)
-        {
-            o.method("clone", &clone);
-            o.method("start", &start);
-            o.method("stop", &stop);
-            o.method("seconds", &seconds);
-            o.method("millisecs", &millisecs);
-            o.method("microsecs", &microsecs);
-        });
-
-        newGlobal(t, "Timer");
-    }
-
-    struct Members
-    {
-        protected StopWatch mWatch;
-        protected mdfloat mTime = 0;
-    }
-
-    uword clone(MDThread* t, uword numParams)
-    {
-        newObject(t, 0, null, 0, Members.sizeof);
-        *getMembers!(Members)(t, -1) = Members.init;
-        return 1;
-    }
-
-    uword start(MDThread* t, uword numParams)
-    {
-        getThis(t).mWatch.start();
-        return 0;
-    }
-
-    uword stop(MDThread* t, uword numParams)
-    {
-        auto members = getThis(t);
-        members.mTime = members.mWatch.stop();
-        return 0;
-    }
-
-    uword seconds(MDThread* t, uword numParams)
-    {
-        pushFloat(t, getThis(t).mTime);
-        return 1;
-    }
-
-    uword millisecs(MDThread* t, uword numParams)
-    {
-        pushFloat(t, getThis(t).mTime * 1_000);
-        return 1;
-    }
-
-    uword microsecs(MDThread* t, uword numParams)
-    {
-        pushFloat(t, getThis(t).mTime * 1_000_000);
-        return 1;
-    }
-}