Make it possible to compile a code with def test(): global data

SebastienTainon · SebastienTainon · commit 73f4d924ff80 · 2023-07-26T15:09:17.000+02:00
diff --git a/franceioi/test.html b/franceioi/test.html
@@ -3,17 +3,20 @@
     <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js" type="text/javascript"></script>
     <!--<script src="../../bebras-tasks/_common/modules/ext/skulpt/skulpt.quickAlgo.min.js" type="text/javascript"></script>-->
     <script src="../dist/skulpt.min.js" type="text/javascript"></script>
-    <script src="./skulpt-stdlib.js" type="text/javascript"></script>
+    <script src="../dist/skulpt-stdlib.js" type="text/javascript"></script>
     <!--<script src="../../bebras-tasks/_common/modules/ext/skulpt/debugger.js" type="text/javascript"></script>-->
-    <!--<script src="../dist/debugger.js" type="text/javascript"></script>-->
-    <script src="../debugger/debugger.js" type="text/javascript"></script>
+    <script src="../dist/debugger.js" type="text/javascript"></script>
+<!--    <script src="../debugger/debugger.js" type="text/javascript"></script>-->
 </head>
 
 <body>
 
 <script type="text/javascript">
     window.currentPythonRunner = {
-        reportValue: (val) => val
+        reportValue: (name, value) => {
+            console.log('reported value', {name, value});
+        },
+        _debugger: new Sk.Debugger('test.py', this),
     };
 
     // output functions are configurable.  This one just appends some text
diff --git a/src/compile.js b/src/compile.js
@@ -690,20 +690,22 @@ Compiler.prototype.hookAffectation = function (mangled, dataToStore, debug) {
     // out(mangled, "=", dataToStore, ";");
 
     // If doesn't start with $loc.
-    if (mangled.substr(0, 5) !== "$loc.") {
+    if (mangled.substr(0, 5) !== "$loc." && mangled.substr(0, 5) !== "$gbl.") {
         out(mangled, "=", dataToStore, ";");
 
         return;
     }
 
-    // TO :   $loc.varName = window.currentPythonRunner.reportValue(value, 'varName');
+    var prefix = mangled.substr(0, 4);
+    
+    // TO :   [prefix].varName = window.currentPythonRunner.reportValue(value, 'varName');
     var varName = mangled.substr(5);
     out("if (" + dataToStore + ".hasOwnProperty('_uuid')) {");
-    out("  $loc.__refs__ = ($loc.hasOwnProperty('__refs__')) ? $loc.__refs__ : [];");
-    out("  if (!$loc.__refs__.hasOwnProperty(" + dataToStore + "._uuid)) {");
-    out("    $loc.__refs__[" + dataToStore + "._uuid] = [];");
+    out("  " + prefix + ".__refs__ = (" + prefix + ".hasOwnProperty('__refs__')) ? " + prefix + ".__refs__ : [];");
+    out("  if (!" + prefix + ".__refs__.hasOwnProperty(" + dataToStore + "._uuid)) {");
+    out("    " + prefix + ".__refs__[" + dataToStore + "._uuid] = [];");
     out("  }");
-    out("  $loc.__refs__[" + dataToStore + "._uuid].push(\"" + varName + "\");");
+    out("  " + prefix + ".__refs__[" + dataToStore + "._uuid].push(\"" + varName + "\");");
     out("}");
 
     out(mangled, "=", "window.currentPythonRunner.reportValue(", dataToStore, ", '", varName, "');");
