refactor

syjer · syjer · commit 24c6c346b328 · 2026-05-24T15:04:52.000+02:00
diff --git a/src/main/java/ch/digitalfondue/jfiveparse/Characters.java b/src/main/java/ch/digitalfondue/jfiveparse/Characters.java
@@ -24,7 +24,9 @@ final class Characters {
     static final char EXCLAMATION_MARK = 0x0021;
     /** & */
     static final char AMPERSAND = 0x0026;
+    /** < */
     static final char LESSTHAN_SIGN = 0x003C;
+    /** > */
     static final char GREATERTHAN_SIGN = 0x003E;
     static final char SOLIDUS = 0x002F;
     static final char QUESTION_MARK = 0x003F;
diff --git a/src/main/java/ch/digitalfondue/jfiveparse/ProcessedInputStream.java b/src/main/java/ch/digitalfondue/jfiveparse/ProcessedInputStream.java
@@ -52,12 +52,18 @@ int readUntilAttributeValue(ResizableCharBuilder builder, int quoteChar, boolean
         return readUntilAttributeValueInternal(builder, quoteChar, stopAtAmpersand);
     }
 
+    private static boolean mustStopReadUntilAttributeValueUnquoted(int chr) {
+        return Common.isTabLfFfCrOrSpace(chr) || chr == Characters.AMPERSAND || chr == Characters.GREATERTHAN_SIGN
+                || chr == Characters.NULL || chr == Characters.QUOTATION_MARK ||
+                chr == Characters.APOSTROPHE || chr == Characters.LESSTHAN_SIGN ||
+                chr == Characters.EQUALS_SIGN || chr == Characters.GRAVE_ACCENT || chr == Characters.EOF;
+    }
+
     int readUntilAttributeValueUnquoted(ResizableCharBuilder builder) {
         int chr;
         while (!buffer.isEmpty) {
             chr = buffer.removeFirst();
-            if (Common.isTabLfFfCrOrSpace(chr) || chr == Characters.AMPERSAND || chr == '>' || chr == Characters.NULL ||
-                    chr == '"' || chr == '\'' || chr == Characters.LESSTHAN_SIGN || chr == '=' || chr == '`' || chr == Characters.EOF) {
+            if (mustStopReadUntilAttributeValueUnquoted(chr)) {
                 return chr;
             }
             builder.append((char) chr);
@@ -77,12 +83,16 @@ int readUntilTagName(ResizableCharBuilder builder) {
         return readUntilTagNameInternal(builder);
     }
 
+    private static boolean mustStopReadUntilAttributeName(int chr) {
+        return Common.isTabLfFfCrOrSpace(chr) || chr == Characters.SOLIDUS || chr == Characters.EQUALS_SIGN || chr == Characters.GREATERTHAN_SIGN || chr == Characters.NULL ||
+                chr == Characters.QUOTATION_MARK || chr == Characters.APOSTROPHE || chr == Characters.LESSTHAN_SIGN || chr == Characters.EOF;
+    }
+
     int readUntilAttributeName(ResizableCharBuilder builder) {
         int chr;
         while (!buffer.isEmpty) {
             chr = buffer.removeFirst();
-            if (Common.isTabLfFfCrOrSpace(chr) || chr == Characters.SOLIDUS || chr == '=' || chr == '>' || chr == Characters.NULL ||
-                    chr == '"' || chr == '\'' || chr == Characters.LESSTHAN_SIGN || chr == Characters.EOF) {
+            if (mustStopReadUntilAttributeName(chr)) {
                 return chr;
             }
             builder.append((char) chr);
@@ -94,7 +104,7 @@ int readUntilComment(ResizableCharBuilder builder) {
         int chr;
         while (!buffer.isEmpty) {
             chr = buffer.removeFirst();
-            if (chr == '-' || chr == Characters.NULL || chr == Characters.EOF) {
+            if (chr == Characters.HYPHEN_MINUS || chr == Characters.NULL || chr == Characters.EOF) {
                 return chr;
             }
             builder.append((char) chr);
@@ -104,70 +114,68 @@ int readUntilComment(ResizableCharBuilder builder) {
 
     protected int readUntilInternal(ResizableCharBuilder builder, boolean stopAtAmpersand, boolean stopAtLessThan) {
         int chr;
-        while ((chr = read()) != -1) {
+        while ((chr = read()) != Characters.EOF) {
             if ((stopAtAmpersand && chr == Characters.AMPERSAND) || (stopAtLessThan && chr == Characters.LESSTHAN_SIGN) || chr == Characters.NULL) {
                 return chr;
             }
             builder.append((char) chr);
         }
-        return -1;
+        return Characters.EOF;
     }
 
     protected int readUntilAttributeValueInternal(ResizableCharBuilder builder, int quoteChar, boolean stopAtAmpersand) {
         int chr;
-        while ((chr = read()) != -1) {
+        while ((chr = read()) != Characters.EOF) {
             if (chr == quoteChar || (stopAtAmpersand && chr == Characters.AMPERSAND) || chr == Characters.NULL) {
                 return chr;
             }
             builder.append((char) chr);
         }
-        return -1;
+        return Characters.EOF;
     }
 
     protected int readUntilAttributeValueUnquotedInternal(ResizableCharBuilder builder) {
         int chr;
-        while ((chr = read()) != -1) {
-            if (Common.isTabLfFfCrOrSpace(chr) || chr == Characters.AMPERSAND || chr == '>' || chr == Characters.NULL ||
-                    chr == '"' || chr == '\'' || chr == Characters.LESSTHAN_SIGN || chr == '=' || chr == '`') {
+        while ((chr = read()) != Characters.EOF) {
+            if (mustStopReadUntilAttributeValueUnquoted(chr)) {
                 return chr;
             }
             builder.append((char) chr);
         }
-        return -1;
+        return Characters.EOF;
     }
 
     protected int readUntilTagNameInternal(ResizableCharBuilder builder) {
         int chr;
-        while ((chr = read()) != -1) {
+        while ((chr = read()) != Characters.EOF) {
             if (Common.isTabLfFfCrOrSpace(chr) || chr == Characters.SOLIDUS || chr == Characters.GREATERTHAN_SIGN || chr == Characters.NULL) {
                 return chr;
             }
             builder.append((char) chr);
         }
-        return -1;
+        return Characters.EOF;
     }
 
     protected int readUntilAttributeNameInternal(ResizableCharBuilder builder) {
         int chr;
-        while ((chr = read()) != -1) {
-            if (Common.isTabLfFfCrOrSpace(chr) || chr == Characters.SOLIDUS || chr == '=' || chr == '>' || chr == Characters.NULL ||
-                    chr == '"' || chr == '\'' || chr == Characters.LESSTHAN_SIGN) {
+        while ((chr = read()) != Characters.EOF) {
+            if (mustStopReadUntilAttributeName(chr)) {
                 return chr;
             }
             builder.append((char) chr);
         }
-        return -1;
+        return Characters.EOF;
     }
 
     protected int readUntilCommentInternal(ResizableCharBuilder builder) {
         int chr;
-        while ((chr = read()) != -1) {
-            if (chr == '-' || chr == Characters.NULL) {
+        while ((chr = read()) != Characters.EOF) {
+            if (chr == Characters.HYPHEN_MINUS || chr == Characters.NULL) {
                 return chr;
             }
             builder.append((char) chr);
         }
-        return -1;
+        return Characters.EOF;
     }
 
     //
@@ -234,7 +242,7 @@ static class StringProcessedInputStream extends ProcessedInputStream {
         // used for test
         protected int getCharAt(int pos) {
             if (pos >= length) {
-                return -1;
+                return Characters.EOF;
             }
             return input[pos];
         }
@@ -244,7 +252,7 @@ protected int read() {
             if (pos < length) {
                 return input[pos++];
             }
-            return -1;
+            return Characters.EOF;
         }
 
         @Override
@@ -262,7 +270,7 @@ protected int readUntilInternal(ResizableCharBuilder builder, boolean stopAtAmpe
             }
             builder.append(input, pos, n - pos);
             pos = n;
-            return -1;
+            return Characters.EOF;
         }
 
         @Override
@@ -280,7 +288,7 @@ protected int readUntilAttributeValueInternal(ResizableCharBuilder builder, int
             }
             builder.append(input, pos, n - pos);
             pos = n;
-            return -1;
+            return Characters.EOF;
         }
 
         @Override
@@ -289,8 +297,7 @@ protected int readUntilAttributeValueUnquotedInternal(ResizableCharBuilder build
             int i = pos;
             while (i < n) {
                 char c = input[i];
-                if (Common.isTabLfFfCrOrSpace(c) || c == Characters.AMPERSAND || c == '>' || c == Characters.NULL ||
-                        c == '"' || c == '\'' || c == Characters.LESSTHAN_SIGN || c == '=' || c == '`') {
+                if (mustStopReadUntilAttributeValueUnquoted(c)) {
                     builder.append(input, pos, i - pos);
                     pos = i + 1;
                     return c;
@@ -299,7 +306,7 @@ protected int readUntilAttributeValueUnquotedInternal(ResizableCharBuilder build
             }
             builder.append(input, pos, n - pos);
             pos = n;
-            return -1;
+            return Characters.EOF;
         }
 
         @Override
@@ -317,7 +324,7 @@ protected int readUntilTagNameInternal(ResizableCharBuilder builder) {
             }
             builder.append(input, pos, n - pos);
             pos = n;
-            return -1;
+            return Characters.EOF;
         }
 
         @Override
@@ -326,17 +333,16 @@ protected int readUntilAttributeNameInternal(ResizableCharBuilder builder) {
             int i = pos;
             while (i < n) {
                 char c = input[i];
-                if (Common.isTabLfFfCrOrSpace(c) || c == Characters.SOLIDUS || c == '=' || c == '>' || c == Characters.NULL ||
-                        c == '"' || c == '\'' || c == Characters.LESSTHAN_SIGN) {
-                    builder.append(input, pos, i - pos);
+                if (mustStopReadUntilAttributeName(c)) {
+                    builder.append(input, pos, i - pos); // append remaining
                     pos = i + 1;
                     return c;
                 }
                 i++;
             }
             builder.append(input, pos, n - pos);
             pos = n;
-            return -1;
+            return Characters.EOF;
         }
 
         @Override
@@ -354,7 +360,7 @@ protected int readUntilCommentInternal(ResizableCharBuilder builder) {
             }
             builder.append(input, pos, n - pos);
             pos = n;
-            return -1;
+            return Characters.EOF;
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -52,12 +52,18 @@ int readUntilAttributeValue(ResizableCharBuilder builder, int quoteChar, boolean`
`52`	`52`	`return readUntilAttributeValueInternal(builder, quoteChar, stopAtAmpersand);`
`53`	`53`	`}`
`54`	`54`
	`55`	`+ private static boolean mustStopReadUntilAttributeValueUnquoted(int chr) {`
	`56`	`+ return Common.isTabLfFfCrOrSpace(chr) \|\| chr == Characters.AMPERSAND \|\| chr == Characters.GREATERTHAN_SIGN`
	`57`	`+ \|\| chr == Characters.NULL \|\| chr == Characters.QUOTATION_MARK \|\|`
	`58`	`+ chr == Characters.APOSTROPHE \|\| chr == Characters.LESSTHAN_SIGN \|\|`
	`59`	`+ chr == Characters.EQUALS_SIGN \|\| chr == Characters.GRAVE_ACCENT \|\| chr == Characters.EOF;`
	`60`	`+ }`
	`61`	`+`
`55`	`62`	`int readUntilAttributeValueUnquoted(ResizableCharBuilder builder) {`
`56`	`63`	`int chr;`
`57`	`64`	`while (!buffer.isEmpty) {`
`58`	`65`	`chr = buffer.removeFirst();`
`59`		`- if (Common.isTabLfFfCrOrSpace(chr) \|\| chr == Characters.AMPERSAND \|\| chr == '>' \|\| chr == Characters.NULL \|\|`
`60`		- chr == '"' \|\| chr == '\'' \|\| chr == Characters.LESSTHAN_SIGN \|\| chr == '=' \|\| chr == '`' \|\| chr == Characters.EOF) {
	`66`	`+ if (mustStopReadUntilAttributeValueUnquoted(chr)) {`
`61`	`67`	`return chr;`
`62`	`68`	`}`
`63`	`69`	`builder.append((char) chr);`
`@@ -77,12 +83,16 @@ int readUntilTagName(ResizableCharBuilder builder) {`
`77`	`83`	`return readUntilTagNameInternal(builder);`
`78`	`84`	`}`
`79`	`85`
	`86`	`+ private static boolean mustStopReadUntilAttributeName(int chr) {`
	`87`	`+ return Common.isTabLfFfCrOrSpace(chr) \|\| chr == Characters.SOLIDUS \|\| chr == Characters.EQUALS_SIGN \|\| chr == Characters.GREATERTHAN_SIGN \|\| chr == Characters.NULL \|\|`
	`88`	`+ chr == Characters.QUOTATION_MARK \|\| chr == Characters.APOSTROPHE \|\| chr == Characters.LESSTHAN_SIGN \|\| chr == Characters.EOF;`
	`89`	`+ }`
	`90`	`+`
`80`	`91`	`int readUntilAttributeName(ResizableCharBuilder builder) {`
`81`	`92`	`int chr;`
`82`	`93`	`while (!buffer.isEmpty) {`
`83`	`94`	`chr = buffer.removeFirst();`
`84`		`- if (Common.isTabLfFfCrOrSpace(chr) \|\| chr == Characters.SOLIDUS \|\| chr == '=' \|\| chr == '>' \|\| chr == Characters.NULL \|\|`
`85`		`- chr == '"' \|\| chr == '\'' \|\| chr == Characters.LESSTHAN_SIGN \|\| chr == Characters.EOF) {`
	`95`	`+ if (mustStopReadUntilAttributeName(chr)) {`
`86`	`96`	`return chr;`
`87`	`97`	`}`
`88`	`98`	`builder.append((char) chr);`
`@@ -94,7 +104,7 @@ int readUntilComment(ResizableCharBuilder builder) {`
`94`	`104`	`int chr;`
`95`	`105`	`while (!buffer.isEmpty) {`
`96`	`106`	`chr = buffer.removeFirst();`
`97`		`- if (chr == '-' \|\| chr == Characters.NULL \|\| chr == Characters.EOF) {`
	`107`	`+ if (chr == Characters.HYPHEN_MINUS \|\| chr == Characters.NULL \|\| chr == Characters.EOF) {`
`98`	`108`	`return chr;`
`99`	`109`	`}`
`100`	`110`	`builder.append((char) chr);`
`@@ -104,70 +114,68 @@ int readUntilComment(ResizableCharBuilder builder) {`
`104`	`114`
`105`	`115`	`protected int readUntilInternal(ResizableCharBuilder builder, boolean stopAtAmpersand, boolean stopAtLessThan) {`
`106`	`116`	`int chr;`
`107`		`- while ((chr = read()) != -1) {`
	`117`	`+ while ((chr = read()) != Characters.EOF) {`
`108`	`118`	`if ((stopAtAmpersand && chr == Characters.AMPERSAND) \|\| (stopAtLessThan && chr == Characters.LESSTHAN_SIGN) \|\| chr == Characters.NULL) {`
`109`	`119`	`return chr;`
`110`	`120`	`}`
`111`	`121`	`builder.append((char) chr);`
`112`	`122`	`}`
`113`		`- return -1;`
	`123`	`+ return Characters.EOF;`
`114`	`124`	`}`
`115`	`125`
`116`	`126`	`protected int readUntilAttributeValueInternal(ResizableCharBuilder builder, int quoteChar, boolean stopAtAmpersand) {`
`117`	`127`	`int chr;`
`118`		`- while ((chr = read()) != -1) {`
	`128`	`+ while ((chr = read()) != Characters.EOF) {`
`119`	`129`	`if (chr == quoteChar \|\| (stopAtAmpersand && chr == Characters.AMPERSAND) \|\| chr == Characters.NULL) {`
`120`	`130`	`return chr;`
`121`	`131`	`}`
`122`	`132`	`builder.append((char) chr);`
`123`	`133`	`}`
`124`		`- return -1;`
	`134`	`+ return Characters.EOF;`
`125`	`135`	`}`
`126`	`136`
`127`	`137`	`protected int readUntilAttributeValueUnquotedInternal(ResizableCharBuilder builder) {`
`128`	`138`	`int chr;`
`129`		`- while ((chr = read()) != -1) {`
`130`		`- if (Common.isTabLfFfCrOrSpace(chr) \|\| chr == Characters.AMPERSAND \|\| chr == '>' \|\| chr == Characters.NULL \|\|`
`131`		- chr == '"' \|\| chr == '\'' \|\| chr == Characters.LESSTHAN_SIGN \|\| chr == '=' \|\| chr == '`') {
	`139`	`+ while ((chr = read()) != Characters.EOF) {`
	`140`	`+ if (mustStopReadUntilAttributeValueUnquoted(chr)) {`
`132`	`141`	`return chr;`
`133`	`142`	`}`
`134`	`143`	`builder.append((char) chr);`
`135`	`144`	`}`
`136`		`- return -1;`
	`145`	`+ return Characters.EOF;`
`137`	`146`	`}`
`138`	`147`
`139`	`148`	`protected int readUntilTagNameInternal(ResizableCharBuilder builder) {`
`140`	`149`	`int chr;`
`141`		`- while ((chr = read()) != -1) {`
	`150`	`+ while ((chr = read()) != Characters.EOF) {`
`142`	`151`	`if (Common.isTabLfFfCrOrSpace(chr) \|\| chr == Characters.SOLIDUS \|\| chr == Characters.GREATERTHAN_SIGN \|\| chr == Characters.NULL) {`
`143`	`152`	`return chr;`
`144`	`153`	`}`
`145`	`154`	`builder.append((char) chr);`
`146`	`155`	`}`
`147`		`- return -1;`
	`156`	`+ return Characters.EOF;`
`148`	`157`	`}`
`149`	`158`
`150`	`159`	`protected int readUntilAttributeNameInternal(ResizableCharBuilder builder) {`
`151`	`160`	`int chr;`
`152`		`- while ((chr = read()) != -1) {`
`153`		`- if (Common.isTabLfFfCrOrSpace(chr) \|\| chr == Characters.SOLIDUS \|\| chr == '=' \|\| chr == '>' \|\| chr == Characters.NULL \|\|`
`154`		`- chr == '"' \|\| chr == '\'' \|\| chr == Characters.LESSTHAN_SIGN) {`
	`161`	`+ while ((chr = read()) != Characters.EOF) {`
	`162`	`+ if (mustStopReadUntilAttributeName(chr)) {`
`155`	`163`	`return chr;`
`156`	`164`	`}`
`157`	`165`	`builder.append((char) chr);`
`158`	`166`	`}`
`159`		`- return -1;`
	`167`	`+ return Characters.EOF;`
`160`	`168`	`}`
`161`	`169`
`162`	`170`	`protected int readUntilCommentInternal(ResizableCharBuilder builder) {`
`163`	`171`	`int chr;`
`164`		`- while ((chr = read()) != -1) {`
`165`		`- if (chr == '-' \|\| chr == Characters.NULL) {`
	`172`	`+ while ((chr = read()) != Characters.EOF) {`
	`173`	`+ if (chr == Characters.HYPHEN_MINUS \|\| chr == Characters.NULL) {`
`166`	`174`	`return chr;`
`167`	`175`	`}`
`168`	`176`	`builder.append((char) chr);`
`169`	`177`	`}`
`170`		`- return -1;`
	`178`	`+ return Characters.EOF;`
`171`	`179`	`}`
`172`	`180`
`173`	`181`	`//`
`@@ -234,7 +242,7 @@ static class StringProcessedInputStream extends ProcessedInputStream {`
`234`	`242`	`// used for test`
`235`	`243`	`protected int getCharAt(int pos) {`
`236`	`244`	`if (pos >= length) {`
`237`		`- return -1;`
	`245`	`+ return Characters.EOF;`
`238`	`246`	`}`
`239`	`247`	`return input[pos];`
`240`	`248`	`}`
`@@ -244,7 +252,7 @@ protected int read() {`
`244`	`252`	`if (pos < length) {`
`245`	`253`	`return input[pos++];`
`246`	`254`	`}`
`247`		`- return -1;`
	`255`	`+ return Characters.EOF;`
`248`	`256`	`}`
`249`	`257`
`250`	`258`	`@Override`
`@@ -262,7 +270,7 @@ protected int readUntilInternal(ResizableCharBuilder builder, boolean stopAtAmpe`
`262`	`270`	`}`
`263`	`271`	`builder.append(input, pos, n - pos);`
`264`	`272`	`pos = n;`
`265`		`- return -1;`
	`273`	`+ return Characters.EOF;`
`266`	`274`	`}`
`267`	`275`
`268`	`276`	`@Override`
`@@ -280,7 +288,7 @@ protected int readUntilAttributeValueInternal(ResizableCharBuilder builder, int`
`280`	`288`	`}`
`281`	`289`	`builder.append(input, pos, n - pos);`
`282`	`290`	`pos = n;`
`283`		`- return -1;`
	`291`	`+ return Characters.EOF;`
`284`	`292`	`}`
`285`	`293`
`286`	`294`	`@Override`
`@@ -289,8 +297,7 @@ protected int readUntilAttributeValueUnquotedInternal(ResizableCharBuilder build`
`289`	`297`	`int i = pos;`
`290`	`298`	`while (i < n) {`
`291`	`299`	`char c = input[i];`
`292`		`- if (Common.isTabLfFfCrOrSpace(c) \|\| c == Characters.AMPERSAND \|\| c == '>' \|\| c == Characters.NULL \|\|`
`293`		- c == '"' \|\| c == '\'' \|\| c == Characters.LESSTHAN_SIGN \|\| c == '=' \|\| c == '`') {
	`300`	`+ if (mustStopReadUntilAttributeValueUnquoted(c)) {`
`294`	`301`	`builder.append(input, pos, i - pos);`
`295`	`302`	`pos = i + 1;`
`296`	`303`	`return c;`
`@@ -299,7 +306,7 @@ protected int readUntilAttributeValueUnquotedInternal(ResizableCharBuilder build`
`299`	`306`	`}`
`300`	`307`	`builder.append(input, pos, n - pos);`
`301`	`308`	`pos = n;`
`302`		`- return -1;`
	`309`	`+ return Characters.EOF;`
`303`	`310`	`}`
`304`	`311`
`305`	`312`	`@Override`
`@@ -317,7 +324,7 @@ protected int readUntilTagNameInternal(ResizableCharBuilder builder) {`
`317`	`324`	`}`
`318`	`325`	`builder.append(input, pos, n - pos);`
`319`	`326`	`pos = n;`
`320`		`- return -1;`
	`327`	`+ return Characters.EOF;`
`321`	`328`	`}`
`322`	`329`
`323`	`330`	`@Override`
`@@ -326,17 +333,16 @@ protected int readUntilAttributeNameInternal(ResizableCharBuilder builder) {`
`326`	`333`	`int i = pos;`
`327`	`334`	`while (i < n) {`
`328`	`335`	`char c = input[i];`
`329`		`- if (Common.isTabLfFfCrOrSpace(c) \|\| c == Characters.SOLIDUS \|\| c == '=' \|\| c == '>' \|\| c == Characters.NULL \|\|`
`330`		`- c == '"' \|\| c == '\'' \|\| c == Characters.LESSTHAN_SIGN) {`
`331`		`- builder.append(input, pos, i - pos);`
	`336`	`+ if (mustStopReadUntilAttributeName(c)) {`
	`337`	`+ builder.append(input, pos, i - pos); // append remaining`
`332`	`338`	`pos = i + 1;`
`333`	`339`	`return c;`
`334`	`340`	`}`
`335`	`341`	`i++;`
`336`	`342`	`}`
`337`	`343`	`builder.append(input, pos, n - pos);`
`338`	`344`	`pos = n;`
`339`		`- return -1;`
	`345`	`+ return Characters.EOF;`
`340`	`346`	`}`
`341`	`347`
`342`	`348`	`@Override`
`@@ -354,7 +360,7 @@ protected int readUntilCommentInternal(ResizableCharBuilder builder) {`
`354`	`360`	`}`
`355`	`361`	`builder.append(input, pos, n - pos);`
`356`	`362`	`pos = n;`
`357`		`- return -1;`
	`363`	`+ return Characters.EOF;`
`358`	`364`	`}`
`359`	`365`	`}`
`360`	`366`