(java): #2507 added support for hexadecimal floating point literals

src/languages/java.js

@@ -5,7 +5,7 @@ Category: common, enterprise
 Website: https://www.java.com/
 */
 
-export default function(hljs) {
+export default function (hljs) {
  var JAVA_IDENT_RE = '[\u00C0-\u02B8a-zA-Z_$][\u00C0-\u02B8a-zA-Z_$0-9]*';
  var GENERIC_IDENT_RE = JAVA_IDENT_RE + '(<' + JAVA_IDENT_RE + '(\\s*,\\s*' + JAVA_IDENT_RE + ')*>)?';
  var KEYWORDS =
@@ -18,32 +18,25 @@ export default function(hljs) {
  var ANNOTATION = {
  className: 'meta',
  begin: '@' + JAVA_IDENT_RE,
- contains:[
+ contains: [
  {
  begin: /\(/,
  end: /\)/,
  contains: ["self"] // allow nested () inside our annotation
  },
  ]
  }
- // https://docs.oracle.com/javase/7/docs/technotes/guides/language/underscores-literals.html
- var JAVA_NUMBER_RE = '\\b' +
- '(' +
- '0[bB]([01]+[01_]+[01]+|[01]+)' + // 0b...
- '|' +
- '0[xX]([a-fA-F0-9]+[a-fA-F0-9_]+[a-fA-F0-9]+|[a-fA-F0-9]+)' + // 0x...
- '|' +
- '(' +
- '([\\d]+[\\d_]+[\\d]+|[\\d]+)(\\.([\\d]+[\\d_]+[\\d]+|[\\d]+))?' +
- '|' +
- '\\.([\\d]+[\\d_]+[\\d]+|[\\d]+)' +
- ')' +
- '([eE][-+]?\\d+)?' + // octal, decimal, float
- ')' +
- '[lLfF]?';
  var JAVA_NUMBER_MODE = {
  className: 'number',
- begin: JAVA_NUMBER_RE,
+ variants: [
+ { begin: '\\b(0[bB][01]+([01_]*[01]+)?)[lL]?' }, // binary
+ { begin: '\\b(0[0-7]+([0-7_]*[0-7]+)?)[dDfFlL]?' }, // octal
+ { begin: '\\b[\\d]+([\\d_]*[\\d]+)?[lL]?' }, // decimal
+ { begin: '\\b([\\d]*[\\.][\\d_]*[\\d]+|[\\d]+[\\d_]*)[eE][+-]?[\\d]+[dDfF]?' }, // scientific notation
+ { begin: '\\b[\\d]+[\\.][\\d_]*[\\d]+[dDfF]?' }, // floating point
+ { begin: '\\b0[xX]([a-fA-F0-9]+[a-fA-F0-9_]*[a-fA-F0-9]+)[pP]?[\\d]*[lL]?' }, // hexadecimal
+ { begin: '\\b0[xX]((([a-fA-F0-9]+[a-fA-F0-9_]+[a-fA-F0-9]+|[a-fA-F0-9]+)?[\\.]?)?([a-fA-F0-9]+[a-fA-F0-9_]+[a-fA-F0-9]+|[a-fA-F0-9]+)?[pP][+-]?([\\d]+)[dDfF]?|([a-fA-F0-9]+[a-fA-F0-9_]+[a-fA-F0-9]+|[a-fA-F0-9]+))[fFdD]?' }, // hexadecimal floating point
+ ],
  relevance: 0
  };
 
@@ -57,15 +50,15 @@ export default function(hljs) {
  '/\\*\\*',
  '\\*/',
  {
- relevance : 0,
- contains : [
+ relevance: 0,
+ contains: [
  {
  // eat up @'s in emails to prevent them to be recognized as doctags
  begin: /\w+@/, relevance: 0
  },
  {
- className : 'doctag',
- begin : '@[A-Za-z]+'
+ className: 'doctag',
+ begin: '@[A-Za-z]+'
  }
  ]
  }
@@ -80,7 +73,7 @@ export default function(hljs) {
  keywords: 'class interface',
  illegal: /[:"\[\]]/,
  contains: [
- {beginKeywords: 'extends implements'},
+ { beginKeywords: 'extends implements' },
  hljs.UNDERSCORE_TITLE_MODE
  ]
  },

test/markup/java/numbers.expect.txt

@@ -7,3 +7,24 @@
 <span class="hljs-keyword">byte</span> nybbles = <span class="hljs-number">0b0010_0101</span>;
 <span class="hljs-keyword">long</span> bytes = <span class="hljs-number">0b11010010_01101001_10010100_10010010</span>;
 <span class="hljs-keyword">int</span> n = <span class="hljs-number">1234</span> + Contacts._ID;
+<span class="hljs-keyword">float</span> f = <span class="hljs-number">0x1.4p2f</span>;
+<span class="hljs-keyword">double</span> d = <span class="hljs-number">0x.ep-6</span>;
+<span class="hljs-keyword">int</span> octal = <span class="hljs-number">0777</span>;
+<span class="hljs-keyword">float</span> f = <span class="hljs-number">2e3f</span>;
+<span class="hljs-keyword">double</span> d = <span class="hljs-number">1.2e4D</span>;
+a = <span class="hljs-number">0x4fa6p2</span>;
+b = <span class="hljs-number">0x.4p2</span>;
+c = <span class="hljs-number">0xa.ffp3f</span>;
+d = <span class="hljs-number">0x1.0p2F</span>;
+e = <span class="hljs-number">0x1.0p2f</span>;
+f = <span class="hljs-number">0x1p1</span>;
+g = <span class="hljs-number">0x.3p4d</span>;
+h = <span class="hljs-number">0x1.2ep5D</span>;
+i = <span class="hljs-number">0x1.p2</span>;
+<span class="hljs-keyword">int</span> i = <span class="hljs-number">23</span>;
+<span class="hljs-keyword">byte</span> mask = <span class="hljs-number">0x0f</span>;
+<span class="hljs-keyword">int</span> i = <span class="hljs-number">4</span>;
+<span class="hljs-keyword">byte</span> mask = <span class="hljs-number">0xa</span>;
+<span class="hljs-keyword">float</span> f = <span class="hljs-number">5.4</span>;
+<span class="hljs-keyword">float</span> f = <span class="hljs-number">2e3</span>;
+<span class="hljs-keyword">int</span> n = <span class="hljs-number">0b1</span>;

test/markup/java/numbers.txt

@@ -7,3 +7,24 @@ long maxLong = 0x7fff_ffff_ffff_ffffL;
 byte nybbles = 0b0010_0101;
 long bytes = 0b11010010_01101001_10010100_10010010;
 int n = 1234 + Contacts._ID;
+float f = 0x1.4p2f;
+double d = 0x.ep-6;
+int octal = 0777;
+float f = 2e3f;
+double d = 1.2e4D;
+a = 0x4fa6p2;
+b = 0x.4p2;
+c = 0xa.ffp3f;
+d = 0x1.0p2F;
+e = 0x1.0p2f;
+f = 0x1p1;
+g = 0x.3p4d;
+h = 0x1.2ep5D;
+i = 0x1.p2;
+int i = 23;
+byte mask = 0x0f;
+int i = 4;
+byte mask = 0xa;
+float f = 5.4;
+float f = 2e3;
+int n = 0b1;