move AlloyStrings to alloyast

QiyueChen04 · QiyueChen04 · commit b547b8a0d696 · 2025-10-15T21:24:58.000-04:00
diff --git a/app/src/main/java/ca/uwaterloo/watform/alloyast/AlloyFile.java b/app/src/main/java/ca/uwaterloo/watform/alloyast/AlloyFile.java
@@ -1,7 +1,7 @@
 package ca.uwaterloo.watform.alloyast;
 
 import ca.uwaterloo.watform.alloyast.paragraph.*;
-import ca.uwaterloo.watform.utils.AlloyStrings;
+import ca.uwaterloo.watform.alloyast.AlloyStrings;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/app/src/main/java/ca/uwaterloo/watform/alloyast/AlloyStrings.java b/app/src/main/java/ca/uwaterloo/watform/alloyast/AlloyStrings.java
@@ -1,4 +1,4 @@
-package ca.uwaterloo.watform.utils;
+package ca.uwaterloo.watform.alloyast;
 
 public final class AlloyStrings {
 	private AlloyStrings() {
diff --git a/app/src/main/java/ca/uwaterloo/watform/alloyast/expr/binary/AlloyAndExpr.java b/app/src/main/java/ca/uwaterloo/watform/alloyast/expr/binary/AlloyAndExpr.java
@@ -2,7 +2,7 @@
 
 import ca.uwaterloo.watform.alloyast.*;
 import ca.uwaterloo.watform.alloyast.expr.*;
-import ca.uwaterloo.watform.utils.AlloyStrings;
+import ca.uwaterloo.watform.alloyast.AlloyStrings;
 
 public final class AlloyAndExpr extends AlloyBinaryExpr {
 	public AlloyAndExpr(Pos pos, AlloyExpr left, AlloyExpr right) {
diff --git a/app/src/main/java/ca/uwaterloo/watform/alloyast/expr/binary/AlloyArrowExpr.java b/app/src/main/java/ca/uwaterloo/watform/alloyast/expr/binary/AlloyArrowExpr.java
@@ -2,7 +2,7 @@
 
 import ca.uwaterloo.watform.alloyast.*;
 import ca.uwaterloo.watform.alloyast.expr.*;
-import ca.uwaterloo.watform.utils.AlloyStrings;
+import ca.uwaterloo.watform.alloyast.AlloyStrings;
 
 public final class AlloyArrowExpr extends AlloyBinaryExpr {
 	public enum Mul {
diff --git a/app/src/main/java/ca/uwaterloo/watform/alloyast/expr/binary/AlloyDomRestrExpr.java b/app/src/main/java/ca/uwaterloo/watform/alloyast/expr/binary/AlloyDomRestrExpr.java
@@ -2,7 +2,7 @@
 
 import ca.uwaterloo.watform.alloyast.*;
 import ca.uwaterloo.watform.alloyast.expr.*;
-import ca.uwaterloo.watform.utils.AlloyStrings;
+import ca.uwaterloo.watform.alloyast.AlloyStrings;
 
 public final class AlloyDomRestrExpr extends AlloyBinaryExpr {
 	public AlloyDomRestrExpr(Pos pos, AlloyExpr left, AlloyExpr right) {
diff --git a/app/src/main/java/ca/uwaterloo/watform/alloyast/expr/binary/AlloyDotExpr.java b/app/src/main/java/ca/uwaterloo/watform/alloyast/expr/binary/AlloyDotExpr.java
@@ -2,7 +2,7 @@
 
 import ca.uwaterloo.watform.alloyast.*;
 import ca.uwaterloo.watform.alloyast.expr.*;
-import ca.uwaterloo.watform.utils.AlloyStrings;
+import ca.uwaterloo.watform.alloyast.AlloyStrings;
 
 public final class AlloyDotExpr extends AlloyBinaryExpr {
 	public AlloyDotExpr(Pos pos, AlloyExpr left, AlloyExpr right) {
diff --git a/app/src/main/java/ca/uwaterloo/watform/alloyast/expr/binary/AlloyIffExpr.java b/app/src/main/java/ca/uwaterloo/watform/alloyast/expr/binary/AlloyIffExpr.java
@@ -2,7 +2,7 @@
 
 import ca.uwaterloo.watform.alloyast.*;
 import ca.uwaterloo.watform.alloyast.expr.*;
-import ca.uwaterloo.watform.utils.AlloyStrings;
+import ca.uwaterloo.watform.alloyast.AlloyStrings;
 
 public final class AlloyIffExpr extends AlloyBinaryExpr {
 	public AlloyIffExpr(Pos pos, AlloyExpr left, AlloyExpr right) {
diff --git a/app/src/main/java/ca/uwaterloo/watform/alloyast/expr/binary/AlloyImpliesExpr.java b/app/src/main/java/ca/uwaterloo/watform/alloyast/expr/binary/AlloyImpliesExpr.java
@@ -2,7 +2,7 @@
 
 import ca.uwaterloo.watform.alloyast.*;
 import ca.uwaterloo.watform.alloyast.expr.*;
-import ca.uwaterloo.watform.utils.AlloyStrings;
+import ca.uwaterloo.watform.alloyast.AlloyStrings;
 
 public final class AlloyImpliesExpr extends AlloyBinaryExpr {
 	public AlloyImpliesExpr(Pos pos, AlloyExpr left, AlloyExpr right) {
diff --git a/app/src/main/java/ca/uwaterloo/watform/alloyast/expr/binary/AlloyIntersExpr.java b/app/src/main/java/ca/uwaterloo/watform/alloyast/expr/binary/AlloyIntersExpr.java
@@ -2,7 +2,7 @@
 
 import ca.uwaterloo.watform.alloyast.*;
 import ca.uwaterloo.watform.alloyast.expr.*;
-import ca.uwaterloo.watform.utils.AlloyStrings;
+import ca.uwaterloo.watform.alloyast.AlloyStrings;
 
 public final class AlloyIntersExpr extends AlloyBinaryExpr {
 	public AlloyIntersExpr(Pos pos, AlloyExpr left, AlloyExpr right) {
diff --git a/app/src/main/java/ca/uwaterloo/watform/alloyast/expr/binary/AlloyOrExpr.java b/app/src/main/java/ca/uwaterloo/watform/alloyast/expr/binary/AlloyOrExpr.java
@@ -2,7 +2,7 @@
 
 import ca.uwaterloo.watform.alloyast.*;
 import ca.uwaterloo.watform.alloyast.expr.*;
-import ca.uwaterloo.watform.utils.AlloyStrings;
+import ca.uwaterloo.watform.alloyast.AlloyStrings;
 
 public final class AlloyOrExpr extends AlloyBinaryExpr {
 	public AlloyOrExpr(Pos pos, AlloyExpr left, AlloyExpr right) {
diff --git a/app/src/main/java/ca/uwaterloo/watform/alloyast/expr/binary/AlloyRelOvrdExpr.java b/app/src/main/java/ca/uwaterloo/watform/alloyast/expr/binary/AlloyRelOvrdExpr.java
@@ -2,7 +2,7 @@
 
 import ca.uwaterloo.watform.alloyast.*;
 import ca.uwaterloo.watform.alloyast.expr.*;
-import ca.uwaterloo.watform.utils.AlloyStrings;
+import ca.uwaterloo.watform.alloyast.AlloyStrings;
 
 public final class AlloyRelOvrdExpr extends AlloyBinaryExpr {
 	public AlloyRelOvrdExpr(Pos pos, AlloyExpr left, AlloyExpr right) {
diff --git a/app/src/main/java/ca/uwaterloo/watform/alloyast/expr/binary/AlloyRngRestrExpr.java b/app/src/main/java/ca/uwaterloo/watform/alloyast/expr/binary/AlloyRngRestrExpr.java
@@ -2,7 +2,7 @@
 
 import ca.uwaterloo.watform.alloyast.*;
 import ca.uwaterloo.watform.alloyast.expr.*;
-import ca.uwaterloo.watform.utils.AlloyStrings;
+import ca.uwaterloo.watform.alloyast.AlloyStrings;
 
 public final class AlloyRngRestrExpr extends AlloyBinaryExpr {
 	public AlloyRngRestrExpr(Pos pos, AlloyExpr left, AlloyExpr right) {
diff --git a/app/src/main/java/ca/uwaterloo/watform/alloyast/expr/binary/AlloyStateSeqExpr.java b/app/src/main/java/ca/uwaterloo/watform/alloyast/expr/binary/AlloyStateSeqExpr.java
@@ -2,7 +2,7 @@
 
 import ca.uwaterloo.watform.alloyast.*;
 import ca.uwaterloo.watform.alloyast.expr.*;
-import ca.uwaterloo.watform.utils.AlloyStrings;
+import ca.uwaterloo.watform.alloyast.AlloyStrings;
 
 public final class AlloyStateSeqExpr extends AlloyBinaryExpr {
 	public AlloyStateSeqExpr(Pos pos, AlloyExpr left, AlloyExpr right) {
diff --git a/app/src/main/java/ca/uwaterloo/watform/alloyast/expr/helper/AlloyAsnExprHelper.java b/app/src/main/java/ca/uwaterloo/watform/alloyast/expr/helper/AlloyAsnExprHelper.java
@@ -4,7 +4,7 @@
 import ca.uwaterloo.watform.alloyast.AlloyASTNode;
 import ca.uwaterloo.watform.alloyast.expr.AlloyExpr;
 import ca.uwaterloo.watform.alloyast.expr.var.AlloyNameExpr;
-import ca.uwaterloo.watform.utils.AlloyStrings;
+import ca.uwaterloo.watform.alloyast.AlloyStrings;
 
 public final class AlloyAsnExprHelper extends AlloyASTNode {
 	public final AlloyNameExpr name;
diff --git a/app/src/main/java/ca/uwaterloo/watform/alloyast/expr/misc/AlloyBlock.java b/app/src/main/java/ca/uwaterloo/watform/alloyast/expr/misc/AlloyBlock.java
@@ -2,7 +2,7 @@
 
 import ca.uwaterloo.watform.alloyast.*;
 import ca.uwaterloo.watform.alloyast.expr.AlloyExpr;
-import ca.uwaterloo.watform.utils.AlloyStrings;
+import ca.uwaterloo.watform.alloyast.AlloyStrings;
 import java.util.Collections;
 import java.util.List;
 
diff --git a/app/src/main/java/ca/uwaterloo/watform/alloyast/expr/misc/AlloyIteExpr.java b/app/src/main/java/ca/uwaterloo/watform/alloyast/expr/misc/AlloyIteExpr.java
@@ -2,7 +2,7 @@
 
 import ca.uwaterloo.watform.alloyast.Pos;
 import ca.uwaterloo.watform.alloyast.expr.AlloyExpr;
-import ca.uwaterloo.watform.utils.AlloyStrings;
+import ca.uwaterloo.watform.alloyast.AlloyStrings;
 
 public final class AlloyIteExpr extends AlloyExpr {
 	public final AlloyExpr cond;
diff --git a/app/src/main/java/ca/uwaterloo/watform/alloyast/expr/misc/AlloyLetExpr.java b/app/src/main/java/ca/uwaterloo/watform/alloyast/expr/misc/AlloyLetExpr.java
@@ -3,7 +3,7 @@
 import ca.uwaterloo.watform.alloyast.*;
 import ca.uwaterloo.watform.alloyast.expr.*;
 import ca.uwaterloo.watform.alloyast.expr.helper.*;
-import ca.uwaterloo.watform.utils.AlloyStrings;
+import ca.uwaterloo.watform.alloyast.AlloyStrings;
 import java.util.Collections;
 import java.util.List;
 
diff --git a/app/src/main/java/ca/uwaterloo/watform/alloyast/expr/misc/AlloyParenExpr.java b/app/src/main/java/ca/uwaterloo/watform/alloyast/expr/misc/AlloyParenExpr.java
@@ -2,7 +2,7 @@
 
 import ca.uwaterloo.watform.alloyast.Pos;
 import ca.uwaterloo.watform.alloyast.expr.AlloyExpr;
-import ca.uwaterloo.watform.utils.AlloyStrings;
+import ca.uwaterloo.watform.alloyast.AlloyStrings;
 
 public final class AlloyParenExpr extends AlloyExpr {
 	public final AlloyExpr sub;
diff --git a/app/src/main/java/ca/uwaterloo/watform/alloyast/expr/unary/AlloyNumCardinalityExpr.java b/app/src/main/java/ca/uwaterloo/watform/alloyast/expr/unary/AlloyNumCardinalityExpr.java
@@ -2,7 +2,7 @@
 
 import ca.uwaterloo.watform.alloyast.*;
 import ca.uwaterloo.watform.alloyast.expr.*;
-import ca.uwaterloo.watform.utils.AlloyStrings;
+import ca.uwaterloo.watform.alloyast.AlloyStrings;
 
 public final class AlloyNumCardinalityExpr extends AlloyUnaryExpr {
 	public AlloyNumCardinalityExpr(Pos pos, AlloyExpr sub) {
diff --git a/app/src/main/java/ca/uwaterloo/watform/alloyast/expr/unary/AlloyNumIntExpr.java b/app/src/main/java/ca/uwaterloo/watform/alloyast/expr/unary/AlloyNumIntExpr.java
@@ -2,7 +2,7 @@
 
 import ca.uwaterloo.watform.alloyast.*;
 import ca.uwaterloo.watform.alloyast.expr.*;
-import ca.uwaterloo.watform.utils.AlloyStrings;
+import ca.uwaterloo.watform.alloyast.AlloyStrings;
 
 public final class AlloyNumIntExpr extends AlloyUnaryExpr {
 	public AlloyNumIntExpr(Pos pos, AlloyExpr sub) {
diff --git a/app/src/main/java/ca/uwaterloo/watform/alloyast/expr/unary/AlloyNumSumExpr.java b/app/src/main/java/ca/uwaterloo/watform/alloyast/expr/unary/AlloyNumSumExpr.java
@@ -2,7 +2,7 @@
 
 import ca.uwaterloo.watform.alloyast.*;
 import ca.uwaterloo.watform.alloyast.expr.*;
-import ca.uwaterloo.watform.utils.AlloyStrings;
+import ca.uwaterloo.watform.alloyast.AlloyStrings;
 
 public final class AlloyNumSumExpr extends AlloyUnaryExpr {
 	public AlloyNumSumExpr(Pos pos, AlloyExpr sub) {
diff --git a/app/src/main/java/ca/uwaterloo/watform/alloyast/expr/unary/AlloyPrimeExpr.java b/app/src/main/java/ca/uwaterloo/watform/alloyast/expr/unary/AlloyPrimeExpr.java
@@ -2,7 +2,7 @@
 
 import ca.uwaterloo.watform.alloyast.*;
 import ca.uwaterloo.watform.alloyast.expr.*;
-import ca.uwaterloo.watform.utils.AlloyStrings;
+import ca.uwaterloo.watform.alloyast.AlloyStrings;
 
 public final class AlloyPrimeExpr extends AlloyUnaryExpr {
 	public AlloyPrimeExpr(Pos pos, AlloyExpr sub) {
diff --git a/app/src/main/java/ca/uwaterloo/watform/alloyast/expr/unary/AlloyReflTransClosExpr.java b/app/src/main/java/ca/uwaterloo/watform/alloyast/expr/unary/AlloyReflTransClosExpr.java
@@ -2,7 +2,7 @@
 
 import ca.uwaterloo.watform.alloyast.*;
 import ca.uwaterloo.watform.alloyast.expr.*;
-import ca.uwaterloo.watform.utils.AlloyStrings;
+import ca.uwaterloo.watform.alloyast.AlloyStrings;
 
 public final class AlloyReflTransClosExpr extends AlloyUnaryExpr {
 	public AlloyReflTransClosExpr(Pos pos, AlloyExpr sub) {
diff --git a/app/src/main/java/ca/uwaterloo/watform/alloyast/expr/unary/AlloyTransClosExpr.java b/app/src/main/java/ca/uwaterloo/watform/alloyast/expr/unary/AlloyTransClosExpr.java
@@ -2,7 +2,7 @@
 
 import ca.uwaterloo.watform.alloyast.*;
 import ca.uwaterloo.watform.alloyast.expr.*;
-import ca.uwaterloo.watform.utils.AlloyStrings;
+import ca.uwaterloo.watform.alloyast.AlloyStrings;
 
 public final class AlloyTransClosExpr extends AlloyUnaryExpr {
 	public AlloyTransClosExpr(Pos pos, AlloyExpr sub) {
diff --git a/app/src/main/java/ca/uwaterloo/watform/alloyast/expr/unary/AlloyTransExpr.java b/app/src/main/java/ca/uwaterloo/watform/alloyast/expr/unary/AlloyTransExpr.java
@@ -2,7 +2,7 @@
 
 import ca.uwaterloo.watform.alloyast.*;
 import ca.uwaterloo.watform.alloyast.expr.*;
-import ca.uwaterloo.watform.utils.AlloyStrings;
+import ca.uwaterloo.watform.alloyast.AlloyStrings;
 
 public final class AlloyTransExpr extends AlloyUnaryExpr {
 	public AlloyTransExpr(Pos pos, AlloyExpr sub) {
diff --git a/app/src/main/java/ca/uwaterloo/watform/alloyast/expr/var/AlloyQnameExpr.java b/app/src/main/java/ca/uwaterloo/watform/alloyast/expr/var/AlloyQnameExpr.java
@@ -1,7 +1,7 @@
 package ca.uwaterloo.watform.alloyast.expr.var;
 
 import ca.uwaterloo.watform.alloyast.*;
-import ca.uwaterloo.watform.utils.AlloyStrings;
+import ca.uwaterloo.watform.alloyast.AlloyStrings;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
diff --git a/app/src/main/java/ca/uwaterloo/watform/alloyast/expr/var/AlloySeqIntExpr.java b/app/src/main/java/ca/uwaterloo/watform/alloyast/expr/var/AlloySeqIntExpr.java
@@ -2,7 +2,7 @@
 
 import ca.uwaterloo.watform.alloyast.*;
 import ca.uwaterloo.watform.alloyast.expr.AlloyExpr;
-import ca.uwaterloo.watform.utils.AlloyStrings;
+import ca.uwaterloo.watform.alloyast.AlloyStrings;
 
 public final class AlloySeqIntExpr extends AlloyVarExpr {
 	public AlloySeqIntExpr(Pos pos) {
diff --git a/app/src/main/java/ca/uwaterloo/watform/alloyast/expr/var/AlloySigIntExpr.java b/app/src/main/java/ca/uwaterloo/watform/alloyast/expr/var/AlloySigIntExpr.java
@@ -2,7 +2,7 @@
 
 import ca.uwaterloo.watform.alloyast.*;
 import ca.uwaterloo.watform.alloyast.expr.AlloyExpr;
-import ca.uwaterloo.watform.utils.AlloyStrings;
+import ca.uwaterloo.watform.alloyast.AlloyStrings;
 
 public final class AlloySigIntExpr extends AlloyVarExpr {
 	public AlloySigIntExpr(Pos pos) {
diff --git a/app/src/main/java/ca/uwaterloo/watform/alloyast/expr/var/AlloyStepsExpr.java b/app/src/main/java/ca/uwaterloo/watform/alloyast/expr/var/AlloyStepsExpr.java
@@ -2,7 +2,7 @@
 
 import ca.uwaterloo.watform.alloyast.*;
 import ca.uwaterloo.watform.alloyast.expr.AlloyExpr;
-import ca.uwaterloo.watform.utils.AlloyStrings;
+import ca.uwaterloo.watform.alloyast.AlloyStrings;
 
 public final class AlloyStepsExpr extends AlloyVarExpr {
 	public AlloyStepsExpr(Pos pos) {
diff --git a/app/src/main/java/ca/uwaterloo/watform/alloyast/expr/var/AlloyStringExpr.java b/app/src/main/java/ca/uwaterloo/watform/alloyast/expr/var/AlloyStringExpr.java
@@ -2,7 +2,7 @@
 
 import ca.uwaterloo.watform.alloyast.*;
 import ca.uwaterloo.watform.alloyast.expr.AlloyExpr;
-import ca.uwaterloo.watform.utils.AlloyStrings;
+import ca.uwaterloo.watform.alloyast.AlloyStrings;
 
 public final class AlloyStringExpr extends AlloyVarExpr {
 	public AlloyStringExpr(Pos pos) {
diff --git a/app/src/main/java/ca/uwaterloo/watform/alloyast/expr/var/AlloyUnivExpr.java b/app/src/main/java/ca/uwaterloo/watform/alloyast/expr/var/AlloyUnivExpr.java
@@ -2,7 +2,7 @@
 
 import ca.uwaterloo.watform.alloyast.*;
 import ca.uwaterloo.watform.alloyast.expr.AlloyExpr;
-import ca.uwaterloo.watform.utils.AlloyStrings;
+import ca.uwaterloo.watform.alloyast.AlloyStrings;
 
 public final class AlloyUnivExpr extends AlloyVarExpr {
 	public AlloyUnivExpr(Pos pos) {
diff --git a/app/src/main/java/ca/uwaterloo/watform/alloyast/misc/AlloyDecl.java b/app/src/main/java/ca/uwaterloo/watform/alloyast/misc/AlloyDecl.java
@@ -4,7 +4,7 @@
 import ca.uwaterloo.watform.alloyast.AlloyASTNode;
 import ca.uwaterloo.watform.alloyast.expr.AlloyExpr;
 import ca.uwaterloo.watform.alloyast.expr.var.AlloyNameExpr;
-import ca.uwaterloo.watform.utils.AlloyStrings;
+import ca.uwaterloo.watform.alloyast.AlloyStrings;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package ca.uwaterloo.watform.utils;`
	`1`	`+package ca.uwaterloo.watform.alloyast;`
`2`	`2`
`3`	`3`	`public final class AlloyStrings {`
`4`	`4`	`private AlloyStrings() {`