исправление енума на инт
This commit is contained in:
@@ -16,7 +16,17 @@ public class Loop extends FileObjectWithMessages {
|
||||
@Expose
|
||||
private int hasNonRectangularBounds;
|
||||
@Expose
|
||||
public LoopState loopState;
|
||||
private int loopState;
|
||||
public LoopState getLoopState(){
|
||||
switch (loopState){
|
||||
case 1:
|
||||
return LoopState.GoodLoop;
|
||||
case 2:
|
||||
return LoopState.BadLoop;
|
||||
default:
|
||||
return LoopState.Loop;
|
||||
}
|
||||
}
|
||||
//---
|
||||
@Expose
|
||||
public List<FuncCall> funcCalls = new Vector<>();
|
||||
@@ -44,74 +54,9 @@ public class Loop extends FileObjectWithMessages {
|
||||
all_children.addAll(children);
|
||||
return all_children;
|
||||
}
|
||||
/*
|
||||
public Loop(String[] packedLoopInfo, Index idx, DBProjectFile father_in) {
|
||||
file = father_in.name;
|
||||
int calls = Integer.parseInt(packedLoopInfo[idx.Inc()]);//+
|
||||
for (int k = 0; k < calls; ++k) {
|
||||
String c_name = packedLoopInfo[idx.Inc()];
|
||||
int c_line = Integer.parseInt(packedLoopInfo[idx.Inc()]);
|
||||
func_calls.add(new FuncCall(father_in, c_name, c_line));
|
||||
}
|
||||
line = Integer.parseInt(packedLoopInfo[idx.Inc()]);
|
||||
lineNumAfterLoop = Integer.parseInt(packedLoopInfo[idx.Inc()]);
|
||||
perfectLoop = Integer.parseInt(packedLoopInfo[idx.Inc()]);
|
||||
hasOutGoto = Integer.parseInt(packedLoopInfo[idx.Inc()]);
|
||||
hasPrints = Integer.parseInt(packedLoopInfo[idx.Inc()]);
|
||||
childCount = Integer.parseInt(packedLoopInfo[idx.Inc()]);
|
||||
int state = Integer.parseInt(packedLoopInfo[idx.Inc()]);
|
||||
switch (state) {
|
||||
case 1:
|
||||
loopState = LoopState.GoodLoop;
|
||||
break;
|
||||
case 2:
|
||||
loopState = LoopState.BadLoop;
|
||||
break;
|
||||
default:
|
||||
loopState = LoopState.Loop;
|
||||
break;
|
||||
}
|
||||
hasNonRectangularBounds = Integer.parseInt(packedLoopInfo[idx.Inc()]); //+
|
||||
if (hasNonRectangularBounds ==1)
|
||||
non_rect_iters.add(new NonRectIter(father_in, line));
|
||||
////-------------------------------------------------------------------------------
|
||||
// число внешних переходов
|
||||
int e_gotos_size = Integer.parseInt(packedLoopInfo[idx.Inc()]); //+
|
||||
for (int k = 0; k < e_gotos_size; ++k) {
|
||||
int c_line = Integer.parseInt(packedLoopInfo[idx.Inc()]);
|
||||
e_gotos.add(new EGoto(father_in, c_line));
|
||||
}
|
||||
//число внутренних переходов
|
||||
int i_gotos_size = Integer.parseInt(packedLoopInfo[idx.Inc()]); //+
|
||||
for (int k = 0; k < i_gotos_size; ++k) {
|
||||
int c_line = Integer.parseInt(packedLoopInfo[idx.Inc()]);
|
||||
i_gotos.add(new IGoto(father_in, c_line));
|
||||
}
|
||||
//число операторов печати
|
||||
int IOs_size = Integer.parseInt(packedLoopInfo[idx.Inc()]); //+
|
||||
for (int k = 0; k < IOs_size; ++k) {
|
||||
int c_line = Integer.parseInt(packedLoopInfo[idx.Inc()]);
|
||||
ios.add(new IO(father_in, c_line));
|
||||
}
|
||||
//число операторов останова (STOPб PAUSE)
|
||||
int stops_size = Integer.parseInt(packedLoopInfo[idx.Inc()]); //++
|
||||
for (int k = 0; k < stops_size; ++k) {
|
||||
int c_line = Integer.parseInt(packedLoopInfo[idx.Inc()]);
|
||||
stops.add(new Stop(father_in, c_line));
|
||||
}
|
||||
//--------------------------------------------------------------------------------
|
||||
for (int i = 0; i < childCount; ++i) {
|
||||
Loop nextChild = new Loop(packedLoopInfo, idx, father_in);
|
||||
children.add(nextChild);
|
||||
}
|
||||
father_in.AllLoops.put(line, this);
|
||||
//нельзя использовать конструктор с параметрами из за особеностей распаковки.
|
||||
CheckMessagesPresence();
|
||||
}
|
||||
*/
|
||||
@Override
|
||||
public String TypeKey() {
|
||||
return loopState.toString();
|
||||
return getLoopState().toString();
|
||||
}
|
||||
@Override
|
||||
public String Description() {
|
||||
@@ -127,7 +72,7 @@ public class Loop extends FileObjectWithMessages {
|
||||
}
|
||||
@Override
|
||||
public VisualiserFonts getFont() {
|
||||
return loopState.getFont();
|
||||
return getLoopState().getFont();
|
||||
}
|
||||
public void toMap_r(LinkedHashMap<Integer, Loop> loops_map){
|
||||
loops_map.put(line, this);
|
||||
|
||||
Reference in New Issue
Block a user