Add files via upload

Author: tebe6502

test/tests/test_misc.py

@@ -137,6 +137,28 @@ def test_misc7(self):
 	""")
 
         assert test.varWord('a') == 1
-	
-	
-	
+
+
+    def test_misc8(self):
+
+        test.runCode("""
+	var
+	  p: PByte;
+	  ptr: pointer;
+	  i: byte;
+	  
+	  tb, bf: array [0..31] of byte;
+	  
+	begin
+	 ptr:=pointer($3043);
+	 i:=3;
+	 tb[3] := $a3;
+	 bf[3] := $9a;
+
+	 p:=pointer(ptr + tb[i] + bf[i] shl 8);
+
+	end.
+	""")
+
+        assert test.varWord('p') == 51942
+

test/tests/test_structs.py

@@ -5,7 +5,6 @@
 
 class Test_Structs:
 
-    @pytest.mark.skip(reason="don't know how packed record works, so unable to assert properly (bocianu)")        
     def test_struct1(self):
 
         test.runCode("""
@@ -35,12 +34,12 @@ def test_struct1(self):
         end.
 
         """)
-        
-        monsteradr = mem.readWord(labels['MAIN.MONSTER'])
-        for i in range(0,4):
-            monster = mem.readWord(monsteradr) + i * 2
-            assert mem.read(monster) == i
-            #assert mem.read(monster+6) == i * 2;
+
+        monsterArrayAddress = test.varWord('monster')
+        monstersArray = test.getArray(monsterArrayAddress, 4, element_size = 2)
+        for i in range(0,3):
+            assert test.getByte(monstersArray[i]) == i
+            assert test.getByte(monstersArray[i] + 5) == i * 2
 
 
     def test_struct2(self):
@@ -68,10 +67,10 @@ def test_struct2(self):
 
         end.
         """)
-        
+
         monsterArrayAddress = test.varWord('monster')
         monstersArray = test.getArray(monsterArrayAddress, 4, element_size = 2)
-        for i in range(0,4):
+        for i in range(0,3):
             assert test.getByte(monstersArray[i]) == i
             assert test.getByte(monstersArray[i] + 1) == i * 2
 
@@ -99,5 +98,7 @@ def test_struct3(self):
 
         end.
         """)
-        
+
         assert test.varWord('w') == 2000
+
+