let process_notation st =
match st with
- | Notation (loc, l1, associativity, precedence, l2) ->
+ | Notation (loc, dir, l1, associativity, precedence, l2) ->
let rule_id =
- CicNotationParser.extend l1 ?precedence ?associativity
- (fun env loc -> CicNotationFwd.instantiate_level2 env l2)
+ if dir <> Some `RightToLeft then
+ [ RuleId (CicNotationParser.extend l1 ?precedence ?associativity
+ (fun env loc -> CicNotationFwd.instantiate_level2 env l2)) ]
+ else
+ []
in
let pp_id =
- CicNotationRew.add_pretty_printer ?precedence ?associativity l2 l1
+ if dir <> Some `LeftToRight then
+ [ PrettyPrinterId
+ (CicNotationRew.add_pretty_printer ?precedence ?associativity
+ l2 l1) ]
+ else
+ []
in
- st, [ RuleId rule_id; PrettyPrinterId pp_id ]
+ st, rule_id @ pp_id
| Interpretation (loc, dsc, l2, l3) ->
let interp_id = CicNotationRew.add_interpretation dsc l2 l3 in
st, [ InterpretationId interp_id ]
let load_notation fname =
let ic = open_in fname in
- let istream = Stream.of_channel ic in
+ let lexbuf = Ulexing.from_utf8_channel ic in
try
while true do
- match GrafiteParser.parse_statement istream with
+ match GrafiteParser.parse_statement lexbuf with
| Executable (_, Command (_, cmd)) -> ignore (process_notation cmd)
| _ -> ()
done