Fix bugs, support pointer add / subtract

WilliamQiufeng · Aug 5, 2022 · d1df006 · d1df006
1 parent 1972b5e
commit d1df006
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 3 deletions.
diff --git a/PseudoCode.Core/Runtime/Instances/Instance.cs b/PseudoCode.Core/Runtime/Instances/Instance.cs
@@ -40,6 +40,7 @@ public virtual T Get<T>()
 
     public virtual string Represent()
     {
+        if (Value == null) return "NULL";
         return Type switch
         {
             DateType => Get<DateOnly>().ToString("dd/MM/yyyy"),

diff --git a/PseudoCode.Core/Runtime/Operations/UnaryOperation.cs b/PseudoCode.Core/Runtime/Operations/UnaryOperation.cs
@@ -30,7 +30,7 @@ public override void MetaOperate()
             Program.AnalyserFeedbacks.Add(new Feedback
             {
                 Message =
-                    $"This operation on {to} is either not supported or will be casted to another type at runtime",
+                    $"{OperatorMethod} operation on {to} is either not supported or will be casted to another type at runtime",
                 Severity = Feedback.SeverityType.Warning,
                 SourceRange = SourceRange
             });

diff --git a/PseudoCode.Core/Runtime/Types/PointerType.cs b/PseudoCode.Core/Runtime/Types/PointerType.cs
@@ -4,7 +4,7 @@
 
 namespace PseudoCode.Core.Runtime.Types;
 
-public class PointerType : Type
+public class PointerType : PrimitiveType<uint>
 {
     public override string Name => "POINTER";
     public override uint Id => PointerId;
@@ -14,6 +14,24 @@ public PointerType(Scope parentScope, PseudoProgram program) : base(parentScope,
     {
     }
 
+    public override Type BinaryResultType(PseudoOperator type, Type right)
+    {
+        if (right is IntegerType)
+        {
+            return type switch
+            {
+                PseudoOperator.Add or PseudoOperator.Subtract => this,
+                _ => base.BinaryResultType(type, right)
+            };
+        }
+        return base.BinaryResultType(type, right);
+    }
+
+    public override Type UnaryResultType(PseudoOperator type)
+    {
+        return type is PseudoOperator.GetPointed ? PointedType : base.UnaryResultType(type);
+    }
+
     public override bool IsConvertableFrom(Type type)
     {
         return type is PointerType;
@@ -29,4 +47,18 @@ public override Instance GetPointed(Instance i)
 
         throw new InvalidAccessError($"Access to uninitialized address {address}", null);
     }
+
+    public override Instance CastFrom(Instance i)
+    {
+        return Instance(Convert.ToUInt32(i.Value), ParentScope);
+    }
+    public override Instance Add(Instance i1, Instance i2)
+    {
+        return ArithmeticOperation(i1, i2, (arg1, arg2) => arg1 + arg2);
+    }
+
+    public override Instance Subtract(Instance i1, Instance i2)
+    {
+        return ArithmeticOperation(i1, i2, (arg1, arg2) => arg1 - arg2);
+    }
 }
diff --git a/PseudoCode.Core/run.pseudo b/PseudoCode.Core/run.pseudo
@@ -30,8 +30,11 @@ a <- 0
 a <- -(a + a * -a POW 2 POW 3) DIV 100 MOD 100
 c <- a < 63 - 2.3 OR (a > 65 OR a > 63) AND NOT a < 65 AND TRUE
 Char <- '\n'
-OUTPUT ^Char, iptr, ^Char^
+DECLARE DatePtr : ^DATE
+DatePtr <- (^Char) + 1
+OUTPUT ^Char, iptr, DatePtr^ // DatePtr points to unassigned value
 Date <- 28/02/2008 + 10/03/0010
+OUTPUT DatePtr^
 OUTPUT a + 2 + a, c, Char, Date
 IF a <> 64 THEN
     OUTPUT b