Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Why3
why3
Commits
e3ed9e32
Commit
e3ed9e32
authored
Mar 23, 2017
by
Sylvain Dailler
Browse files
Adding error message.
parent
d599fad5
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/ide/why3.css
View file @
e3ed9e32
...
...
@@ -222,6 +222,12 @@ body {
width
:
100%
;
height
:
100%
;
}
#why3-log-container
{
overflow
:
auto
;
width
:
100%
;
height
:
100%
;
}
/******* CONTEXT MENU *********/
.why3-contextmenu
{
display
:
none
;
...
...
src/ide/why3.html
View file @
e3ed9e32
...
...
@@ -105,9 +105,9 @@
</div>
<span
class=
"why3-tab-label why3-widget why3-inactive"
>
Log
</span>
<div
class=
"why3-widget why3-tab"
>
<div
id=
"why3-
error
-container"
class=
"why3-container"
>
<div
id=
"why3-
log
-container"
class=
"why3-container"
>
<iframe
name=
"form-answer"
></iframe>
<div
id=
"why3-
error
-bg"
class=
"why3-widget"
>
<div
id=
"why3-
log
-bg"
class=
"why3-widget"
>
Log
</div>
</div>
</div>
...
...
@@ -136,8 +136,21 @@
</form>
</div>
<div
id=
"why3-resize-bar2"
class=
"why3-widget"
></div>
<div
id=
"why3-tab-container2"
>
<div
id=
"why3-tab-panel2"
>
<span
class=
"why3-widget"
></span>
<div
class=
"why3-widget"
>
<div
id=
"why3-editor-container2"
>
<div
id=
"why3-error-container"
class=
"why3-widget"
>
Error message
</div>
</div>
</div>
</div>
</div>
</div>
<!-- open and save -->
<a
id=
"why3-save-as"
href=
""
class=
"why3-hidden"
></a>
<input
id=
"why3-open"
type=
"file"
class=
"why3-hidden"
/>
...
...
src/ide/why3_js.ml
View file @
e3ed9e32
...
...
@@ -59,21 +59,25 @@ let getElement cast id =
(**********)
module
PE
=
struct
let
error
_panel
=
getElement
AsHtml
.
div
"why3-
error
-bg"
let
log
_panel
=
getElement
AsHtml
.
div
"why3-
log
-bg"
let
doc
=
Dom_html
.
document
let
error_container
=
getElement
AsHtml
.
div
"why3-error-container"
let
print
_cls
msg
=
let
node
=
doc
##
createElement
(
Js
.
string
"P"
)
in
let
textnode
=
doc
##
createTextNode
(
Js
.
string
msg
)
in
appendChild
node
textnode
;
appendChild
error
_panel
node
appendChild
log
_panel
node
let
error
_print_error
=
print
"why3-error"
let
log
_print_error
=
print
"why3-error"
let
error_print_msg
=
print
"why3-msg"
let
log_print_msg
=
print
"why3-msg"
let
error_print_msg
s
=
error_container
##.
innerHTML
:=
Js
.
string
s
(* TODO remove this *)
let
printAnswer
s
=
error
_print_msg
s
let
printAnswer
s
=
log
_print_msg
s
end
...
...
@@ -529,7 +533,7 @@ end
let
interpNotif
(
n
:
notification
)
=
match
n
with
|
Initialized
_g
->
PE
.
printAnswer
"Initialized"
PE
.
error_print_msg
"Initialized"
|
New_node
(
nid
,
parent
,
ntype
,
name
,
detached
)
->
TaskList
.
attach_new_node
nid
parent
ntype
name
detached
;
TaskList
.
onclick_do_something
(
string_of_int
nid
);
...
...
@@ -541,12 +545,37 @@ let interpNotif (n: notification) =
|
Remove
nid
->
TaskList
.
remove_node
(
string_of_int
nid
)
|
Saved
->
PE
.
printAnswer
"Saved"
|
Message
_
->
PE
.
error_print_msg
"Saved"
|
Message
m
->
begin
match
m
with
|
Proof_error
(
nid
,
s
)
->
PE
.
error_print_msg
(
Format
.
asprintf
"Proof error on selected node:
\"
%s
\"
"
s
)
|
Transf_error
(
nid
,
s
)
->
PE
.
error_print_msg
(
Format
.
asprintf
"Transformation error on selected node:
\"
%s
\"
"
s
)
|
Strat_error
(
nid
,
s
)
->
PE
.
error_print_msg
(
Format
.
asprintf
"Strategy error on selected node:
\"
%s
\"
"
s
)
|
Query_Error
(
nid
,
s
)
->
PE
.
error_print_msg
(
Format
.
asprintf
"Query error on selected node:
\"
%s
\"
"
s
)
|
Query_Info
(
nid
,
s
)
->
PE
.
error_print_msg
s
|
Help
s
->
PE
.
error_print_msg
s
|
Information
s
->
PE
.
error_print_msg
s
|
Error
s
->
PE
.
error_print_msg
(
Format
.
asprintf
"Error:
\"
%s
\"
"
s
)
|
Open_File_Error
s
->
PE
.
error_print_msg
(
Format
.
asprintf
"Error while opening file:
\"
%s
\"
"
s
)
|
_
->
()
;
let
s
=
Format
.
asprintf
"%a"
Json_util
.
print_notification
n
in
PE
.
printAnswer
s
end
|
Dead
s
->
PE
.
printAnswer
s
PE
.
error_print_msg
s
|
Node_change
(
nid
,
up
)
->
begin
match
up
with
...
...
@@ -639,20 +668,6 @@ let () =
ToolBar
.(
add_action
button_reload
(
fun
()
->
PE
.
printAnswer
"Reload"
;
TaskList
.
clear
()
;
sendRequest
Reload
))
let
()
=
ToolBar
.(
add_action
button_redo
(
fun
()
->
(*TaskList.print_msg "Redo";*)
(*interpNotif (New_node (0, 0, NRoot, "blah", false));*)
interpNotif
(
New_node
(
1
,
0
,
NFile
,
"beh"
,
false
));
interpNotif
(
New_node
(
2
,
1
,
NGoal
,
"beh2"
,
false
));
interpNotif
(
Node_change
(
1
,
Proved
true
));
(*TaskList.update_status `Unknown "1";
TaskList.onclick_do_something "1";*)
TaskList
.
remove_node
"2"
(* TODO remove seems to work ! *)
))
(* TODO Server handling *)
(*let () = Js.Unsafe.global##stopNotificationHandler <-
Js.wrap_callback stopNotificationHandler
...
...
src/session/itp_server.ml
View file @
e3ed9e32
...
...
@@ -749,7 +749,7 @@ module Make (S:Controller_itp.Scheduler) (P:Protocol) = struct
let
msg
=
Pp
.
sprintf
"%a"
(
get_exception_message
d
.
cont
.
controller_session
id
)
e
in
P
.
notify
(
Message
(
Strat
_error
(
node_ID_from_pn
id
,
msg
)))
P
.
notify
(
Message
(
Transf
_error
(
node_ID_from_pn
id
,
msg
)))
|
_
->
()
let
rec
apply_transform
nid
t
args
=
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment