fewer and fewer problems to work out. see test.pas

Author: BenLand100

Expression.cpp

@@ -139,9 +139,11 @@ While::~While() {
 }
 Value* While::eval(Frame* frame) {
     Value* res = cond->eval(frame);
+    debug("while_restype=" << res->type);
     while (res->asBoolean()) {
         delete res;
         evalBlock(&block,frame);
+        res = cond->eval(frame);
     }
     delete res;
     return new Value();

Interpreter.cpp

@@ -16,6 +16,11 @@ Interpreter::~Interpreter() {
 }
 
 void Interpreter::run() {
+    std::map<std::string,int>::iterator iter = names.begin();
+    while (iter != names.end()) {
+        debug(iter->first << ">>" << iter->second);
+        iter++;
+    }
     Frame* frame = new Frame(prog);
     evalBlock(&prog->block, frame);
     delete frame;

Operator.cpp

@@ -34,13 +34,15 @@ class FDiv : public Operator {
         stack.pop();
         Value* a = stack.top();
         stack.pop();
-        double res = a->asReal() - b->asReal();
+        double res = a->asReal() / b->asReal();
         stack.push(new RealValue(res));
         delete a;
         delete b;
     }
 };
 
+#include <math.h>
+
 class Mod : public Operator {
 public:
     Mod() : Operator(OP_MOD) { };
@@ -51,10 +53,10 @@ class Mod : public Operator {
         Value* a = stack.top();
         stack.pop();
         if (a->type == TYPE_REAL || b->type == TYPE_REAL) {
-            double res = a->asReal() - b->asReal();
+            double res = fmod(a->asReal(),b->asReal());
             stack.push(new RealValue(res));
         } else {
-            int res = a->asInteger() - b->asInteger();
+            int res = a->asInteger() % b->asInteger();
             stack.push(new IntegerValue(res));
         }
         delete a;
@@ -72,10 +74,10 @@ class Mul : public Operator {
         Value* a = stack.top();
         stack.pop();
         if (a->type == TYPE_REAL || b->type == TYPE_REAL) {
-            double res = a->asReal() - b->asReal();
+            double res = a->asReal() * b->asReal();
             stack.push(new RealValue(res));
         } else {
-            int res = a->asInteger() - b->asInteger();
+            int res = a->asInteger() * b->asInteger();
             stack.push(new IntegerValue(res));
         }
         delete a;
@@ -97,10 +99,10 @@ class Add : public Operator {
             str.append(b->asString());
             stack.push(new StringValue(str));
         } else if (a->type == TYPE_REAL || b->type == TYPE_REAL) {
-            double res = a->asReal() - b->asReal();
+            double res = a->asReal() + b->asReal();
             stack.push(new RealValue(res));
         } else {
-            int res = a->asInteger() - b->asInteger();
+            int res = a->asInteger() + b->asInteger();
             stack.push(new IntegerValue(res));
         }
         delete a;

Value.cpp

@@ -345,13 +345,13 @@ ArrayValue::ArrayValue(ArrayValue& val) : Value(TYPE_ARRAY,(Type*)val.typeObj) {
 
 ArrayValue::~ArrayValue() {
     if (*objrefcount) {
+        (*objrefcount)--;
+    } else {
         for (int i = 0; i < *asize; i++) {
             delete (*array)[i];
         }
         delete *array;
         delete objrefcount;
-    } else {
-        (*objrefcount)--;
     }
     if (*refcount) {
         (*refcount)--;
@@ -386,13 +386,13 @@ void ArrayValue::set(Value* val) {
     *asize = *((ArrayValue*)val)->asize;
     *start = *((ArrayValue*)val)->start;
     if (*objrefcount) {
+        (*objrefcount)--;
+    } else {
         for (int i = 0; i < *asize; i++) {
             delete (*array)[i];
         }
         delete *array;
         delete objrefcount;
-    } else {
-        (*objrefcount)--;
     }
     objrefcount = ((ArrayValue*)val)->objrefcount;
     (*objrefcount)++;
@@ -526,6 +526,8 @@ RecordValue::RecordValue(RecordValue& val) : Value(TYPE_RECORD,(Type*)val.typeOb
 
 RecordValue::~RecordValue() {
     if (*objrefcount) {
+        (*objrefcount)--;
+    } else {
         delete *types;
         std::map<int,Value*>::iterator iter = (*fields)->begin();
         std::map<int,Value*>::iterator end = (*fields)->end();
@@ -535,8 +537,6 @@ RecordValue::~RecordValue() {
         }
         delete *fields;
         delete objrefcount;
-    } else {
-        (*objrefcount)--;
     }
     if (*refcount) {
         (*refcount)--;
@@ -561,11 +561,11 @@ Value* RecordValue::clone() {
 
 void RecordValue::set(Value* val) {
     if (*objrefcount) {
+        (*objrefcount)--;
+    } else {
         delete *types;
         delete *fields;
         delete objrefcount;
-    } else {
-        (*objrefcount)--;
     }
     objrefcount = ((RecordValue*)val)->objrefcount;
     (*objrefcount)++;

lexer.cpp

@@ -112,7 +112,7 @@ char* lex(char* ppg, std::map<std::string,int> &names) {
             case 'e':
                 goto name;
             case 'f':
-                if (ppg[1] == 'a' && ppg[2] == 'l' && ppg[3] == 's' && ppg[4] == 'e' && !namechar(ppg[4])) {
+                if (ppg[1] == 'a' && ppg[2] == 'l' && ppg[3] == 's' && ppg[4] == 'e' && !namechar(ppg[5])) {
                     *(toks++) = (char)PBOOLEAN;
                     *(toks++) = (char)BOOL_FALSE;
                     ppg += 4;

parser.cpp

@@ -373,7 +373,7 @@ Expression* parseExpr(char* &cur) {
                 }
                 if (lastType == POPERATOR && tok[0] == POPERATOR && tok[1] == OP_SUB) //special operator renaming
                     tok[1] = OP_NEG;
-                char prec = precedence[OP_ARRAYSET];
+                char prec = precedence[tok[1]];
                 while (!oper->empty() && prec <= oper->top().prec) {
                     expr.push_back(oper->top().op);
                     oper->pop();
@@ -508,12 +508,12 @@ Case* parseCase(char* &cur) {
 For* parseFor(char* &cur) {
     debug("parseFor");
     cur = next(cur); //skip for
+    cur = next(cur); //get var
     int var = *(int*)(cur+1);
     cur = next(cur); //skip :=
     Expression* begin = parseExpr(cur);
     cur = next(cur); //grap the to/downto
     bool inc = cur[1] == RES_TO;
-    cur = next(cur);
     Expression* end = parseExpr(cur);
     cur = next(cur); //skip do
     //System.out.println("End: " + end);

test.pas

@@ -7,19 +7,19 @@ procedure writeln(str: string);
 begin
 end;
 
-procedure chartostr(str: string);
+function chartostr(str: string) : string;
 begin
 end;
 
-procedure booltostr(str: string);
+function booltostr(str: string) : string;
 begin
 end;
 
-procedure realtostr(str: string);
+function realtostr(str: string) : string;
 begin
 end;
 
-procedure inttostr(str: string);
+function inttostr(str: string) : string;
 begin
 end;
 
@@ -92,7 +92,7 @@ procedure testwhile;
     i:integer;
 begin
     i:= 0;
-    while i<10 do
+    while i < 10 do
     begin
         writeln(inttostr(i));
         i:= i + 1;
@@ -366,19 +366,19 @@ procedure testpointer;
     writeln(RealToStr(newReal));
     writeln(IntToStr(newInteger));
     writeln(BoolToStr(newBoolean));
-    //testifelse;
+    testifelse;
     testorderoperations;
     testtruths;
-    //testwhile;
-    //testfor;
-    //testcase;
-    //testrepeatuntil;
-    //writeln('For exec: ' + RealToStr(forlooptime));
-    //doarraystuff;
+    testwhile;
+    testfor;
+    testcase;
+    testrepeatuntil;
+    writeln('For exec: ' + RealToStr(forlooptime));
+    //doarraystuff; //arrays messed up, takes out three
     //testtypes;
     //phonebook;
-    //testtry;
+    //testtry; //doesn't check for any exception yet, but *works* 
     testref;
-    //writeln(inttostr(3*-1));
-    //testpointer;
+    writeln(inttostr(3*-1));
+    //testpointer; //something is wrong with assigning values that contain references (objects)
 end;