Merge branch 'negated' of kompiler.org:trs into negated

tests/test_b1_ch08.py

@@ -19,5 +19,5 @@ class TestB1Ch08(unittest.TestCase):
     def test_diagnostic_test_application(self):
         apply_expressions(Parser, [
             ('7p+2p', 1, (L(7) + 2) * 'p'),
-            #('7p-3p', 1, (L(7) - 3) * 'p'),
+            ('7p-3p', 1, (L(7) + -L(3)) * 'p'),
             ])

tests/test_leiden_oefenopgave.py

@@ -74,10 +74,14 @@ class TestLeidenOefenopgave(TestCase):
                        'xx + x * -1 - 1x - 1 * -1',
                        'x ^ (1 + 1) + x * -1 - 1x - 1 * -1',
                        'x ^ 2 + x * -1 - 1x - 1 * -1',
-                       # FIXME: 'x ^ 2 + (-1 - 1)x - 1 * -1',
-                       # FIXME: 'x ^ 2 - 2x - 1 * -1',
-                       # FIXME: 'x ^ 2 - 2x - -1',
-                       # FIXME: 'x ^ 2 - 2x + 1',
+                       'x ^ 2 - x * 1 - 1x - 1 * -1',
+                       'x ^ 2 - x - 1x - 1 * -1',
+                       'x ^ 2 - x - x - 1 * -1',
+                       'x ^ 2 + (1 + 1) * -x - 1 * -1',
+                       'x ^ 2 + 2 * -x - 1 * -1',
+                       'x ^ 2 - 2x - 1 * -1',
+                       'x ^ 2 - 2x - -1',
+                       'x ^ 2 - 2x + 1',
                      ]]:
             self.assertRewrite(chain)