Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
J
jscoq-light
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Pierre Rousselin
jscoq-light
Commits
bba6e7bd
Commit
bba6e7bd
authored
Feb 3, 2022
by
Shachar Itzhaky
Browse files
Options
Downloads
Patches
Plain Diff
[port] Bump serapi to 0.15.0.
parent
53eadd92
No related branches found
No related tags found
No related merge requests found
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
.gitmodules
+1
-1
1 addition, 1 deletion
.gitmodules
coq-js/icoq.ml
+4
-4
4 additions, 4 deletions
coq-js/icoq.ml
coq-js/jscoq_doc.ml
+4
-4
4 additions, 4 deletions
coq-js/jscoq_doc.ml
coq-js/jscoq_doc.mli
+1
-1
1 addition, 1 deletion
coq-js/jscoq_doc.mli
coq-serapi
+1
-1
1 addition, 1 deletion
coq-serapi
with
11 additions
and
11 deletions
.gitmodules
+
1
−
1
View file @
bba6e7bd
...
...
@@ -5,4 +5,4 @@
[submodule "coq-serapi"]
path = coq-serapi
url = https://github.com/ejgallego/coq-serapi.git
branch = v8.1
4
branch = v8.1
5
This diff is collapsed.
Click to expand it.
coq-js/icoq.ml
+
4
−
4
View file @
bba6e7bd
...
...
@@ -105,7 +105,7 @@ let coq_init opts =
(* Core Coq initialization *)
Lib
.
init
()
;
Global
.
set_
engagement
Declarations
.
PredicativeSet
;
Global
.
set_
impredicative_set
false
;
Global
.
set_VM
false
;
Global
.
set_native_compiler
false
;
Flags
.
set_native_compiler
false
;
...
...
@@ -138,11 +138,11 @@ let new_doc opts =
let
mode_of_stm
~
doc
sid
=
match
Stm
.
state_of_id
~
doc
sid
with
|
`
Valid
(
Some
{
lemmas
=
Some
_
;
_
})
->
Proof
|
Valid
(
Some
{
lemmas
=
Some
_
;
_
})
->
Proof
|
_
->
General
let
context_of_st
m
=
match
m
with
|
`
Valid
(
Some
{
Vernacstate
.
lemmas
=
Some
lemma
;
_
}
)
->
|
Stm
.
Valid
(
Some
{
Vernacstate
.
lemmas
=
Some
lemma
;
_
}
)
->
Vernacstate
.
LemmaStack
.
with_top
lemma
~
f
:
(
fun
pstate
->
Declare
.
Proof
.
get_current_context
pstate
)
|
_
->
...
...
@@ -231,7 +231,7 @@ let compile_vo ~doc vo_out_fn =
(* freeze and un-freeze to to allow "snapshot" compilation *)
(* (normally, save_library_to closes the lib) *)
let
frz
=
Vernacstate
.
freeze_interp_state
~
marshallable
:
false
in
Library
.
save_library_to
Library
.
ProofsTodoNone
~
output_native_objects
:
false
dirp
vo_out_fn
(
Global
.
opaque_tables
()
)
;
Library
.
save_library_to
Library
.
ProofsTodoNone
~
output_native_objects
:
false
dirp
vo_out_fn
;
Vernacstate
.
unfreeze_interp_state
frz
;
Js_of_ocaml
.
Sys_js
.
read_file
~
name
:
vo_out_fn
...
...
...
...
This diff is collapsed.
Click to expand it.
coq-js/jscoq_doc.ml
+
4
−
4
View file @
bba6e7bd
...
...
@@ -136,14 +136,14 @@ let cancel ~doc can_st =
in
let
doc
,
eres
=
Stm
.
edit_at
~
doc
edit_st
in
match
eres
with
|
`
NewTip
->
c_ran
,
(
doc
,
k_ran
)
|
NewTip
->
c_ran
,
(
doc
,
k_ran
)
(* - [tip] is the new document tip.
- [st] -- [stop] is dropped.
- [stop] -- [tip] has been kept.
- [start] is where the editing zone starts
- [add] happen on top of [id].
*)
|
`
Focus
foc
->
cancel_interval
edit_st
foc
,
(
doc
,
sdoc
)
|
Focus
foc
->
cancel_interval
edit_st
foc
,
(
doc
,
sdoc
)
(* Edit is deprecated, we implement it in terms of cancel. *)
...
...
@@ -154,8 +154,8 @@ let edit ~doc edit_st =
else
let
doc
,
eres
=
Stm
.
edit_at
~
doc
edit_st
in
match
eres
with
|
`
NewTip
->
let
cc
,
sdoc
=
split_while
sdoc
~
f
:
(
fun
st
->
Stateid
.
newer_than
st
edit_st
)
in
cc
,
(
doc
,
sdoc
)
|
`
Focus
foc
->
cancel_interval
edit_st
foc
,
(
doc
,
sdoc
)
|
NewTip
->
let
cc
,
sdoc
=
split_while
sdoc
~
f
:
(
fun
st
->
Stateid
.
newer_than
st
edit_st
)
in
cc
,
(
doc
,
sdoc
)
|
Focus
foc
->
cancel_interval
edit_st
foc
,
(
doc
,
sdoc
)
let
observe
~
doc
sid
=
let
doc
,
sdoc
=
doc
in
...
...
...
...
This diff is collapsed.
Click to expand it.
coq-js/jscoq_doc.mli
+
1
−
1
View file @
bba6e7bd
...
...
@@ -24,7 +24,7 @@ val add :
ontop
:
Stateid
.
t
->
newid
:
Stateid
.
t
->
string
->
Loc
.
t
option
*
[
`NewTip
|
`Unfocus
of
Stateid
.
t
]
*
ser_doc
Loc
.
t
option
*
Stm
.
add_focus
*
ser_doc
val
query
:
doc
:
ser_doc
->
...
...
...
...
This diff is collapsed.
Click to expand it.
coq-serapi
@
9204d486
Compare
90649c9d
to
9204d486
Subproject commit 9
0649c9d1d1ded649cc37d020dc2e41143eea394
Subproject commit 9
204d486b50ed3c6ec5952cdcc895f762378d11c
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
sign in
to comment