Skip to content

[version] Port to Coq 8.17 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 10, 2023
Merged

[version] Port to Coq 8.17 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
unreleased
----------

- Allow `?backend=js` in the URL to set backend to JS instead of WASM
(@ejgallego, #2)
- Port to jsCoq 8.17 , thanks to Shachar for a lot of help! (@ejgallego, #2)
- Initial version, thanks to all in Zulip for lots of feedback.
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ FILES_HTML=$(addsuffix .html,$(FILES))

all: $(FILES_HTML)

%.html: %.v %.glob
%.html: %.v %.glob jscoqdoc
./jscoqdoc $<

%.glob: %.v
Expand Down
4 changes: 3 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ We have customized the following files from the oficial distro:
+ custom load of packages in `jscoq-agent.js`
+ custom paths in `jscoqdoc` binary

We default to the WebAssembly jsCoq version.
We default to the WebAssembly jsCoq version, to update that set the
`backend:` parameter in the `jscoq-agent` file to `js` or use the
query `?backend=wa` in the jsCoq URL.

You may want to tweak more stuff too.

Expand Down
10 changes: 7 additions & 3 deletions jscoq-agent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* This script is adapted from the Software Foundations jsCoq build.
* So, it may require some tweaking depending on your development and styles.
*/
import { JsCoq, Deprettify } from './node_modules/wacoq/ui-js/index.js';
import { JsCoq, Deprettify } from './node_modules/jscoq/dist/frontend/index.js';

function jsCoqInject() {
var b = document.body;
Expand All @@ -22,7 +22,11 @@ var jsCoqShow = location.search === '?jscoq=on' ||
location.search !== '?jscoq=off' && localStorage.jsCoqShow === 'true';

var jscoq_ids = ['#main > div.code, #main > div.HIDEFROMHTML > div.code'];

var sp = new URLSearchParams(location.search);

var jscoq_opts = {
backend: sp.get('backend') || 'wa',
layout: 'flex',
show: jsCoqShow,
focus: false,
Expand All @@ -47,8 +51,8 @@ async function jsCoqLoad() {
page.setAttribute('tabindex', '-1');
page.focus();

// - load and start jsCoq
await JsCoq.load(jscoq_opts.base_path);
// - load and start jsCoq, not needed in 8.17
// await JsCoq.load(jscoq_opts.base_path);

Deprettify.REPLACES.push( // LF,PLF define their own versions (for Imp)
[/∨/g, '\\/'], [/∧/g, '/\\'], [/↔/g, '<->'], [/≤/g, '<='], [/≠/g, '<>'],
Expand Down
4 changes: 2 additions & 2 deletions jscoqdoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ const fs = require('fs'),
chld = require('child-process-promise');

const JSCOQ_URL = process.env['JSCOQ_URL'] || '.',
SCRIPTS = ["node_modules/wacoq/ui-js/jscoq-loader.js", "jscoq-agent.js"],
STYLES = ["node_modules/wacoq/ui-css/jscoqdoc.css"];
SCRIPTS = ["node_modules/jscoq/dist/frontend/index.js", "jscoq-agent.js"],
STYLES = ["node_modules/jscoq/dist/frontend/index.css", "node_modules/jscoq/frontend/classic/css/jscoqdoc.css"];

const DEFAULT_TEMPLATE =`
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
Expand Down
Loading