Skip to content
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.

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

Merge 'document/' directory of 'WebAssembly/reference-types/master', excluding 'document/js-api/'. #91

Merged
merged 503 commits into from
Dec 30, 2019

Conversation

ioannad
Copy link
Collaborator

@ioannad ioannad commented Dec 23, 2019

To work on the exception-handling formal spec, this repository should be up to date with the required reference-types spec.
I only merged the document/ directory (on which I plan to work) excluding document/js-api/ because of the open PR #86.
Another reason for not touching other directories except document\ is the open PR #28 which adds changes to interpreter/ and test/.

Ms2ger and others added 30 commits July 1, 2018 13:50
- Fulfill the test coverage of Alignment section
 - Centralize alignment relative tests in one file
They need four spaces rather than three to escape from the parent list.
* There was an extra `</span>` in the math fragments; this occurred when
  replacing the output before "katex-html". This removes the extra
  closing tag, and also adds a function to catch look for balanced tags
  in the math output. It's not very clever, but it works for the current
  math fragments.
* Some `<a>` tags were being generated with multiple "style" attributes,
  to prevent underlining links.
  The fix here is to add a new style section instead of annotating each
  element.
* The CSS validator doesn't seem to allow using an unknown font-family
  name in the font shorthand.
* s/whitespace/white-space/
This uses the same htmldiff script as found in the w3c HTML diff
service: https://services.w3.org/htmldiff

To diff locally, run: `make diff` in the core directory.
* Mark arguments as variables.

This is the standard bikeshed convention, and fixes some single-use variable
warnings.

* Fix links to 'resolve' for Promises.

Fixes #845.

* Fix interaction of notes and lists.

These notes should be part of a list item, rather than splitting the list.
These are no longer true, now that the mutable-globals proposal has been
merged into the spec.
rossberg and others added 18 commits September 30, 2019 13:28
I will be taking over Dan's duties as editor.
Similar to #1076, don't include index numbers in expected error messages
from validation. This allows implementations to avoid creating
dynamically formatted strings for validation error messages. Admittedly
this isn't a huge burden, but it does seem like something that shouldn't
be required to pass the spec test.
* Test that INT_MIN/0 gets a divide-by-zero trap.

* Test Unicode characters that differ with NFC, NFD, NFKC, and NFKD.

There are three characters whose normalization forms under NFC, NFD, NFKC,
and NFKD are all different. Test them.

* Add a testcase for unreachable in an if-then with no else.
according to
https://webassembly.github.io/spec/core/exec/instructions.html#exec-return
the `Return` instruction pops the top of the stack, until the next
frame. The equivalent in the reference interpreter should be to set
the value stack to `[]`. This is what is happening for `Break` as well.
So for consistency, also do it here.

This has no visible effect: If the first instruction is `Returning`, the
stack is ignored.
…s/master', excluding 'document/js-api/'.

In particular, I did the following:
```
 $ git remote add reference-types path/to/reference-types
 $ git fetch reference-types --tags
 $ git merge -v --no-commit --allow-unrelated-histories reference-types/master
 $ git reset -- document/js-api interpreter test papers proposals w3c.json deploy_key.enc README.md LICENSE .travis.yml .gitmodules .gitignore
```
@aheejin
Copy link
Member

aheejin commented Dec 29, 2019

Thank you! Sorry for the delayed reply.

I think we can also add JS-API; I'm not sure if #86 will be updated any time soon, and we also have another plans for JS API because of #89. All JS API changes can be rebased onto this, so I don't think it will be a problem.

And also I think we can update the interpreter too. #28 is an old PR that implements the first version of the spec, which had different sets of instructions. So I think we shouldn't wait on that PR either. But I also think the interpreter would better be updated by a separate PR.

Copy link
Member

@aheejin aheejin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you! Could you delete 'excluding ...' part from the title?

@aheejin aheejin merged commit 0d8fab6 into WebAssembly:master Dec 30, 2019
@rossberg
Copy link
Member

rossberg commented Jan 7, 2020

May I suggest that we only merge proposal dependencies wholesale? That is, if one proposal depends on another, merge/rebase the entire repo. Plus, document this dependency. That is the only way to stay up-to-date cleanly with upstream changes in the other repo and avoid versioning and merging chaos later (in my recent experience, that is already a hard enough problem without starting to fragment dependencies).

For example, a while ago I started rebasing the reftype proposal on the bulk proposal by merging it in.

ioannad pushed a commit to ioannad/exception-handling that referenced this pull request Jun 6, 2020
aheejin added a commit to aheejin/exception-handling that referenced this pull request Jun 12, 2020
…aster' (WebAssembly#91)"

This reverts commit 0d8fab6.

This reverts WebAssembly#91, which squashed all upstream commits into one, which
was not the recommended way in
https://github.com/WebAssembly/proposals/blob/master/howto.md#syncing-with-upstream-changes.
aheejin added a commit to aheejin/exception-handling that referenced this pull request Jun 12, 2020
…aster' (WebAssembly#91)"

This reverts commit 0d8fab6.

This reverts WebAssembly#91, which squashed all upstream commits into one, which
was not the recommended way in
https://github.com/WebAssembly/proposals/blob/master/howto.md#syncing-with-upstream-changes.
aheejin added a commit that referenced this pull request Jun 15, 2020
…aster' (#91)" (#117)

This reverts commit 0d8fab6.

This reverts #91, which squashed all upstream commits into one, which
was not the recommended way in
https://github.com/WebAssembly/proposals/blob/master/howto.md#syncing-with-upstream-changes.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.