Skip to content

Commit

Permalink
Loading
Loading status checks…
+ Mesh Editor.
Browse files Browse the repository at this point in the history 
#2 ExportAs ok
Improving TreeNode. Addition vectors 1/1 (revert to my Android Calculator App)
Game works again.
TextDialog in feature processing
Include spaces in AlgebraicTree formulas.
New class analyze StringAnalyser.+

Signed-off-by: Manuel Daniel Dahmen <[email protected]>
@manuelddahmen
manuelddahmen committed Jan 30, 2024
1 parent ae64027 commit f1a86c2
Showing 2 changed files with 65 additions and 44 deletions.
107 changes: 64 additions & 43 deletions src/main/java/one/empty3/library1/tree/StringAnalyser.java
View file
Original file line number Diff line number Diff line change
@@ -58,6 +58,22 @@ public Token addToken(Token token) {
return this;
}

public int nextToken(String input, int position) {
if (!nextTokens.getData1d().isEmpty()) {
return nextTokens.getData1d().get(0).parse(input, position);
}
return position;
}

public Token nextToken() {
if (!nextTokens.getData1d().isEmpty()) {
return nextTokens.getData1d().get(0);
}
return new Token() {

};
}

public void setAction(Action action) {
this.action = action;
}
@@ -89,6 +105,9 @@ public void setSuccessful(boolean successful) {
this.successful = successful;
if (successful && action != null)
action();
if (!successful) {
System.err.println("<<<Error : " + toString() + ">>>");
}
}

public Action getAction() {
@@ -144,9 +163,8 @@ public int parse(String input, int position) {

for (String searched : names) {
if (input.substring(position).startsWith(searched)) {
this.setSuccessful(true);
construct.currentClass.setAccessModifier(searched);
return searched.length();
setSuccessful(true);
return position + searched.length();
}
}
return 0;
@@ -304,17 +322,11 @@ public String toString() {
}
}

class TokenPackage extends TokenChoiceStringMandatory {
class TokenPackage extends TokenString {
public TokenPackage() {
super(new String[]{"package"});
}
super("package");

@Override
public int parse(String input, int position) {
position = super.parse(input.substring(position), position) + position;
return position;
}

}

class TokenQualifiedName extends TokenName {
@@ -364,20 +376,26 @@ public TokenString(String name) {

@Override
public int parse(String input, int position) {
position = super.skipBlanks(input, position);
position = super.parse(input, position);
if (position < input.length() && input.substring(position).startsWith(name)) {
setSuccessful(true);
position += name.length();
int position1 = position + name.length();
if (!getNextToken().getData1d().isEmpty()) {
position = getNextToken().getElem(0).parse(input, position);
if (getNextToken().getElem(0).isSuccessful()) {
return position;
int position2 = nextToken(input, position1);
if (nextToken().isSuccessful()) {
setSuccessful(true);
return position2;
} else {
setSuccessful(false);
return position1;
}
} else {
setSuccessful(true);
return position1;
}
} else {
setSuccessful(false);
return position;
}
setSuccessful(false);
return position;
}

@Override
@@ -447,6 +465,7 @@ public int parse(String input, int position) {
position2 = token.parse(input, position1);
if (!token.isSuccessful()) {
allOk = false;
position2 = position1;
} else {
allNotOk = false;
position1 = position2;
@@ -455,10 +474,12 @@ public int parse(String input, int position) {
}
if (isSuccessful() && !getNextToken().getData1d().isEmpty()) {
int position3 = getNextToken().getElem(0).parse(input, position2);
setSuccessful(getNextToken().getElem(0).isSuccessful());
if (isSuccessful()) {

if (getNextToken().getElem(0).isSuccessful()) {
setSuccessful(true);
return position3;
} else {
setSuccessful(false);
return position2;
}
}
@@ -482,21 +503,29 @@ public int parse(String input, int position) {
int position2 = choice.parse(input, position1);
if (choice.isSuccessful()) {
if (!getNextToken().getData1d().isEmpty()) {
int position3 = getNextToken().getElem(0).parse(input, position2);
if (getNextToken().getElem(0).isSuccessful()) {
int position3 = nextToken(input, position2);
if (nextToken().isSuccessful()) {
setSuccessful(true);
return position3;
} else {
setSuccessful(false);
return position3;
return position2;
}
} else {
setSuccessful(true);
return position2;
}
} else {
if (!getNextToken().getData1d().isEmpty()) {
int position3 = nextToken(input, position2);
if (nextToken().isSuccessful()) {
setSuccessful(true);
return position3;
}
}
setSuccessful(false);
return position;
}
setSuccessful(false);
return position2;
}
}

@@ -520,30 +549,22 @@ public int parse(String input, int position) {
for (Token token : choices) {
position1 = token.parse(input, position1);
if (!token.isSuccessful()) {
allOk = false;
if (i > 0) {
setSuccessful(true);
if (!getNextToken().getData1d().isEmpty())
return getNextToken().getData1d().get(0).parse(input, position0);
return position0;
allOk = false;
break;
} else {
allOk = false;
setSuccessful(false);
return position;
}
}
}
position0 = position1;
if (allOk) {
setSuccessful(true);
if (!getNextToken().getData1d().isEmpty())
return getNextToken().getData1d().get(0).parse(input, position0);
return position0;

}
if (allOk)
position0 = position1;
i++;
}
setSuccessful(false);
return position;
setSuccessful(true);
return position0;
}
}

@@ -824,8 +845,8 @@ public boolean action() {
return false;
}
};
Token aPackage = definitions.put(0, new TokenCodeFile().addToken(new SingleTokenOptional(
new MultiTokenMandatory(new TokenString("package"),
Token aPackage = definitions.put(0, new TokenCodeFile().addToken(
new SingleTokenOptional(new MultiTokenMandatory(new TokenString("package"),
packageQualifiedName, new TokenSemiColon())))
.addToken(new MultiTokenOptional(new TokenClassScope(),
isFinal).addToken(new MultiTokenMandatory(tokenClassKeyword, className, new TokenOpenBracket()))
2 changes: 1 addition & 1 deletion src/test/java/one/empty3/library1/tree/TestAlgebraicTreeVector.kt
View file
Original file line number Diff line number Diff line change
@@ -767,7 +767,7 @@ class TestAlgebraicTreeVector() {
"}\n"

val parse: Int = stringAnalyser.parse(input)
println(input)
println(input.substring(parse))
stringAnalyser.definitions.keys.sorted().forEach {
if (it != null) {
println(

0 comments on commit f1a86c2

Please sign in to comment.