address review feedback

compiler/test/grainfmt/includes.expected.gr

@@ -10,12 +10,13 @@ include "array"
 include "array" as Foo
 from List use { length, map, forEach as each }
 from Opt use { MutableOpt, ImmutableOpt as Imm, type Opt, type Opt as OptAlias }
-from Opt use { /* comment1 */ /* comment2 */ /* comment3 */ /* comment4 */ /* comment5 */ /* comment6 */ /* comment7 */ /* comment8 */
+from Opt use { /* comment1 */ /* comment2 */ /* comment3 */ /* comment4 */ /* comment5 */ /* comment6 */ /* comment7 */ /* comment8 */ /* comment9 */
  MutableOpt,
  ImmutableOpt as Imm,
  type Opt,
  type Opt as OptAlias,
  exception Exc as E,
+ exception Exc2,
 }
 
 include "runtime/unsafe/wasmi32"

compiler/test/grainfmt/includes.input.gr

@@ -11,7 +11,7 @@ include /* special include */ "array"
 include "array" as /* special include */ Foo
 from List use { length, map, forEach as each }
 from Opt use { MutableOpt, ImmutableOpt as Imm, type Opt, type Opt as OptAlias }
-from Opt use { MutableOpt, /* comment1 */ ImmutableOpt /* comment2 */ as /* comment3 */ Imm /* comment4 */, /* comment5 */ type /* comment6 */ Opt, type Opt as /* comment7 */ OptAlias, exception Exc as /* comment8 */ E }
+from Opt use { MutableOpt, /* comment1 */ 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 { 

compiler/test/suites/provides.re

@@ -13,6 +13,7 @@ describe("provides", ({test, testSkip}) => {
  );
  let assertCompileError = makeCompileErrorRunner(test);
  let assertRunError = makeErrorRunner(test_or_skip);
+ let assertRun = makeRunner(test_or_skip);
  let assertHasWasmExport = (name, prog, export) => {
  test(
  name,
@@ -154,7 +155,7 @@ describe("provides", ({test, testSkip}) => {
  );
  assertRunError(
  "provide_exceptions1",
- "include \"provideException\"; from ProvideException use *; let f = () => if (true) { throw MyException }; f()",
+ "include \"provideException\"; let f = () => if (true) { throw ProvideException.MyException }; f()",
  "OriginalException",
  );
  assertRunError(
@@ -167,6 +168,26 @@ describe("provides", ({test, testSkip}) => {
  "include \"reprovideException\"; from ReprovideException use { exception MyException as E }; let f = () => if (true) { throw E }; f()",
  "OriginalException",
  );
+ assertRun(
+ "provide_exceptions4",
+ {|
+ include "reprovideException"
+ from ReprovideException use { exception MyException, excVal1, excVal2 }
+ match (excVal1) {
+ MyException => print("good1"),
+ _ => assert false,
+ }
+ match (excVal2) {
+ MyException => print("good2"),
+ _ => assert false,
+ }
+ match (MyException) {
+ ReprovideException.MyException => print("good3"),
+ _ => assert false,
+ }
+ |},
+ "good1\ngood2\ngood3\n",
+ );
 
  assertSnapshot("let_rec_provide", "provide let rec foo = () => 5");
 

compiler/test/test-libs/provideException.gr

@@ -2,4 +2,6 @@ module ProvideException
 
 exception OriginalException
 
-provide { exception OriginalException as MyException }
+let excVal1 = OriginalException
+
+provide { exception OriginalException as MyException, excVal1 }

compiler/test/test-libs/reprovideException.gr

@@ -1,6 +1,8 @@
 module ReprovideException
 
 include "./provideException"
-from ProvideException use { exception MyException }
+from ProvideException use { exception MyException, excVal1 }
 
-provide { exception MyException }
+let excVal2 = ProvideException.MyException
+
+provide { exception MyException, excVal1, excVal2 }