You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2018/03/08 21:34:49 UTC
[2/8] jena git commit: More tests for hexadecimal digits.
More tests for hexadecimal digits.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/dc8fb522
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/dc8fb522
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/dc8fb522
Branch: refs/heads/master
Commit: dc8fb522d6b9cacea7440c6aa36f1d9fe02d5a89
Parents: 7163eb8
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Dec 28 21:08:46 2017 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Mar 6 16:38:22 2018 +0000
----------------------------------------------------------------------
.../org/apache/jena/riot/system/RiotChars.java | 54 ++++++++++++--------
1 file changed, 32 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/dc8fb522/jena-arq/src/main/java/org/apache/jena/riot/system/RiotChars.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/system/RiotChars.java b/jena-arq/src/main/java/org/apache/jena/riot/system/RiotChars.java
index 927a932..0f97b5c 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/system/RiotChars.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/system/RiotChars.java
@@ -23,39 +23,39 @@ public class RiotChars
// ---- Character classes
public static boolean isAlpha(int codepoint) {
- return Character.isLetter(codepoint) ;
+ return Character.isLetter(codepoint);
}
public static boolean isAlphaNumeric(int codepoint) {
- return Character.isLetterOrDigit(codepoint) ;
+ return Character.isLetterOrDigit(codepoint);
}
/** ASCII A-Z */
public static boolean isA2Z(int ch) {
- return range(ch, 'a', 'z') || range(ch, 'A', 'Z') ;
+ return range(ch, 'a', 'z') || range(ch, 'A', 'Z');
}
/** ASCII A-Z or 0-9 */
public static boolean isA2ZN(int ch) {
- return range(ch, 'a', 'z') || range(ch, 'A', 'Z') || range(ch, '0', '9') ;
+ return range(ch, 'a', 'z') || range(ch, 'A', 'Z') || range(ch, '0', '9');
}
/** ASCII 0-9 */
public static boolean isDigit(int ch) {
- return range(ch, '0', '9') ;
+ return range(ch, '0', '9');
}
public static boolean isWhitespace(int ch) {
- // ch = ch | 0xFF ;
- return isHorizontalWhitespace(ch) || isNewlineChar(ch) || ch == '\f' ;
+ // ch = ch | 0xFF;
+ return isHorizontalWhitespace(ch) || isNewlineChar(ch) || ch == '\f';
}
public static boolean isHorizontalWhitespace(int ch) {
- return ch == ' ' || ch == '\t' ;
+ return ch == ' ' || ch == '\t';
}
public static boolean isNewlineChar(int ch) {
- return ch == '\r' || ch == '\n' ;
+ return ch == '\r' || ch == '\n';
}
/*
@@ -85,22 +85,22 @@ Notes: PN_CHARS_BASE has a hole above #xD800 -- these are the surrogate pairs
// Surrogate pairs
r(ch, 0xD800, 0xDFFF) ||
r(ch, 0xF900, 0xFDCF) || r(ch, 0xFDF0, 0xFFFD) ||
- r(ch, 0x10000, 0xEFFFF) ; // Outside the basic plain.
+ r(ch, 0x10000, 0xEFFFF); // Outside the basic plain.
}
public static boolean isPNChars_U(int ch) {
//PN_CHARS_BASE | '_'
- return isPNCharsBase(ch) || ( ch == '_' ) ;
+ return isPNCharsBase(ch) || ( ch == '_' );
}
public static boolean isPNChars_U_N(int ch) {
// PN_CHARS_U | [0-9]
- return isPNCharsBase(ch) || ( ch == '_' ) || isDigit(ch) ;
+ return isPNCharsBase(ch) || ( ch == '_' ) || isDigit(ch);
}
public static boolean isPNChars(int ch) {
// PN_CHARS ::= PN_CHARS_U | '-' | [0-9] | #x00B7 | [#x0300-#x036F] | [#x203F-#x2040]
- return isPNChars_U(ch) || isDigit(ch) || ( ch == '-' ) || ch == 0x00B7 || r(ch, 0x300, 0x036F) || r(ch, 0x203F, 0x2040) ;
+ return isPNChars_U(ch) || isDigit(ch) || ( ch == '-' ) || ch == 0x00B7 || r(ch, 0x300, 0x036F) || r(ch, 0x203F, 0x2040);
}
public static boolean isPN_LOCAL_ESC(char ch) {
@@ -109,30 +109,40 @@ Notes: PN_CHARS_BASE has a hole above #xD800 -- these are the surrogate pairs
case '\\': case '_': case '~': case '.': case '-': case '!': case '$':
case '&': case '\'': case '(': case ')': case '*': case '+': case ',':
case ';': case '=': case '/': case '?': case '#': case '@': case '%':
- return true ;
+ return true;
default:
- return false ;
+ return false;
}
}
/** Hexadecimal character */
public static boolean isHexChar(int ch) {
- return range(ch, '0', '9') || range(ch, 'a', 'f') || range(ch, 'A', 'F') ;
+ return range(ch, '0', '9') || range(ch, 'a', 'f') || range(ch, 'A', 'F');
}
+ /** Hexadecimal character, only lower case a-f */
+ public static boolean isHexCharLC(int ch) {
+ return range(ch, '0', '9') || range(ch, 'a', 'f');
+ }
+
+ /** Hexadecimal character, only upper case A-F */
+ public static boolean isHexCharUC(int ch) {
+ return range(ch, '0', '9') || range(ch, 'A', 'F');
+ }
+
public static int valHexChar(int ch) {
if ( range(ch, '0', '9') )
- return ch - '0' ;
+ return ch - '0';
if ( range(ch, 'a', 'f') )
- return ch - 'a' + 10 ;
+ return ch - 'a' + 10;
if ( range(ch, 'A', 'F') )
- return ch - 'A' + 10 ;
- return -1 ;
+ return ch - 'A' + 10;
+ return -1;
}
- private static boolean r(int ch, int a, int b) { return ( ch >= a && ch <= b ) ; }
+ private static boolean r(int ch, int a, int b) { return ( ch >= a && ch <= b ); }
public static boolean range(int ch, char a, char b) {
- return (ch >= a && ch <= b) ;
+ return (ch >= a && ch <= b);
}
}