artem.didytschuk/rechenmaschine
1
0
Fork 0
forked from IF-LK-2020/rechenmaschine
Code Issues Pull Requests Releases Wiki Activity

Negative Zahlen implementiert im format (-#)

Browse Source
This commit is contained in:
Artem Didytschuk
2021-04-19 10:01:44 +02:00
parent 120a36735a
commit d531bf0d4f
1 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Rechenmaschine.java
View File

@@ -241,7 +241,11 @@ public class Rechenmaschine {
currentToken.append(buchstabe); currentToken.append(buchstabe);
state = 2; state = 2;
} }
case '+', '-', '*', '/' -> { case '+', '-' -> {
tokenlist.append(new Token("OPERATOR",Character.toString(buchstabe)));
state = 5;
}
case '*', '/' -> {
System.out.println("Unmittelbar nach ( darf kein Operator oder ) folgen."); System.out.println("Unmittelbar nach ( darf kein Operator oder ) folgen.");
return false; return false;
} }
@@ -321,7 +325,7 @@ public class Rechenmaschine {
state = 1; state = 1;
break; break;
} else if( currentToken.getToken().equals("(")){ } else if( currentToken.getToken().equals("(")){
state = 0; state = 2;
break; break;
} else if( currentToken.getToken().equals(")")){ } else if( currentToken.getToken().equals(")")){
state = 1; state = 1;
@@ -345,11 +349,28 @@ public class Rechenmaschine {
return false; return false;
} else if( currentToken.getToken().equals(")")) { } else if( currentToken.getToken().equals(")")) {
state = 1; state = 1;
break;
} else {
fehler = "Unbekanntes Token: "+currentToken.getType();
return false;
}
case 2:
if( currentToken.getType().equals("OPERATOR") ) {
state = 0;
break;
} else if( currentToken.getType().equals("OPERAND") ) {
state = 1;
break;
} else if( currentToken.getToken().equals("(")){
state = 2;
break;
} else if( currentToken.getToken().equals(")")){
state = 1;
break;
} else { } else {
fehler = "Unbekanntes Token: "+currentToken.getType(); fehler = "Unbekanntes Token: "+currentToken.getType();
return false; return false;
} }
} }
tokenlist.next(); tokenlist.next();