UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

[apps/code] VariableBoxController::contains method

Browse Source
This commit is contained in:
Léa Saviot
2020-04-01 14:58:30 +02:00
committed by Émilie Feral
parent 4cb947759d
commit d2bfe01cd4
2 changed files with 45 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
apps/code/variable_box_controller.cpp
View File

@@ -368,50 +368,30 @@ importCurrent:
int nameLength = lex->vstr.len;
// Check if the token completes the text to autocomplete
bool canKeepChecking = textToAutocomplete == nullptr;
if (!canKeepChecking) {
bool tokenAutocompletesText = textToAutocomplete == nullptr;
if (!tokenAutocompletesText) {
// TODO LEA Caution with aprentheses (when comparing rect and rect(r)
if (textToAutocompleteLength < nameLength && strncmp(name, textToAutocomplete, textToAutocompleteLength) == 0) {
canKeepChecking = true;
tokenAutocompletesText = true;
}
}
if (canKeepChecking) {
bool alreadyInVarBox = false;
// TODO LEA speed this up with dichotomia?
NodeOrigin origins[] = { NodeOrigin::CurrentScript, NodeOrigin::Builtins, NodeOrigin::Importation};
for (NodeOrigin origin : origins) {
const int nodesCount = nodesCountForOrigin(origin);
ScriptNode * nodes = nodesForOrigin(origin);
for (int i = 0; i < nodesCount; i++) {
ScriptNode * matchingNode = nodes + i;
int comparisonResult = NodeNameCompare(matchingNode, name, nameLength);
if (comparisonResult == 0) {
alreadyInVarBox = true;
break;
}
if (comparisonResult > 0) {
break;
}
}
if (alreadyInVarBox) {
if (tokenAutocompletesText && !contains(name, nameLength)) {
/* If the token autocompletes the text and it is not already in the
* variable box, add it. */
/* This is a trick to get the token position in the text. The -2 was
* found from stepping in the code and trying. */
// TODO LEA FIXME
for (int i = 0; i < 3; i++) {
if (strncmp(tokenInText, name, nameLength) != 0) {
tokenInText--;
} else {
break;
}
}
if (!alreadyInVarBox) {
/* This is a trick to get the token position in the text. The -2 was
* found from stepping in the code and trying. */
// TODO LEA FIXME
for (int i = 0; i < 3; i++) {
if (strncmp(tokenInText, name, nameLength) != 0) {
tokenInText--;
} else {
break;
}
}
assert(strncmp(tokenInText, name, nameLength) == 0);
addNode(defToken ? ScriptNode::Type::Function : ScriptNode::Type::Variable, NodeOrigin::CurrentScript, tokenInText, nameLength, scriptIndex);
}
assert(strncmp(tokenInText, name, nameLength) == 0);
addNode(defToken ? ScriptNode::Type::Function : ScriptNode::Type::Variable, NodeOrigin::CurrentScript, tokenInText, nameLength, scriptIndex);
}
}
@@ -474,6 +454,7 @@ int VariableBoxController::MaxNodesCountForOrigin(NodeOrigin origin) {
}
int VariableBoxController::NodeNameCompare(ScriptNode * node, const char * name, int nameLengthMaybe, bool * strictlyStartsWith) {
// TODO LEA compare until parenthesis
assert(strictlyStartsWith == nullptr || *strictlyStartsWith == false);
const char * nodeName = node->name();
const int nodeNameLength = node->nameLength() < 0 ? strlen(nodeName) : node->nameLength();
@@ -599,4 +580,29 @@ void VariableBoxController::addNode(ScriptNode::Type type, NodeOrigin origin, co
*currentNodeCount = *currentNodeCount + 1;
}
bool VariableBoxController::contains(const char * name, int nameLength) {
bool alreadyInVarBox = false;
// TODO LEA speed this up with dichotomia?
NodeOrigin origins[] = {NodeOrigin::CurrentScript, NodeOrigin::Builtins, NodeOrigin::Importation};
for (NodeOrigin origin : origins) {
const int nodesCount = nodesCountForOrigin(origin);
ScriptNode * nodes = nodesForOrigin(origin);
for (int i = 0; i < nodesCount; i++) {
ScriptNode * matchingNode = nodes + i;
int comparisonResult = NodeNameCompare(matchingNode, name, nameLength);
if (comparisonResult == 0) {
alreadyInVarBox = true;
break;
}
if (comparisonResult > 0) {
break;
}
}
if (alreadyInVarBox) {
break;
}
}
return alreadyInVarBox;
}
}

2
apps/code/variable_box_controller.h
View File

@@ -67,6 +67,8 @@ private:
void insertTextInCaller(const char * text, int textLength = -1);
void addNodesFromImportMaybe(mp_parse_node_struct_t * parseNode, const char * textToAutocomplete, int textToAutocompleteLength);
void addNode(ScriptNode::Type type, NodeOrigin origin, const char * name, int nameLength, int scriptIndex = 0);
bool contains(const char * name, int nameLength);
ScriptNode m_currentScriptNodes[k_maxScriptNodesCount];
ScriptNode m_builtinNodes[k_totalBuiltinNodesCount];