From a2cc0adb52524cd8ea12c08bce948722b496c785 Mon Sep 17 00:00:00 2001 From: Jan-Niclas Loosen Date: Fri, 16 Jan 2026 13:50:04 +0100 Subject: [PATCH] Fix bug found in project 04 --- {Project-02-03 => Project-02-03-04}/compiler.py | 0 {Project-02-03 => Project-02-03-04}/helpers/__init__.py | 0 {Project-02-03 => Project-02-03-04}/helpers/console.py | 0 {Project-02-03 => Project-02-03-04}/main.py | 0 {Project-02-03 => Project-02-03-04}/parser.out | 0 {Project-02-03 => Project-02-03-04}/parsetab.py | 0 {Project-02-03 => Project-02-03-04}/syntax.py | 0 .../tramcodes/argsParamsExample.tram | 0 {Project-02-03 => Project-02-03-04}/tramcodes/complex.tram | 0 {Project-02-03 => Project-02-03-04}/tramcodes/geq.tram | 0 {Project-02-03 => Project-02-03-04}/tramcodes/homework.tram | 0 {Project-02-03 => Project-02-03-04}/triplalex.py | 2 +- .../triplaprograms/argsParamsExample.tripla | 0 .../triplaprograms/complex.tripla | 0 .../triplaprograms/condition.tripla | 0 .../triplaprograms/defSemiExample.tripla | 0 .../triplaprograms/factorial.tripla | 0 .../triplaprograms/faulty-multiple-let.tripla | 0 .../triplaprograms/faulty_if.tripla | 0 {Project-02-03 => Project-02-03-04}/triplaprograms/func.tripla | 0 {Project-02-03 => Project-02-03-04}/triplaprograms/geq.tripla | 0 .../triplaprograms/ggT_euclid_iter.tripla | 0 .../triplaprograms/ggT_euclid_rec.tripla | 0 .../triplaprograms/homework.tripla | 0 .../triplaprograms/invalidProgram.tripla | 0 .../triplaprograms/multiple-let-with-same-func-name.tripla | 0 .../triplaprograms/multiple-let.tripla | 0 {Project-02-03 => Project-02-03-04}/triplaprograms/or.tripla | 0 {Project-02-03 => Project-02-03-04}/triplaprograms/p1.tripla | 0 {Project-02-03 => Project-02-03-04}/triplaprograms/p2.tripla | 0 {Project-02-03 => Project-02-03-04}/triplaprograms/p3.tripla | 0 {Project-02-03 => Project-02-03-04}/triplaprograms/p4.tripla | 0 {Project-02-03 => Project-02-03-04}/triplaprograms/p5.tripla | 0 {Project-02-03 => Project-02-03-04}/triplaprograms/p6.tripla | 0 .../triplaprograms/side_effect.tripla | 0 .../triplaprograms/simple_dfa.tripla | 0 .../triplaprograms/simple_if.tripla | 0 .../triplaprograms/simple_if_2.tripla | 0 .../triplaprograms/simple_if_3.tripla | 0 .../triplaprograms/simple_if_4.tripla | 0 .../triplaprograms/simple_if_5.tripla | 0 .../triplaprograms/simple_if_6.tripla | 0 .../triplaprograms/simple_if_7.tripla | 0 .../triplaprograms/square.tripla | 0 .../triplaprograms/validProgram.tripla | 0 {Project-02-03 => Project-02-03-04}/triplaprograms/while.tripla | 0 .../triplaprograms/while_2.tripla | 0 .../triplaprograms/wrapped-ggT.tripla | 0 .../triplaprograms/wrapper.tripla | 0 {Project-02-03 => Project-02-03-04}/triplayacc.py | 0 {Project-02-03 => Project-02-03-04}/vistram/__init__.py | 0 {Project-02-03 => Project-02-03-04}/vistram/assembler.py | 0 {Project-02-03 => Project-02-03-04}/vistram/tram.py | 0 {Project-02-03 => Project-02-03-04}/vistram/vistram.py | 0 54 files changed, 1 insertion(+), 1 deletion(-) rename {Project-02-03 => Project-02-03-04}/compiler.py (100%) rename {Project-02-03 => Project-02-03-04}/helpers/__init__.py (100%) rename {Project-02-03 => Project-02-03-04}/helpers/console.py (100%) rename {Project-02-03 => Project-02-03-04}/main.py (100%) rename {Project-02-03 => Project-02-03-04}/parser.out (100%) rename {Project-02-03 => Project-02-03-04}/parsetab.py (100%) rename {Project-02-03 => Project-02-03-04}/syntax.py (100%) rename {Project-02-03 => Project-02-03-04}/tramcodes/argsParamsExample.tram (100%) rename {Project-02-03 => Project-02-03-04}/tramcodes/complex.tram (100%) rename {Project-02-03 => Project-02-03-04}/tramcodes/geq.tram (100%) rename {Project-02-03 => Project-02-03-04}/tramcodes/homework.tram (100%) rename {Project-02-03 => Project-02-03-04}/triplalex.py (92%) rename {Project-02-03 => Project-02-03-04}/triplaprograms/argsParamsExample.tripla (100%) rename {Project-02-03 => Project-02-03-04}/triplaprograms/complex.tripla (100%) rename {Project-02-03 => Project-02-03-04}/triplaprograms/condition.tripla (100%) rename {Project-02-03 => Project-02-03-04}/triplaprograms/defSemiExample.tripla (100%) rename {Project-02-03 => Project-02-03-04}/triplaprograms/factorial.tripla (100%) rename {Project-02-03 => Project-02-03-04}/triplaprograms/faulty-multiple-let.tripla (100%) rename {Project-02-03 => Project-02-03-04}/triplaprograms/faulty_if.tripla (100%) rename {Project-02-03 => Project-02-03-04}/triplaprograms/func.tripla (100%) rename {Project-02-03 => Project-02-03-04}/triplaprograms/geq.tripla (100%) rename {Project-02-03 => Project-02-03-04}/triplaprograms/ggT_euclid_iter.tripla (100%) rename {Project-02-03 => Project-02-03-04}/triplaprograms/ggT_euclid_rec.tripla (100%) rename {Project-02-03 => Project-02-03-04}/triplaprograms/homework.tripla (100%) rename {Project-02-03 => Project-02-03-04}/triplaprograms/invalidProgram.tripla (100%) rename {Project-02-03 => Project-02-03-04}/triplaprograms/multiple-let-with-same-func-name.tripla (100%) rename {Project-02-03 => Project-02-03-04}/triplaprograms/multiple-let.tripla (100%) rename {Project-02-03 => Project-02-03-04}/triplaprograms/or.tripla (100%) rename {Project-02-03 => Project-02-03-04}/triplaprograms/p1.tripla (100%) rename {Project-02-03 => Project-02-03-04}/triplaprograms/p2.tripla (100%) rename {Project-02-03 => Project-02-03-04}/triplaprograms/p3.tripla (100%) rename {Project-02-03 => Project-02-03-04}/triplaprograms/p4.tripla (100%) rename {Project-02-03 => Project-02-03-04}/triplaprograms/p5.tripla (100%) rename {Project-02-03 => Project-02-03-04}/triplaprograms/p6.tripla (100%) rename {Project-02-03 => Project-02-03-04}/triplaprograms/side_effect.tripla (100%) rename {Project-02-03 => Project-02-03-04}/triplaprograms/simple_dfa.tripla (100%) rename {Project-02-03 => Project-02-03-04}/triplaprograms/simple_if.tripla (100%) rename {Project-02-03 => Project-02-03-04}/triplaprograms/simple_if_2.tripla (100%) rename {Project-02-03 => Project-02-03-04}/triplaprograms/simple_if_3.tripla (100%) rename {Project-02-03 => Project-02-03-04}/triplaprograms/simple_if_4.tripla (100%) rename {Project-02-03 => Project-02-03-04}/triplaprograms/simple_if_5.tripla (100%) rename {Project-02-03 => Project-02-03-04}/triplaprograms/simple_if_6.tripla (100%) rename {Project-02-03 => Project-02-03-04}/triplaprograms/simple_if_7.tripla (100%) rename {Project-02-03 => Project-02-03-04}/triplaprograms/square.tripla (100%) rename {Project-02-03 => Project-02-03-04}/triplaprograms/validProgram.tripla (100%) rename {Project-02-03 => Project-02-03-04}/triplaprograms/while.tripla (100%) rename {Project-02-03 => Project-02-03-04}/triplaprograms/while_2.tripla (100%) rename {Project-02-03 => Project-02-03-04}/triplaprograms/wrapped-ggT.tripla (100%) rename {Project-02-03 => Project-02-03-04}/triplaprograms/wrapper.tripla (100%) rename {Project-02-03 => Project-02-03-04}/triplayacc.py (100%) rename {Project-02-03 => Project-02-03-04}/vistram/__init__.py (100%) rename {Project-02-03 => Project-02-03-04}/vistram/assembler.py (100%) rename {Project-02-03 => Project-02-03-04}/vistram/tram.py (100%) rename {Project-02-03 => Project-02-03-04}/vistram/vistram.py (100%) diff --git a/Project-02-03/compiler.py b/Project-02-03-04/compiler.py similarity index 100% rename from Project-02-03/compiler.py rename to Project-02-03-04/compiler.py diff --git a/Project-02-03/helpers/__init__.py b/Project-02-03-04/helpers/__init__.py similarity index 100% rename from Project-02-03/helpers/__init__.py rename to Project-02-03-04/helpers/__init__.py diff --git a/Project-02-03/helpers/console.py b/Project-02-03-04/helpers/console.py similarity index 100% rename from Project-02-03/helpers/console.py rename to Project-02-03-04/helpers/console.py diff --git a/Project-02-03/main.py b/Project-02-03-04/main.py similarity index 100% rename from Project-02-03/main.py rename to Project-02-03-04/main.py diff --git a/Project-02-03/parser.out b/Project-02-03-04/parser.out similarity index 100% rename from Project-02-03/parser.out rename to Project-02-03-04/parser.out diff --git a/Project-02-03/parsetab.py b/Project-02-03-04/parsetab.py similarity index 100% rename from Project-02-03/parsetab.py rename to Project-02-03-04/parsetab.py diff --git a/Project-02-03/syntax.py b/Project-02-03-04/syntax.py similarity index 100% rename from Project-02-03/syntax.py rename to Project-02-03-04/syntax.py diff --git a/Project-02-03/tramcodes/argsParamsExample.tram b/Project-02-03-04/tramcodes/argsParamsExample.tram similarity index 100% rename from Project-02-03/tramcodes/argsParamsExample.tram rename to Project-02-03-04/tramcodes/argsParamsExample.tram diff --git a/Project-02-03/tramcodes/complex.tram b/Project-02-03-04/tramcodes/complex.tram similarity index 100% rename from Project-02-03/tramcodes/complex.tram rename to Project-02-03-04/tramcodes/complex.tram diff --git a/Project-02-03/tramcodes/geq.tram b/Project-02-03-04/tramcodes/geq.tram similarity index 100% rename from Project-02-03/tramcodes/geq.tram rename to Project-02-03-04/tramcodes/geq.tram diff --git a/Project-02-03/tramcodes/homework.tram b/Project-02-03-04/tramcodes/homework.tram similarity index 100% rename from Project-02-03/tramcodes/homework.tram rename to Project-02-03-04/tramcodes/homework.tram diff --git a/Project-02-03/triplalex.py b/Project-02-03-04/triplalex.py similarity index 92% rename from Project-02-03/triplalex.py rename to Project-02-03-04/triplalex.py index 7903e03..92c7c21 100644 --- a/Project-02-03/triplalex.py +++ b/Project-02-03-04/triplalex.py @@ -47,7 +47,7 @@ t_AOP = r'\+|\-|\*|/' t_COMP = r'<=|>=|<|>' # Equality operators -t_EQOP = r'\|\||&&|==|!=' +t_EQOP = r'==|!=' # Logical operators t_LOP = r'\|\||&&' diff --git a/Project-02-03/triplaprograms/argsParamsExample.tripla b/Project-02-03-04/triplaprograms/argsParamsExample.tripla similarity index 100% rename from Project-02-03/triplaprograms/argsParamsExample.tripla rename to Project-02-03-04/triplaprograms/argsParamsExample.tripla diff --git a/Project-02-03/triplaprograms/complex.tripla b/Project-02-03-04/triplaprograms/complex.tripla similarity index 100% rename from Project-02-03/triplaprograms/complex.tripla rename to Project-02-03-04/triplaprograms/complex.tripla diff --git a/Project-02-03/triplaprograms/condition.tripla b/Project-02-03-04/triplaprograms/condition.tripla similarity index 100% rename from Project-02-03/triplaprograms/condition.tripla rename to Project-02-03-04/triplaprograms/condition.tripla diff --git a/Project-02-03/triplaprograms/defSemiExample.tripla b/Project-02-03-04/triplaprograms/defSemiExample.tripla similarity index 100% rename from Project-02-03/triplaprograms/defSemiExample.tripla rename to Project-02-03-04/triplaprograms/defSemiExample.tripla diff --git a/Project-02-03/triplaprograms/factorial.tripla b/Project-02-03-04/triplaprograms/factorial.tripla similarity index 100% rename from Project-02-03/triplaprograms/factorial.tripla rename to Project-02-03-04/triplaprograms/factorial.tripla diff --git a/Project-02-03/triplaprograms/faulty-multiple-let.tripla b/Project-02-03-04/triplaprograms/faulty-multiple-let.tripla similarity index 100% rename from Project-02-03/triplaprograms/faulty-multiple-let.tripla rename to Project-02-03-04/triplaprograms/faulty-multiple-let.tripla diff --git a/Project-02-03/triplaprograms/faulty_if.tripla b/Project-02-03-04/triplaprograms/faulty_if.tripla similarity index 100% rename from Project-02-03/triplaprograms/faulty_if.tripla rename to Project-02-03-04/triplaprograms/faulty_if.tripla diff --git a/Project-02-03/triplaprograms/func.tripla b/Project-02-03-04/triplaprograms/func.tripla similarity index 100% rename from Project-02-03/triplaprograms/func.tripla rename to Project-02-03-04/triplaprograms/func.tripla diff --git a/Project-02-03/triplaprograms/geq.tripla b/Project-02-03-04/triplaprograms/geq.tripla similarity index 100% rename from Project-02-03/triplaprograms/geq.tripla rename to Project-02-03-04/triplaprograms/geq.tripla diff --git a/Project-02-03/triplaprograms/ggT_euclid_iter.tripla b/Project-02-03-04/triplaprograms/ggT_euclid_iter.tripla similarity index 100% rename from Project-02-03/triplaprograms/ggT_euclid_iter.tripla rename to Project-02-03-04/triplaprograms/ggT_euclid_iter.tripla diff --git a/Project-02-03/triplaprograms/ggT_euclid_rec.tripla b/Project-02-03-04/triplaprograms/ggT_euclid_rec.tripla similarity index 100% rename from Project-02-03/triplaprograms/ggT_euclid_rec.tripla rename to Project-02-03-04/triplaprograms/ggT_euclid_rec.tripla diff --git a/Project-02-03/triplaprograms/homework.tripla b/Project-02-03-04/triplaprograms/homework.tripla similarity index 100% rename from Project-02-03/triplaprograms/homework.tripla rename to Project-02-03-04/triplaprograms/homework.tripla diff --git a/Project-02-03/triplaprograms/invalidProgram.tripla b/Project-02-03-04/triplaprograms/invalidProgram.tripla similarity index 100% rename from Project-02-03/triplaprograms/invalidProgram.tripla rename to Project-02-03-04/triplaprograms/invalidProgram.tripla diff --git a/Project-02-03/triplaprograms/multiple-let-with-same-func-name.tripla b/Project-02-03-04/triplaprograms/multiple-let-with-same-func-name.tripla similarity index 100% rename from Project-02-03/triplaprograms/multiple-let-with-same-func-name.tripla rename to Project-02-03-04/triplaprograms/multiple-let-with-same-func-name.tripla diff --git a/Project-02-03/triplaprograms/multiple-let.tripla b/Project-02-03-04/triplaprograms/multiple-let.tripla similarity index 100% rename from Project-02-03/triplaprograms/multiple-let.tripla rename to Project-02-03-04/triplaprograms/multiple-let.tripla diff --git a/Project-02-03/triplaprograms/or.tripla b/Project-02-03-04/triplaprograms/or.tripla similarity index 100% rename from Project-02-03/triplaprograms/or.tripla rename to Project-02-03-04/triplaprograms/or.tripla diff --git a/Project-02-03/triplaprograms/p1.tripla b/Project-02-03-04/triplaprograms/p1.tripla similarity index 100% rename from Project-02-03/triplaprograms/p1.tripla rename to Project-02-03-04/triplaprograms/p1.tripla diff --git a/Project-02-03/triplaprograms/p2.tripla b/Project-02-03-04/triplaprograms/p2.tripla similarity index 100% rename from Project-02-03/triplaprograms/p2.tripla rename to Project-02-03-04/triplaprograms/p2.tripla diff --git a/Project-02-03/triplaprograms/p3.tripla b/Project-02-03-04/triplaprograms/p3.tripla similarity index 100% rename from Project-02-03/triplaprograms/p3.tripla rename to Project-02-03-04/triplaprograms/p3.tripla diff --git a/Project-02-03/triplaprograms/p4.tripla b/Project-02-03-04/triplaprograms/p4.tripla similarity index 100% rename from Project-02-03/triplaprograms/p4.tripla rename to Project-02-03-04/triplaprograms/p4.tripla diff --git a/Project-02-03/triplaprograms/p5.tripla b/Project-02-03-04/triplaprograms/p5.tripla similarity index 100% rename from Project-02-03/triplaprograms/p5.tripla rename to Project-02-03-04/triplaprograms/p5.tripla diff --git a/Project-02-03/triplaprograms/p6.tripla b/Project-02-03-04/triplaprograms/p6.tripla similarity index 100% rename from Project-02-03/triplaprograms/p6.tripla rename to Project-02-03-04/triplaprograms/p6.tripla diff --git a/Project-02-03/triplaprograms/side_effect.tripla b/Project-02-03-04/triplaprograms/side_effect.tripla similarity index 100% rename from Project-02-03/triplaprograms/side_effect.tripla rename to Project-02-03-04/triplaprograms/side_effect.tripla diff --git a/Project-02-03/triplaprograms/simple_dfa.tripla b/Project-02-03-04/triplaprograms/simple_dfa.tripla similarity index 100% rename from Project-02-03/triplaprograms/simple_dfa.tripla rename to Project-02-03-04/triplaprograms/simple_dfa.tripla diff --git a/Project-02-03/triplaprograms/simple_if.tripla b/Project-02-03-04/triplaprograms/simple_if.tripla similarity index 100% rename from Project-02-03/triplaprograms/simple_if.tripla rename to Project-02-03-04/triplaprograms/simple_if.tripla diff --git a/Project-02-03/triplaprograms/simple_if_2.tripla b/Project-02-03-04/triplaprograms/simple_if_2.tripla similarity index 100% rename from Project-02-03/triplaprograms/simple_if_2.tripla rename to Project-02-03-04/triplaprograms/simple_if_2.tripla diff --git a/Project-02-03/triplaprograms/simple_if_3.tripla b/Project-02-03-04/triplaprograms/simple_if_3.tripla similarity index 100% rename from Project-02-03/triplaprograms/simple_if_3.tripla rename to Project-02-03-04/triplaprograms/simple_if_3.tripla diff --git a/Project-02-03/triplaprograms/simple_if_4.tripla b/Project-02-03-04/triplaprograms/simple_if_4.tripla similarity index 100% rename from Project-02-03/triplaprograms/simple_if_4.tripla rename to Project-02-03-04/triplaprograms/simple_if_4.tripla diff --git a/Project-02-03/triplaprograms/simple_if_5.tripla b/Project-02-03-04/triplaprograms/simple_if_5.tripla similarity index 100% rename from Project-02-03/triplaprograms/simple_if_5.tripla rename to Project-02-03-04/triplaprograms/simple_if_5.tripla diff --git a/Project-02-03/triplaprograms/simple_if_6.tripla b/Project-02-03-04/triplaprograms/simple_if_6.tripla similarity index 100% rename from Project-02-03/triplaprograms/simple_if_6.tripla rename to Project-02-03-04/triplaprograms/simple_if_6.tripla diff --git a/Project-02-03/triplaprograms/simple_if_7.tripla b/Project-02-03-04/triplaprograms/simple_if_7.tripla similarity index 100% rename from Project-02-03/triplaprograms/simple_if_7.tripla rename to Project-02-03-04/triplaprograms/simple_if_7.tripla diff --git a/Project-02-03/triplaprograms/square.tripla b/Project-02-03-04/triplaprograms/square.tripla similarity index 100% rename from Project-02-03/triplaprograms/square.tripla rename to Project-02-03-04/triplaprograms/square.tripla diff --git a/Project-02-03/triplaprograms/validProgram.tripla b/Project-02-03-04/triplaprograms/validProgram.tripla similarity index 100% rename from Project-02-03/triplaprograms/validProgram.tripla rename to Project-02-03-04/triplaprograms/validProgram.tripla diff --git a/Project-02-03/triplaprograms/while.tripla b/Project-02-03-04/triplaprograms/while.tripla similarity index 100% rename from Project-02-03/triplaprograms/while.tripla rename to Project-02-03-04/triplaprograms/while.tripla diff --git a/Project-02-03/triplaprograms/while_2.tripla b/Project-02-03-04/triplaprograms/while_2.tripla similarity index 100% rename from Project-02-03/triplaprograms/while_2.tripla rename to Project-02-03-04/triplaprograms/while_2.tripla diff --git a/Project-02-03/triplaprograms/wrapped-ggT.tripla b/Project-02-03-04/triplaprograms/wrapped-ggT.tripla similarity index 100% rename from Project-02-03/triplaprograms/wrapped-ggT.tripla rename to Project-02-03-04/triplaprograms/wrapped-ggT.tripla diff --git a/Project-02-03/triplaprograms/wrapper.tripla b/Project-02-03-04/triplaprograms/wrapper.tripla similarity index 100% rename from Project-02-03/triplaprograms/wrapper.tripla rename to Project-02-03-04/triplaprograms/wrapper.tripla diff --git a/Project-02-03/triplayacc.py b/Project-02-03-04/triplayacc.py similarity index 100% rename from Project-02-03/triplayacc.py rename to Project-02-03-04/triplayacc.py diff --git a/Project-02-03/vistram/__init__.py b/Project-02-03-04/vistram/__init__.py similarity index 100% rename from Project-02-03/vistram/__init__.py rename to Project-02-03-04/vistram/__init__.py diff --git a/Project-02-03/vistram/assembler.py b/Project-02-03-04/vistram/assembler.py similarity index 100% rename from Project-02-03/vistram/assembler.py rename to Project-02-03-04/vistram/assembler.py diff --git a/Project-02-03/vistram/tram.py b/Project-02-03-04/vistram/tram.py similarity index 100% rename from Project-02-03/vistram/tram.py rename to Project-02-03-04/vistram/tram.py diff --git a/Project-02-03/vistram/vistram.py b/Project-02-03-04/vistram/vistram.py similarity index 100% rename from Project-02-03/vistram/vistram.py rename to Project-02-03-04/vistram/vistram.py