Pointers work. Next step: exceptions

Author: BenLand100

Operator.cpp

@@ -311,7 +311,7 @@ class Addr : public Operator {
         stack.pop();
         Pointer* pt = Type::getPointerType((Type*)val->typeObj);
         PointerValue* ref = new PointerValue(pt,frame->typemap);
-        ref->set(val);
+        ref->setRef(val);
         stack.push(ref);
         delete val;
     }

Value.cpp

@@ -40,6 +40,7 @@ void Value::set(Value* val) { }
 Value* Value::clone() { return new Value(); }
 Value* Value::duplicate() { return new Value(); }
 Value* Value::getRef() { return 0; }
+void Value::setRef(Value* ref) { }
 void Value::negate() { }
 void Value::incr() { }
 void Value::decr() { }
@@ -490,7 +491,7 @@ PointerValue::PointerValue(Pointer* pt, std::map<int,Type*> &typemap) : Value(TY
     refType = new Type*;
     *refType = (Type*)pt->pointsTo;
     ref = new Value*;
-    *ref = 0;
+    *ref = new Value();
 }
 
 
@@ -529,14 +530,19 @@ Value* PointerValue::clone() {
 
 void PointerValue::set(Value* val) {
     *refType = *((PointerValue*)val)->refType;
-    if (*ref) delete *ref;
+    delete *ref;
     *ref = (*((PointerValue*)val)->ref)->duplicate();
 }
 
 Value* PointerValue::getRef() {
     return *ref;
 }
 
+void PointerValue::setRef(Value* ref_impl) {
+    delete *ref;
+    *ref = ref_impl->duplicate();
+}
+
 //**** BEGIN RECORDVALUE DEFINITION ***
 
 RecordValue::RecordValue(Record* rec, std::map<int,Type*> &typemap) : Value(TYPE_RECORD,rec) {

Value.h

@@ -29,6 +29,7 @@ class Value : public Element {
     virtual Value* clone(); 
     virtual Value* duplicate();
     virtual Value* getRef();
+    virtual void setRef(Value* ref);
     virtual void negate();
     virtual void incr();
     virtual void decr();
@@ -197,6 +198,7 @@ class PointerValue : public Value {
     Value* clone();
     void set(Value* val);
     Value* getRef();
+    void setRef(Value* ref);
 
 private:
     Value** ref;

parser.cpp

@@ -223,15 +223,14 @@ Method* parseMethod(char* &cur) {
 
 std::map<char,char> precedence_map() {
     std::map <char,char> prec;
-    prec[OP_ARRAYGET] = 6; //Careful
-    prec[OP_ARRAYSET] = 6; //Careful
-    prec[OP_FIELDGET] = 6; //Careful
-    prec[OP_FIELDSET] = 6; //Careful
-    prec[OP_DEREFGET] = 6; //Careful
-    prec[OP_DEREFSET] = 6; //Careful
-    
-    prec[OP_ADDR] =     5; //Careful
+    prec[OP_ARRAYGET] = 5; //Careful
+    prec[OP_ARRAYSET] = 5; //Careful
+    prec[OP_FIELDGET] = 5; //Careful
+    prec[OP_FIELDSET] = 5; //Careful
+    prec[OP_DEREFGET] = 5; //Careful
+    prec[OP_DEREFSET] = 5; //Careful
 
+    prec[OP_ADDR] =     4; //Careful
     prec[OP_NOT] =      4;
     prec[OP_NEG] =      4; //Careful, this has to be parsed from a urinary -
 
@@ -279,6 +278,7 @@ Expression* parseExpr(char* &cur) {
     std::stack<std::stack<opprec>*> parseStack;
     std::stack<opprec>* oper = new std::stack<opprec>();
     char lastType = -1, nextType = -1;
+    bool prefix = false;
     while (*cur) {
         char* tok = next(cur);
         lastType = nextType;
@@ -378,6 +378,14 @@ Expression* parseExpr(char* &cur) {
                 if (lastType == POPERATOR && tok[0] == POPERATOR && tok[1] == OP_SUB) //special operator renaming
                     tok[1] = OP_NEG;
                 char prec = precedence[tok[1]];
+                switch (tok[1]) {
+                    case OP_NEG:
+                    case OP_NOT:
+                    case OP_ADDR:
+                        prefix = true;
+                        oper->push(mk_opprec(Operator::get(tok[1]),prec));
+                        goto next_exprparse;
+                }
                 while (!oper->empty() && prec <= oper->top().prec) {
                     expr.push_back(oper->top().op);
                     oper->pop();
@@ -452,6 +460,11 @@ Expression* parseExpr(char* &cur) {
         next_exprparse:
         debug("next_exprparse");
         cur = tok;
+        if (!prefix && !oper->empty() && oper->top().prec == 4) {
+            expr.push_back(oper->top().op);
+            oper->pop();
+        }
+        if (prefix) prefix = false;
     }
     end_exprparse:
     debug("end_exprparse");

test.pas

@@ -363,7 +363,8 @@ procedure testpointer;
     phonebook;
     //testtry; //doesn't check for any exception yet, but *works* 
     testref;
+    testpointer;
     writeln(inttostr(3*-1));
-    //testpointer; //needs some work
+    writeln(inttostr(3+-(2*6)));
     writeln('great success!');
 end;