Fixed ^= error, newline test case

blockpy-edu · Jun 2, 2020 · c20c963 · c20c963
1 parent 8ef3dbe
commit c20c963
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 22 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/dist/skulpt_parser.js b/dist/skulpt_parser.js
@@ -47,6 +47,9 @@ Sk.builtin = {
   int_: function int_(n) {
     this.v = n;
   },
+  float_: function float_(n) {
+    this.v = n;
+  },
   bool: {
     "true$": {
       v: true

diff --git a/src/ast/ast_AugAssign.js b/src/ast/ast_AugAssign.js
@@ -56,6 +56,7 @@ Blockly.Blocks['ast_AugAssign'] = {
     },
     updateShape_: function (block) {
         // Add new inputs.
+        this.getField("OP_NAME").getOptions(false);
         if (this.simpleTarget_) {
             if (!this.getInput('VAR_ANCHOR')) {
                 this.appendDummyInput('VAR_ANCHOR')
@@ -123,4 +124,4 @@ BlockMirrorTextToBlocks.prototype['ast_AugAssign'] = function (node, parent) {
             "@simple": simpleTarget,
             "@preposition": preposition
         });
-};
+};
diff --git a/src/block_editor.js b/src/block_editor.js
@@ -170,7 +170,7 @@ BlockMirrorBlockEditor.prototype.getToolbarWidth = function () {
     } else {
         return this.workspace.toolbox_.width;
     }
-}
+};
 
 BlockMirrorBlockEditor.prototype.VIEW_CONFIGURATIONS = {
     'split': {

diff --git a/src/skulpt/skulpt_shim.js b/src/skulpt/skulpt_shim.js
@@ -31,6 +31,9 @@ Sk.builtin = {
     int_: function(n) {
         this.v = n;
     },
+    float_: function(n) {
+        this.v = n;
+    },
     bool: {
         "true$": { v: true },
         "false$": { v: true },

diff --git a/test/minimal_skulpt.html b/test/minimal_skulpt.html
@@ -91,7 +91,7 @@
 
 </head>
 <body>
-<button id='go'>GO</button>
+<button id='go'>Run Unit Tests</button>
 <button id='make-image'>Make Image</button>
 <div id="image-spot"></div>
 <div style="width:900px; margin:0 auto;"
@@ -231,7 +231,7 @@
         "while x == 0:\n    pass\nwhile y < z:\n    a = 0\nelse:\n    b = a",
         "import x as y, b as c, d\nimport os",
         "from . import x\nfrom .os import y\nfrom ..path import z\nfrom dog.house import a\nfrom cat import b, c as d, e",
-        "import matplotlib.pyplot as plt",
+        //"import matplotlib.pyplot as plt",
         "with open('filename') as outfile:\n    pass",
         "with open('filename') as outfile, open('file2') as infile, other_context:\n    pass",
         "#hello world!\n# Another comment\n#: int\n\na",
@@ -241,8 +241,8 @@
         "(lambda x: x)()",
         "class Alpha:\n    def beta():\n        '''\n        Hello World!\n        Testing.\n        '''",
         "'test'.replace(1, 2, 3)",
-        "'\n'",
-        '"""\ntest"""'
+        "'\\n'",
+        "'''\ntest'''"
     ];
 
     function runTests() {