Skip to content
Snippets Groups Projects
Commit 1c981724 authored by charguer's avatar charguer Committed by Thomas Wood
Browse files

merged

parent 623e3213
No related branches found
No related tags found
No related merge requests found
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
} }
#disp_env_pane { #disp_env_pane {
height: 150px; height: 180px;
} }
.CodeMirror-selected { background: #F3F781; } .CodeMirror-selected { background: #F3F781; }
......
...@@ -864,6 +864,7 @@ and js_of_path_longident path ident = ...@@ -864,6 +864,7 @@ and js_of_path_longident path ident =
| "&&" -> "&&" | "&&" -> "&&"
| "||" -> "||" | "||" -> "||"
(* for float: *) (* for float: *)
| "=" -> "=="
| "+." -> "+" | "+." -> "+"
| "*." -> "*" | "*." -> "*"
| "-." -> "-" | "-." -> "-"
...@@ -880,8 +881,6 @@ and js_of_path_longident path ident = ...@@ -880,8 +881,6 @@ and js_of_path_longident path ident =
| "/" -> "/" | "/" -> "/"
(* for string *) (* for string *)
| "^" -> "+" (* !!TODO: we want to claim ability to type our sublanguage, so we should not use this *) | "^" -> "+" (* !!TODO: we want to claim ability to type our sublanguage, so we should not use this *)
(* for equality *)
| "=" -> "=="
| res -> | res ->
let res = if !generate_qualified_names && (Path.head path).Ident.name <> "Stdlib" let res = if !generate_qualified_names && (Path.head path).Ident.name <> "Stdlib"
then ppf_path path else res in then ppf_path path else res in
......
...@@ -674,3 +674,39 @@ type codetype = ...@@ -674,3 +674,39 @@ type codetype =
| Coq_codetype_global [@f] | Coq_codetype_global [@f]
| Coq_codetype_eval [@f] | Coq_codetype_eval [@f]
(*
let thebound =
((fun p -> 1. +. (2. *. p))
((fun p -> 1. +. (2. *. p))
((fun p -> 1. +. (2. *. p))
((fun p -> 1. +. (2. *. p))
((fun p -> 1. +. (2. *. p))
((fun p -> 1. +. (2. *. p))
((fun p -> 1. +. (2. *. p))
((fun p -> 1. +. (2. *. p))
((fun p -> 1. +. (2. *. p))
((fun p -> 1. +. (2. *. p))
((fun p -> 1. +. (2. *. p))
((fun p -> 1. +. (2. *. p))
((fun p -> 1. +. (2. *. p))
((fun p -> 1. +. (2. *. p))
((fun p -> 1. +. (2. *. p))
((fun p -> 1. +. (2. *. p))
((fun p -> 1. +. (2. *. p))
((fun p -> 1. +. (2. *. p))
((fun p -> 1. +. (2. *. p))
((fun p -> 1. +. (2. *. p))
((fun p -> 1. +. (2. *. p))
((fun p -> 1. +. (2. *. p))
((fun p -> 1. +. (2. *. p))
((fun p -> 1. +. (2. *. p))
((fun p -> 1. +. (2. *. p))
((fun p -> 1. +. (2. *. p))
((fun p -> 1. +. (2. *. p))
((fun p -> 1. +. (2. *. p))
((fun p -> 1. +. (2. *. p))
((fun p -> 1. +. (2. *. p))
((fun p -> 1. +. (2. *. p))
1.)))))))))))))))))))))))))))))))
*)
\ No newline at end of file
...@@ -86,6 +86,7 @@ var source_files = [ ...@@ -86,6 +86,7 @@ var source_files = [
'var x = 2;\nx', 'var x = 2;\nx',
'"use strict";\nvar x = 1;\nx++;\nx', '"use strict";\nvar x = 1;\nx++;\nx',
'{} + {}', '{} + {}',
'x = [1]',
'throw 3', 'throw 3',
'var x = { a : 1, b : 2 }; ', 'var x = { a : 1, b : 2 }; ',
'var x = { a : 1 };\n x.b = 2;\nx', 'var x = { a : 1 };\n x.b = 2;\nx',
...@@ -1405,8 +1406,9 @@ readSourceParseAndRun(); ...@@ -1405,8 +1406,9 @@ readSourceParseAndRun();
// $("#reach_condition").val("I_line()"); // $("#reach_condition").val("I_line()");
// button_test_handler(); // button_test_handler();
//setExample(3); //
//stepTo(5873); //stepTo(5873);
setExample(3);
function showCurrent() { function showCurrent() {
console.log(tracer_items[tracer_pos]); console.log(tracer_items[tracer_pos]);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment