Put python analysis in importModules-1.5

Import by bundle now import css if present in a bundle Import python-analysis only if language = python (defered to import when language modules are imported) Show a console.log if python-analysis module is imported but cannot be used (forbidden variables) Add a gulpfile-v4 for compatibility with gulpt 4
France-ioi · Apr 23, 2020 · af5fe2f · af5fe2f
1 parent 7137088
commit af5fe2f
Show file tree

Hide file tree

Showing 17 changed files with 14,702 additions and 2,492 deletions.
diff --git a/bundles/bebras-base.js b/bundles/bebras-base.js
diff --git a/bundles/bebras-interface.js b/bundles/bebras-interface.js
diff --git a/bundles/python-analysis.js b/bundles/python-analysis.js
diff --git a/bundles/quickAlgo-all-blockly.js b/bundles/quickAlgo-all-blockly.js
diff --git a/bundles/quickAlgo-all-python-1.5.js b/bundles/quickAlgo-all-python-1.5.js
diff --git a/bundles/quickAlgo-all-python.js b/bundles/quickAlgo-all-python.js
diff --git a/ext/codecast/README.md b/ext/codecast/README.md
@@ -2,6 +2,16 @@
 
 ## Add the skulpt analysis to a task
 
+In task/index.html, load the python_analysis module that is available from importModules 1.5 :
+
+```
+  importModules([
+    ...'python-analysis'...
+  ]);
+```
+
+Note : The module will be loaded only if the python language is selected.
+
 In task/task.js, the "variables" whole category must be selected :
 
 ```
@@ -21,16 +31,6 @@ In task/task.js, the "variables" whole category must be selected :
   ...
 ```
 
-It is possible also to disable the modules in such case using the disableAnalysis option in gridInfos :
-
-```
-  subTask.gridInfos = {
-    ...
-    disableAnalysis: true,
-    ...
-  }
-```
-
 ## Modify the React components related to analysis display
 
 The components are written using javascript ES6 and compiled using babel, their source code are within the **source-components-es6** directory.

diff --git a/ext/codecast/analysis.js b/ext/codecast/analysis.js
@@ -22,6 +22,9 @@ var analyseSkulptState = function analyseSkulptState(suspensions, lastAnalysis)
     var functionCallStack = Immutable.List();
     for (var suspensionIdx = 0; suspensionIdx < suspensions.length; suspensionIdx++) {
         var suspension = suspensions[suspensionIdx];
+        if (!isProgramSuspension(suspension)) {
+            continue;
+        }
 
         var lastScopeAnalysis = null;
         if (lastAnalysis && lastAnalysis.functionCallStack.size > suspensionIdx) {
@@ -200,6 +203,18 @@ var valuesWithPrevious = function valuesWithPrevious(newValue, oldValue) {
     }
 };
 
+/**
+ * Checks whether a suspension is a program's suspension.
+ * It can also be only a promise encapsulated in a suspension when certain functions are called.
+ *
+ * @param {Object} suspension The suspension.
+ *
+ * @returns {boolean}
+ */
+var isProgramSuspension = function(suspension) {
+    return suspension.hasOwnProperty('$lineno');
+};
+
 /**
  * Clone a skulpt value.
  *