Commit graph

222 commits

Author SHA1 Message Date
Nicolas PENELOUX
ad14b5bd46 conflict 2023-11-25 14:33:32 +01:00
Nicolas PENELOUX
79029a186e ? 2023-11-25 14:33:03 +01:00
acd881c0dd
mm 2023-11-21 17:33:12 +01:00
e091ae9860
coupé en 2 2023-11-21 17:17:43 +01:00
da6e4547a8
debug 2023-11-20 04:54:40 +01:00
195139e058
fmt 2023-11-20 04:43:27 +01:00
099ac3a73d
Merge branch 'master' of gaufre.informatique.univ-paris-diderot.fr:aguatto/compilation-m1-2023 2023-11-19 16:26:18 +01:00
Adrien Guatto
6355f88c0f Jalon 3 2023-11-15 19:08:33 +01:00
6f097cba99
fmt 2023-11-14 17:01:38 +01:00
Nicolas PENELOUX
c7c9b0c351 formats, ajout commentaires et makefile 2023-11-13 17:47:48 +01:00
Nicolas PENELOUX
d7b09be593 72/72, fix for 2023-11-13 16:39:29 +01:00
Nicolas PENELOUX
b1cade7dd4 add PRecord, marche pas mais je l'ai fais quand même 2023-11-13 14:31:17 +01:00
4b32388ae7
correct position? 2023-11-12 19:42:09 +01:00
b92523f677
c bon 2023-11-12 19:38:23 +01:00
be75f1425b
fmt 2023-11-12 19:37:57 +01:00
5f2c67b1b3
67/72 2023-11-12 19:30:41 +01:00
aec53f30e1
fmt 2023-11-12 18:11:36 +01:00
Nicolas PENELOUX
a3c305fb9c 48/72, fix Assign, Apply, add pattern for Wildcard / Literal / Variable / TypeAnnotation / Tagged / Tuple / Or & And 2023-11-11 21:49:31 +01:00
Nicolas PENELOUX
d149e5d1e7 début pattern 2023-11-09 22:38:50 +01:00
Nicolas PENELOUX
67434aab60 Ajout de for ? je sais plus honnêtement le projet me casse la tête 2023-11-09 22:18:57 +01:00
Nicolas PENELOUX
095b120963 34/72, ajout assign/while/define et correction Record 2023-11-07 20:32:03 +01:00
Nicolas PENELOUX
97b8205daf ajout IfThenElse/Fun/Field/début d'autres 2023-11-07 14:16:54 +01:00
Nicolas PENELOUX
ff6ab31442 conflict 2023-11-07 12:22:26 +01:00
ce19965127
todo 2023-11-06 20:57:21 +01:00
2546d6d16b
apply 2023-11-06 20:55:37 +01:00
d461396636
function recursive 2023-11-06 20:26:28 +01:00
Nicolas PENELOUX
e2d2c1c127 ajout Record/Sequence/Ref/Read/Tagged et début Apply 2023-11-06 18:04:31 +01:00
682b727dd2
oops sry 2023-11-05 00:54:46 +01:00
c74809cc73
fmt 2023-11-05 00:52:33 +01:00
Nicolas PENELOUX
7842d4dc14 ajout Tuple et dereference 2023-11-04 10:40:31 +01:00
2961872f99
interpretation max (0/72 :))))) ) 2023-10-30 17:13:59 +01:00
44744cc667
trying to understand the CHARABIA 2023-10-30 16:32:18 +01:00
ceb2caa21e
fmt.. sorry 2023-10-30 14:53:49 +01:00
30eb4b0eaf
Merge branch 'master' of gaufre.informatique.univ-paris-diderot.fr:aguatto/compilation-m1-2023 2023-10-25 16:20:14 +02:00
Adrien Guatto
277a50669a Publication du jalon 2 2023-10-25 15:16:53 +02:00
b06572a5ca
remove debugging related code 2023-10-25 10:01:23 +02:00
899dae5ea1
nested comment block 2023-10-25 09:58:44 +02:00
75e2d0e78c
470/470 2023-10-25 00:49:17 +02:00
8108b1c4fc
refactor doing nothing 2023-10-25 00:36:07 +02:00
358470f280
469/470 2023-10-25 00:35:34 +02:00
27ed7ebddb
NO CONFLICT 2023-10-25 00:22:43 +02:00
77e713191d
todo 2023-10-24 23:59:23 +02:00
485c2cd15c
refactor doing nothing 2023-10-24 23:46:32 +02:00
88efc86649
fmt 2023-10-24 23:09:45 +02:00
f596c5c64d
only 1 conflict 2023-10-24 22:56:19 +02:00
Nicolas PENELOUX
74ab37ec6b conflicts 2023-10-24 22:52:54 +02:00
Nicolas PENELOUX
ec792fd40d 235/235 . 2023-10-24 22:51:13 +02:00
397dade946
fmt 2023-10-24 21:58:58 +02:00
885f2e0790
Merge branch 'anri' of gaufre.informatique.univ-paris-diderot.fr:Anri/compilation-m1-2023 into anri 2023-10-24 21:44:31 +02:00
05c2d703bf
strings! 2023-10-24 21:44:29 +02:00
Nicolas PENELOUX
6019b902e1 Merge branch 'anri' of gaufre.informatique.univ-paris-diderot.fr:Anri/compilation-m1-2023 into anri 2023-10-24 21:22:14 +02:00
Nicolas PENELOUX
0c79e84739 Trying to fix Sequence 2023-10-24 21:22:02 +02:00
d9fd965b3b
fmt 2023-10-24 20:25:22 +02:00
Nicolas PENELOUX
f8d9068012 fix Pattern Tuple issue, add to much ( and ) 2023-10-24 20:01:38 +02:00
Nicolas PENELOUX
556f637cf6 fix infix application 2023-10-24 16:44:19 +02:00
Nicolas PENELOUX
a702759618 fix tdefinition issue (the list wasn't optional) 2023-10-24 16:36:12 +02:00
0fcd634f81
ascii table 2023-10-24 16:25:29 +02:00
24860a540f
never crash 2023-10-24 15:46:53 +02:00
abcbd1754c
refactor 2023-10-24 15:38:57 +02:00
41fa9baedc
Merge branch 'anri' of gaufre.informatique.univ-paris-diderot.fr:Anri/compilation-m1-2023 into anri 2023-10-24 15:32:23 +02:00
f3ceb046f9
escapes 2023-10-24 15:32:22 +02:00
Nicolas PENELOUX
862a4b7835 int plus propre 2023-10-24 15:25:55 +02:00
Nicolas PENELOUX
9444102aea Lexer gère mieux les nombres désormais 2023-10-24 15:20:11 +02:00
27696ecf09
renommage pour bien voir avec la grammaire 2023-10-24 15:12:10 +02:00
7af9e7622f
lol 2023-10-24 14:57:16 +02:00
46e5c9e270
refactor 2023-10-24 14:54:50 +02:00
8be119b71c
fmt 2023-10-24 14:42:23 +02:00
da98682682
no 2023-10-24 14:40:17 +02:00
9566754c75
COLON type_scheme 2023-10-24 14:34:37 +02:00
Nicolas PENELOUX
5f48faa278 136 -> 30 conflicts 2023-10-24 13:29:57 +02:00
Nicolas PENELOUX
cd04e3c0fc Merge branch 'anri' of gaufre.informatique.univ-paris-diderot.fr:Anri/compilation-m1-2023 into anri 2023-10-24 12:42:19 +02:00
Nicolas PENELOUX
17d2b0d370 merge 2023-10-24 12:39:14 +02:00
ede3bcd07c
fmt 2023-10-23 19:22:02 +02:00
ca5b578afa
recup_char should work? 2023-10-23 19:09:56 +02:00
Nicolas PENELOUX
144b0bdc75 fix do while 2023-10-23 17:28:56 +02:00
Nicolas PENELOUX
bfbcc60c5d 124 conflitcs 2023-10-23 17:05:28 +02:00
Nicolas PENELOUX
94fdab56fc correction reference et lexer 2023-10-23 12:35:31 +02:00
Nicolas PENELOUX
892d0bf8dc 390 conflicts -> 160 2023-10-23 11:57:01 +02:00
Nicolas PENELOUX
edc2664613 debut resolution conflict 2023-10-23 11:25:18 +02:00
5a1dbcf6de
refactor 2023-10-21 15:33:19 +02:00
9f6ec012a5
fix Tuple 2023-10-21 14:14:56 +02:00
8604834fe0
newlines 2023-10-21 12:54:58 +02:00
48a9b8b23d
opbin? 2023-10-21 12:44:40 +02:00
4d08e97bd8
update pattern 2023-10-21 11:15:17 +02:00
2f05f7ba09
fmt and some rewrite of expressions 2023-10-21 02:43:18 +02:00
dc34c9f194
fmt 2023-10-21 02:41:30 +02:00
5692c73984
conflits? 2023-10-21 00:36:46 +02:00
Nicolas PENELOUX
8ed2b0c51f conflict 2023-10-20 20:48:23 +02:00
Nicolas PENELOUX
66af6713b5 essai parser 2023-10-20 20:45:16 +02:00
726daf228d
fmt2 2023-10-20 19:10:39 +02:00
7683cada98
fmt 2023-10-20 19:06:08 +02:00
aa5009e94c
Merge branch 'master' into anri 2023-10-20 18:53:21 +02:00
a8362a397f
Merge branch 'master' of https://gaufre.informatique.univ-paris-diderot.fr/aguatto/compilation-m1-2023 2023-10-20 18:51:39 +02:00
Adrien Guatto
82eb952fe8 flap : corrections mineures
Correction d'explications dans les commentaires.

Correction de l'affichage des types abstraits (pas de signe "="
superflu).
2023-10-18 23:17:29 +02:00
Nicolas PENELOUX
aa664edcd4 suite expressions 2023-10-18 22:35:14 +02:00
Nicolas PENELOUX
648076bb3e fix POr et PAnd, continuation d'expression 2023-10-18 18:31:18 +02:00
Nicolas PENELOUX
d1cdc273bd début expression parser et string lexer 2023-10-18 17:28:31 +02:00
2e44ba6dcd
fix recfunctions keyword 2023-10-18 13:59:54 +02:00
094f5f784a
Add error message for parsing, basic string and char support, also fix broken tokens 2023-10-18 00:02:59 +02:00
4ffd33ccc8
Merge branch 'nico' into anri 2023-10-17 18:31:29 +02:00
9b29e8fb8c
tokens 2023-10-17 17:48:00 +02:00
0e81edc636
type conflict 2023-10-17 17:29:40 +02:00
Nicolas PENELOUX
d957aa29a9 ajout pattern pour le parser, attention aux conflits never reduced de Or et And 2023-10-17 17:02:54 +02:00
3dc4a1068c
some definitions added 2023-10-17 16:49:43 +02:00
Nicolas PENELOUX
be467f3503 ajout type et fonction dans le parser 2023-10-17 16:19:51 +02:00
fadc63e30a
more cases for commentary 2023-10-17 15:05:05 +02:00
f11c33ff18
format 2023-10-17 11:49:13 +02:00
f9acb6c76e
Merge branch 'nico' into jalon1/anri 2023-10-17 11:34:04 +02:00
Nicolas PENELOUX
a58be772ac ajout parser et un peu lexer 2023-10-16 22:59:17 +02:00
Nicolas PENELOUX
04e06654de ajout parser et lexer (prof au niveau de RecFunctions) 2023-10-11 20:16:46 +02:00
99a124ce20
Merge branch 'master' into jalon1/anri 2023-10-09 18:05:46 +02:00
c8fa276e14
Mise a jour des auteurs 2023-10-09 18:04:35 +02:00
eb29cc6f2f
Merge branch 'master' of https://gaufre.informatique.univ-paris-diderot.fr/aguatto/compilation-m1-2023 2023-10-09 17:59:58 +02:00
Nicolas PENELOUX
35ecae440b ajout nouveauté lexer 2023-10-09 17:40:42 +02:00
Nicolas PENELOUX
69e027a8ba ajout fichier AUTEURS 2023-10-09 16:52:07 +02:00
Nicolas PENELOUX
115e4426bd ajout gestion commentaires 2023-10-09 13:41:21 +02:00
Adrien Guatto
ac53e8865a Remove duplicate file 2023-10-09 13:28:15 +02:00
0240ac6d4c
support of identifier and integers literal 2023-10-08 18:24:28 +02:00
e94cca2df9
ocamlformat 2023-10-08 16:02:06 +02:00
542d26fca0
Ignore tests files 2023-10-08 15:54:40 +02:00
4ec23c4b46
ignore build files and directories 2023-10-08 13:37:27 +02:00
Adrien Guatto
4640f3e910 Publication du jalon 1 2023-10-04 15:40:22 +02:00