Changeset 209

Timestamp:

10/08/07 11:22:17 (1 year ago)

Author:

JarrettBillingsley

Message:

--

Files:

• trunk/lib.brf (modified) (1 diff)
• trunk/mdcl.brf (modified) (1 diff)
• trunk/mdcl.zip (modified) (previous)
• trunk/minid/baselib.d (modified) (3 diffs)
• trunk/minid/compiler.d (modified) (5 diffs)
• trunk/minid/iolib.d (modified) (1 diff)
• trunk/minid/types.d (modified) (145 diffs)
• trunk/minid/utils.d (modified) (1 diff)
• trunk/samples/simple.md (modified) (5 diffs)
• trunk/samples/speed.md (modified) (6 diffs)
• trunk/test.opt (modified) (previous)

trunk/lib.brf

@@ -1 +1 @@
-minid/arraylib.d
+minid/bind.d
-minid/baselib.d
-minid/charlib.d
+minid/commandline.d
-minid/compiler.d
-minid/iolib.d

trunk/mdcl.brf

@@ -2 +2 @@
--clean
--release
+-op
--O
--op

trunk/minid/baselib.d

@@ -480 +480 @@
-
-        baseFormat(s, s.getAllParams(), &sink);
-Cout()
+Stdout.flush
-        return 0;
-    }
@@ -486 +486 @@
-    int writeln(MDState s, uint numParams)
-    {
+        char[256] buffer = void;
+        char[] buf = buffer;
+
-        for(uint i = 0; i < numParams; i++)
-
+
+
+
+
-
-        Stdout.newline;
@@ -495 +501 @@
-    int write(MDState s, uint numParams)
-    {
+        char[256] buffer = void;
+        char[] buf = buffer;
+
-        for(uint i = 0; i < numParams; i++)
-
-
-
+
+
+
+
+
+
-        return 0;
-    }

trunk/minid/compiler.d

@@ -126 +126 @@
-    else
-        fs.codeI(stmts[$ - 1].mEndLocation.line, Op.Ret, 0, 1);
+        
+    //fs.showMe(); Stdout.flush;
-
-    return fs.toFuncDef();
@@ -3186 +3188 @@
-    public void codeGen(FuncState s)
-    {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
@@ -6928 +6982 @@
-                cmpVal = 0;
-            else if(mOp1.isInt && mOp2.isInt)
-mOp1.asInt() - mOp2.asInt(
+Compare3(mOp1.asInt(), mOp2.asInt()
-            else if((mOp1.isInt || mOp1.isFloat) && (mOp2.isInt || mOp2.isFloat))
-
-
-
-
-
-
-
-
+
-            else if(mOp1.isChar && mOp2.isChar)
-mOp1.asChar() - mOp2.asChar(
+Compare3(mOp1.asChar, mOp2.asChar
-            else if(mOp1.isString && mOp2.isString)
-                cmpVal = dcmp(mOp1.asString(), mOp2.asString());
@@ -6991 +7038 @@
-    {
-        super(location, endLocation, Op.Cmp3, left, right);
+    }
+    
+    public override Expression fold()
+    {
+        mOp1 = mOp1.fold();
+        mOp2 = mOp2.fold();
+        
+        if(mOp1.isConstant && mOp2.isConstant)
+        {
+            int cmpVal = 0;
+
+            if(mOp1.isNull && mOp2.isNull)
+                cmpVal = 0;
+            else if(mOp1.isInt && mOp2.isInt)
+                cmpVal = Compare3(mOp1.asInt(), mOp2.asInt());
+            else if((mOp1.isInt || mOp1.isFloat) && (mOp2.isInt || mOp2.isFloat))
+                cmpVal = Compare3(mOp1.asFloat(), mOp2.asFloat());
+            else if(mOp1.isChar && mOp2.isChar)
+                cmpVal = Compare3(mOp1.asChar(), mOp2.asChar());
+            else if(mOp1.isString && mOp2.isString)
+                cmpVal = dcmp(mOp1.asString(), mOp2.asString());
+            else
+                throw new MDCompileException(mLocation, "Invalid compile-time comparison");
+
+            return new IntExp(mLocation, cmpVal);
+        }
+
+
+        return this;
-    }
-}
@@ -9156 +9232 @@
-
-        // rewrite super(1, 2, 3) as super.constructor(1, 2, 3)
-(this.super)
+__class.super
-
-        ThisExp _this = new ThisExp(mLocation);
-
+
+
-        DotExp dot = new DotExp(mLocation, mEndLocation, sup, method);
-        CallExp call = new CallExp(mLocation, mEndLocation, dot, _this, mArgs);

trunk/minid/iolib.d

@@ -423 +423 @@
-            mLines = new LineIterator!(char)(mInput);
-        }
-
+
-        public T readVal(T)()
-        {

trunk/minid/types.d

@@ -365 +365 @@
-            case Type.Null:
-                return true;
-
+
-            case Type.Bool:
-                return this.mBool == other.mBool;
@@ -402 +402 @@
-
-            case Type.Int:
-this.mInt - other.mInt
+Compare3(this.mInt, other.mInt)
-
-            case Type.Float:
-
-
-
-
-
-
+
-
-            case Type.Char:
-this.mChar - other.mChar
+Compare3(this.mChar, other.mChar)
-
-            default:
@@ -446 +441 @@
-            case Type.Int:
-                if(other.mType == Type.Float)
-
-
-
-
-
-
-
-
-
-
+
-                else
-this.mInt - other.mInt
+Compare3(this.mInt, other.mInt)
-
-            case Type.Float:
-                if(other.mType == Type.Int)
-
-
-
-
-
-
-
-
-
-
+
-                else
-
-
-
-
-
-
-
-
+
-
-            case Type.Char:
-- other.mChar
+< other.mChar ? -1 : this.mChar > other.mChar ? 1 : 0
-
-            default:
@@ -1463 +1433 @@
-        for(uint i = 0; i < values.length; i++)
-        {
-isString()
-as!(MDString)
-isChar()
+mType == MDValue.Type.String
+mString
+mType == MDValue.Type.Char
-                l += 1;
-            else
@@ -1473 +1443 @@
-            }
-        }
-
+
-        dchar[] result = new dchar[l];
-
+
-        uint i = 0;
-
+
-        foreach(MDValue v; values)
-        {
-isString()
+mType == MDValue.Type.String
-            {
-as!(MDString)
+mString
-                result[i .. i + s.length] = s.mData[];
-                i += s.length;
@@ -1488 +1458 @@
-            else
-            {
-as!(dchar)
+mChar
-                i++;
-            }
@@ -1793 +1763 @@
-    public MDValue* opIndex(ref MDValue index)
-    {
-isNull()
+mType == MDValue.Type.Null
-            throw new MDException("Cannot index a table with null");
-
@@ -1810 +1780 @@
-    public void opIndexAssign(ref MDValue value, ref MDValue index)
-    {
-isNull()
+mType == MDValue.Type.Null
-            throw new MDException("Cannot index assign a table with null");
-
-isNull()
+mType == MDValue.Type.Null
-        {
-            if(index in mData)
@@ -2182 +2152 @@
-    private static MDArray concat(MDValue[] values)
-    {
-isArray()
-
-isArray()
-as!(MDArray) ~ values[1].as!(MDArray)
+mType == MDValue.Type.Array
+
+mType == MDValue.Type.Array
+mArray ~ values[1].mArray
-            else
-as!(MDArray)
+mArray
-        }
-
@@ -2194 +2164 @@
-        foreach(uint i, MDValue v; values)
-        {
-isArray()
-as!(MDArray)
+mType == MDValue.Type.Array
+mArray
-            else
-                l += 1;
@@ -2206 +2176 @@
-        foreach(MDValue v; values)
-        {
-isArray()
+mType == MDValue.Type.Array
-            {
-as!(MDArray)
+mArray
-                result.mData[i .. i + a.length] = a.mData[];
-                i += a.length;
@@ -2226 +2196 @@
-        foreach(uint i, ref MDValue v; values)
-        {
-isArray()
-as!(MDArray)
+mType == MDValue.Type.Array
+mArray
-            else
-                dest ~= v;
@@ -2360 +2330 @@
-    public void opIndexAssign(ref MDValue value, MDString index)
-    {
-isFunction()
+mType == MDValue.Type.Function
-            mMethods[index] = value;
-        else
@@ -2435 +2405 @@
-{
-    protected MDClass mClass;
+    protected MDNamespace mMethods;
-    protected MDNamespace mFields;
-    protected MDNamespace mMethods;
-
-    private this(MDClass _class)
@@ -2442 +2412 @@
-        mType = MDValue.Type.Instance;
-        mClass = _class;
+        mMethods = mClass.mMethods;
-        mFields = mClass.mFields.dup;
-        mMethods = mClass.mMethods;
-    }
-
@@ -2488 +2458 @@
-    public void opIndexAssign(ref MDValue value, MDString index)
-    {
-isFunction()
+mType == MDValue.Type.Function
-            throw new MDException("Attempting to change a method of an instance of '{}'", mClass.toUtf8());
-        else if(auto member = index in mFields)
@@ -2552 +2522 @@
-    }
-}
+
+import tango.stdc.stdlib: cmalloc = malloc, cfree = free;
+import tango.core.Exception;
+import tango.core.Memory;
-
-/**
@@ -3241 +3215 @@
-    package static MDModuleDef function(FilePath, char[][]) tryPath;
-    version(MDDynLibs) package static char[] function(char[], char[][]) tryDynLibPath;
-
+
-    private Location[] mTraceback;
-    private MDState mMainThread;
@@ -3581 +3555 @@
-            else
-            {
-isNamespace()
-as!(MDNamespace)
+mType == MDValue.Type.Namespace
+mNamespace
-                else
-                    throw new MDException("Error loading module \"{}\": conflicts with {}", name, join(packages[0 .. i + 1], "."d));
@@ -3593 +3567 @@
-        if(v !is null)
-        {
-!v.isNamespace()
+v.mType != MDValue.Type.Namespace
-                throw new MDException("Error loading module \"{}\": a global of the same name already exists", name);
-
-as!(MDNamespace)
+mNamespace
-        }
-        else
@@ -3945 +3919 @@
-
-            if(numReturns == -1)
-basedIndexToAbs(
+(mCurrentAR.base + 
-            else
-            {
-basedIndexToAbs(funcSlot)
+mCurrentAR.base + funcSlot
-                return numReturns;
-            }
@@ -4028 +4002 @@
-
-    // 4. Make the call.
-2
+3
-
-    // 5. Pop any return values.
@@ -4051 +4025 @@
-            
-        if(numReturns == -1)
-basedIndexToAbs(
+(mCurrentAR.base + 
-        else
-        {
-basedIndexToAbs(slot)
+mCurrentAR.base + slot
-            return numReturns;
-        }
@@ -4122 +4096 @@
-    public final bool isParam(char[] type)(uint index)
-    {
-getBasedStackIndex()
+mStackIndex - mCurrentAR.base
-            badParamError(index, "not enough parameters");
-
-getBasedStack(index + 1).isNull()
-getBasedStack(index + 1).isBool()
-getBasedStack(index + 1).isInt()
-getBasedStack(index + 1).isFloat()
-getBasedStack(index + 1).isChar()
-getBasedStack(index + 1).isString()
-getBasedStack(index + 1).isTable()
-getBasedStack(index + 1).isArray()
-getBasedStack(index + 1).isFunction()
-getBasedStack(index + 1).isClass()
-getBasedStack(index + 1).isInstance()
-getBasedStack(index + 1).isNamespace()
-getBasedStack(index + 1).isThread()
+mStack[mCurrentAR.base + index + 1].mType == MDValue.Type.Null
+mStack[mCurrentAR.base + index + 1].mType == MDValue.Type.Bool
+mStack[mCurrentAR.base + index + 1].mType == MDValue.Type.Int
+mStack[mCurrentAR.base + index + 1].mType == MDValue.Type.Float
+mStack[mCurrentAR.base + index + 1].mType == MDValue.Type.Char
+mStack[mCurrentAR.base + index + 1].mType == MDValue.Type.String
+mStack[mCurrentAR.base + index + 1].mType == MDValue.Type.Table
+mStack[mCurrentAR.base + index + 1].mType == MDValue.Type.Array
+mStack[mCurrentAR.base + index + 1].mType == MDValue.Type.Function
+mStack[mCurrentAR.base + index + 1].mType == MDValue.Type.Class
+mStack[mCurrentAR.base + index + 1].mType == MDValue.Type.Instance
+mStack[mCurrentAR.base + index + 1].mType == MDValue.Type.Namespace
+mStack[mCurrentAR.base + index + 1].mType == MDValue.Type.Thread
-        else
-        {
@@ -4157 +4131 @@
-    public final T getParam(T = MDValue)(uint index)
-    {
-getBasedStackIndex()
+mStackIndex - mCurrentAR.base
-            badParamError(index, "not enough parameters");
-
@@ -4205 +4179 @@
-    public final MDValue[] getParams(int lo, int hi)
-    {
-getBasedStackIndex()
+mStackIndex - mCurrentAR.base
-
-        if(lo < 0)
@@ -4227 +4201 @@
-    public final MDValue[] getAllParams()
-    {
-getBasedStackIndex()
+mStackIndex - mCurrentAR.base
-            return null;
-
@@ -4336 +4310 @@
-    public final MDString valueToString(ref MDValue value)
-    {
-isString()
-as!(MDString)
+mType == MDValue.Type.String
+mString
-
-        MDValue* method = getMM(value, MM.ToString);
-        
-!method.isFunction()
+method.mType != MDValue.Type.Function
-            return new MDString(value.toUtf8());
-
-        mNativeCallDepth++;
-
+
-        scope(exit)
-            mNativeCallDepth--;
-
-as!(MDClosure)
+mFunction
-        MDValue ret = pop();
-
-!ret.isString()
+ret.mType != MDValue.Type.String
-            throwRuntimeException("MDState.valueToString() - '{}' method did not return a string", MetaNames[MM.ToString]);
-
-as!(MDString)
+
+mString
-    }
-
@@ -4445 +4419 @@
-        return binOp(MM.Mod, &a, &b);
-    }
-
+
-    /**
-    Negates the argument.  Calls metamethods.
@@ -4461 +4435 @@
-        reflOp(MM.AddEq, &a, &b);
-    }
-
+
-    /// ditto
-    public final void subeq(ref MDValue a, ref MDValue b)
@@ -4467 +4441 @@
-        reflOp(MM.SubEq, &a, &b);
-    }
-
+
-    /// ditto
-    public final void muleq(ref MDValue a, ref MDValue b)
@@ -4539 +4513 @@
-        binaryReflOp(MM.AndEq, &a, &b);
-    }
-
+
-    /// ditto
-    public final void oreq(ref MDValue a, ref MDValue b)
@@ -4568 +4542 @@
-    {
-        binaryReflOp(MM.UShrEq, &a, &b);
+    }
+    
+    /**
+    Concatenates the list of values (which must be at least two items long) into a single value and
+    returns it.  Calls metamethods.
+    */
+    public final MDValue cat(MDValue[] vals)
+    {
+        if(vals.length < 2)
+            throwRuntimeException("MDState.cat() - Must have at least two values to concatenate");
+
+        return operatorCat(vals);
+    }
+
+    /**
+    Appends the list of values (which must have at least one item) to the end of the value held in dest.
+    Calls metamethods.
+    */
+    public final void cateq(ref MDValue dest, MDValue[] vals)
+    {
+        if(vals.length < 1)
+            throwRuntimeException("MDState.cateq() - Must have at least one value to append");
+
+        operatorCatAssign(&dest, vals);
-    }
-
@@ -4688 +4686 @@
-        assert(numParams >= 0, "negative num params in callPrologue");
-
-getAbsStack(slot)
+&mStack[slot]
-        
-        switch(func.type())
-        {
-            case MDValue.Type.Function:
-as!(MDClosure)
+mFunction
-                paramSlot = slot + 1;
-                break;
-
-            case MDValue.Type.Class:
-as!(MDClass)
+mClass
-                MDInstance n = cls.newInstance();
-                MDValue* ctor = cls.getCtor();
-
-isFunction()
+mType == MDValue.Type.Function
-                {
-                    uint thisSlot = slot + 1;
@@ -4709 +4707 @@
-                    try
-                    {
-as!(MDClosure)
+mFunction
-                            execute();
-                    }
@@ -4716 +4714 @@
-                    catch(MDException e)
-                        throw new MDRuntimeException(startTraceback(), &e.value);
-
+   
-                
-                mStack[slot] = n;
@@ -4744 +4742 @@
-
-            case MDValue.Type.Thread:
-as!(MDState)
+mThread
-                
-                if(thread is this)
@@ -4830 +4828 @@
-                MDValue* method = getMM(*func, MM.Call);
-
-!method.isFunction()
+method.mType != MDValue.Type.Function
-                    throwRuntimeException("Attempting to call a value of type '{}'", func.typeString());
-
-copyAbsStack(slot + 1, slot)
+mStack[slot + 1] = mStack[slot]
-                paramSlot = slot + 1;
-as!(MDClosure)
+mFunction
-                break;
-        }
@@ -4916 +4914 @@
-                for(int i = 0; i < funcDef.mNumParams; i++)
-                {
-copyAbsStack(mStackIndex, oldParamSlot)
-getAbsStack(oldParamSlot)
+mStack[mStackIndex] = mStack[oldParamSlot]
+mStack[oldParamSlot]
-                    oldParamSlot++;
-                    mStackIndex++;
@@ -4952 +4950 @@
-
-            for(int i = base + funcDef.mStackSize; i >= 0 && i >= base + numParams; i--)
-getAbsStack(i)
+mStack[i]
-
-            mCurrentAR.savedTop = mStackIndex;
@@ -5226 +5224 @@
-    }
-
-    protected final void copyBasedStack(uint dest, uint src)
-    {
-        assert((mCurrentAR.base + dest) < mStack.length && (mCurrentAR.base + src) < mStack.length, "invalid based stack indices");
-        
-        if(dest != src)
-            mStack[mCurrentAR.base + dest] = mStack[mCurrentAR.base + src];
-    }
-
-    protected final void copyAbsStack(uint dest, uint src)
-    {
-        assert(dest < mStack.length && src < mStack.length, "invalid copyAbsStack indices");
-
-        if(dest != src)
-            mStack[dest] = mStack[src];
-    }
-    
-    protected final void moveStackFrom(MDState other, uint numValues)
-    {
@@ -5256 +5238 @@
-    }
-
-    protected final MDValue* getBasedStack(uint offset)
-    {
-        assert((mCurrentAR.base + offset) < mStack.length, "invalid based stack index");
-        return &mStack[mCurrentAR.base + offset];
-    }
-
-    protected final MDValue* getAbsStack(uint offset)
-    {
-        assert(offset < mStack.length, "invalid getAbsStack stack index");
-        return &mStack[offset];
-    }
-
-    protected final uint basedIndexToAbs(uint offset)
-    {
-        assert((mCurrentAR.base + offset) < mStack.length, "invalid basedIndexToAbs index");
-        return mCurrentAR.base + offset;
-    }
-    
-    protected final uint absIndexToBased(uint offset)
-    {
-        assert((cast(int)(offset - mCurrentAR.base)) >= 0 && offset < mStack.length, "invalid absIndexToBased index");
-        return offset - mCurrentAR.base;
-    }
-
-    protected final void close(uint index)
-    {
-getBasedStack(index)
+&mStack[mCurrentAR.base + index]
-
-        for(MDUpval* uv = mUpvalHead; uv !is null && uv.value >= base; uv = mUpvalHead)
@@ -5301 +5259 @@
-    protected final MDUpval* findUpvalue(uint num)
-    {
-getBasedStack(num)
+&mStack[mCurrentAR.base + num]
-
-        for(MDUpval* uv = mUpvalHead; uv !is null && uv.value >= slot; uv = uv.next)
@@ -5323 +5281 @@
-    }
-
-    protected final int getBasedStackIndex()
-    {
-        return mStackIndex - mCurrentAR.base;
-    }
-
-    protected final MDValue* getMM(ref MDValue obj, MM method)
-    {
@@ -5335 +5288 @@
-        {
-            case MDValue.Type.Table:
-as!(MDTable)
-
-!m.isFunction()
+mTable
+
+m.mType != MDValue.Type.Function
-                    goto default;
-
@@ -5343 +5296 @@
-
-            case MDValue.Type.Instance:
-as!(MDInstance)
+mInstance
-                break;
-
@@ -5356 +5309 @@
-        }
-
-!m.isFunction()
+m.mType != MDValue.Type.Function
-            return &MDValue.nullValue;
-        else
@@ -5365 +5318 @@
-    // Interpreter
-    // ===================================================================================
-
+
-    protected final MDValue binOp(MM operation, MDValue* RS, MDValue* RT)
-    {
-        debug(TIMINGS) scope _profiler_ = new Profiler("Arith");
-
-
-
-
+
+
+
+
+
+
+
-            {
+                int i1 = RS.mInt;
+