X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=core%2Fsrc%2Fde%2Fcongrace%2Fexp4j%2FTokenizer.java;h=c2c99d974d233d6bb63c21568dd6404b3d8062f0;hb=192fdbaaf3c37387c35727e2266d724381120a58;hp=1591995ea6987b4be8d3b42817dd511a5596d275;hpb=0136c39fd03820cef4c8e6c84b624ac8013a287e;p=debian%2Fopenrocket diff --git a/core/src/de/congrace/exp4j/Tokenizer.java b/core/src/de/congrace/exp4j/Tokenizer.java index 1591995e..c2c99d97 100644 --- a/core/src/de/congrace/exp4j/Tokenizer.java +++ b/core/src/de/congrace/exp4j/Tokenizer.java @@ -166,6 +166,7 @@ class Tokenizer { Token lastToken; for (int i = 0; i < chars.length; i++) { char c = chars[i]; + if (c == ' ') continue; if (isDigit(c)) { @@ -179,12 +180,12 @@ class Tokenizer { } i += numberLen - 1; lastToken = new NumberToken(valueBuilder.toString()); - } else if (Character.isLetter(c) || c == '_' || c == '#') { + } else if (Character.isLetter(c) || c == '_' || c == '$') { // can be a variable or function final StringBuilder nameBuilder = new StringBuilder(); nameBuilder.append(c); int offset = 1; - while (chars.length > i + offset && (Character.isLetter(chars[i + offset]) || Character.isDigit(chars[i + offset]) || chars[i + offset] == '_' || chars[i + offset] == '#')) { + while (chars.length > i + offset && (Character.isLetter(chars[i + offset]) || Character.isDigit(chars[i + offset]) || chars[i + offset] == '_' || chars[i + offset] == '$')) { nameBuilder.append(chars[i + offset++]); } String name = nameBuilder.toString();