feat(compiler)!: Update use syntax (#2041)

Author: ospencer

compiler/src/formatting/fmt.re

@@ -2213,7 +2213,7 @@ let print_expression = (fmt, ~infix_wrap=d => group(indent(d)), expr) => {
            },
          )
     | PExpUse(ident, use_items) =>
-      string("from")
+      string("use")
       ++ fmt.print_comment_range(
            fmt,
            ~allow_breaks=false,
@@ -2224,7 +2224,7 @@ let print_expression = (fmt, ~infix_wrap=d => group(indent(d)), expr) => {
            ident.loc,
          )
       ++ fmt.print_identifier(fmt, ident.txt)
-      ++ string(" use ")
+      ++ string(".")
       ++ (
         switch (use_items) {
         | PUseAll =>

compiler/src/parsing/parser.messages

@@ -36,7 +36,7 @@ program: MODULE YIELD
 ## The known suffix of the stack is as follows:
 ## MODULE
 ##
-program: MODULE UIDENT EOL FROM YIELD
+program: MODULE UIDENT EOL USE YIELD
 ##
 ## Ends in an error in state: 40.
 ##
@@ -386,7 +386,7 @@ program: MODULE UIDENT EOL FOREIGN WASM LIDENT COLON LIDENT THICKARROW
 
 Expected the keyword `from` followed by an external WebAssembly namespace surrounded by `"`.
 
-program: MODULE UIDENT EOL FROM UIDENT YIELD
+program: MODULE UIDENT EOL USE UIDENT YIELD
 ##
 ## Ends in an error in state: 42.
 ##
@@ -402,9 +402,9 @@ program: MODULE UIDENT EOL FROM UIDENT YIELD
 ## In state 102, spurious reduction of production qualified_uid -> lseparated_nonempty_list_inner(dot,type_id_str)
 ##
 
-Expected the keyword `use` followed by items to use surrounded by `{}` or `*` to use all bindings.
+Expected `.` followed by items to use surrounded by `{}` or `*` to use all bindings.
 
-program: MODULE UIDENT EOL FROM UIDENT USE YIELD
+program: MODULE UIDENT EOL USE UIDENT DOT YIELD
 ##
 ## Ends in an error in state: 43.
 ##
@@ -413,10 +413,27 @@ program: MODULE UIDENT EOL FROM UIDENT USE YIELD
 ## The known suffix of the stack is as follows:
 ## FROM qualified_uid USE
 ##
+program: MODULE UIDENT EOL USE UIDENT DOT EOL YIELD
+##
+## Ends in an error in state: 92.
+##
+## lseparated_nonempty_list_inner(dot,type_id_str) -> lseparated_nonempty_list_inner(dot,type_id_str) DOT eols . type_id_str [ DOT ]
+## use_stmt -> USE lseparated_nonempty_list_inner(dot,type_id_str) DOT eols . use_shape [ THICKARROW STAR SLASH SEMI RPAREN RCARET RBRACK RBRACE PIPE LCARET INFIX_90 INFIX_80 INFIX_70 INFIX_60 INFIX_50 INFIX_40 INFIX_30 INFIX_120 INFIX_110 INFIX_100 EOL EOF ELSE DASH COMMA COLON AND ]
+##
+## The known suffix of the stack is as follows:
+## USE lseparated_nonempty_list_inner(dot,type_id_str) DOT eols
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 3, spurious reduction of production nonempty_list(eol) -> EOL
+## In state 6, spurious reduction of production eols -> nonempty_list(eol)
+##
 
 Expected bindings to use surrounded by `{}` or `*` to use all bindings.
 
-program: MODULE UIDENT EOL FROM UIDENT USE LBRACE YIELD
+program: MODULE UIDENT EOL USE UIDENT DOT LBRACE YIELD
 ##
 ## Ends in an error in state: 46.
 ##
@@ -434,7 +451,7 @@ program: MODULE UIDENT EOL FROM UIDENT USE LBRACE YIELD
 
 Expected a lowercase identifier to use a value, the keyword `module` followed by an uppercase identifier to use a module, or the keyword `type` followed by an uppercase identifier to use a type.
 
-program: MODULE UIDENT EOL FROM UIDENT USE LBRACE TYPE YIELD
+program: MODULE UIDENT EOL USE UIDENT DOT LBRACE TYPE YIELD
 ##
 ## Ends in an error in state: 48.
 ##
@@ -443,7 +460,7 @@ program: MODULE UIDENT EOL FROM UIDENT USE LBRACE TYPE YIELD
 ## The known suffix of the stack is as follows:
 ## TYPE
 ##
-program: MODULE UIDENT EOL FROM UIDENT USE LBRACE MODULE YIELD
+program: MODULE UIDENT EOL USE UIDENT DOT LBRACE MODULE YIELD
 ##
 ## Ends in an error in state: 57.
 ##
@@ -455,7 +472,7 @@ program: MODULE UIDENT EOL FROM UIDENT USE LBRACE MODULE YIELD
 
 Expected an uppercase type identifier.
 
-program: MODULE UIDENT EOL FROM UIDENT USE LBRACE EXCEPTION YIELD
+program: MODULE UIDENT EOL USE UIDENT DOT LBRACE EXCEPTION YIELD
 ##
 ## Ends in an error in state: 57.
 ##
@@ -582,7 +599,7 @@ program: MODULE UIDENT EOL PROVIDE LBRACE EXCEPTION YIELD
 
 Expected an exception identifier to provide.
 
-program: MODULE UIDENT EOL FROM UIDENT USE LBRACE LIDENT AS LIDENT YIELD
+program: MODULE UIDENT EOL USE UIDENT DOT LBRACE LIDENT AS LIDENT YIELD
 ##
 ## Ends in an error in state: 62.
 ##
@@ -619,7 +636,7 @@ program: MODULE UIDENT EOL PROVIDE LBRACE LIDENT AS YIELD
 
 Expected a lowercase alias.
 
-program: MODULE UIDENT EOL FROM UIDENT USE LBRACE LIDENT COMMA YIELD
+program: MODULE UIDENT EOL USE UIDENT DOT LBRACE LIDENT COMMA YIELD
 ##
 ## Ends in an error in state: 66.
 ##

compiler/src/parsing/parser.mly

@@ -354,7 +354,7 @@ use_shape:
   | lbrace use_items? rbrace { PUseItems (Option.value ~default:[] $2) }
 
 use_stmt:
-  | FROM qualified_uid USE use_shape { Expression.use ~loc:(to_loc $loc) ~core_loc:(to_loc $loc) $2 $4 }
+  | USE qualified_uid_inline dot use_shape { Expression.use ~loc:(to_loc $loc) ~core_loc:(to_loc $loc) $2 $4 }
 
 include_alias:
   | AS opt_eols qualified_uid { make_module_alias $3 }
@@ -486,8 +486,11 @@ qualified_lid:
   | modid dot id_str { mkid (List.append $1 [$3]) (to_loc $loc) }
   | id_str %prec EQUAL { (mkid [$1]) (to_loc $loc) }
 
+%inline qualified_uid_inline:
+  | lseparated_nonempty_list(dot, type_id_str) { (mkid $1) (to_loc $loc) }
+
 qualified_uid:
-  | lseparated_nonempty_list(dot, type_id_str) %prec DOT { (mkid $1) (to_loc $loc) }
+  | qualified_uid_inline %prec DOT { $1 }
 
 lid:
   | id_str { (mkid [$1]) (to_loc $loc) }

compiler/test/grainfmt/comments.expected.gr

@@ -257,7 +257,8 @@ let ( // yo
 let { /* foo */ foo } = void
 let { foo: /* foo */ bar } = void
 
-from Mod use { module /* Foo */ Foo, type /* Foo */ Foo, foo }
+use Mod.{ module /* Foo */ Foo, type /* Foo */ Foo, foo }
+use Mod.*
 
 match (5) {
   1 /* when */ when false => 5,
@@ -461,8 +462,8 @@ foo := /* foo */ /* foo */ foo
 
 return /* return */ foo
 
-from /* from */ Mod use /* Mod */ /* use */ *
-from /* from */ Mod use { /* Mod */ /* use */ foo }
+use /* use */ Mod./* Mod */ /* dot */ *
+use /* use */ Mod.{ /* Mod */ /* dot */ foo }
 
 while (/* true */ true) {
   void

compiler/test/grainfmt/comments.input.gr

@@ -233,7 +233,8 @@ let ( // yo
 let {foo: /* foo */ foo,} = void
 let {foo: /* foo */ bar,} = void
 
-from Mod use { module /* Foo */ Foo, type /* Foo */ Foo, foo }
+use Mod.{ module /* Foo */ Foo, type /* Foo */ Foo, foo }
+use Mod.*
 
 match (5) {
     1 /* when */ when false => 5,
@@ -386,8 +387,8 @@ foo /* foo */ := /* foo */ foo
 
 return /* return */ foo
 
-from /* from */ Mod /* Mod */ use /* use */ *
-from /* from */ Mod /* Mod */ use /* use */ {foo}
+use /* use */ Mod /* Mod */ . /* dot */ *
+use /* use */ Mod /* Mod */ . /* dot */ {foo}
 
 while /* true */ (true) {void}
 while (/* true */ true) {void}

compiler/test/grainfmt/includes.expected.gr

@@ -7,14 +7,14 @@ include "option" as Opt
 include "option" as Opt
 include /* special include */ "array"
 include "array" as /* special include */ Foo
-from List use { length, map, forEach as each }
-from Opt use {
+use List.{ length, map, forEach as each }
+use Opt.{
   module MutableOpt,
   module ImmutableOpt as Imm,
   type Opt,
   type Opt as OptAlias,
 }
-from Opt use {
+use Opt.{
   module MutableOpt, /* comment1 */
   module ImmutableOpt as /* comment2 */ /* comment3 */ Imm, /* comment4 */
   /* comment5 */
@@ -25,13 +25,13 @@ from Opt use {
 }
 
 include "runtime/unsafe/wasmi32"
-from WasmI32 use { add as (+), mul as (*), xor as (^), shl as (<<) }
+use WasmI32.{ add as (+), mul as (*), xor as (^), shl as (<<) }
 
 provide foreign wasm storage_read:
   (WasmI64, WasmI64, WasmI64) => WasmI64 as storageRead from "env"
 
 include "runtime/unsafe/wasmi32"
-from WasmI32 use {
+use WasmI32.{
   eq, // comment1
   // comment 3
   and_ as (&), // comment 2

compiler/test/grainfmt/includes.input.gr

@@ -8,12 +8,12 @@ include "option" as
  Opt
 include /* special include */ "array"
 include "array" as  /* special include */ Foo
-from List use { length, map, forEach as each }
-from Opt use { module MutableOpt, module ImmutableOpt as Imm, type Opt, type Opt as OptAlias }
-from Opt use { module MutableOpt, /* comment1 */ module ImmutableOpt /* comment2 */ as /* comment3 */ Imm /* comment4 */, /* comment5 */ type /* comment6 */ Opt, type Opt as /* comment7 */ OptAlias, exception Exc as /* comment8 */ E, exception Exc2 /* comment9 */ }
+use List.{ length, map, forEach as each }
+use Opt.{ module MutableOpt, module ImmutableOpt as Imm, type Opt, type Opt as OptAlias }
+use Opt.{ module MutableOpt, /* comment1 */ module ImmutableOpt /* comment2 */ as /* comment3 */ Imm /* comment4 */, /* comment5 */ type /* comment6 */ Opt, type Opt as /* comment7 */ OptAlias, exception Exc as /* comment8 */ E, exception Exc2 /* comment9 */ }
 
 include "runtime/unsafe/wasmi32"
-from WasmI32 use { 
+use WasmI32.{ 
   add as (+),
   mul as (*),
   xor as (^),
@@ -24,7 +24,7 @@ provide foreign wasm storage_read: (WasmI64, WasmI64, WasmI64) => WasmI64 as sto
 
 
 include "runtime/unsafe/wasmi32"
-from WasmI32 use {
+use WasmI32.{
   eq, // comment1
   // comment 3
   and_ as (&), // comment 2

compiler/test/input/letMutForLoop.gr

@@ -5,7 +5,7 @@ include "runtime/debugPrint"
 
 @unsafe
 let foo = () => {
-  from WasmI64 use { (+), (<) }
+  use WasmI64.{ (+), (<) }
   for (let mut x = 0N; x < 5N; x += 1N) {
     DebugPrint.printI64(x)
   }

compiler/test/input/list.gr

@@ -1,6 +1,6 @@
 module List
 
 include "list"
-from List use *
+use List.*
 
 print("OK")

compiler/test/input/long_lists.gr

@@ -1,7 +1,7 @@
 module LongLists
 
 include "list"
-from List use *
+use List.*
 
 let rec make_list = (x, n) => {
   let rec helper = (a, b, acc) => {