Claudio/collection modules by crusso · Pull Request #220 · caffeinelabs/motoko

crusso · 2019-03-07T12:37:27Z

Matt, I've refactored the libraries to just used an immediate module construction. It gets rid of the boilerplate at the end if each library and avoid the Lib__ naming. See if you like it.

… collections

… as boolean lists

nomeata · 2019-03-07T13:02:08Z

Did you want this to be a PR against Matt’s branch? In that case, use the “Edit” button on top and change the target branch.

matthewhammer

These changes are great! The resulting code is much simpler and cleaner.
Thanks, @crusso!

matthewhammer · 2019-03-07T13:35:06Z

One minor question: Are we trying to merge into master, or into collection-modules, here?

matthewhammer · 2019-03-07T13:42:22Z

Hmm...perhaps it's time to start having the seeds of a quasi-official collections library in master?

Then, I can start working on the produce exchange example by doing PRs against master as well.

And, since all of this standard library work (current and future) is mostly independent of making changes to the compiler source, there's little harm in merging into master, rather than my working branch; I'd be happy to abandon these side branches, in preference of smaller PRs against master in the future.

What do other people think?

cc @nomeata @ggreif @rossberg

crusso · 2019-03-07T14:07:00Z

Oh, my intention was to merge into matt's collection-modules. It was just meant as a proposal. I'll retarget and @matthewhammer can decide what to with it.

@matthewhammer, I'm fine with you merging into master. Maybe the libraries should live under a meaningful folder though, like lib (perhaps do whatever the ocaml repo does).

nomeata · 2019-03-07T14:24:37Z

I am fine having it in master, if all code is actually built by our CI infrastructure, so that it does not rot.

matthewhammer · 2019-03-07T14:56:59Z

OK, I've moved things, per the slack discussion:

stdlib is a new sibling of samples and test, etc
stdlib/examples contains one (still nascent) example, the produce exchange.

Arguably, the examples subdirectory should really be merged somehow with samples subdirectory, except the latter is meant (I think) to contain self-contained samples, whereas the former are meant to all depend on the new standard library in very non-trivial ways, as will be the case with the produce exchange.

What do people think? Can we merge into master now? I'm happy to revisit this organization question later.

nomeata

Please make sure it is built from default.nix, in derivation native_test, just like test/ and samples/.

nomeata · 2019-03-07T15:09:35Z

stdlib/Makefile

@@ -0,0 +1,110 @@
+ASC=../src/asc
+OUTDIR=out


In the other directories, this is _out (not my convention, but let’s stick to it).

You should add a .gitignore here that ignores that directory.

nomeata · 2019-03-07T15:11:18Z

stdlib/nonCriticalPath/stream.as

@@ -0,0 +1,109 @@
+/*


What is the meaning of a nonCriticalPath subdirectory?

A temporary receptacle for code that I wrote, but that isn't "on the critical path" of what I need to implement the produce exchange.

I'm happy to remove it entirely, if that's preferable. Or, rename this subdirectory to something more suggestive of its role.

nomeata

LGTM, thanks!

ggreif

I'd love this to be tested in CI! Please merge soon.

## Changelog for candid: Branch: master Commits: [dfinity/candid@af281b25...5ab5d320](dfinity/candid@af281b2...5ab5d32) * [`a689de3e`](dfinity/candid@a689de3) fix typescript binding for tuple ([dfinity/candid⁠#219](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity/candid/issues/219)) * [`c9f06ebf`](dfinity/candid@c9f06eb) Rust support for Func and Service ([dfinity/candid⁠#218](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity/candid/issues/218)) * [`5ab5d320`](dfinity/candid@5ab5d32) release ([dfinity/candid⁠#220](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity/candid/issues/220))

matthewhammer added 30 commits February 4, 2019 13:15

list functions in AS, inspired by SML Basis library

947744f

done with SML basis List module; starting streams (aka lazy lists)

b97eb67

readme stub

2012f69

nits

35cf9aa

a stream function: mapfilter

5a470d7

another stream function: map

e3da12b

stream function 'merge'

6c9ad8e

nits; typos

4686876

address feedback from Andreas

4d3f864

fix type error, with Andreas's help

1a83957

fix type error, with Andreas's help

0ebde57

Merge branch 'collections' of github.com:dfinity-lab/actorscript into…

6e1f251

… collections

update readme

2b682e3

starting hashtrie; many loose ends remain

5a9149f

hashtrie construction operations; everything needs testing now

c8629f5

minor: md formatting

d4f9e91

minor: typo

5c25eed

minor

a978eb7

encode functional sets as hashtries; run a baby test, encoding hashes…

06b19fe

… as boolean lists

hashtrie: debugging reveals some bugs

95f41e4

hashtries: simple tests on sets pass; tests insertion & membership

415d631

hashtries: finish little tests on sets; fix typo

9236308

hashtrie: more emulation of sum types (see AST-42)

829003a

squash! hashtrie: more emulation of sum types (see AST-42)

5c36751

simple merge on hash tries; union on sets

2354ec7

minor: update issue link

0ed35ee

hash tries: conj, disj; sets: intersect

6ff2bf8

hashtrie: debugging conj and disj; disj has bugs

a4d439a

hashtrie: debug disj; write+test setCard, setEq

30ea11b

hashtrie: filter

5ddfcbb

crusso added 2 commits March 7, 2019 12:28

simplify fake module construction exploiting new { <decs>} syntax

97f15dd

indent 'module' bodies

1d4b273

crusso requested a review from matthewhammer March 7, 2019 12:38

forgot to fix SetDb.as

d0b0a8d

crusso mentioned this pull request Mar 7, 2019

WIP: Collection modules #218

Merged

matthewhammer reviewed Mar 7, 2019

View reviewed changes

matthewhammer approved these changes Mar 7, 2019

View reviewed changes

Makefile: module output files in a separate directory

6e9f054

crusso changed the base branch from master to collection-modules March 7, 2019 14:04

matthewhammer added 4 commits March 7, 2019 07:46

Makefile nits; more futzing for later

4ec6fc4

move collections in source tree

8953b59

fix Makefile, post move

165d088

move produce exchange to 'examples' subdir

5274e4c

matthewhammer changed the base branch from collection-modules to master March 7, 2019 14:53

nomeata suggested changes Mar 7, 2019

View reviewed changes

matthewhammer added 2 commits March 7, 2019 09:17

Makefile nits

7049305

add stdlib dir to other Makefile, and nix derivation

f580a97

matthewhammer requested a review from nomeata March 7, 2019 19:34

nomeata approved these changes Mar 8, 2019

View reviewed changes

ggreif reviewed Mar 8, 2019

View reviewed changes

matthewhammer merged commit f31baf1 into master Mar 11, 2019

nomeata deleted the claudio/collection-modules branch April 18, 2019 13:04

		@@ -0,0 +1,110 @@
		ASC=../src/asc
		OUTDIR=out

Conversation

crusso commented Mar 7, 2019

Uh oh!

nomeata commented Mar 7, 2019

Uh oh!

matthewhammer left a comment

Choose a reason for hiding this comment

Uh oh!

matthewhammer commented Mar 7, 2019

Uh oh!

matthewhammer commented Mar 7, 2019

Uh oh!

crusso commented Mar 7, 2019

Uh oh!

nomeata commented Mar 7, 2019

Uh oh!

matthewhammer commented Mar 7, 2019

Uh oh!

nomeata left a comment

Choose a reason for hiding this comment

Uh oh!

nomeata Mar 7, 2019

Choose a reason for hiding this comment

Uh oh!

matthewhammer Mar 7, 2019

Choose a reason for hiding this comment

Uh oh!

nomeata Mar 7, 2019

Choose a reason for hiding this comment

Uh oh!

matthewhammer Mar 7, 2019

Choose a reason for hiding this comment

Uh oh!

nomeata left a comment

Choose a reason for hiding this comment

Uh oh!

ggreif left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants