aboutsummaryrefslogtreecommitdiff
path: root/ide
diff options
context:
space:
mode:
authorherbelin2009-06-29 19:15:14 +0000
committerherbelin2009-06-29 19:15:14 +0000
commitf8e2c78e8bfd8679a77e3cf676bde58c4efffd45 (patch)
tree6e49a2f913b740da6bb0d25228542fc669c87cb6 /ide
parent54723df2707b84d90ff6ca3c4285122405a39f6b (diff)
Miscellaneous practical commits:
- theories: made a hint database with the constructor of eq_true - coqide: binding F5 to About dans coqide + made coqide aware of string interpretation inside comments - lexer: added warning when ending comments inside a strings itself in a comment - xlate: completed patten-matching on IntroForthComing git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@12217 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'ide')
-rw-r--r--ide/coqide.ml8
-rw-r--r--ide/highlight.mll7
2 files changed, 15 insertions, 0 deletions
diff --git a/ide/coqide.ml b/ide/coqide.ml
index 14a0fd0371..01aef20fcd 100644
--- a/ide/coqide.ml
+++ b/ide/coqide.ml
@@ -2841,6 +2841,14 @@ with _ := Induction for _ Sort _.\n",61,10, Some GdkKeysyms._S);
())
in
let _ =
+ queries_factory#add_item "_About " ~key:GdkKeysyms._F5
+ ~callback:(fun () -> let term = get_current_word () in
+ (Command_windows.command_window ())#new_command
+ ~command:"About"
+ ~term
+ ())
+ in
+ let _ =
queries_factory#add_item "_Locate"
~callback:(fun () -> let term = get_current_word () in
(Command_windows.command_window ())#new_command
diff --git a/ide/highlight.mll b/ide/highlight.mll
index b791aa5098..4b36414d64 100644
--- a/ide/highlight.mll
+++ b/ide/highlight.mll
@@ -139,9 +139,16 @@ and next_interior_order = parse
and comment = parse
| "*)" { !comment_start,lexeme_end lexbuf,"comment" }
| "(*" { ignore (comment lexbuf); comment lexbuf }
+ | "\"" { string_in_comment lexbuf }
| _ { comment lexbuf }
| eof { raise End_of_file }
+and string_in_comment = parse
+ | "\"\"" { string_in_comment lexbuf }
+ | "\"" { comment lexbuf }
+ | _ { string_in_comment lexbuf }
+ | eof { raise End_of_file }
+
{
open Ideutils