Merge branch 'main' of github.com:subha0319/liquidjava

Author: subha0319

README.md

@@ -47,7 +47,7 @@ Additionally, you'll need the following dependency, which includes the LiquidJav
 #### Maven
 ```xml
 <dependency>
-    <groupId>io.github.rcosta358</groupId>
+    <groupId>io.github.liquid-java</groupId>
     <artifactId>liquidjava-api</artifactId>
     <version>0.0.3</version>
 </dependency>
@@ -60,7 +60,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'io.github.rcosta358:liquidjava-api:0.0.3'
+    implementation 'io.github.liquid-java:liquidjava-api:0.0.3'
 }
 ```
 

liquidjava-api/pom.xml

@@ -3,7 +3,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>io.github.rcosta358</groupId>
+	<groupId>io.github.liquid-java</groupId>
 	<artifactId>liquidjava-api</artifactId>
 	<version>0.0.3</version>
 	<name>liquidjava-api</name>

liquidjava-api/release.sh

@@ -0,0 +1 @@
+mvn -Dgpg.skip=false -Dmaven.deploy.skip=false clean deploy

liquidjava-example/pom.xml

@@ -48,7 +48,7 @@
 			<version>${version.memcompiler}</version>
 		</dependency>
 		<dependency>
-			<groupId>io.github.rcosta358</groupId>
+			<groupId>io.github.liquid-java</groupId>
 			<artifactId>liquidjava-api</artifactId>
 			<version>0.0.3</version>
 		</dependency>

liquidjava-example/src/main/java/testSuite/ErrorAfterIf.java

@@ -1,4 +1,4 @@
-// @ExpectedError: "Type expected:(#r_26 == a || #r_26 == b)"
+// @ExpectedError: "Type expected"
 package testSuite;
 
 import liquidjava.specification.Refinement;

liquidjava-example/src/main/java/testSuite/ErrorArithmeticBinaryOperations.java

@@ -1,4 +1,4 @@
-// @ExpectedError: "Type expected:(#z_2 > 0)"
+// @ExpectedError: "Type expected"
 package testSuite;
 
 import liquidjava.specification.Refinement;

liquidjava-example/src/main/java/testSuite/ErrorSimpleAssignment.java

@@ -1,4 +1,4 @@
-// @ExpectedError: "Type expected:(#c_0 > 2)"
+// @ExpectedError: "Type expected"
 package testSuite;
 
 import liquidjava.specification.Refinement;

liquidjava-verifier/pom.xml

@@ -172,7 +172,7 @@
 		</dependency>
 
 		<dependency>
-			<groupId>io.github.rcosta358</groupId>
+			<groupId>io.github.liquid-java</groupId>
 			<artifactId>liquidjava-api</artifactId>
 			<version>0.0.3</version>
 		</dependency>

liquidjava-verifier/src/test/java/liquidjava/api/tests/TestExamples.java

@@ -7,6 +7,7 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.stream.Stream;
+import java.util.Optional;
 import liquidjava.api.CommandLineLauncher;
 import liquidjava.diagnostics.ErrorEmitter;
 
@@ -51,16 +52,18 @@ public void testFile(final Path filePath) throws IOException {
                 fail();
             } else {
                 // NEW: Check if it's the *correct* error
-                String expectedError = getExpectedError(filePath);
+                Optional<String> expectedError = getExpectedError(filePath);
 
                 // If an expected error is specified in the file, check it.
-                // We check the 'title' for a match.
-                if (expectedError != null) {
-                    String actualErrorTitle = errorEmitter.getTitleMessage(); //
-                    if (actualErrorTitle == null || !actualErrorTitle.equals(expectedError)) {
+                if (expectedError.isPresent()) {
+                    String expected = expectedError.get();
+                    String actualErrorTitle = errorEmitter.getTitleMessage();
+
+                    if (actualErrorTitle == null || !actualErrorTitle.contains(expected)) {
                         System.out.println("Error in directory: " + fileName + " --- wrong error message found.");
-                        System.out.println("  Expected: " + expectedError);
-                        System.out.println("  Actual: " + (actualErrorTitle != null ? actualErrorTitle : "NULL"));
+                        System.out.println("  Expected to contain: \"" + expected + "\"");
+                        System.out.println("  Actual:              \""
+                                + (actualErrorTitle != null ? actualErrorTitle : "NULL") + "\"");
                         fail();
                     }
                 }
@@ -113,30 +116,29 @@ public void testMultiplePaths() {
     }
 
     /**
-     * Reads the given file to find an expected error message specified in a comment. The comment format is: //
-     * 
-     * @ExpectedError: "Error Title"
+     * Reads the given file to find an expected error message specified in a comment on the first line. The comment
+     * format is: // @ExpectedError: "Error Title"
      *
      * @param filePath
      *            path to the test file
      *
-     * @return The expected error title, or null if not specified.
+     * @return An Optional containing the expected error string, or Optional.empty() if not specified or if it's a
+     *         directory.
      *
      * @throws IOException
      *             if an I/O error occurs
      */
-    private String getExpectedError(Path filePath) throws IOException {
+    private Optional<String> getExpectedError(Path filePath) throws IOException {
         if (Files.isDirectory(filePath)) {
-            // Currently, we don't support expected errors for entire directories.
-            return null;
+            return Optional.empty();
         }
 
-        // Try to find the expected error comment in the first 10 lines
-        try (Stream<String> lines = Files.lines(filePath).limit(10)) {
-            return lines.map(String::trim).filter(line -> line.startsWith("// @ExpectedError:")).findFirst()
+        // Try to find the expected error comment on the first line
+        try (Stream<String> lines = Files.lines(filePath)) {
+            return lines.findFirst() // Get only the first line
+                    .map(String::trim).filter(line -> line.startsWith("// @ExpectedError:"))
                     .map(line -> line.substring(line.indexOf(":") + 1).trim()) // Get text after the colon
-                    .map(line -> line.replace("\"", "")) // Remove quotes
-                    .orElse(null); // No expected error specified
+                    .map(line -> line.replace("\"", "")); // Remove quotes
         }
     }
 }