Commit 58102aad authored by auraes's avatar auraes 💬
Browse files

soi -lui eux remplacés par se lui leur

parent 42860477
......@@ -479,8 +479,8 @@ System_file;
'-la': _noun = la_obj;
'-l^': _noun = l_obj;
'-les': _noun = les_obj;
'lui': _noun = lui_obj;
'leur': _noun = leur_obj;
'lui': _noun = lui_obj;
'leur': _noun = leur_obj;
}
!FRENCH
if(_noun == 0) {
......
......@@ -1187,7 +1187,7 @@ Include "parser.h";
!FRENCH
Object selfobj "vous"
with
name 'se',
name 'se',
short_name "vous-même",
description "Ça a l'air bien !",
before NULL,
......
......@@ -123,33 +123,33 @@ System_file;
switch (w) { !y en
'se', 's^':
switch (w1) {
'le': w = "-le à soi";
'la': w = "-la à soi";
'les': w = "-les à soi";
'l^': w = "-l' à soi";
default: w = "soi"; r = 1;
'le': w = "-le à se";
'la': w = "-la à se";
'les': w = "-les à se";
'l^': w = "-l' à se";
default: w = "se"; r = 1;
}
'l^': w = "-l'"; r = 1;
'le':
switch (w1) {
'lui': w = "-le à -lui";
'leur': w = "-le à eux";
'lui': w = "-le à lui";
'leur': w = "-le à leur";
default: w = "-le"; r = 1;
}
'la':
switch (w1) {
'lui': w = "-la à -lui";
'leur': w = "-la à eux";
'lui': w = "-la à lui";
'leur': w = "-la à leur";
default: w = "-la"; r = 1;
}
'les':
switch (w1) {
'lui': w = "-les à -lui";
'leur': w = "-les à eux";
'lui': w = "-les à lui";
'leur': w = "-les à leur";
default: w = "-les"; r = 1;
}
'lui': w = -lui"; r = 1;
'leur': w = "à eux"; r = 1;
'lui': w = "à lui"; r = 1;
'leur': w = leur"; r = 1;
default: r = 0;
}
......@@ -210,33 +210,33 @@ System_file;
switch (w) { !y en
'se', 's^':
switch (w1) {
'le': w = "-le a soi";
'la': w = "-la a soi";
'les': w = "-les a soi";
'l^': w = "-l' a soi";
default: w = "soi"; r = 1;
'le': w = "-le a se";
'la': w = "-la a se";
'les': w = "-les a se";
'l^': w = "-l' a se";
default: w = "se"; r = 1;
}
'l^': w = "-l'"; r = 1;
'le':
switch (w1) {
'lui': w = "-le a -lui";
'leur': w = "-le a eux";
'lui': w = "-le a lui";
'leur': w = "-le a leur";
default: w = "-le"; r = 1;
}
'la':
switch (w1) {
'lui': w = "-la a -lui";
'leur': w = "-la a eux";
'lui': w = "-la a lui";
'leur': w = "-la a leur";
default: w = "-la"; r = 1;
}
'les':
switch (w1) {
'lui': w = "-les a -lui";
'leur': w = "-les a eux";
'lui': w = "-les a lui";
'leur': w = "-les a leur";
default: w = "-les"; r = 1;
}
'lui': w = "a -lui"; r = 1;
'leur': w = "a eux"; r = 1;
'lui': w = "a lui"; r = 1;
'leur': w = "a leur"; r = 1;
default: r = 0;
}
......
......@@ -36,7 +36,7 @@ System_file;
len_dic = (dict_end-dict_start)/dict_entry_size; !TODO Global
if (lgm>6) lgm = 6;
for (i=0 : i<len_dic : i++) { !WARNING si accents
w = HDR_DICTIONARY-->0+7+7*i; ! 7/9
w = HDR_DICTIONARY-->0+7+7*i;
@output_stream 3 StorageForShortName;
print (address) w;
@output_stream -3;
......@@ -64,15 +64,16 @@ System_file;
];
[ DecolleApostrophe motn at lgm w1 w2 v;
at = PosMot(motn);
lgm = WordLength(motn);
if (buffer->(at+1) ~= ''') return 0;
at = PosMot(motn) + 1;
lgm = WordLength(motn) - 2;
if (buffer->at ~= ''') return 0;
--at;
if (buffer->at == 'l') w1 = 'l^';
else if (buffer->at == 'd') w1 = 'de';
else if (buffer->at == 's') w1 = 'se';
else return 0;
w2 = DictWord(at+2, lgm-2);
at = at + 2;
w2 = DictWord(at, lgm);
if (w2) { !TODO optimiser
InsertWordParse(motn+1, w2);
parse-->(motn*2-1) = w1;
......@@ -106,13 +107,13 @@ System_file;
r = PosMot(i) + 1;
if (i == n) {
parse-->(i*2-1) = 'dj';
buffer->r = 'j';
!buffer->r = 'j';
}
else {
w1 = DicMot(i+1);
if (w1 && (w1->#dict_par1) & 8) {
parse-->(i*2-1) = 'dj';
buffer->r = 'j';
!buffer->r = 'j';
}
}
#EndIf;
......@@ -120,17 +121,15 @@ System_file;
}
if (n == 1) return;
!Pronoms avant le verbe
w1 = parse-->1;
w2 = parse-->3;
r = 1;
switch (w1) { !y en
'se', 'lui', 'leur': ;
'l^': w1 = '-l^';
'le': w1 = '-le';
'la': w1 = '-la';
'les': w1 = '-les';
'se', 'lui', 'leur': ;
default: r = 0;
}
if (r) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment