From d59ca34fcdf767e86985cedd881784d7b8bb05a2 Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Fri, 16 Jun 2023 22:24:37 +0100
Subject: Update PCollections to 4.0.1

---
 .../compiler/ast/typed/TypedFunctionDefinitionNode.java        |  6 +++---
 .../org/shedlang/compiler/typechecker/TypeCheckerContext.java  | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/main/java')

diff --git a/src/main/java/org/shedlang/compiler/ast/typed/TypedFunctionDefinitionNode.java b/src/main/java/org/shedlang/compiler/ast/typed/TypedFunctionDefinitionNode.java
index e4d9a7c6..524e11a3 100644
--- a/src/main/java/org/shedlang/compiler/ast/typed/TypedFunctionDefinitionNode.java
+++ b/src/main/java/org/shedlang/compiler/ast/typed/TypedFunctionDefinitionNode.java
@@ -1,7 +1,7 @@
 package org.shedlang.compiler.ast.typed;
 
 import org.pcollections.Empty;
-import org.pcollections.POrderedSet;
+import org.pcollections.OrderedPSet;
 import org.pcollections.PVector;
 import org.shedlang.compiler.sources.Source;
 import org.shedlang.compiler.sources.Sources;
@@ -57,7 +57,7 @@ public record TypedFunctionDefinitionNode(
             Empty.vector(),
             Optional.empty(),
             new TypedTypeLevelReferenceNode<>("Unit", Types.metaType(Types.UNIT), Sources.NULL),
-            Empty.orderedSet(),
+            OrderedPSet.empty(),
             Empty.vector()
         );
     }
@@ -68,7 +68,7 @@ public record TypedFunctionDefinitionNode(
         PVector<TypedParamNode> namedParams,
         Optional<TypedTypeLevelExpressionNode<Effect>> effect,
         TypedTypeLevelExpressionNode<Type> returnType,
-        POrderedSet<String> freeVariables,
+        OrderedPSet<String> freeVariables,
         PVector<TypedFunctionStatementNode> body
     ) {
         public TypedFunctionDefinitionNode build() {
diff --git a/src/main/java/org/shedlang/compiler/typechecker/TypeCheckerContext.java b/src/main/java/org/shedlang/compiler/typechecker/TypeCheckerContext.java
index a377058a..a3f63a2d 100644
--- a/src/main/java/org/shedlang/compiler/typechecker/TypeCheckerContext.java
+++ b/src/main/java/org/shedlang/compiler/typechecker/TypeCheckerContext.java
@@ -1,8 +1,8 @@
 package org.shedlang.compiler.typechecker;
 
 import org.pcollections.Empty;
+import org.pcollections.OrderedPSet;
 import org.pcollections.PMap;
-import org.pcollections.POrderedSet;
 import org.shedlang.compiler.types.NamespaceName;
 import org.shedlang.compiler.types.NamespaceTypeInfo;
 import org.shedlang.compiler.types.Type;
@@ -18,19 +18,19 @@ public class TypeCheckerContext {
     public static final TypeCheckerContext EMPTY = new TypeCheckerContext(
         Empty.map(),
         Set.of(),
-        Empty.orderedSet(),
+        OrderedPSet.empty(),
         Empty.map()
     );
 
     private final PMap<String, Type> environment;
     private final Set<String> boundVariables;
-    private final POrderedSet<String> freeVariables;
+    private final OrderedPSet<String> freeVariables;
     private final PMap<NamespaceName, NamespaceTypeInfo> namespaceTypeInfo;
 
     public TypeCheckerContext(
         PMap<String, Type> environment,
         Set<String> boundVariables,
-        POrderedSet<String> freeVariables,
+        OrderedPSet<String> freeVariables,
         PMap<NamespaceName, NamespaceTypeInfo> namespaceTypeInfo
     ) {
         this.environment = environment;
@@ -43,7 +43,7 @@ public class TypeCheckerContext {
         return new TypeCheckerContext(
             this.environment.plusAll(environment),
             environment.keySet(),
-            Empty.orderedSet(),
+            OrderedPSet.empty(),
             this.namespaceTypeInfo
         );
     }
-- 
cgit v1.2.3