feat: add repro for issue #4323 and cater for a conformity annotation #4324

ggreif · 2023-12-14T19:24:37Z

reproduce feature request #4323 and implement it

This won't restrict the resulting type (as pointed out by @rossberg), but merely verifies the interface. public and type annotations on bindings inside the block are there for shaping the former (just like in class definitions).

TODO:

documentation
Changelog.md
resolve old-ish problem now marked with FIXME — chore: remove the FIXME for duplicated M0135 #4355

github-actions · 2023-12-14T19:44:44Z

Comparing from bd6bfa3 to fab8dd4:
In terms of gas, 1 tests regressed and the mean change is +0.2%.
In terms of size, no changes are observed in 5 tests.

and use `function`

doc/md/examples/grammar.txt

crusso · 2023-12-15T14:19:07Z

Cool. Have you got a follow on PR? This one makes the grammar a bit weird (pulling the equal sign into the annotation grammar), so I'd rather review the effect of both in case there's a cleaner refactoring.

ggreif · 2023-12-15T14:34:34Z

src/mo_frontend/parser.mly

+    { let t = Option.join t in
+      let sort = Type.(match s.it with
+                       | Actor -> "actor" | Module -> "module" | Object -> "object"
+                       | _ -> assert false) in


This covers Memory, but that cannot happen via obj_sort, so this is dead.

Use the same procedure as with `ClassD`, viz. adding an optional type to `ObjBlockE` and checking for it after inferring the body's type.

leave "strange" productions like ``` Motoko module M : module {} {} ``` where `}` and `{` collide, but we can rectify that by coming up with a formatter rule to insert `=` in-between

ggreif · 2024-01-08T19:41:07Z

doc/md/basic-concepts.md

@@ -150,7 +150,7 @@ x * y + x

 A declaration list is not itself (immediately) an *expression*, so we cannot (immediately) declare another variable with its final value (`3`).

-**Block expressions.** We can form a *block expression* from this list of declarations by enclosing it with matching *curly braces*. Blocks are only allowed as sub-expressions of control flow expressions like `if`, `loop`, `case`, etc. In all other places, we use `do { … }` to represent block expression, to distinguish blocks from object literals. For example, `do {}` is the empty block of type `()`, while `{}` is an empty record of record type `{}`.
+**Block expressions.** We can form a *block expression* from this list of declarations by enclosing it with matching *curly braces*. Blocks are only allowed as sub-expressions of control flow expressions like `if`, `loop`, `case`, etc. In all other places, we use `do { … }` to represent block expression, to distinguish blocks from object literals. For example, `do {}` is the empty block of type `()`, while `{}` is an empty record of record type `{}`.


There was an invisible character in do { … }, I deleted it, maybe I shouldn't have!

ggreif · 2024-01-08T19:43:00Z

doc/md/examples/grammar.txt

@@ -292,7 +292,7 @@
 <dec_nonvar> ::= 
    'let' <pat> '=' <exp>
    'type' <id> ('<' <list(<typ_bind>, ',')> '>')? '=' <typ>
-    <obj_sort> <id>? '='? <obj_body>
+    <obj_sort> <id>? (':' <typ>)? '='? <obj_body>


In the chapter of object declarations (grep for "where <obj_body> is of the form =? { <dec-field>;* }"), <obj_body> is said to contain the =?, but it is not consistent all over this document. This needs to be fixed-up.

I think it was a "hairline space" 0x200b. The =? problem was resolved in d1007d1.

doc/md/language-manual.md

crusso · 2024-01-09T15:27:47Z

src/mo_frontend/typing.ml

@@ -2434,7 +2445,7 @@ and infer_dec env dec : T.typ =
            display_typ_expand t'
            display_typ_expand t''
      | Some typ, T.Actor ->
-        local_error env dec.at "M0135" "actor class has non-async return type"
+         local_error env dec.at "M0135"(*FIXME: repeated?*) "actor class has non-async return type"


I'll try to fix this, though it is a previous problem.

crusso

LGTM

Co-authored-by: Claudio Russo <claudio@dfinity.org>

ggreif · 2024-01-10T11:14:27Z

@Mergifyio refresh

mergify · 2024-01-10T11:14:30Z

refresh

✅ Pull request refreshed

ggreif · 2024-01-10T12:47:07Z

Closes #4327.

ggreif added 2 commits December 14, 2023 20:23

add repro for issue 4323

99ba9cb

accept

93e7e1c

ggreif added 2 commits December 15, 2023 12:46

refactor

97ccbcf

make it annot_opt_eq

4bacb11

and use `function`

ggreif commented Dec 15, 2023

View reviewed changes

doc/md/examples/grammar.txt Outdated Show resolved Hide resolved

Update doc/md/examples/grammar.txt

2ce56d5

ggreif requested a review from crusso December 15, 2023 13:09

ggreif marked this pull request as ready for review December 15, 2023 13:09

resolve #4323 by allowing annotation

0fe3c0c

ggreif commented Dec 15, 2023

View reviewed changes

crusso mentioned this pull request Dec 15, 2023

simplify grammar? #4327

Closed

ggreif added 2 commits January 8, 2024 17:57

extending ObjBlockE with optional conformity (#4346)

672740f

Use the same procedure as with `ClassD`, viz. adding an optional type to `ObjBlockE` and checking for it after inferring the body's type.

simplify grammar back to how it was originally

35a406f

leave "strange" productions like ``` Motoko module M : module {} {} ``` where `}` and `{` collide, but we can rectify that by coming up with a formatter rule to insert `=` in-between

ggreif changed the title ~~chore: add repro for issue #4323~~ feat: add repro for issue #4323 and cater for conformity annotation Jan 8, 2024

ggreif added 2 commits January 8, 2024 19:32

Merge branch 'master' into gabor/4323

76ab70d

extend Changelog.md

e665214

ggreif changed the title ~~feat: add repro for issue #4323 and cater for conformity annotation~~ feat: add repro for issue #4323 and cater for a conformity annotation Jan 8, 2024

start documentation

8bea39a

ggreif commented Jan 8, 2024

View reviewed changes

finish docs, correcting problems

d1007d1

crusso reviewed Jan 9, 2024

View reviewed changes

doc/md/language-manual.md Outdated Show resolved Hide resolved

crusso reviewed Jan 9, 2024

View reviewed changes

doc/md/language-manual.md Outdated Show resolved Hide resolved

crusso reviewed Jan 9, 2024

View reviewed changes

crusso approved these changes Jan 9, 2024

View reviewed changes

ggreif and others added 3 commits January 9, 2024 16:40

Update doc/md/language-manual.md

cb43a1c

Co-authored-by: Claudio Russo <claudio@dfinity.org>

Update doc/md/language-manual.md

ebc94c0

Co-authored-by: Claudio Russo <claudio@dfinity.org>

tweak

268e6d5

add postive test

e273e79

ggreif added the automerge-squash When ready, merge (using squash) label Jan 10, 2024

mergify bot and others added 5 commits January 10, 2024 10:37

Merge branch 'master' into gabor/4323

ec5d442

Update B.mo

6cb219c

Update issue-4323.mo

60e7619

Update A.mo

a5fa053

Update C.mo

724b378

ggreif force-pushed the gabor/4323 branch from fab8dd4 to 724b378 Compare January 10, 2024 12:43

mergify bot mentioned this pull request Jan 10, 2024

chore: remove the FIXME for duplicated M0135 #4355

Merged

mergify bot merged commit 1235c57 into master Jan 10, 2024
17 checks passed

mergify bot removed the automerge-squash When ready, merge (using squash) label Jan 10, 2024

ggreif added typing Involves the type system feature New feature or request labels Jan 10, 2024

ggreif deleted the gabor/4323 branch January 24, 2024 12:03

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: add repro for issue #4323 and cater for a conformity annotation #4324

feat: add repro for issue #4323 and cater for a conformity annotation #4324

ggreif commented Dec 14, 2023 •

edited

Loading

github-actions bot commented Dec 14, 2023 •

edited

Loading

crusso commented Dec 15, 2023

ggreif Dec 15, 2023

ggreif Jan 8, 2024

ggreif Jan 8, 2024 •

edited

Loading

ggreif Jan 9, 2024

crusso Jan 9, 2024

ggreif Jan 9, 2024

crusso left a comment

ggreif commented Jan 10, 2024

mergify bot commented Jan 10, 2024

ggreif commented Jan 10, 2024

feat: add repro for issue #4323 and cater for a conformity annotation #4324

feat: add repro for issue #4323 and cater for a conformity annotation #4324

Conversation

ggreif commented Dec 14, 2023 • edited Loading

github-actions bot commented Dec 14, 2023 • edited Loading

crusso commented Dec 15, 2023

ggreif Dec 15, 2023

Choose a reason for hiding this comment

ggreif Jan 8, 2024

Choose a reason for hiding this comment

ggreif Jan 8, 2024 • edited Loading

Choose a reason for hiding this comment

ggreif Jan 9, 2024

Choose a reason for hiding this comment

crusso Jan 9, 2024

Choose a reason for hiding this comment

ggreif Jan 9, 2024

Choose a reason for hiding this comment

crusso left a comment

Choose a reason for hiding this comment

ggreif commented Jan 10, 2024

mergify bot commented Jan 10, 2024

✅ Pull request refreshed

ggreif commented Jan 10, 2024

ggreif commented Dec 14, 2023 •

edited

Loading

github-actions bot commented Dec 14, 2023 •

edited

Loading

ggreif Jan 8, 2024 •

edited

Loading