m-m-m/base#8: bugfix

m-m-m · Dec 25, 2024 · 5a59ad9 · 5a59ad9
1 parent f1db927
commit 5a59ad9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/core/src/main/java/io/github/mmm/scanner/AbstractCharStreamScanner.java b/core/src/main/java/io/github/mmm/scanner/AbstractCharStreamScanner.java
@@ -433,7 +433,7 @@ public String readUntil(CharFilter filter, boolean acceptEot) {
       while (this.offset < this.limit) {
         int codePoint = this.buffer.codePointAt(this.offset);
         if (filter.accept(codePoint)) {
-          return getAppended(builder, start, this.offset - 1);
+          return getAppended(builder, start, this.offset);
         }
         handleCodePoint(codePoint);
         this.offset++;

diff --git a/core/src/main/java/io/github/mmm/scanner/CharSequenceScanner.java b/core/src/main/java/io/github/mmm/scanner/CharSequenceScanner.java
@@ -292,13 +292,13 @@ public String readUntil(CharFilter filter, boolean acceptEot) {
     while (this.offset < this.limit) {
       int cp = this.buffer.codePointAt(this.offset);
       if (filter.accept(cp)) {
-        return this.buffer.substring(start, this.offset + 1);
+        return this.buffer.substring(start, this.offset);
       }
       handleCodePoint(cp);
       this.offset++;
     }
     if (acceptEot) {
-      if (start > this.offset) {
+      if (this.offset > start) {
         return this.buffer.substring(start, this.offset);
       } else {
         return "";