no message
This commit is contained in:
@@ -8,14 +8,15 @@ public class ArrayDecl extends FileObjectWithMessages {
|
||||
@Expose
|
||||
public String array_name;
|
||||
@Expose
|
||||
public ArrayLocation array_loc;
|
||||
public ArrayDecl(String array_name_in, ArrayLocation array_loc_in, DBProjectFile father_in, int lineNum_in) {
|
||||
public int array_loc;
|
||||
//--
|
||||
public ArrayDecl(String array_name_in, int array_loc_in, DBProjectFile father_in, int lineNum_in) {
|
||||
super(father_in, lineNum_in);
|
||||
array_name = array_name_in;
|
||||
array_loc = array_loc_in;
|
||||
}
|
||||
@Override
|
||||
public String Description() {
|
||||
return array_loc.getDescription() + " массив " + Utils_.Brackets(array_name);
|
||||
return ArrayLocation.fromInt(array_loc).getDescription() + " массив " + Utils_.Brackets(array_name);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -22,9 +22,6 @@ import java.util.List;
|
||||
import java.util.Vector;
|
||||
import java.util.stream.Collectors;
|
||||
public class ProjectArray extends DBObject {
|
||||
//----------------------------------------------------------------------
|
||||
public static final String[] alignNames = {"i", "j", "k", "l", "m", "n", "q", "r", "s", "t", "u", "w", "x", "y", "z"};
|
||||
//json-------------------
|
||||
@Expose
|
||||
public long id;
|
||||
@Expose
|
||||
@@ -47,7 +44,6 @@ public class ProjectArray extends DBObject {
|
||||
public int isLoopArrayFlag;
|
||||
@Expose
|
||||
Vector<ArrayDecl> declPlaces = new Vector<>();
|
||||
//--шаблон---
|
||||
@Expose
|
||||
List<Integer> deprecateToDist = new Vector<>();
|
||||
@Expose
|
||||
@@ -56,9 +52,10 @@ public class ProjectArray extends DBObject {
|
||||
Vector<IntegerPairJson> sizes = new Vector<>();
|
||||
@Expose
|
||||
Vector<String> regions = new Vector<>();
|
||||
|
||||
// LinkedHashMap<BigInteger, TemplateLink> templateInfo = new LinkedHashMap<>();
|
||||
//---
|
||||
//--
|
||||
//----------------------------------------------------------------------
|
||||
public static final String[] alignNames = {"i", "j", "k", "l", "m", "n", "q", "r", "s", "t", "u", "w", "x", "y", "z"};
|
||||
//json-------------------
|
||||
public String UniqKey;
|
||||
public BigInteger address;
|
||||
|
||||
@@ -135,7 +132,7 @@ public class ProjectArray extends DBObject {
|
||||
DBProjectFile file = Global.mainModule.getProject().db.files.Data.get(declFile);
|
||||
int declLine = Integer.parseInt(localSplited[idxPl + 1]);
|
||||
//declPlaces.add(new Pair<>(declFile, declLine));
|
||||
ArrayDecl decl = new ArrayDecl(shortName, getLocation(), file, declLine);
|
||||
ArrayDecl decl = new ArrayDecl(shortName, location, file, declLine);
|
||||
declPlaces.add(decl);
|
||||
file.array_decls.add(decl); //++
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user