first commit

Astro1123 · Dec 11, 2021 · 40085e0 · 40085e0
1 parent aaf582c
commit 40085e0
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/calc/rpn/ToRPN.java b/calc/rpn/ToRPN.java
@@ -57,12 +57,16 @@ public ArrayList<String> toRPN(ArrayList<String> inlist,ArrayList<String> typeli
 							break;
 						}
 					}
+					if (tp1 > tp2) break;
+					/*
 					if (mode) {
 						if (tp1 >= tp2) break;
 					} else {
 						if (tp1 > tp2) break;
 					}
+					//*/
 					if (stack.size()==0) break;
+					if (mode && tp2 == 100 && tp1 == 100) break;
 					list.add(stack.pop());
 				}
 				stack.push(inlist.get(i));
@@ -152,12 +156,12 @@ public ArrayList<String> toRPN(ArrayList<String> inlist,ArrayList<String> typeli
 	private void oplinit(OperatorList opl, boolean mode) {
 		if (mode == true) {
 			opl.list.add(opl.InputOperatorList("*",70));
-			opl.list.add(opl.InputOperatorList("/",71));
-			opl.list.add(opl.InputOperatorList("//",71));
-			opl.list.add(opl.InputOperatorList("%",71));
-			opl.list.add(opl.InputOperatorList("%%",71));
+			opl.list.add(opl.InputOperatorList("/",70));
+			opl.list.add(opl.InputOperatorList("//",70));
+			opl.list.add(opl.InputOperatorList("%",70));
+			opl.list.add(opl.InputOperatorList("%%",70));
 			opl.list.add(opl.InputOperatorList("+",60));
-			opl.list.add(opl.InputOperatorList("-",61));
+			opl.list.add(opl.InputOperatorList("-",60));
 			opl.list.add(opl.InputOperatorList("=",0));
 			opl.list.add(opl.InputOperatorList("(",0));
 			opl.list.add(opl.InputOperatorList(",",0));