merge

programs/bardemo.tri

@@ -9,12 +9,19 @@ in
         b := 2;
         
         putint(a);
+<<<<<<< HEAD
         puteol();
+=======
+	puteol();
+>>>>>>> ce307a11a6c71de9c69bd0a4c91205bb6437f6e9
         putint(b);
         puteol();
         putint(|a);
         puteol();
         putint(|b);
         puteol()
+<<<<<<< HEAD
 
+=======
+>>>>>>> ce307a11a6c71de9c69bd0a4c91205bb6437f6e9
     end

programs/increment.tri

@@ -0,0 +1,14 @@
+! this won't compile without implementing the bonus material in Practical 3
+
+let
+    var a: Integer
+in
+begin
+    getint(var a);
+    a++;
+    putint(a);
+    puteol();
+    a++;
+    putint(a);
+    puteol();
+end

programs/repeatuntil.tri

@@ -10,5 +10,5 @@ begin
     put('a');
     a := a + 1;
   end
-  until a < 5
+  until a >= 5
 end

programs/while-longloop.tri

@@ -0,0 +1,22 @@
+let
+  var a : Integer;
+  var b : Integer;
+  var c : Integer
+in
+begin
+  put('1');
+  puteol();
+  a := 0;
+  while a < 5000 do
+  begin
+    b := 0;
+    while b < 3000 do
+    begin
+      c := c + a;
+      c := c / (1 + b);
+      b := b + 1;
+    end;
+    a := a + 1;
+  end;
+  putint(c);
+end