X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=matita%2Fmatita%2Fcontribs%2Flambdadelta%2Fbin%2Frecomm%2FrecommParser.mly;h=5e71743a9a087a817fb4b232a7d0f98dd6a4509b;hb=3bf7a0b4185dbffe5b822c907956acdbe2d1c559;hp=79512c7c4db97c1250390960fe9ec6ad94116e6d;hpb=4d232392091ee233afc26ecf3120dd5f5c6a33c8;p=helm.git diff --git a/matita/matita/contribs/lambdadelta/bin/recomm/recommParser.mly b/matita/matita/contribs/lambdadelta/bin/recomm/recommParser.mly index 79512c7c4..5e71743a9 100644 --- a/matita/matita/contribs/lambdadelta/bin/recomm/recommParser.mly +++ b/matita/matita/contribs/lambdadelta/bin/recomm/recommParser.mly @@ -30,6 +30,10 @@ inn: | CW { $1 } | HW { $1 } +inn_w: + | inn { $1 } + | SR { $1 } + inns_r: | inn_r { $1 } | inn_r inns { $1 ^ $2 } @@ -38,6 +42,10 @@ inns: | inn { $1 } | inn inns { $1 ^ $2 } +inns_w: + | inn_w { $1 } + | inn_w inns_w { $1 ^ $2 } + out: | SP { $1 } | SR { $1 } @@ -79,16 +87,16 @@ sws: | SP sw sws { $2 :: $3 } src_l: - | NL { ET.Line $1 } - | OP sp PP inns CP { ET.Mark $4 } - | OP sp KW inns CP { ET.Key ($3, $4) } - | OP sp CW cws CP { ET.Title ($3 :: $4) } - | OP sp HW sws CP { ET.Slice (lc $3 :: $4) } - | OP sp CP { ET.Other ($1, $2, $3) } - | OP sp inns_r CP { ET.Other ($1, $2 ^ $3, $4) } - | OP SR inns CP { ET.Other ($1, $2 ^ $3, $4) } - | OP SR SR inns CP { ET.Other ($1, $2 ^ $3 ^ $4, $5) } - | OP SP SR inns CP { ET.Mark $4 } + | NL { ET.Line $1 } + | OP sp PP inns CP { ET.Mark $4 } + | OP sp KW inns_w CP { ET.Key ($3, $4) } + | OP sp CW cws CP { ET.Title ($3 :: $4) } + | OP sp HW sws CP { ET.Slice (lc $3 :: $4) } + | OP sp CP { ET.Other (0, $1, $2, $3) } + | OP sp inns_r CP { ET.Other (0, $1, $2 ^ $3, $4) } + | OP SR inns CP { ET.Other (1, $1, $2 ^ $3, $4) } + | OP SR SR inns CP { ET.Other (2, $1, $2 ^ $3 ^ $4, $5) } + | OP SP SR inns CP { ET.Mark $4 } src: | outs { ET.Text $1 }