From a5f595b9f8f9f9f538e22403ef47ced915bb1fca Mon Sep 17 00:00:00 2001
From: lascar pacagi <lascar.pacagi@protonmail.com>
Date: Tue, 1 Mar 2022 23:52:51 +0100
Subject: [PATCH 1/6] update README

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index d31f1ab..f68d36c 100644
--- a/README.md
+++ b/README.md
@@ -81,3 +81,5 @@ to go back to the version with a garbage collector do the following.
 git checkout master
 make
 ```
+
+The branch `ast_typed` has an abstract syntax tree decorated with type information. This tree is produced by the typechecker and it can be useful if you want to augment `MiniJava`.

From c5a19f2a5d8e6d91f5a40f6a1e804097b5792c3b Mon Sep 17 00:00:00 2001
From: tracy040401 <tracy@DESKTOP-C7D2AVF>
Date: Tue, 2 Apr 2024 11:56:12 +0200
Subject: [PATCH 2/6] equals works

---
 LMJ.mli               |   3 ++-
 TMJ.mli               |   1 +
 lexer.mll             |   1 +
 mj2c.ml               |   1 +
 parser.mly            |   3 ++-
 printTMJ.ml           |   4 +++-
 print_ast.ml          |   2 ++
 print_tokens.ml       |   2 ++
 test/good/TestEq      | Bin 0 -> 45008 bytes
 test/good/TestEq.c    |  23 +++++++++++++++++++++++
 test/good/TestEq.java |   6 ++++++
 typechecking.ml       |   1 +
 12 files changed, 44 insertions(+), 3 deletions(-)
 create mode 100755 test/good/TestEq
 create mode 100644 test/good/TestEq.c
 create mode 100644 test/good/TestEq.java

diff --git a/LMJ.mli b/LMJ.mli
index 4142cf3..d30edef 100644
--- a/LMJ.mli
+++ b/LMJ.mli
@@ -30,7 +30,8 @@ and binop =
   | OpAdd (** Binary operator [+]. *)
   | OpSub (** Binary operator [-]. *)
   | OpMul (** Binary operator [*]. *)
-  | OpLt  (** Binary operator [<]. *)
+  | OpLt (** Binary operator [<]. *)
+  | OpEq  (** Binary operator [==]. *)
   | OpAnd (** Binary operator [&&]. *)
 
 and unop = UOpNot (** Unary operator [!]. *)
diff --git a/TMJ.mli b/TMJ.mli
index 65182e1..7f90b77 100644
--- a/TMJ.mli
+++ b/TMJ.mli
@@ -26,6 +26,7 @@ and binop = LMJ.binop =
   | OpSub
   | OpMul
   | OpLt
+  | OpEq
   | OpAnd
 
 and unop = LMJ.unop = UOpNot
diff --git a/lexer.mll b/lexer.mll
index 3735afa..38b3226 100644
--- a/lexer.mll
+++ b/lexer.mll
@@ -30,6 +30,7 @@ rule get_token = parse
   | '*'       { TIMES }
   | "&&"      { AND }
   | "<"       { LT }
+  | "=="       { EQ }
   | '('       { LPAREN }
   | ')'       { RPAREN }
   | '['       { LBRACKET }
diff --git a/mj2c.ml b/mj2c.ml
index 3202acb..287dc1c 100644
--- a/mj2c.ml
+++ b/mj2c.ml
@@ -300,6 +300,7 @@ let binop2c
   | OpSub -> fprintf out "-"
   | OpMul -> fprintf out "*"
   | OpLt  -> fprintf out "<"
+  | OpEq  -> fprintf out "=="
   | OpAnd -> fprintf out "&&"
 
 (** [type2c out typ] transpiles the type [typ] to C on the output channel [out]. *)
diff --git a/parser.mly b/parser.mly
index 468d755..abf0a82 100644
--- a/parser.mly
+++ b/parser.mly
@@ -8,7 +8,7 @@
 %token INTEGER BOOLEAN
 %token <string Location.t> IDENT
 %token CLASS PUBLIC STATIC VOID MAIN STRING EXTENDS RETURN
-%token PLUS MINUS TIMES NOT LT AND
+%token PLUS MINUS TIMES NOT LT AND EQ
 %token COMMA SEMICOLON
 %token ASSIGN
 %token LPAREN RPAREN LBRACKET RBRACKET LBRACE RBRACE
@@ -146,6 +146,7 @@ raw_expression:
 | MINUS { OpSub }
 | TIMES { OpMul }
 | LT    { OpLt }
+| EQ    { OpEq }
 | AND   { OpAnd }
 
 instruction:
diff --git a/printTMJ.ml b/printTMJ.ml
index 6710309..8c6eebd 100644
--- a/printTMJ.ml
+++ b/printTMJ.ml
@@ -23,6 +23,8 @@ let binop out = function
      fprintf out "*"
   | OpLt  ->
      fprintf out "<"
+  | OpEq  ->
+      fprintf out "=="
   | OpAnd ->
      fprintf out "&&"
 
@@ -103,7 +105,7 @@ and expr5 out e = match e.raw_expression with
      expr4 out e
 
 and expr6 out e = match e.raw_expression with
-  | EBinOp ((OpLt | OpAnd) as op, e1, e2) ->
+  | EBinOp ((OpLt | OpAnd | OpEq) as op, e1, e2) ->
      fprintf out "%a %a %a"
        expr6 e1
        binop op
diff --git a/print_ast.ml b/print_ast.ml
index b1beb17..0472caa 100644
--- a/print_ast.ml
+++ b/print_ast.ml
@@ -79,6 +79,8 @@ let print_binop out = function
      fprintf out "OpMul"
   | OpLt  ->
      fprintf out "OpLt"
+  | OpEq  ->
+      fprintf out "OpEq"
   | OpAnd ->
      fprintf out "OpAnd"
 
diff --git a/print_tokens.ml b/print_tokens.ml
index 5ed84f4..4a899a4 100644
--- a/print_tokens.ml
+++ b/print_tokens.ml
@@ -52,6 +52,8 @@ let print_token show_loc out = function
      fprintf out "NOT"
   | LT ->
      fprintf out "LT"
+   | EQ ->
+      fprintf out "EQ"
   | AND ->
      fprintf out "AND"
   | COMMA ->
diff --git a/test/good/TestEq b/test/good/TestEq
new file mode 100755
index 0000000000000000000000000000000000000000..6b1777f784bc0184b02c9fff9e3d97d8687cb3d9
GIT binary patch
literal 45008
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

literal 0
HcmV?d00001

diff --git a/test/good/TestEq.c b/test/good/TestEq.c
new file mode 100644
index 0000000..a1e50a9
--- /dev/null
+++ b/test/good/TestEq.c
@@ -0,0 +1,23 @@
+/*
+class TestEq {
+  public static void main(String[] args) {
+    if (1 == 1) System.out.println(42);
+    else System.out.println(0);
+  }
+}
+*/
+#include <stdio.h>
+#include <stdlib.h>
+#include "tgc.h"
+#pragma GCC diagnostic ignored "-Wpointer-to-int-cast"
+#pragma GCC diagnostic ignored "-Wint-to-pointer-cast"
+struct array { int* array; int length; };
+tgc_t gc;
+int main(int argc, char *argv[]) {
+  tgc_start(&gc, &argc);
+  if ((1 == 1)) printf("%d\n", 42);
+  else printf("%d\n", 0);
+  tgc_stop(&gc);
+
+  return 0;
+}
diff --git a/test/good/TestEq.java b/test/good/TestEq.java
new file mode 100644
index 0000000..d6fa137
--- /dev/null
+++ b/test/good/TestEq.java
@@ -0,0 +1,6 @@
+class TestEq {
+    public static void main(String[] args){
+        if(1==1) System.out.println(42);
+        else System.out.println(0);
+    }
+}
\ No newline at end of file
diff --git a/typechecking.ml b/typechecking.ml
index 452bcd5..3c5cee8 100644
--- a/typechecking.ml
+++ b/typechecking.ml
@@ -173,6 +173,7 @@ and typecheck_expression (cenv : class_env) (venv : variable_env) (vinit : S.t)
         | OpSub
         | OpMul -> TypInt, TypInt
         | OpLt  -> TypInt, TypBool
+        | OpEq  -> TypInt, TypBool
         | OpAnd -> TypBool, TypBool
       in
       let e1' = typecheck_expression_expecting cenv venv vinit instanceof expected e1 in

From 6e2a42ade5d75549a04907f0222f57516f9b28ee Mon Sep 17 00:00:00 2001
From: "Jeanne.Le-Gall-Botte" <jeanne.le-gall-botte@insa-rennes.fr>
Date: Tue, 2 Apr 2024 12:00:20 +0200
Subject: [PATCH 3/6] or et gt

---
 LMJ.mli               | 2 ++
 TMJ.mli               | 2 ++
 lexer.mll             | 2 ++
 mj2c.ml               | 2 ++
 parser.mly            | 7 +++++--
 printTMJ.ml           | 6 +++++-
 print_ast.ml          | 4 ++++
 print_tokens.ml       | 4 ++++
 test/good/TestGt.java | 6 ++++++
 test/good/TestOr.java | 6 ++++++
 typechecking.ml       | 2 ++
 11 files changed, 40 insertions(+), 3 deletions(-)
 create mode 100644 test/good/TestGt.java
 create mode 100644 test/good/TestOr.java

diff --git a/LMJ.mli b/LMJ.mli
index 4142cf3..ece6885 100644
--- a/LMJ.mli
+++ b/LMJ.mli
@@ -31,7 +31,9 @@ and binop =
   | OpSub (** Binary operator [-]. *)
   | OpMul (** Binary operator [*]. *)
   | OpLt  (** Binary operator [<]. *)
+  | OpGt  (** Binary operator [>]. *)
   | OpAnd (** Binary operator [&&]. *)
+  | OpOr  (** BInary operator [||]. *)
 
 and unop = UOpNot (** Unary operator [!]. *)
 
diff --git a/TMJ.mli b/TMJ.mli
index 65182e1..cf1a71b 100644
--- a/TMJ.mli
+++ b/TMJ.mli
@@ -26,7 +26,9 @@ and binop = LMJ.binop =
   | OpSub
   | OpMul
   | OpLt
+  | OpGt
   | OpAnd
+  | OpOr
 
 and unop = LMJ.unop = UOpNot
 
diff --git a/lexer.mll b/lexer.mll
index 3735afa..fc180bb 100644
--- a/lexer.mll
+++ b/lexer.mll
@@ -29,7 +29,9 @@ rule get_token = parse
   | '-'       { MINUS }
   | '*'       { TIMES }
   | "&&"      { AND }
+  | "||"      { OR }
   | "<"       { LT }
+  | ">"       { GT }
   | '('       { LPAREN }
   | ')'       { RPAREN }
   | '['       { LBRACKET }
diff --git a/mj2c.ml b/mj2c.ml
index 3202acb..921f0fe 100644
--- a/mj2c.ml
+++ b/mj2c.ml
@@ -300,7 +300,9 @@ let binop2c
   | OpSub -> fprintf out "-"
   | OpMul -> fprintf out "*"
   | OpLt  -> fprintf out "<"
+  | OpGt  -> fprintf out ">"
   | OpAnd -> fprintf out "&&"
+  | OpOr  -> fprintf out "||"
 
 (** [type2c out typ] transpiles the type [typ] to C on the output channel [out]. *)
 let type2c
diff --git a/parser.mly b/parser.mly
index 468d755..ebf17b3 100644
--- a/parser.mly
+++ b/parser.mly
@@ -8,7 +8,7 @@
 %token INTEGER BOOLEAN
 %token <string Location.t> IDENT
 %token CLASS PUBLIC STATIC VOID MAIN STRING EXTENDS RETURN
-%token PLUS MINUS TIMES NOT LT AND
+%token PLUS MINUS TIMES NOT LT GT AND OR
 %token COMMA SEMICOLON
 %token ASSIGN
 %token LPAREN RPAREN LBRACKET RBRACKET LBRACE RBRACE
@@ -17,8 +17,9 @@
 %token IF ELSE WHILE
 %token EOF
 
+%left OR
 %left AND
-%nonassoc LT
+%nonassoc LT GT
 %left PLUS MINUS
 %left TIMES
 %nonassoc NOT
@@ -146,7 +147,9 @@ raw_expression:
 | MINUS { OpSub }
 | TIMES { OpMul }
 | LT    { OpLt }
+| GT    { OpGt }
 | AND   { OpAnd }
+| OR    { OpOr }
 
 instruction:
 | b = block
diff --git a/printTMJ.ml b/printTMJ.ml
index 6710309..78334c8 100644
--- a/printTMJ.ml
+++ b/printTMJ.ml
@@ -23,8 +23,12 @@ let binop out = function
      fprintf out "*"
   | OpLt  ->
      fprintf out "<"
+  | OpGt  ->
+     fprintf out ">"
   | OpAnd ->
      fprintf out "&&"
+  | OpOr  ->
+     fprintf out "||"
 
 (** [expr out e], [expr0 out e], ..., [expr6 out e] print the expression [e]
     on the output channel [out]. [expr] is a synonym for [expr6].
@@ -103,7 +107,7 @@ and expr5 out e = match e.raw_expression with
      expr4 out e
 
 and expr6 out e = match e.raw_expression with
-  | EBinOp ((OpLt | OpAnd) as op, e1, e2) ->
+  | EBinOp ((OpLt | OpGt | OpAnd | OpOr) as op, e1, e2) ->
      fprintf out "%a %a %a"
        expr6 e1
        binop op
diff --git a/print_ast.ml b/print_ast.ml
index b1beb17..f1260fe 100644
--- a/print_ast.ml
+++ b/print_ast.ml
@@ -79,8 +79,12 @@ let print_binop out = function
      fprintf out "OpMul"
   | OpLt  ->
      fprintf out "OpLt"
+  | OpGt  ->
+     fprintf out "OpGt"
   | OpAnd ->
      fprintf out "OpAnd"
+  | OpOr  ->
+     fprintf out "OpOr"
 
 (** [print_expression prefix out e] prints the expression [e] on the output channel [out].
     [prefix] is the string already printed just before [e]. *)
diff --git a/print_tokens.ml b/print_tokens.ml
index 5ed84f4..f3da4e0 100644
--- a/print_tokens.ml
+++ b/print_tokens.ml
@@ -52,8 +52,12 @@ let print_token show_loc out = function
      fprintf out "NOT"
   | LT ->
      fprintf out "LT"
+  | GT ->
+     fprintf out "GT"
   | AND ->
      fprintf out "AND"
+  | OR ->
+     fprintf out "OR"
   | COMMA ->
      fprintf out "COMMA"
   | SEMICOLON ->
diff --git a/test/good/TestGt.java b/test/good/TestGt.java
new file mode 100644
index 0000000..d22168f
--- /dev/null
+++ b/test/good/TestGt.java
@@ -0,0 +1,6 @@
+class TestGt {
+    public static void main(String[] args){
+        if(2>1) System.out.println(42);
+        else System.out.println(0);
+    }
+}
\ No newline at end of file
diff --git a/test/good/TestOr.java b/test/good/TestOr.java
new file mode 100644
index 0000000..acb7145
--- /dev/null
+++ b/test/good/TestOr.java
@@ -0,0 +1,6 @@
+class TestOr {
+    public static void main(String[] args) {
+        if(true || false) System.out.println(42);
+        else System.out.println(0);
+    }
+}
\ No newline at end of file
diff --git a/typechecking.ml b/typechecking.ml
index 452bcd5..644aac9 100644
--- a/typechecking.ml
+++ b/typechecking.ml
@@ -173,7 +173,9 @@ and typecheck_expression (cenv : class_env) (venv : variable_env) (vinit : S.t)
         | OpSub
         | OpMul -> TypInt, TypInt
         | OpLt  -> TypInt, TypBool
+        | OpGt  -> TypInt, TypBool
         | OpAnd -> TypBool, TypBool
+        | OpOr  -> TypBool, TypBool
       in
       let e1' = typecheck_expression_expecting cenv venv vinit instanceof expected e1 in
       let e2' = typecheck_expression_expecting cenv venv vinit instanceof expected e2 in

From d7978f621a6f868c7758d2a7b9857ee771a56fc3 Mon Sep 17 00:00:00 2001
From: tracy040401 <tracy@DESKTOP-C7D2AVF>
Date: Mon, 8 Apr 2024 16:06:08 +0200
Subject: [PATCH 4/6] updated

---
 parser.mly | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/parser.mly b/parser.mly
index abf0a82..8e53a81 100644
--- a/parser.mly
+++ b/parser.mly
@@ -165,6 +165,10 @@ instruction:
 | IF LPAREN c = expression RPAREN i1 = instruction ELSE i2 = instruction
    { IIf (c, i1, i2) }
 
+// if sans else 
+| IF LPAREN c = expression RPAREN i1 = instruction // ce qu'on lit 
+   { IIf (c, i1, IBlock([])) } // ce qu'on reconnait 
+
 | WHILE LPAREN c = expression RPAREN i = instruction
    { IWhile (c, i) }
 

From f7dbe8aa16cd7be113797c348868e2eaa1fda9b1 Mon Sep 17 00:00:00 2001
From: tracy040401 <tracy@DESKTOP-C7D2AVF>
Date: Mon, 8 Apr 2024 16:15:09 +0200
Subject: [PATCH 5/6] updated

---
 LMJ.mli               | 3 +++
 TMJ.mli               | 2 ++
 lexer.mll             | 2 ++
 mj2c.ml               | 2 ++
 parser.mly            | 9 ++++++++-
 printTMJ.ml           | 8 ++++++++
 print_ast.ml          | 4 ++++
 print_tokens.ml       | 4 ++++
 test/good/TestGt.java | 6 ++++++
 test/good/TestOr.java | 6 ++++++
 typechecking.ml       | 2 ++
 11 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 test/good/TestGt.java
 create mode 100644 test/good/TestOr.java

diff --git a/LMJ.mli b/LMJ.mli
index d30edef..98e951c 100644
--- a/LMJ.mli
+++ b/LMJ.mli
@@ -32,7 +32,10 @@ and binop =
   | OpMul (** Binary operator [*]. *)
   | OpLt (** Binary operator [<]. *)
   | OpEq  (** Binary operator [==]. *)
+  | OpLt  (** Binary operator [<]. *)
+  | OpGt  (** Binary operator [>]. *)
   | OpAnd (** Binary operator [&&]. *)
+  | OpOr  (** BInary operator [||]. *)
 
 and unop = UOpNot (** Unary operator [!]. *)
 
diff --git a/TMJ.mli b/TMJ.mli
index 7f90b77..3f01e64 100644
--- a/TMJ.mli
+++ b/TMJ.mli
@@ -27,7 +27,9 @@ and binop = LMJ.binop =
   | OpMul
   | OpLt
   | OpEq
+  | OpGt
   | OpAnd
+  | OpOr
 
 and unop = LMJ.unop = UOpNot
 
diff --git a/lexer.mll b/lexer.mll
index 38b3226..3a04c52 100644
--- a/lexer.mll
+++ b/lexer.mll
@@ -29,8 +29,10 @@ rule get_token = parse
   | '-'       { MINUS }
   | '*'       { TIMES }
   | "&&"      { AND }
+  | "||"      { OR }
   | "<"       { LT }
   | "=="       { EQ }
+  | ">"       { GT }
   | '('       { LPAREN }
   | ')'       { RPAREN }
   | '['       { LBRACKET }
diff --git a/mj2c.ml b/mj2c.ml
index 287dc1c..eca0885 100644
--- a/mj2c.ml
+++ b/mj2c.ml
@@ -301,7 +301,9 @@ let binop2c
   | OpMul -> fprintf out "*"
   | OpLt  -> fprintf out "<"
   | OpEq  -> fprintf out "=="
+  | OpGt  -> fprintf out ">"
   | OpAnd -> fprintf out "&&"
+  | OpOr  -> fprintf out "||"
 
 (** [type2c out typ] transpiles the type [typ] to C on the output channel [out]. *)
 let type2c
diff --git a/parser.mly b/parser.mly
index 8e53a81..96dd74d 100644
--- a/parser.mly
+++ b/parser.mly
@@ -8,7 +8,11 @@
 %token INTEGER BOOLEAN
 %token <string Location.t> IDENT
 %token CLASS PUBLIC STATIC VOID MAIN STRING EXTENDS RETURN
+<<<<<<< HEAD
 %token PLUS MINUS TIMES NOT LT AND EQ
+=======
+%token PLUS MINUS TIMES NOT LT GT AND OR
+>>>>>>> 6e2a42ade5d75549a04907f0222f57516f9b28ee
 %token COMMA SEMICOLON
 %token ASSIGN
 %token LPAREN RPAREN LBRACKET RBRACKET LBRACE RBRACE
@@ -17,8 +21,9 @@
 %token IF ELSE WHILE
 %token EOF
 
+%left OR
 %left AND
-%nonassoc LT
+%nonassoc LT GT
 %left PLUS MINUS
 %left TIMES
 %nonassoc NOT
@@ -147,7 +152,9 @@ raw_expression:
 | TIMES { OpMul }
 | LT    { OpLt }
 | EQ    { OpEq }
+| GT    { OpGt }
 | AND   { OpAnd }
+| OR    { OpOr }
 
 instruction:
 | b = block
diff --git a/printTMJ.ml b/printTMJ.ml
index 8c6eebd..19145ce 100644
--- a/printTMJ.ml
+++ b/printTMJ.ml
@@ -23,10 +23,17 @@ let binop out = function
      fprintf out "*"
   | OpLt  ->
      fprintf out "<"
+<<<<<<< HEAD
   | OpEq  ->
       fprintf out "=="
+=======
+  | OpGt  ->
+     fprintf out ">"
+>>>>>>> 6e2a42ade5d75549a04907f0222f57516f9b28ee
   | OpAnd ->
      fprintf out "&&"
+  | OpOr  ->
+     fprintf out "||"
 
 (** [expr out e], [expr0 out e], ..., [expr6 out e] print the expression [e]
     on the output channel [out]. [expr] is a synonym for [expr6].
@@ -106,6 +113,7 @@ and expr5 out e = match e.raw_expression with
 
 and expr6 out e = match e.raw_expression with
   | EBinOp ((OpLt | OpAnd | OpEq) as op, e1, e2) ->
+  | EBinOp ((OpLt | OpGt | OpAnd | OpOr) as op, e1, e2) ->
      fprintf out "%a %a %a"
        expr6 e1
        binop op
diff --git a/print_ast.ml b/print_ast.ml
index 0472caa..e33cb1c 100644
--- a/print_ast.ml
+++ b/print_ast.ml
@@ -81,8 +81,12 @@ let print_binop out = function
      fprintf out "OpLt"
   | OpEq  ->
       fprintf out "OpEq"
+  | OpGt  ->
+     fprintf out "OpGt"
   | OpAnd ->
      fprintf out "OpAnd"
+  | OpOr  ->
+     fprintf out "OpOr"
 
 (** [print_expression prefix out e] prints the expression [e] on the output channel [out].
     [prefix] is the string already printed just before [e]. *)
diff --git a/print_tokens.ml b/print_tokens.ml
index 4a899a4..e4b3e2d 100644
--- a/print_tokens.ml
+++ b/print_tokens.ml
@@ -54,8 +54,12 @@ let print_token show_loc out = function
      fprintf out "LT"
    | EQ ->
       fprintf out "EQ"
+  | GT ->
+     fprintf out "GT"
   | AND ->
      fprintf out "AND"
+  | OR ->
+     fprintf out "OR"
   | COMMA ->
      fprintf out "COMMA"
   | SEMICOLON ->
diff --git a/test/good/TestGt.java b/test/good/TestGt.java
new file mode 100644
index 0000000..d22168f
--- /dev/null
+++ b/test/good/TestGt.java
@@ -0,0 +1,6 @@
+class TestGt {
+    public static void main(String[] args){
+        if(2>1) System.out.println(42);
+        else System.out.println(0);
+    }
+}
\ No newline at end of file
diff --git a/test/good/TestOr.java b/test/good/TestOr.java
new file mode 100644
index 0000000..acb7145
--- /dev/null
+++ b/test/good/TestOr.java
@@ -0,0 +1,6 @@
+class TestOr {
+    public static void main(String[] args) {
+        if(true || false) System.out.println(42);
+        else System.out.println(0);
+    }
+}
\ No newline at end of file
diff --git a/typechecking.ml b/typechecking.ml
index 3c5cee8..f167cb0 100644
--- a/typechecking.ml
+++ b/typechecking.ml
@@ -174,7 +174,9 @@ and typecheck_expression (cenv : class_env) (venv : variable_env) (vinit : S.t)
         | OpMul -> TypInt, TypInt
         | OpLt  -> TypInt, TypBool
         | OpEq  -> TypInt, TypBool
+        | OpGt  -> TypInt, TypBool
         | OpAnd -> TypBool, TypBool
+        | OpOr  -> TypBool, TypBool
       in
       let e1' = typecheck_expression_expecting cenv venv vinit instanceof expected e1 in
       let e2' = typecheck_expression_expecting cenv venv vinit instanceof expected e2 in

From 8a447778528d422df043ecc21f091cb3d68e9f9f Mon Sep 17 00:00:00 2001
From: tracy040401 <tracy@DESKTOP-C7D2AVF>
Date: Mon, 8 Apr 2024 16:17:54 +0200
Subject: [PATCH 6/6] Revert "updated"

This reverts commit f7dbe8aa16cd7be113797c348868e2eaa1fda9b1.

	modified:   LMJ.mli
	modified:   TMJ.mli
	modified:   lexer.mll
	modified:   mj2c.ml
	modified:   parser.mly
	modified:   printTMJ.ml
	modified:   print_ast.ml
	modified:   print_tokens.ml
	deleted:    test/good/TestGt.java
	deleted:    test/good/TestOr.java
	modified:   typechecking.ml
---
 LMJ.mli               | 3 ---
 TMJ.mli               | 2 --
 lexer.mll             | 2 --
 mj2c.ml               | 2 --
 parser.mly            | 9 +--------
 printTMJ.ml           | 8 --------
 print_ast.ml          | 4 ----
 print_tokens.ml       | 4 ----
 test/good/TestGt.java | 6 ------
 test/good/TestOr.java | 6 ------
 typechecking.ml       | 2 --
 11 files changed, 1 insertion(+), 47 deletions(-)
 delete mode 100644 test/good/TestGt.java
 delete mode 100644 test/good/TestOr.java

diff --git a/LMJ.mli b/LMJ.mli
index 98e951c..d30edef 100644
--- a/LMJ.mli
+++ b/LMJ.mli
@@ -32,10 +32,7 @@ and binop =
   | OpMul (** Binary operator [*]. *)
   | OpLt (** Binary operator [<]. *)
   | OpEq  (** Binary operator [==]. *)
-  | OpLt  (** Binary operator [<]. *)
-  | OpGt  (** Binary operator [>]. *)
   | OpAnd (** Binary operator [&&]. *)
-  | OpOr  (** BInary operator [||]. *)
 
 and unop = UOpNot (** Unary operator [!]. *)
 
diff --git a/TMJ.mli b/TMJ.mli
index 3f01e64..7f90b77 100644
--- a/TMJ.mli
+++ b/TMJ.mli
@@ -27,9 +27,7 @@ and binop = LMJ.binop =
   | OpMul
   | OpLt
   | OpEq
-  | OpGt
   | OpAnd
-  | OpOr
 
 and unop = LMJ.unop = UOpNot
 
diff --git a/lexer.mll b/lexer.mll
index 3a04c52..38b3226 100644
--- a/lexer.mll
+++ b/lexer.mll
@@ -29,10 +29,8 @@ rule get_token = parse
   | '-'       { MINUS }
   | '*'       { TIMES }
   | "&&"      { AND }
-  | "||"      { OR }
   | "<"       { LT }
   | "=="       { EQ }
-  | ">"       { GT }
   | '('       { LPAREN }
   | ')'       { RPAREN }
   | '['       { LBRACKET }
diff --git a/mj2c.ml b/mj2c.ml
index eca0885..287dc1c 100644
--- a/mj2c.ml
+++ b/mj2c.ml
@@ -301,9 +301,7 @@ let binop2c
   | OpMul -> fprintf out "*"
   | OpLt  -> fprintf out "<"
   | OpEq  -> fprintf out "=="
-  | OpGt  -> fprintf out ">"
   | OpAnd -> fprintf out "&&"
-  | OpOr  -> fprintf out "||"
 
 (** [type2c out typ] transpiles the type [typ] to C on the output channel [out]. *)
 let type2c
diff --git a/parser.mly b/parser.mly
index 96dd74d..8e53a81 100644
--- a/parser.mly
+++ b/parser.mly
@@ -8,11 +8,7 @@
 %token INTEGER BOOLEAN
 %token <string Location.t> IDENT
 %token CLASS PUBLIC STATIC VOID MAIN STRING EXTENDS RETURN
-<<<<<<< HEAD
 %token PLUS MINUS TIMES NOT LT AND EQ
-=======
-%token PLUS MINUS TIMES NOT LT GT AND OR
->>>>>>> 6e2a42ade5d75549a04907f0222f57516f9b28ee
 %token COMMA SEMICOLON
 %token ASSIGN
 %token LPAREN RPAREN LBRACKET RBRACKET LBRACE RBRACE
@@ -21,9 +17,8 @@
 %token IF ELSE WHILE
 %token EOF
 
-%left OR
 %left AND
-%nonassoc LT GT
+%nonassoc LT
 %left PLUS MINUS
 %left TIMES
 %nonassoc NOT
@@ -152,9 +147,7 @@ raw_expression:
 | TIMES { OpMul }
 | LT    { OpLt }
 | EQ    { OpEq }
-| GT    { OpGt }
 | AND   { OpAnd }
-| OR    { OpOr }
 
 instruction:
 | b = block
diff --git a/printTMJ.ml b/printTMJ.ml
index 19145ce..8c6eebd 100644
--- a/printTMJ.ml
+++ b/printTMJ.ml
@@ -23,17 +23,10 @@ let binop out = function
      fprintf out "*"
   | OpLt  ->
      fprintf out "<"
-<<<<<<< HEAD
   | OpEq  ->
       fprintf out "=="
-=======
-  | OpGt  ->
-     fprintf out ">"
->>>>>>> 6e2a42ade5d75549a04907f0222f57516f9b28ee
   | OpAnd ->
      fprintf out "&&"
-  | OpOr  ->
-     fprintf out "||"
 
 (** [expr out e], [expr0 out e], ..., [expr6 out e] print the expression [e]
     on the output channel [out]. [expr] is a synonym for [expr6].
@@ -113,7 +106,6 @@ and expr5 out e = match e.raw_expression with
 
 and expr6 out e = match e.raw_expression with
   | EBinOp ((OpLt | OpAnd | OpEq) as op, e1, e2) ->
-  | EBinOp ((OpLt | OpGt | OpAnd | OpOr) as op, e1, e2) ->
      fprintf out "%a %a %a"
        expr6 e1
        binop op
diff --git a/print_ast.ml b/print_ast.ml
index e33cb1c..0472caa 100644
--- a/print_ast.ml
+++ b/print_ast.ml
@@ -81,12 +81,8 @@ let print_binop out = function
      fprintf out "OpLt"
   | OpEq  ->
       fprintf out "OpEq"
-  | OpGt  ->
-     fprintf out "OpGt"
   | OpAnd ->
      fprintf out "OpAnd"
-  | OpOr  ->
-     fprintf out "OpOr"
 
 (** [print_expression prefix out e] prints the expression [e] on the output channel [out].
     [prefix] is the string already printed just before [e]. *)
diff --git a/print_tokens.ml b/print_tokens.ml
index e4b3e2d..4a899a4 100644
--- a/print_tokens.ml
+++ b/print_tokens.ml
@@ -54,12 +54,8 @@ let print_token show_loc out = function
      fprintf out "LT"
    | EQ ->
       fprintf out "EQ"
-  | GT ->
-     fprintf out "GT"
   | AND ->
      fprintf out "AND"
-  | OR ->
-     fprintf out "OR"
   | COMMA ->
      fprintf out "COMMA"
   | SEMICOLON ->
diff --git a/test/good/TestGt.java b/test/good/TestGt.java
deleted file mode 100644
index d22168f..0000000
--- a/test/good/TestGt.java
+++ /dev/null
@@ -1,6 +0,0 @@
-class TestGt {
-    public static void main(String[] args){
-        if(2>1) System.out.println(42);
-        else System.out.println(0);
-    }
-}
\ No newline at end of file
diff --git a/test/good/TestOr.java b/test/good/TestOr.java
deleted file mode 100644
index acb7145..0000000
--- a/test/good/TestOr.java
+++ /dev/null
@@ -1,6 +0,0 @@
-class TestOr {
-    public static void main(String[] args) {
-        if(true || false) System.out.println(42);
-        else System.out.println(0);
-    }
-}
\ No newline at end of file
diff --git a/typechecking.ml b/typechecking.ml
index f167cb0..3c5cee8 100644
--- a/typechecking.ml
+++ b/typechecking.ml
@@ -174,9 +174,7 @@ and typecheck_expression (cenv : class_env) (venv : variable_env) (vinit : S.t)
         | OpMul -> TypInt, TypInt
         | OpLt  -> TypInt, TypBool
         | OpEq  -> TypInt, TypBool
-        | OpGt  -> TypInt, TypBool
         | OpAnd -> TypBool, TypBool
-        | OpOr  -> TypBool, TypBool
       in
       let e1' = typecheck_expression_expecting cenv venv vinit instanceof expected e1 in
       let e2' = typecheck_expression_expecting cenv venv vinit instanceof expected e2 in