ソースを参照

优化代码格式化

mxd 3 年 前
コミット
4087697313

+ 1 - 1
magic-editor/src/console/src/scripts/beautifier/javascript/tokenizer.js

@@ -66,7 +66,7 @@ var TOKEN = {
 
 var directives_core = new Directives(/\/\*/, /\*\//);
 
-var number_pattern = /0[xX][0123456789abcdefABCDEF_]*n?|0[oO][01234567_]*n?|0[bB][01_]*n?|\d[\d_]*n|(?:\.\d[\d_]*|\d[\d_]*\.?[\d_]*)(?:[eE][+-]?[\d_]+)?/;
+var number_pattern = /0[xX][0123456789abcdefABCDEF_]*[mMdDlLfFsSbB]?|0[oO][01234567_]*[mMdDlLfFsSbB]?|0[bB][01_]*[mMdDlLfFsSbB]?|\d[\d_]*[mMdDlLfFsSbB]|(?:\.\d[\d_]*|\d[\d_]*\.?[\d_]*)(?:[eE][+-]?[\d_]+)?/;
 
 var digit = /[0-9]/;
 

+ 2 - 2
magic-editor/src/console/src/scripts/parsing/tokenizer.js

@@ -118,7 +118,7 @@ const tokenizerNumber = (stream, tokens) => {
             if (stream.matchAny(["L", "l"], true)) {
                 let span = stream.endSpan();
                 let text = span.getText();
-                tokens.push(new LiteralToken(TokenType.LongLiteral, span, parseInt(text.substring(2, text.length() - 1).replace(/\_/g,''), 16)));
+                tokens.push(new LiteralToken(TokenType.LongLiteral, span, parseInt(text.substring(2, text.length - 1).replace(/\_/g,''), 16)));
                 return true;
             }
             tokens.push(autoNumberType(stream.endSpan(), 16));
@@ -130,7 +130,7 @@ const tokenizerNumber = (stream, tokens) => {
             if (stream.matchAny([ "L", "l"], true)) {
                 let span = stream.endSpan();
                 let text = span.getText();
-                tokens.push(new LiteralToken(TokenType.LongLiteral, span, parseInt(text.substring(0, text.length() - 1).replace(/\_/g,''), 2)));
+                tokens.push(new LiteralToken(TokenType.LongLiteral, span, parseInt(text.substring(2, text.length - 1).replace(/\_/g,''), 2)));
                 return true;
             }
             tokens.push(autoNumberType(stream.endSpan(), 2));