From c1d45929983914b996eb113d140f546dc4ebc635 Mon Sep 17 00:00:00 2001 From: Denis Merigoux Date: Wed, 13 Sep 2023 14:14:47 +0200 Subject: [PATCH] Correct MR_* fields for characters with accents --- compiler/surface/lexer_pl.cppo.ml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/compiler/surface/lexer_pl.cppo.ml b/compiler/surface/lexer_pl.cppo.ml index 34ef9d66..d5f3aa6a 100644 --- a/compiler/surface/lexer_pl.cppo.ml +++ b/compiler/surface/lexer_pl.cppo.ml @@ -22,16 +22,19 @@ #define MS_CONSEQUENCE "konsekwencja" #define MS_DATA "dane" #define MS_DEPENDS "zależy od" -#define MR_DEPENDS "zależy", space_plus, "od" +#define MR_DEPENDS "zale", 0x017C, "y", space_plus, "od" #define MS_DECLARATION "deklaracja" #define MS_CONTEXT "kontekst" #define MS_DECREASING "malejący" +#define MR_DECREASING "malej", 0x0105, ",cy" #define MS_INCREASING "rosnący" +#define MR_INCREASING "rosn", 0x0105, "cy" #define MS_OF "z" #define MS_COLLECTION "kolekcja" #define MS_CONTAINS "zawiera" #define MS_ENUM "enumeracja" #define MS_INTEGER "całkowita" +#define MR_INTEGER "ca", 0x0142, "kowita" #define MS_MONEY "pieniądze" #define MR_MONEY "pieni", 0x0105, "dze" #define MS_TEXT "tekst" @@ -43,6 +46,7 @@ #define MS_BOOLEAN "zerojedynkowy" #define MS_SUM "suma" #define MS_FILLED "spełnione" +#define MR_FILLED "spe", 0x0142, "nione" #define MS_DEFINITION "definicja" #define MS_STATE "stan" #define MS_LABEL "etykieta" @@ -56,6 +60,7 @@ #define MS_UNDER_CONDITION "pod warunkiem" #define MR_UNDER_CONDITION "pod", space_plus, "warunkiem" #define MS_IF "jeżeli" +#define MR_IF "je", 0x017C, "eli" #define MS_THEN "wtedy" #define MS_ELSE "inaczej" #define MS_CONDITION "warunek" @@ -63,12 +68,14 @@ #define MS_STRUCT "struktura" #define MS_ASSERTION "asercja" #define MS_VARIES "różna" +#define MR_VARIES "r", 0xf3, 0x017C, "na" #define MS_WITH_V "wraz z" #define MR_WITH_V "wraz", space_plus, "z" #define MS_FOR "dla" #define MS_ALL "wszystkie" #define MS_WE_HAVE "mamy" #define MS_FIXED "stałoprzecinkowa" +#define MR_FIXED "sta", 0x0142, "oprzecinkowa" #define MS_BY "przez" #define MS_RULE "zasada" #define MS_LET "niech" @@ -77,7 +84,7 @@ #define MS_AMONG "wśród" #define MR_AMONG "w", 0x15B, "r", 0xf3, "d" #define MS_SUCH "takie że" -#define MR_SUCH "takie", space_plus, "że" +#define MR_SUCH "takie", space_plus, 0x017C, "e" #define MS_THAT "to" #define MS_AND "i" #define MS_OR "lub" @@ -90,9 +97,12 @@ #define MS_CARDINAL "liczba" #define MS_YEAR "rok" #define MS_MONTH "miesiąc" +#define MR_MONTH "miesi", 0x0105, "c" #define MS_DAY "dzień" +#define MR_DAY "dzie", 0x0144 #define MS_TRUE "prawda" #define MS_FALSE "fałsz" +#define MR_FALSE "fa", 0x0142, "sz" #define MS_INPUT "wejście" #define MR_INPUT "wej", 0x15B, "cie" #define MS_OUTPUT "wyjście"