diff options
author | glondu <glondu@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2009-09-17 15:58:14 +0000 |
---|---|---|
committer | glondu <glondu@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2009-09-17 15:58:14 +0000 |
commit | 61ccbc81a2f3b4662ed4a2bad9d07d2003dda3a2 (patch) | |
tree | 961cc88c714aa91a0276ea9fbf8bc53b2b9d5c28 /ide/gtk_parsing.ml | |
parent | 6d3fbdf36c6a47b49c2a4b16f498972c93c07574 (diff) |
Delete trailing whitespaces in all *.{v,ml*} files
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@12337 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'ide/gtk_parsing.ml')
-rw-r--r-- | ide/gtk_parsing.ml | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/ide/gtk_parsing.ml b/ide/gtk_parsing.ml index 8da4d9dda..e92a345e3 100644 --- a/ide/gtk_parsing.ml +++ b/ide/gtk_parsing.ml @@ -24,38 +24,38 @@ let is_word_char c = Glib.Unichar.isalnum c || c = underscore || c = prime -let starts_word (it:GText.iter) = +let starts_word (it:GText.iter) = prerr_endline ("Starts word ? '"^(Glib.Utf8.from_unichar it#char)^"'"); (not it#copy#nocopy#backward_char || (let c = it#backward_char#char in not (is_word_char c))) -let ends_word (it:GText.iter) = +let ends_word (it:GText.iter) = (not it#copy#nocopy#forward_char || let c = it#forward_char#char in not (is_word_char c) ) -let inside_word (it:GText.iter) = +let inside_word (it:GText.iter) = let c = it#char in not (starts_word it) && not (ends_word it) && is_word_char c -let is_on_word_limit (it:GText.iter) = inside_word it || ends_word it +let is_on_word_limit (it:GText.iter) = inside_word it || ends_word it let find_word_start (it:GText.iter) = let rec step_to_start it = prerr_endline "Find word start"; - if not it#nocopy#backward_char then + if not it#nocopy#backward_char then (prerr_endline "find_word_start: cannot backward"; it) else if is_word_char it#char then step_to_start it - else (it#nocopy#forward_char; + else (it#nocopy#forward_char; prerr_endline ("Word start at: "^(string_of_int it#offset));it) in step_to_start it#copy @@ -64,8 +64,8 @@ let find_word_start (it:GText.iter) = let find_word_end (it:GText.iter) = let rec step_to_end (it:GText.iter) = prerr_endline "Find word end"; - let c = it#char in - if c<>0 && is_word_char c then ( + let c = it#char in + if c<>0 && is_word_char c then ( ignore (it#nocopy#forward_char); step_to_end it ) else ( @@ -75,34 +75,34 @@ let find_word_end (it:GText.iter) = step_to_end it#copy -let get_word_around (it:GText.iter) = +let get_word_around (it:GText.iter) = let start = find_word_start it in let stop = find_word_end it in start,stop -let rec complete_backward w (it:GText.iter) = +let rec complete_backward w (it:GText.iter) = prerr_endline "Complete backward..."; - match it#backward_search w with + match it#backward_search w with | None -> (prerr_endline "backward_search failed";None) - | Some (start,stop) -> + | Some (start,stop) -> prerr_endline ("complete_backward got a match:"^(string_of_int start#offset)^(string_of_int stop#offset)); - if starts_word start then + if starts_word start then let ne = find_word_end stop in if ne#compare stop = 0 then complete_backward w start else Some (start,stop,ne) else complete_backward w start - -let rec complete_forward w (it:GText.iter) = + +let rec complete_forward w (it:GText.iter) = prerr_endline "Complete forward..."; - match it#forward_search w with + match it#forward_search w with | None -> None - | Some (start,stop) -> - if starts_word start then + | Some (start,stop) -> + if starts_word start then let ne = find_word_end stop in - if ne#compare stop = 0 then + if ne#compare stop = 0 then complete_forward w stop else Some (stop,stop,ne) else complete_forward w stop |