[Fix] Fix conflicts ._.

apps/code/Makefile

@@ -1,6 +1,10 @@
 apps += Code::App
 app_headers += apps/code/app.h
 
+app_code_test_src = $(addprefix apps/code/,\
+  script_template.cpp \
+)
+
 app_code_src = $(addprefix apps/code/,\
   app.cpp \
   console_controller.cpp \
@@ -19,11 +23,11 @@ app_code_src = $(addprefix apps/code/,\
   script_node_cell.cpp \
   script_parameter_controller.cpp \
   script_store.cpp \
-  script_template.cpp \
   variable_box_controller.cpp \
 )
 
-app_src += $(app_code_src)
+app_code_src += $(app_code_test_src)
+apps_src += $(app_code_src)
 
 i18n_files += $(addprefix apps/code/,\
   base.de.i18n\

apps/code/catalog.de.i18n

@@ -139,10 +139,10 @@ PythonRadians = "Convert x from degrees to radians"
 PythonRandint = "Random integer in [a,b]"
 PythonRandom = "Floating point number in [0,1["
 PythonRandomFunction = "random module function prefix"
-PythonRandrange = "Random number in range(start, stop)"
+PythonRandrange = "Random number in range(start,stop)"
 PythonRangeStartStop = "List from start to stop-1"
 PythonRangeStop = "List from 0 to stop-1"
-PythonRect = "z in cartesian coordinates"
+PythonRect = "Convert to cartesian coordinates"
 PythonRemove = "Remove the first occurrence of x"
 PythonReverse = "Reverse the elements of the list"
 PythonRound = "Round to n digits"

apps/code/catalog.en.i18n

@@ -139,10 +139,10 @@ PythonRadians = "Convert x from degrees to radians"
 PythonRandint = "Random integer in [a,b]"
 PythonRandom = "Floating point number in [0,1["
 PythonRandomFunction = "random module function prefix"
-PythonRandrange = "Random number in range(start, stop)"
+PythonRandrange = "Random number in range(start,stop)"
 PythonRangeStartStop = "List from start to stop-1"
 PythonRangeStop = "List from 0 to stop-1"
-PythonRect = "z in cartesian coordinates"
+PythonRect = "Convert to cartesian coordinates"
 PythonRemove = "Remove the first occurrence of x"
 PythonReverse = "Reverse the elements of the list"
 PythonRound = "Round to n digits"

apps/code/catalog.es.i18n

@@ -139,10 +139,10 @@ PythonRadians = "Convert x from degrees to radians"
 PythonRandint = "Random integer in [a,b]"
 PythonRandom = "Floating point number in [0,1["
 PythonRandomFunction = "random module function prefix"
-PythonRandrange = "Random number in range(start, stop)"
+PythonRandrange = "Random number in range(start,stop)"
 PythonRangeStartStop = "List from start to stop-1"
 PythonRangeStop = "List from 0 to stop-1"
-PythonRect = "z in cartesian coordinates"
+PythonRect = "Convert to cartesian coordinates"
 PythonRemove = "Remove the first occurrence of x"
 PythonReverse = "Reverse the elements of the list"
 PythonRound = "Round to n digits"

apps/code/catalog.fr.i18n

@@ -139,7 +139,7 @@ PythonRadians = "Conversion de degrés en radians"
 PythonRandint = "Entier aléatoire dans [a,b]"
 PythonRandom = "Nombre décimal dans [0,1["
 PythonRandomFunction = "Préfixe fonction du module random"
-PythonRandrange = "Nombre dans range(start, stop)"
+PythonRandrange = "Nombre dans range(start,stop)"
 PythonRangeStartStop = "Liste de start à stop-1"
 PythonRangeStop = "Liste de 0 à stop-1"
 PythonRect = "Conversion en algébrique"

apps/code/catalog.pt.i18n

@@ -139,10 +139,10 @@ PythonRadians = "Convert x from degrees to radians"
 PythonRandint = "Random integer in [a,b]"
 PythonRandom = "Floating point number in [0,1["
 PythonRandomFunction = "random module function prefix"
-PythonRandrange = "Random number in range(start, stop)"
+PythonRandrange = "Random number in range(start,stop)"
 PythonRangeStartStop = "List from start to stop-1"
 PythonRangeStop = "List from 0 to stop-1"
-PythonRect = "z in cartesian coordinates"
+PythonRect = "Convert to cartesian coordinates"
 PythonRemove = "Remove the first occurrence of x"
 PythonReverse = "Reverse the elements of the list"
 PythonRound = "Round to n digits"

apps/code/catalog.universal.i18n

@@ -165,17 +165,17 @@ PythonCommandRandint = "randint(a,b)"
 PythonCommandRandom = "random()"
 PythonCommandRandomFunction = "random.function"
 PythonCommandRandomFunctionWithoutArg = "random.\x11"
-PythonCommandRandrange = "randrange(start, stop)"
-PythonCommandRangeStartStop = "range(start, stop)"
+PythonCommandRandrange = "randrange(start,stop)"
+PythonCommandRangeStartStop = "range(start,stop)"
 PythonCommandRangeStop = "range(stop)"
 PythonCommandReal = "z.real"
 PythonCommandRealWithoutArg = ".real"
-PythonCommandRect = "rect(r, arg)"
+PythonCommandRect = "rect(r,arg)"
 PythonCommandRemove = "list.remove(x)"
 PythonCommandRemoveWithoutArg = ".remove(\x11)"
 PythonCommandReverse = "list.reverse()"
 PythonCommandReverseWithoutArg = ".reverse()"
-PythonCommandRound = "round(x, n)"
+PythonCommandRound = "round(x,n)"
 PythonCommandScatter = "scatter(x,y)"
 PythonCommandSeed = "seed(x)"
 PythonCommandSetPixel = "set_pixel(x,y,color)"
@@ -227,7 +227,7 @@ PythonTurtleCommandRed = "'red'"
 PythonTurtleCommandReset = "reset()"
 PythonTurtleCommandRight = "right(a)"
 PythonTurtleCommandSetheading = "setheading(a)"
-PythonTurtleCommandSetposition = "setposition(x, [y])"
+PythonTurtleCommandSetposition = "setposition(x,[y])"
 PythonTurtleCommandShowturtle = "showturtle()"
 PythonTurtleCommandSpeed = "speed(x)"
 PythonTurtleCommandWhite = "'white'"

apps/code/script_store.cpp

@@ -36,6 +36,12 @@ bool ScriptStore::isFull() {
 
 void ScriptStore::scanScriptsForFunctionsAndVariables(void * context, ScanCallback storeFunction, ScanCallback storeVariable) {
   for (int scriptIndex = 0; scriptIndex < numberOfScripts(); scriptIndex++) {
+    
+    //Don't scan not loaded script
+    if (!scriptAtIndex(scriptIndex).importationStatus()){
+      continue;
+    }
+
     // Handle lexer or parser errors with nlr.
     nlr_buf_t nlr;
     if (nlr_push(&nlr) == 0) {