eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-06-16 04:26:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add simple tweak mode support for underscores in decimal and hexadecimal numbers

Browse Source
This commit is contained in:
Tempestas Ludi
2022-03-28 17:57:33 +02:00
parent b3a14b2be7
commit c4e806e3f0
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/src/processing/mode/java/tweak/SketchParser.java
+4 -4
View File
@@ -115,7 +115,7 @@ public class SketchParser {
// for every number found:
// save its type (int/float), name, value and position in code.
Pattern p = Pattern.compile("[\\[\\{<>(),\\t\\s\\+\\-\\/\\*^%!|&=?:~]\\d+\\.?\\d*");
Pattern p = Pattern.compile("[\\[\\{<>(),\\t\\s\\+\\-\\/\\*^%!|&=?:~]\\d+(_+\\d+)*(\\.\\d+(_+\\d+)*)?"); // Matches any "delimiting" character, and then a decimal number.
for (int i = 0; i < codeTabs.length; i++) {
List<Handle> handles = new ArrayList<>();
allHandles.add(handles);
@@ -185,7 +185,7 @@ public class SketchParser {
continue;
int line = countLines(c.substring(0, start)) - 1; // zero based
String value = c.substring(start, end);
String value = c.substring(start, end).replace("_", "");
if (value.contains(".") || forceFloat) {
// consider this as a float
String name = varPrefix + "_float[" + floatVarCount +"]";
@@ -211,7 +211,7 @@ public class SketchParser {
private void addAllHexNumbers() {
// for every number found:
// save its type (int/float), name, value and position in code.
Pattern p = Pattern.compile("[\\[\\{<>(),\\t\\s\\+\\-\\/\\*^%!|&=?:~]0x[A-Fa-f0-9]+");
Pattern p = Pattern.compile("[\\[\\{<>(),\\t\\s\\+\\-\\/\\*^%!|&=?:~]0x[A-Fa-f0-9]+(_+[A-Fa-f0-9]+)*");
for (int i = 0; i < codeTabs.length; i++) {
String c = codeTabs[i];
Matcher m = p.matcher(c);
@@ -248,7 +248,7 @@ public class SketchParser {
}
int line = countLines(c.substring(0, start)) - 1; // zero based
String value = c.substring(start, end);
String value = c.substring(start, end).replace("_", "");
String name = varPrefix + "_int[" + intVarCount + "]";
Handle handle;
try {