tree_store#get ~row:iter ~column:interp_no_col
end
+exception UseLibrary;;
let rec interactive_error_interp ~all_passes
(source_buffer:GSourceView.source_buffer) notify_exn offset errorll filename
return ()
);
connect_button dialog#disambiguationErrorsMoreErrors
- (fun _ -> return () ;
- interactive_error_interp ~all_passes:true source_buffer
- notify_exn offset errorll filename);
+ (fun _ -> return () ; raise UseLibrary);
connect_button dialog#disambiguationErrorsCancelButton fail;
dialog#disambiguationErrors#show ();
GtkThread.main ()
connect_menu_item main#ligatureButton self#nextSimilarSymbol;
ignore(source_buffer#connect#after#insert_text
~callback:(fun iter str ->
- if false && str = " " then self#expand_virtual_if_any iter " "));
+ if main#menuitemAutoAltL#active && str = " " then
+ ignore(self#expand_virtual_if_any iter " ")));
ignore (findRepl#findEntry#connect#activate find_forward);
(* interface lockers *)
let lock_world _ =
let thread_main =
fun () ->
lock_world ();
+ let saved_use_library= !MultiPassDisambiguator.use_library in
try
+ MultiPassDisambiguator.use_library := !all_disambiguation_passes;
f ();
+ MultiPassDisambiguator.use_library := saved_use_library;
unlock_world ()
with
| MultiPassDisambiguator.DisambiguationError (offset,errorll) ->
~all_passes:!all_disambiguation_passes source_buffer
notify_exn offset errorll (s())#filename
with
- exc -> notify_exn exc);
+ | UseLibrary ->
+ MultiPassDisambiguator.use_library := true;
+ (try f ()
+ with
+ | MultiPassDisambiguator.DisambiguationError (offset,errorll) ->
+ interactive_error_interp ~all_passes:true source_buffer
+ notify_exn offset errorll (s())#filename
+ | exc ->
+ notify_exn exc);
+ | exc -> notify_exn exc);
+ MultiPassDisambiguator.use_library := saved_use_library;
unlock_world ()
| exc ->
notify_exn exc;
~stop:(iter#copy#backward_chars
(MatitaGtkMisc.utf8_string_length inplaceof + len));
source_buffer#insert ~iter:(source_buffer#get_iter_at_mark `INSERT)
- (if inplaceof.[0] = '\\' then s else (s ^ tok))
- with Virtuals.Not_a_virtual -> ()
+ (if inplaceof.[0] = '\\' then s else (s ^ tok));
+ true
+ with Virtuals.Not_a_virtual -> false
method private nextSimilarSymbol () =
let write_similarsymbol s =
with GText.No_such_mark _ -> true
in
if new_similarsymbol then
+ (if not(self#expand_virtual_if_any (source_buffer#get_iter_at_mark `INSERT) "")then
let last_symbol =
let i = source_buffer#get_iter_at_mark `INSERT in
Glib.Utf8.first_char (i#get_slice ~stop:(i#copy#backward_chars 1))
in
(match Virtuals.similar_symbols last_symbol with
- | [] ->
- let i = source_buffer#get_iter_at_mark `INSERT in
- self#expand_virtual_if_any i ""
+ | [] -> ()
| hd :: next ::tl ->
let hd, tl =
if hd = last_symbol then next, tl @ [hd] else hd, (next::tl)
in
write_similarsymbol hd;
similarsymbols <- tl @ [ hd ]
- | _ -> assert false) (* singleton eq classes are a non sense *)
+ | _ -> assert false)) (* singleton eq classes are a non sense *)
else
match similarsymbols with
| [] -> ()